diff --git a/.github/workflows/cypress-dev.yml b/.github/workflows/cypress-dev.yml
new file mode 100644
index 0000000000..9aaf565207
--- /dev/null
+++ b/.github/workflows/cypress-dev.yml
@@ -0,0 +1,34 @@
+name: Cypress E2E — Dev
+
+# Auto-triggers after a successful dev deployment.
+# Can also be run manually — supply base_url to target a feature branch deployment
+# instead of the default dev environment URL.
+#
+# Runs Cypress inside OpenShift (d18498-tools) rather than on the GitHub-hosted
+# runner, since the app's Route is IP-allowlisted to the BC Gov network.
+# Test credentials come from Vault (GH_UGM_CYPRESS_CONFIG) via External Secrets,
+# not GitHub Actions secrets — see cypress-e2e-runner.yml.
+
+on:
+  workflow_run:
+    workflows: ["Dev - Build & Push docker images"]
+    types: [completed]
+  workflow_dispatch:
+    inputs:
+      base_url:
+        description: "Override baseUrl (e.g. https://feature-branch.apps.silver.devops.gov.bc.ca/)"
+        required: false
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  cypress:
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
+    uses: ./.github/workflows/cypress-e2e-runner.yml
+    with:
+      env_name: dev
+      cypress_config_key: CYPRESS_CONFIG_DEV
+      base_url: ${{ inputs.base_url || '' }}
+    secrets: inherit
diff --git a/.github/workflows/cypress-e2e-runner.yml b/.github/workflows/cypress-e2e-runner.yml
new file mode 100644
index 0000000000..77d7f6fa06
--- /dev/null
+++ b/.github/workflows/cypress-e2e-runner.yml
@@ -0,0 +1,130 @@
+name: Cypress E2E (runner)
+
+# Shared job called by cypress-dev/test/uat/prod.yml.
+#
+# Unlike Grants, this doesn't run Cypress on the GitHub-hosted runner directly —
+# the Unity Grant Manager Route is IP-allowlisted to the BC Gov network, which
+# GitHub-hosted runners can't reach. Instead this job launches an OpenShift Job
+# (from the unity-cypress-job Template in d18498-tools) that runs the existing
+# Unity.AutoUI Cypress suite from inside the cluster, waits for it to finish,
+# and pulls the logs/screenshots back into this Actions run.
+#
+# Test credentials are NOT GitHub secrets — the Job pulls them from the
+# unity-cypress-config Secret in d18498-tools, synced from Vault
+# (GH_UGM_CYPRESS_CONFIG) via External Secrets.
+#
+# OpenShift auth reuses the same oc-login pattern already used by
+# docker-build-dev.yml/docker-build-test.yml/docker-build-main.yml.
+
+on:
+  workflow_call:
+    inputs:
+      env_name:
+        description: "Cypress environment name: dev | test | uat | prod"
+        required: true
+        type: string
+      cypress_config_key:
+        description: "Key in the unity-cypress-config Secret for this env (e.g. CYPRESS_CONFIG_DEV)"
+        required: true
+        type: string
+      base_url:
+        description: "Optional baseUrl override — use to target a feature branch deployment instead of the default env URL"
+        required: false
+        type: string
+        default: ""
+      gh_environment:
+        description: "GitHub Environment to source OpenShift credentials from (defaults to env_name — dev/test have their own; uat/prod reuse 'main')"
+        required: false
+        type: string
+        default: ""
+
+permissions:
+  contents: read
+
+env:
+  TOOLS_NAMESPACE: d18498-tools
+  JOB_TIMEOUT: 20m
+
+jobs:
+  cypress:
+    name: Cypress E2E — ${{ inputs.env_name }}
+    runs-on: ubuntu-latest
+    environment: ${{ inputs.gh_environment || inputs.env_name }}
+    env:
+      OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
+      OC_AUTH_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
+      GH_TOKEN: ${{ secrets.GH_API_TOKEN }}
+
+    steps:
+      - name: Install OpenShift CLI
+        run: |
+          curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
+          tar -xvf oc.tar.gz
+          sudo mv oc /usr/local/bin
+
+      - name: Connect to OpenShift API
+        run: oc login --token=$OC_AUTH_TOKEN --server=$OC_CLUSTER
+
+      - name: Launch Cypress Job
+        id: launch
+        run: |
+          # The unity-cypress-job Template lives in the tenant-gitops-d18498 repo
+          # and is synced into the cluster by ArgoCD — process it by name directly
+          # from d18498-tools rather than checking out that repo here.
+          JOB_REF=$(oc process unity-cypress-job \
+            -p ENV=${{ inputs.env_name }} \
+            -p CYPRESS_CONFIG_KEY=${{ inputs.cypress_config_key }} \
+            -p GIT_REF=$GITHUB_SHA \
+            -p GIT_TOKEN=$GH_TOKEN \
+            -p BASE_URL="${{ inputs.base_url }}" \
+            -n $TOOLS_NAMESPACE \
+            | oc create -f - -o name -n $TOOLS_NAMESPACE)
+          echo "Created $JOB_REF"
+          echo "job_ref=$JOB_REF" >> "$GITHUB_OUTPUT"
+
+      - name: Wait for Cypress Job to finish
+        id: wait
+        run: |
+          JOB_REF="${{ steps.launch.outputs.job_ref }}"
+          oc wait --for=condition=complete --timeout=$JOB_TIMEOUT "$JOB_REF" -n $TOOLS_NAMESPACE &
+          COMPLETE_PID=$!
+          oc wait --for=condition=failed --timeout=$JOB_TIMEOUT "$JOB_REF" -n $TOOLS_NAMESPACE &
+          FAILED_PID=$!
+          wait -n $COMPLETE_PID $FAILED_PID || true
+          kill $COMPLETE_PID $FAILED_PID 2>/dev/null || true
+
+          SUCCEEDED=$(oc get "$JOB_REF" -n $TOOLS_NAMESPACE -o jsonpath='{.status.succeeded}')
+          echo "succeeded=${SUCCEEDED:-0}" >> "$GITHUB_OUTPUT"
+
+      - name: Show Cypress logs
+        if: always()
+        run: |
+          JOB_REF="${{ steps.launch.outputs.job_ref }}"
+          oc logs "$JOB_REF" -n $TOOLS_NAMESPACE -c cypress --tail=-1 || true
+
+      - name: Collect screenshots on failure
+        if: steps.wait.outputs.succeeded != '1'
+        run: |
+          JOB_NAME="${{ steps.launch.outputs.job_ref }}"
+          JOB_NAME="${JOB_NAME#job.batch/}"
+          POD=$(oc get pods -n $TOOLS_NAMESPACE -l job-name="$JOB_NAME" -o jsonpath='{.items[0].metadata.name}')
+          mkdir -p cypress-screenshots
+          oc cp "$TOOLS_NAMESPACE/$POD:/workspace/applications/Unity.AutoUI/cypress/screenshots" ./cypress-screenshots -c cypress || true
+
+      - name: Upload screenshots on failure
+        if: steps.wait.outputs.succeeded != '1'
+        uses: actions/upload-artifact@v5
+        with:
+          name: cypress-screenshots-${{ inputs.env_name }}-${{ github.run_number }}
+          path: cypress-screenshots
+          if-no-files-found: ignore
+
+      - name: Clean up Cypress Job
+        if: always()
+        run: |
+          JOB_REF="${{ steps.launch.outputs.job_ref }}"
+          oc delete "$JOB_REF" -n $TOOLS_NAMESPACE --ignore-not-found
+
+      - name: Fail workflow if Cypress did not succeed
+        if: steps.wait.outputs.succeeded != '1'
+        run: exit 1
diff --git a/.github/workflows/cypress-prod.yml b/.github/workflows/cypress-prod.yml
new file mode 100644
index 0000000000..03ee93b499
--- /dev/null
+++ b/.github/workflows/cypress-prod.yml
@@ -0,0 +1,20 @@
+name: Cypress E2E — Prod
+
+# Manual-only — triggered after UAT sign-off, not automatically after deployment.
+#
+# Runs Cypress inside OpenShift (d18498-tools) — see cypress-e2e-runner.yml.
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  cypress:
+    uses: ./.github/workflows/cypress-e2e-runner.yml
+    with:
+      env_name: prod
+      cypress_config_key: CYPRESS_CONFIG_PROD
+      gh_environment: main
+    secrets: inherit
diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml
new file mode 100644
index 0000000000..9a907f33d9
--- /dev/null
+++ b/.github/workflows/cypress-test.yml
@@ -0,0 +1,24 @@
+name: Cypress E2E — Test
+
+# Runs against the test environment after a successful test deployment,
+# or manually via workflow_dispatch.
+#
+# Runs Cypress inside OpenShift (d18498-tools) — see cypress-e2e-runner.yml.
+
+on:
+  workflow_run:
+    workflows: ["Test - Build & Push docker images"]
+    types: [completed]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  cypress:
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
+    uses: ./.github/workflows/cypress-e2e-runner.yml
+    with:
+      env_name: test
+      cypress_config_key: CYPRESS_CONFIG_TEST
+    secrets: inherit
diff --git a/.github/workflows/cypress-uat.yml b/.github/workflows/cypress-uat.yml
new file mode 100644
index 0000000000..4e3236b8f1
--- /dev/null
+++ b/.github/workflows/cypress-uat.yml
@@ -0,0 +1,30 @@
+name: Cypress E2E — UAT
+
+# Runs against the UAT environment after a successful main deployment,
+# or manually via workflow_dispatch.
+#
+# Unity has no separate UAT build workflow — UAT deploys off the main build,
+# so this triggers off the same workflow_run as prod's build pipeline.
+# There's also no "uat" GitHub Environment today, so oc-login reuses the
+# "main" Environment's OpenShift credentials (same cluster-wide access).
+#
+# Runs Cypress inside OpenShift (d18498-tools) — see cypress-e2e-runner.yml.
+
+on:
+  workflow_run:
+    workflows: ["Main - Build & Push docker images"]
+    types: [completed]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  cypress:
+    if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
+    uses: ./.github/workflows/cypress-e2e-runner.yml
+    with:
+      env_name: uat
+      cypress_config_key: CYPRESS_CONFIG_UAT
+      gh_environment: main
+    secrets: inherit
diff --git a/.gitignore b/.gitignore
index cf56f6bd31..8cae5022ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ bld/
 # Visual Studio cache/options directory
 .vs/
 .vscode/
+*.lscache
 # Uncomment if you have tasks that create the project's static files in wwwroot
 **/wwwroot/lib/
 
diff --git a/applications/Unity.AutoUI/.gitignore b/applications/Unity.AutoUI/.gitignore
index 2a269a8917..7fa35447c1 100644
--- a/applications/Unity.AutoUI/.gitignore
+++ b/applications/Unity.AutoUI/.gitignore
@@ -1,8 +1,14 @@
 # Cypress TypeScript project gitignore
 
-# Comment cypress.env.json to update build pipeline settings 
+# Comment cypress.env.json to update build pipeline settings
 cypress.env.json
 
+# Local environment config files — create from the .example files in cypress/config/
+cypress/config/dev.json
+cypress/config/test.json
+cypress/config/uat.json
+cypress/config/prod.json
+
 # Dependency directories
 node_modules/
 jspm_packages/
@@ -10,6 +16,9 @@ cypress/videos
 cypress/screenshots
 cypress/report
 
+cypress/scripts/last-submission-id.json
+cypress/scripts/bulk-submission-ids.json
+
 # Optional npm cache directory
 .npm
 
@@ -33,38 +42,3 @@ pids
 *.seed
 *.pid.lock
 
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-.vs/
-.vscode/
-
-# User-specific files
-*.suo
-*.user
-*.rsuser
-*.userosscache
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-[Ll]ogs/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
diff --git a/applications/Unity.AutoUI/cypress/config/README-gitignore-config-json-files.md b/applications/Unity.AutoUI/cypress/config/README-gitignore-config-json-files.md
new file mode 100644
index 0000000000..355f5f08c9
--- /dev/null
+++ b/applications/Unity.AutoUI/cypress/config/README-gitignore-config-json-files.md
@@ -0,0 +1,19 @@
+# Cypress Environment Config Files
+
+The `*.json` config files in this folder are **excluded from git** (via `.gitignore`) because they contain credentials.
+Each developer must create their own local copies from the `.example` files provided.
+
+In CI, `dev.json`/`test.json`/`uat.json`/`prod.json` are written at runtime from the `unity-cypress-config` Secret
+(synced from Vault key `GH_UGM_CYPRESS_CONFIG`) by the Cypress Job — see `cypress-job-template.yaml` in
+`tenant-gitops-d18498`.
+
+## Setup
+
+Copy the example file(s) for the environment(s) you need and fill in your credentials:
+
+```bash
+Copy-Item cypress/config/dev.json.example   cypress/config/dev.json
+Copy-Item cypress/config/test.json.example  cypress/config/test.json
+Copy-Item cypress/config/uat.json.example   cypress/config/uat.json
+Copy-Item cypress/config/prod.json.example  cypress/config/prod.json
+```
diff --git a/applications/Unity.AutoUI/cypress/config/dev.json.example b/applications/Unity.AutoUI/cypress/config/dev.json.example
new file mode 100644
index 0000000000..184c864869
--- /dev/null
+++ b/applications/Unity.AutoUI/cypress/config/dev.json.example
@@ -0,0 +1,11 @@
+{
+    "webapp.url": "https://dev-unity.apps.silver.devops.gov.bc.ca/",
+    "environment": "DEV",
+    "test1username": "",
+    "test1password": "",
+    "test2username": "",
+    "test2password": "",
+    "TEST_EMAIL_TO": "",
+    "TEST_EMAIL_CC": "",
+    "TEST_EMAIL_BCC": ""
+}
diff --git a/applications/Unity.AutoUI/cypress/config/dev2.json.example b/applications/Unity.AutoUI/cypress/config/dev2.json.example
new file mode 100644
index 0000000000..cf9669d754
--- /dev/null
+++ b/applications/Unity.AutoUI/cypress/config/dev2.json.example
@@ -0,0 +1,11 @@
+{
+    "webapp.url": "https://dev2-unity.apps.silver.devops.gov.bc.ca/",
+    "environment": "DEV2",
+    "test1username": "",
+    "test1password": "",
+    "test2username": "",
+    "test2password": "",
+    "TEST_EMAIL_TO": "",
+    "TEST_EMAIL_CC": "",
+    "TEST_EMAIL_BCC": ""
+}
diff --git a/applications/Unity.AutoUI/cypress/config/prod.json.example b/applications/Unity.AutoUI/cypress/config/prod.json.example
new file mode 100644
index 0000000000..8daeac885c
--- /dev/null
+++ b/applications/Unity.AutoUI/cypress/config/prod.json.example
@@ -0,0 +1,11 @@
+{
+    "webapp.url": "https://prod-unity.apps.silver.devops.gov.bc.ca/",
+    "environment": "PROD",
+    "test1username": "",
+    "test1password": "",
+    "test2username": "",
+    "test2password": "",
+    "TEST_EMAIL_TO": "",
+    "TEST_EMAIL_CC": "",
+    "TEST_EMAIL_BCC": ""
+}
diff --git a/applications/Unity.AutoUI/cypress/config/test.json.example b/applications/Unity.AutoUI/cypress/config/test.json.example
new file mode 100644
index 0000000000..0d72840645
--- /dev/null
+++ b/applications/Unity.AutoUI/cypress/config/test.json.example
@@ -0,0 +1,11 @@
+{
+    "webapp.url": "https://test-unity.apps.silver.devops.gov.bc.ca/",
+    "environment": "TEST",
+    "test1username": "",
+    "test1password": "",
+    "test2username": "",
+    "test2password": "",
+    "TEST_EMAIL_TO": "",
+    "TEST_EMAIL_CC": "",
+    "TEST_EMAIL_BCC": ""
+}
diff --git a/applications/Unity.AutoUI/cypress/config/uat.json.example b/applications/Unity.AutoUI/cypress/config/uat.json.example
new file mode 100644
index 0000000000..3f82b0d2b3
--- /dev/null
+++ b/applications/Unity.AutoUI/cypress/config/uat.json.example
@@ -0,0 +1,11 @@
+{
+    "webapp.url": "https://uat-unity.apps.silver.devops.gov.bc.ca/",
+    "environment": "UAT",
+    "test1username": "",
+    "test1password": "",
+    "test2username": "",
+    "test2password": "",
+    "TEST_EMAIL_TO": "",
+    "TEST_EMAIL_CC": "",
+    "TEST_EMAIL_BCC": ""
+}
diff --git a/applications/Unity.AutoUI/package-lock.json b/applications/Unity.AutoUI/package-lock.json
index badb1ccea8..2aa71448bb 100644
--- a/applications/Unity.AutoUI/package-lock.json
+++ b/applications/Unity.AutoUI/package-lock.json
@@ -4,18 +4,20 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "Unity.AutoUI",
       "dependencies": {
         "form-data": "^4.0.5",
         "typescript": "^5.8.3"
       },
       "devDependencies": {
-        "cypress": "^15.8.1"
+        "@types/node": "^25.4.0",
+        "cypress": "^15.17.0"
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.10.tgz",
-      "integrity": "sha512-hauBrOdvu08vOsagkZ/Aju5XuiZx6ldsLfByg1htFeldhex+PeMrYauANzFsMJeAA0+dyPLbDoX2OYuvVoLDkQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-4.0.1.tgz",
+      "integrity": "sha512-y20e+e6dFYkOUUJLVUZTsJRuTiXZaUQ32WD+R/ux/HBybbTx4ge7cNINcua0pU8+SNkKuRbOF12mBmzuzM8n5w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -32,14 +34,13 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "~6.14.1",
+        "qs": "^6.15.2",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "^5.0.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^8.3.2"
+        "tunnel-agent": "^0.6.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14.17.0"
       }
     },
     "node_modules/@cypress/xvfb": {
@@ -64,14 +65,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.9.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.3.tgz",
+      "integrity": "sha512-603BddQMv3pUcr4U2dhujk83N2tTDVr/34wII2B6bJy6g+8WD6yUb11jszNs0gdi4PesVWl7ABt8nYMVpnLUcg==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "undici-types": "~7.16.0"
+        "undici-types": ">=7.24.0 <7.24.7"
       }
     },
     "node_modules/@types/sinonjs__fake-timers": {
@@ -95,65 +95,17 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz",
+      "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "type-fest": "^0.21.3"
+        "environment": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -226,16 +178,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -339,16 +281,6 @@
         "ieee754": "^1.1.13"
       }
     },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/cachedir": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
@@ -442,27 +374,20 @@
         "node": ">=8"
       }
     },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
+      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "restore-cursor": "^3.1.0"
+        "restore-cursor": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/cli-table3": {
@@ -482,22 +407,68 @@
       }
     },
     "node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.2.0.tgz",
+      "integrity": "sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
+        "slice-ansi": "^8.0.0",
+        "string-width": "^8.2.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cli-truncate/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/string-width": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.1.tgz",
+      "integrity": "sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.5.0",
+        "strip-ansi": "^7.1.2"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -591,14 +562,14 @@
       }
     },
     "node_modules/cypress": {
-      "version": "15.9.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.9.0.tgz",
-      "integrity": "sha512-Ks6Bdilz3TtkLZtTQyqYaqtL/WT3X3APKaSLhTV96TmTyudzSjc6EJsJCHmBb7DxO+3R12q3Jkbjgm/iPgmwfg==",
+      "version": "15.17.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.17.0.tgz",
+      "integrity": "sha512-WL5Gcqi1GaDWozBwXmkSAtOPafTsVSRS764iX6xvuz3DPzvBAxbkRyEi4BreVdVWxLDpiYRgZCyJUafBw44njw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@cypress/request": "^3.0.10",
+        "@cypress/request": "^4.0.0",
         "@cypress/xvfb": "^1.2.4",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
@@ -607,25 +578,21 @@
         "blob-util": "^2.0.2",
         "bluebird": "^3.7.2",
         "buffer": "^5.7.1",
-        "cachedir": "^2.3.0",
+        "cachedir": "^2.4.0",
         "chalk": "^4.1.0",
         "ci-info": "^4.1.0",
-        "cli-cursor": "^3.1.0",
         "cli-table3": "0.6.1",
         "commander": "^6.2.1",
         "common-tags": "^1.8.0",
         "dayjs": "^1.10.4",
         "debug": "^4.3.4",
-        "enquirer": "^2.3.6",
         "eventemitter2": "6.4.7",
         "execa": "4.1.0",
         "executable": "^4.1.1",
-        "extract-zip": "2.0.1",
-        "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "hasha": "5.2.2",
         "is-installed-globally": "~0.4.0",
-        "listr2": "^3.8.3",
+        "listr2": "^9.0.5",
         "lodash": "^4.17.23",
         "log-symbols": "^4.0.0",
         "minimist": "^1.2.8",
@@ -635,11 +602,12 @@
         "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
         "supports-color": "^8.1.1",
-        "systeminformation": "^5.27.14",
+        "systeminformation": "^5.31.1",
         "tmp": "~0.2.4",
         "tree-kill": "1.2.2",
+        "tslib": "1.14.1",
         "untildify": "^4.0.0",
-        "yauzl": "^2.10.0"
+        "yauzl": "^3.3.1"
       },
       "bin": {
         "cypress": "bin/cypress"
@@ -648,6 +616,13 @@
         "node": "^20.1.0 || ^22.0.0 || >=24.0.0"
       }
     },
+    "node_modules/cypress/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true,
+      "license": "0BSD"
+    },
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -737,19 +712,17 @@
         "once": "^1.4.0"
       }
     },
-    "node_modules/enquirer": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
-      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+    "node_modules/environment": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
+      "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1",
-        "strip-ansi": "^6.0.1"
-      },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/es-define-property": {
@@ -797,16 +770,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/eventemitter2": {
       "version": "6.4.7",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
@@ -814,6 +777,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
+      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/execa": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
@@ -858,27 +828,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -889,32 +838,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
-    "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -926,16 +849,16 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
+      "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
+        "hasown": "^2.0.4",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
@@ -966,6 +889,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz",
+      "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-intrinsic": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
@@ -1119,9 +1055,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
       "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -1176,16 +1112,6 @@
       ],
       "license": "BSD-3-Clause"
     },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ini": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
@@ -1331,37 +1257,27 @@
       }
     },
     "node_modules/listr2": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
-      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.5.tgz",
+      "integrity": "sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.5.1",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
+        "cli-truncate": "^5.0.0",
+        "colorette": "^2.0.20",
+        "eventemitter3": "^5.0.1",
+        "log-update": "^6.1.0",
+        "rfdc": "^1.4.1",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
-      },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
-        }
+        "node": ">=20.0.0"
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
+      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
       "dev": true,
       "license": "MIT"
     },
@@ -1390,55 +1306,98 @@
       }
     },
     "node_modules/log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
+      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
+        "ansi-escapes": "^7.0.0",
+        "cli-cursor": "^5.0.0",
+        "slice-ansi": "^7.1.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/is-fullwidth-code-point": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
+      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/log-update/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
+      "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/log-update/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+    "node_modules/log-update/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-regex": "^6.2.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/math-intrinsics": {
@@ -1488,6 +1447,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-function": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
+      "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/minimist": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
@@ -1564,22 +1536,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -1656,9 +1612,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
-      "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==",
+      "version": "6.15.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz",
+      "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -1682,17 +1638,49 @@
       }
     },
     "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
+      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
+        "onetime": "^7.0.0",
+        "signal-exit": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/onetime": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-function": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/rfdc": {
@@ -1702,16 +1690,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/rxjs": {
-      "version": "7.8.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
-      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -1764,15 +1742,15 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz",
+      "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
+        "object-inspect": "^1.13.4",
+        "side-channel-list": "^1.0.1",
         "side-channel-map": "^1.0.1",
         "side-channel-weakmap": "^1.0.2"
       },
@@ -1784,14 +1762,14 @@
       }
     },
     "node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz",
+      "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
+        "object-inspect": "^1.13.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1847,18 +1825,49 @@
       "license": "ISC"
     },
     "node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-8.0.0.tgz",
+      "integrity": "sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.2.3",
+        "is-fullwidth-code-point": "^5.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
+      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/sshpk": {
@@ -1942,9 +1951,9 @@
       }
     },
     "node_modules/systeminformation": {
-      "version": "5.30.5",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.30.5.tgz",
-      "integrity": "sha512-DpWmpCckhwR3hG+6udb6/aQB7PpiqVnvSljrjbKxNSvTRsGsg7NVE3/vouoYf96xgwMxXFKcS4Ux+cnkFwYM7A==",
+      "version": "5.31.7",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.7.tgz",
+      "integrity": "sha512-/8NC53e5nP9nmhn42/ncdOkyJnOoue/Vy+tJOyUGd1Yv66G069wK4rrziwhrqDETgk78CudTQupw5z19S5uoZw==",
       "dev": true,
       "license": "MIT",
       "os": [
@@ -1978,13 +1987,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/tldts": {
       "version": "6.1.86",
       "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
@@ -2006,9 +2008,9 @@
       "license": "MIT"
     },
     "node_modules/tmp": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
-      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz",
+      "integrity": "sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2038,13 +2040,6 @@
         "tree-kill": "cli.js"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "dev": true,
-      "license": "0BSD"
-    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -2089,12 +2084,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
-      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "version": "7.24.6",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz",
+      "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==",
       "dev": true,
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/universalify": {
       "version": "2.0.1",
@@ -2116,16 +2110,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
@@ -2158,23 +2142,90 @@
       }
     },
     "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
+      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -2183,14 +2234,16 @@
       "license": "ISC"
     },
     "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+      "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
+        "pend": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     }
   }
diff --git a/applications/Unity.AutoUI/package.json b/applications/Unity.AutoUI/package.json
index d275c5ea12..cbdade5aeb 100644
--- a/applications/Unity.AutoUI/package.json
+++ b/applications/Unity.AutoUI/package.json
@@ -15,6 +15,6 @@
   },
   "devDependencies": {
     "@types/node": "^25.4.0",
-    "cypress": "15.12.0"
+    "cypress": "^15.17.0"
   }
-}
\ No newline at end of file
+}
diff --git a/applications/Unity.GrantManager/.dockerignore b/applications/Unity.GrantManager/.dockerignore
new file mode 100644
index 0000000000..c73fffa5e9
--- /dev/null
+++ b/applications/Unity.GrantManager/.dockerignore
@@ -0,0 +1,16 @@
+# Local secrets must never end up in a Docker build context / image,
+# even for a locally-run `docker build` outside of CI (which never has
+# these files in the first place, since they are gitignored).
+**/appsettings.secrets.json
+**/appsettings.Development.json
+**/.env
+**/.env.*
+**/*.env
+
+# Build artifacts and local tooling state - not needed in the build
+# context and only bloat it / risk copying stale output.
+**/bin/
+**/obj/
+**/node_modules/
+.git/
+.vs/
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/IAIService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/IAIService.cs
index 0606899c8e..8caf69258d 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/IAIService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/IAIService.cs
@@ -10,6 +10,7 @@ public interface IAIService
         Task<bool> IsAvailableAsync();
 
         Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(AttachmentSummaryRequest request, CancellationToken cancellationToken = default);
+        Task<AttachmentSummaryBatchResponse> GenerateAttachmentSummaryBatchAsync(AttachmentSummaryBatchRequest request, CancellationToken cancellationToken = default);
         Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(ApplicationAnalysisRequest request, CancellationToken cancellationToken = default);
         Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(ApplicationScoringRequest request, CancellationToken cancellationToken = default);
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/AIApplicationPromptDataDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/AIApplicationPromptDataDto.cs
new file mode 100644
index 0000000000..d54d2b7897
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/AIApplicationPromptDataDto.cs
@@ -0,0 +1,32 @@
+using System;
+
+namespace Unity.AI.Operations;
+
+public class AIApplicationPromptDataDto
+{
+    public Guid ApplicationId { get; set; }
+
+    public Guid ApplicationFormId { get; set; }
+
+    public string ProjectName { get; set; } = string.Empty;
+
+    public string ReferenceNo { get; set; } = string.Empty;
+
+    public decimal RequestedAmount { get; set; }
+
+    public decimal TotalProjectBudget { get; set; }
+
+    public string? EconomicRegion { get; set; }
+
+    public string? City { get; set; }
+
+    public DateTime SubmissionDate { get; set; }
+
+    public string? ProjectSummary { get; set; }
+
+    public DateTime? ProjectStartDate { get; set; }
+
+    public DateTime? ProjectEndDate { get; set; }
+
+    public string? Community { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/ApplicationAnalysisOperationInputDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/ApplicationAnalysisOperationInputDto.cs
new file mode 100644
index 0000000000..17deda9348
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/ApplicationAnalysisOperationInputDto.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Unity.AI.Models;
+
+namespace Unity.AI.Operations
+{
+    public class ApplicationAnalysisOperationInputDto
+    {
+        [JsonPropertyName("applicationId")]
+        public Guid ApplicationId { get; set; }
+
+        [JsonPropertyName("schema")]
+        public JsonElement Schema { get; set; }
+
+        [JsonPropertyName("data")]
+        public JsonElement Data { get; set; }
+
+        [JsonPropertyName("attachments")]
+        public List<AIAttachmentItem> Attachments { get; set; } = new();
+
+        [JsonPropertyName("promptVersion")]
+        public string? PromptVersion { get; set; }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/ApplicationScoringOperationInputDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/ApplicationScoringOperationInputDto.cs
new file mode 100644
index 0000000000..d2c5946dcf
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/ApplicationScoringOperationInputDto.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Unity.AI.Models;
+
+namespace Unity.AI.Operations
+{
+    public class ApplicationScoringOperationInputDto
+    {
+        [JsonPropertyName("applicationId")]
+        public Guid ApplicationId { get; set; }
+
+        [JsonPropertyName("data")]
+        public JsonElement Data { get; set; }
+
+        [JsonPropertyName("attachments")]
+        public List<AIAttachmentItem> Attachments { get; set; } = new();
+
+        [JsonPropertyName("sections")]
+        public List<ApplicationScoringSectionOperationInputDto> Sections { get; set; } = new();
+
+        [JsonPropertyName("promptVersion")]
+        public string? PromptVersion { get; set; }
+    }
+
+    public class ApplicationScoringSectionOperationInputDto
+    {
+        [JsonPropertyName("sectionName")]
+        public string SectionName { get; set; } = string.Empty;
+
+        [JsonPropertyName("sectionSchema")]
+        public JsonElement SectionSchema { get; set; }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAIApplicationInputBuilder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAIApplicationInputBuilder.cs
new file mode 100644
index 0000000000..6236bffbdd
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAIApplicationInputBuilder.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Unity.AI.Operations;
+
+public interface IAIApplicationInputBuilder
+{
+    Task<ApplicationAnalysisOperationInputDto> BuildApplicationAnalysisInputAsync(AIApplicationPromptDataDto application, string? promptVersion);
+    Task<ApplicationScoringOperationInputDto> BuildApplicationScoringInputAsync(AIApplicationPromptDataDto application, string? promptVersion);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAIApplicationInputDataProvider.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAIApplicationInputDataProvider.cs
new file mode 100644
index 0000000000..69b3220545
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAIApplicationInputDataProvider.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Unity.AI.Models;
+
+namespace Unity.AI.Operations;
+
+public interface IAIApplicationInputDataProvider
+{
+    Task<ApplicationFormSnapshot?> GetApplicationFormAsync(Guid applicationId);
+
+    Task<ApplicationSubmissionSnapshot?> GetApplicationSubmissionAsync(Guid applicationId);
+
+    Task<ApplicationFormVersionSnapshot?> GetApplicationFormVersionAsync(Guid? formVersionId);
+
+    Task<List<AttachmentSummarySnapshot>> GetAttachmentSummariesAsync(Guid applicationId);
+
+    Task<ScoresheetSnapshot?> GetScoresheetAsync(Guid scoresheetId);
+
+    Task<bool> HasAttachmentsAsync(Guid applicationId);
+
+    Task<bool> HasSubmissionAsync(Guid applicationId);
+}
+
+public sealed class ApplicationFormSnapshot
+{
+    public Guid? ScoresheetId { get; set; }
+}
+
+public sealed class ApplicationSubmissionSnapshot
+{
+    public Guid? ApplicationFormVersionId { get; set; }
+
+    public string? Submission { get; set; }
+}
+
+public sealed class ApplicationFormVersionSnapshot
+{
+    public string? FormSchema { get; set; }
+}
+
+public sealed record AttachmentSummarySnapshot(
+    string? FileName,
+    string? Summary);
+
+public sealed class ScoresheetSnapshot
+{
+    public List<ScoresheetSectionSnapshot> Sections { get; set; } = [];
+}
+
+public sealed class ScoresheetSectionSnapshot
+{
+    public string Name { get; set; } = string.Empty;
+
+    public int Order { get; set; }
+
+    public List<ScoresheetFieldSnapshot> Fields { get; set; } = [];
+}
+
+public sealed class ScoresheetFieldSnapshot
+{
+    public Guid Id { get; set; }
+
+    public string Label { get; set; } = string.Empty;
+
+    public string? Description { get; set; }
+
+    public string Type { get; set; } = string.Empty;
+
+    public int Order { get; set; }
+
+    public string? Definition { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAIGenerationPrerequisiteValidator.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAIGenerationPrerequisiteValidator.cs
new file mode 100644
index 0000000000..67df324548
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAIGenerationPrerequisiteValidator.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Unity.AI.Operations;
+
+public interface IAIGenerationPrerequisiteValidator
+{
+    Task EnsureAttachmentSummaryAvailableAsync(Guid applicationId);
+
+    Task EnsureApplicationAnalysisAvailableAsync(Guid applicationId);
+
+    Task EnsureApplicationScoringAvailableAsync(Guid applicationId);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAttachmentSummaryDataProvider.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAttachmentSummaryDataProvider.cs
new file mode 100644
index 0000000000..aeddf77d69
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAttachmentSummaryDataProvider.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Unity.AI.Operations;
+
+public interface IAttachmentSummaryDataProvider
+{
+    Task<AttachmentSummarySource?> GetAttachmentAsync(Guid attachmentId);
+
+    Task UpdateAttachmentSummaryAsync(Guid attachmentId, string summary);
+
+    Task<List<Guid>> GetApplicationAttachmentIdsAsync(Guid applicationId);
+}
+
+public sealed record AttachmentSummarySource(
+    Guid Id,
+    string? FileName,
+    string? ChefsSubmissionId,
+    string? ChefsFileId);
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAttachmentSummaryPersistence.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAttachmentSummaryPersistence.cs
new file mode 100644
index 0000000000..e2a803d1d7
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Operations/IAttachmentSummaryPersistence.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Unity.AI.Operations;
+
+public interface IAttachmentSummaryPersistence
+{
+    Task<AttachmentSummarySource> LoadAsync(Guid attachmentId);
+
+    Task SaveSummaryAsync(Guid attachmentId, string summary);
+
+    Task<List<Guid>> LoadApplicationAttachmentIdsAsync(Guid applicationId);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Prompts/UnityPromptAssetManifest.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Prompts/UnityPromptAssetManifest.cs
new file mode 100644
index 0000000000..93bdb236cf
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Prompts/UnityPromptAssetManifest.cs
@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace Unity.AI.Prompts;
+
+public sealed record UnityPromptAssetManifest(
+    [property: JsonPropertyName("operationName")] string OperationName,
+    [property: JsonPropertyName("promptVersion")] string PromptVersion,
+    [property: JsonPropertyName("inputContractName")] string InputContractName,
+    [property: JsonPropertyName("outputContractName")] string OutputContractName,
+    [property: JsonPropertyName("modelHint")] string? ModelHint = null,
+    [property: JsonPropertyName("profileHint")] string? ProfileHint = null);
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Requests/AttachmentSummaryBatchRequest.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Requests/AttachmentSummaryBatchRequest.cs
new file mode 100644
index 0000000000..031acd1937
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Requests/AttachmentSummaryBatchRequest.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Unity.AI.Requests;
+
+public sealed class AttachmentSummaryBatchRequest
+{
+    [JsonPropertyName("attachments")]
+    public List<AttachmentSummaryBatchItemRequest> Attachments { get; set; } = [];
+
+    [JsonPropertyName("promptVersion")]
+    public string? PromptVersion { get; set; }
+}
+
+public sealed class AttachmentSummaryBatchItemRequest
+{
+    [JsonPropertyName("attachmentId")]
+    public string AttachmentId { get; set; } = string.Empty;
+
+    [JsonPropertyName("fileName")]
+    public string FileName { get; set; } = string.Empty;
+
+    [JsonPropertyName("contentType")]
+    public string ContentType { get; set; } = "application/octet-stream";
+
+    [JsonPropertyName("extractedText")]
+    public string? ExtractedText { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Responses/AttachmentSummaryBatchResponse.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Responses/AttachmentSummaryBatchResponse.cs
new file mode 100644
index 0000000000..4751fe9122
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Responses/AttachmentSummaryBatchResponse.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Unity.AI.Responses;
+
+public sealed class AttachmentSummaryBatchResponse
+{
+    [JsonPropertyName("attachments")]
+    public List<AttachmentSummaryBatchItemResponse> Attachments { get; set; } = [];
+}
+
+public sealed class AttachmentSummaryBatchItemResponse
+{
+    [JsonPropertyName("attachmentId")]
+    public string AttachmentId { get; set; } = string.Empty;
+
+    [JsonPropertyName("summary")]
+    public string Summary { get; set; } = string.Empty;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs
deleted file mode 100644
index e82a6f7669..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-
-namespace Unity.GrantManager.Attachments;
-
-public interface IAttachmentSummaryAppService : IApplicationService
-{
-    Task<List<AttachmentSummaryResultDto>> GenerateAttachmentSummariesForPipelineAsync(List<Guid> attachmentIds, string? promptVersion = null);
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/AIGenerationRequestDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/AIGenerationRequestDto.cs
new file mode 100644
index 0000000000..3a832df03c
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/AIGenerationRequestDto.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Unity.AI.Generation;
+
+public class AIGenerationRequestDto
+{
+    public Guid ApplicationId { get; set; }
+
+    public Guid OperationId { get; set; }
+
+    public string OperationType { get; set; } = string.Empty;
+
+    public string Status { get; set; } = string.Empty;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/AIGenerationStatusDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/AIGenerationStatusDto.cs
new file mode 100644
index 0000000000..ca5684257c
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/AIGenerationStatusDto.cs
@@ -0,0 +1,12 @@
+namespace Unity.AI.Generation;
+
+public class AIGenerationStatusDto
+{
+    public AIGenerationStatusRequestDto? GenerationRequest { get; set; }
+
+    public string? FailureReason { get; set; }
+
+    public bool IsGenerating { get; set; }
+
+    public int RetryAfterSeconds { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/AIGenerationStatusRequestDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/AIGenerationStatusRequestDto.cs
new file mode 100644
index 0000000000..b80e09f433
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/AIGenerationStatusRequestDto.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace Unity.AI.Generation;
+
+public class AIGenerationStatusRequestDto
+{
+    public Guid Id { get; set; }
+
+    public Guid? ApplicationId { get; set; }
+
+    public Guid? OperationId { get; set; }
+
+    public string OperationType { get; set; } = string.Empty;
+
+    public string Status { get; set; } = string.Empty;
+
+    public DateTime? StartedAt { get; set; }
+
+    public DateTime? CompletedAt { get; set; }
+
+    public string? FailureReason { get; set; }
+
+    public bool IsActive { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/GenerateAttachmentSummariesInputDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/GenerateAttachmentSummariesInputDto.cs
new file mode 100644
index 0000000000..82956d14de
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/GenerateAttachmentSummariesInputDto.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.AI.Generation;
+
+public class GenerateAttachmentSummariesInputDto
+{
+    public Guid ApplicationId { get; set; }
+
+    public List<Guid> AttachmentIds { get; set; } = [];
+
+    public string? PromptVersion { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/IAIGenerationAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/IAIGenerationAppService.cs
new file mode 100644
index 0000000000..c22118ed39
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Generation/IAIGenerationAppService.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Unity.GrantManager.Attachments;
+using Unity.GrantManager.GrantApplications;
+using Volo.Abp.Application.Services;
+
+namespace Unity.AI.Generation;
+
+public interface IAIGenerationAppService : IApplicationService
+{
+    Task<List<AttachmentSummaryResultDto>> GenerateAttachmentSummariesAsync(GenerateAttachmentSummariesInputDto input);
+
+    Task<ApplicationAnalysisResultDto> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null);
+
+    Task<ApplicationScoringResultDto> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null);
+
+    Task<AIGenerationStatusDto> GetStatusAsync(Guid applicationId, string operationType);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
deleted file mode 100644
index 9796792385..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-
-namespace Unity.GrantManager.GrantApplications
-{
-    public interface IApplicationAnalysisAppService : IApplicationService
-    {
-        Task<ApplicationAnalysisResultDto> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null);
-        Task<ApplicationAnalysisResultDto> GenerateApplicationAnalysisForPipelineAsync(Guid applicationId, string? promptVersion = null);
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationContentAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
deleted file mode 100644
index 1ce45e8a99..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-
-namespace Unity.GrantManager.GrantApplications;
-
-public interface IApplicationContentAppService : IApplicationService
-{
-    Task<ApplicationContentResultDto> GenerateContentAsync(Guid applicationId, string? promptVersion = null);
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
deleted file mode 100644
index 158f04b607..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-
-namespace Unity.GrantManager.GrantApplications
-{
-    public interface IApplicationScoringAppService : IApplicationService
-    {
-        Task<ApplicationScoringResultDto> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null);
-        Task<ApplicationScoringResultDto> GenerateApplicationScoringForPipelineAsync(Guid applicationId, string? promptVersion = null);
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs
index 6c0a363c86..3e4a2a7b9d 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs
@@ -10,56 +10,59 @@ public class AIPermissionDefinitionProvider : PermissionDefinitionProvider
 {
     public override void Define(IPermissionDefinitionContext context)
     {
-            // AI Permission Group
-            var aiPermissionsGroup = context.AddGroup(
-                AIPermissions.GroupName,
-                L("Permission:AI"));
+        // AI Permission Group
+        var aiPermissionsGroup = context.AddGroup(
+            AIPermissions.GroupName,
+            L("Permission:AI"));
 
+        var aiReporting = aiPermissionsGroup.AddPermission(
+            AIPermissions.Reporting.ReportingDefault,
+            L("Permission:AI.Reporting"))
+            .RequireFeatures("Unity.AIReporting");
 
-            aiPermissionsGroup.AddPermission(
-                AIPermissions.Reporting.ReportingDefault,
-                L("Permission:AI.Reporting"))
-                .RequireFeatures("Unity.AIReporting");                
+        aiReporting.AddChild(
+            AIPermissions.Reporting.CreateEditDataModel,
+            L("Permission:AI.Reporting.CreateEditDataModel"))
+            .RequireFeatures("Unity.AIReporting");
 
-            var viewApplicationAnalysis = aiPermissionsGroup.AddPermission(
-                AIPermissions.Analysis.ViewApplicationAnalysis,
-                L("Permission:AI.ViewApplicationAnalysis"))
-                .RequireFeatures("Unity.AI.ApplicationAnalysis");
+        var viewApplicationAnalysis = aiPermissionsGroup.AddPermission(
+            AIPermissions.Analysis.ViewApplicationAnalysis,
+            L("Permission:AI.ViewApplicationAnalysis"))
+            .RequireFeatures("Unity.AI.ApplicationAnalysis");
 
-            viewApplicationAnalysis.AddChild(
-                AIPermissions.Analysis.GenerateApplicationAnalysis,
-                L("Permission:AI.GenerateApplicationAnalysis"))
-                .RequireFeatures("Unity.AI.ApplicationAnalysis");
+        viewApplicationAnalysis.AddChild(
+            AIPermissions.Analysis.GenerateApplicationAnalysis,
+            L("Permission:AI.GenerateApplicationAnalysis"))
+            .RequireFeatures("Unity.AI.ApplicationAnalysis");
 
-            var viewAttachmentSummary = aiPermissionsGroup.AddPermission(
-                AIPermissions.Analysis.ViewAttachmentSummary,
-                L("Permission:AI.ViewAttachmentSummary"))
-                .RequireFeatures("Unity.AI.AttachmentSummaries");
+        var viewAttachmentSummary = aiPermissionsGroup.AddPermission(
+            AIPermissions.Analysis.ViewAttachmentSummary,
+            L("Permission:AI.ViewAttachmentSummary"))
+            .RequireFeatures("Unity.AI.AttachmentSummaries");
 
-            viewAttachmentSummary.AddChild(
-                AIPermissions.Analysis.GenerateAttachmentSummaries,
-                L("Permission:AI.GenerateAttachmentSummaries"))
-                .RequireFeatures("Unity.AI.AttachmentSummaries");
+        viewAttachmentSummary.AddChild(
+            AIPermissions.Analysis.GenerateAttachmentSummaries,
+            L("Permission:AI.GenerateAttachmentSummaries"))
+            .RequireFeatures("Unity.AI.AttachmentSummaries");
 
-            var viewScoringResult = aiPermissionsGroup.AddPermission(
-                AIPermissions.Analysis.ViewScoringResult,
-                L("Permission:AI.ViewScoringResult"))
-                .RequireFeatures("Unity.AI.Scoring");
+        var viewScoringResult = aiPermissionsGroup.AddPermission(
+            AIPermissions.Analysis.ViewScoringResult,
+            L("Permission:AI.ViewScoringResult"))
+            .RequireFeatures("Unity.AI.Scoring");
 
-            viewScoringResult.AddChild(
-                AIPermissions.Analysis.GenerateScoring,
-                L("Permission:AI.GenerateScoring"))
-                .RequireFeatures("Unity.AI.Scoring");
-
-            var settingManagement = context.GetGroup(SettingManagementPermissions.GroupName);
-            var configureAI = settingManagement.AddPermission(
-                AIPermissions.Configuration.ConfigureAI,
-                L("Permission:AI.ConfigureAI"));
-            configureAI.StateCheckers.Add(new AnyFeaturePermissionStateProvider(
-                "Unity.AI.Scoring",
-                "Unity.AI.AttachmentSummaries",
-                "Unity.AI.ApplicationAnalysis"));
+        viewScoringResult.AddChild(
+            AIPermissions.Analysis.GenerateScoring,
+            L("Permission:AI.GenerateScoring"))
+            .RequireFeatures("Unity.AI.Scoring");
 
+        var settingManagement = context.GetGroup(SettingManagementPermissions.GroupName);
+        var configureAI = settingManagement.AddPermission(
+            AIPermissions.Configuration.ConfigureAI,
+            L("Permission:AI.ConfigureAI"));
+        configureAI.StateCheckers.Add(new AnyFeaturePermissionStateProvider(
+            "Unity.AI.Scoring",
+            "Unity.AI.AttachmentSummaries",
+            "Unity.AI.ApplicationAnalysis"));
     }
 
     private static LocalizableString L(string 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
index b9d561deca..b9ea59607f 100644
--- 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
@@ -9,6 +9,7 @@ public static class AIPermissions
     public static class Reporting
     {
         public const string ReportingDefault = GroupName + ".Reporting";
+        public const string CreateEditDataModel = GroupName + ".Reporting.CreateEditDataModel";
     }
 
     public static class Analysis
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptDto.cs
index 0bdff63a08..d5b673b699 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptDto.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Volo.Abp.Application.Dtos;
 
 namespace Unity.AI.Prompts;
@@ -7,8 +6,9 @@ namespace Unity.AI.Prompts;
 public class AIPromptDto : AuditedEntityDto<Guid>
 {
     public string Name { get; set; } = string.Empty;
-    public string? Description { get; set; }
-    public PromptType Type { get; set; }
+    public int VersionNumber { get; set; }
+    public string SystemPrompt { get; set; } = string.Empty;
+    public string UserPrompt { get; set; } = string.Empty;
+    public string? MetadataJson { get; set; }
     public bool IsActive { get; set; }
-    public List<AIPromptVersionDto> Versions { get; set; } = new();
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptVersionDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptVersionDto.cs
deleted file mode 100644
index a9ed4e50a8..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptVersionDto.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace Unity.AI.Prompts;
-
-public class AIPromptVersionDto : AuditedEntityDto<Guid>
-{
-    public Guid PromptId { get; set; }
-    public int VersionNumber { get; set; }
-    public string SystemPrompt { get; set; } = string.Empty;
-    public string UserPromptTemplate { get; set; } = string.Empty;
-    public string? DeveloperNotes { get; set; }
-    public string? TargetModel { get; set; }
-    public string? TargetProvider { get; set; }
-    public double Temperature { get; set; }
-    public int? MaxTokens { get; set; }
-    public bool IsPublished { get; set; }
-    public bool IsDeprecated { get; set; }
-    public string? MetadataJson { get; set; }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptDto.cs
index 6d361fd3ba..e26973030a 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptDto.cs
@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
@@ -5,17 +6,21 @@ namespace Unity.AI.Prompts;
 
 public class CreateUpdateAIPromptDto
 {
+    public Guid PromptId { get; set; }
+
+    [DisplayName("VersionNumber")]
+    public int VersionNumber { get; set; }
+
     [Required]
-    [MaxLength(200)]
-    [DisplayName("PromptName")]
-    public string Name { get; set; } = string.Empty;
+    [DisplayName("SystemPrompt")]
+    public string SystemPrompt { get; set; } = string.Empty;
 
-    [MaxLength(2000)]
-    [DisplayName("PromptDescription")]
-    public string? Description { get; set; }
+    [Required]
+    [DisplayName("UserPrompt")]
+    public string UserPrompt { get; set; } = string.Empty;
 
-    [DisplayName("PromptType")]
-    public PromptType Type { get; set; }
+    [DisplayName("MetadataJson")]
+    public string? MetadataJson { get; set; }
 
     [DisplayName("PromptIsActive")]
     public bool IsActive { get; set; } = true;
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptVersionDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptVersionDto.cs
deleted file mode 100644
index 8e3414943f..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptVersionDto.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-
-namespace Unity.AI.Prompts;
-
-public class CreateUpdateAIPromptVersionDto
-{
-    public Guid PromptId { get; set; }
-
-    [DisplayName("VersionNumber")]
-    public int VersionNumber { get; set; }
-
-    [Required]
-    [DisplayName("SystemPrompt")]
-    public string SystemPrompt { get; set; } = string.Empty;
-
-    [Required]
-    [DisplayName("UserPromptTemplate")]
-    public string UserPromptTemplate { get; set; } = string.Empty;
-
-    [DisplayName("DeveloperNotes")]
-    public string? DeveloperNotes { get; set; }
-
-    [MaxLength(100)]
-    [DisplayName("TargetModel")]
-    public string? TargetModel { get; set; }
-
-    [MaxLength(100)]
-    [DisplayName("TargetProvider")]
-    public string? TargetProvider { get; set; }
-
-    [DisplayName("Temperature")]
-    public double Temperature { get; set; } = 0.2;
-
-    [DisplayName("MaxTokens")]
-    public int? MaxTokens { get; set; }
-
-    [DisplayName("IsPublished")]
-    public bool IsPublished { get; set; }
-
-    [DisplayName("IsDeprecated")]
-    public bool IsDeprecated { get; set; }
-
-    [DisplayName("MetadataJson")]
-    public string? MetadataJson { get; set; }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptAppService.cs
index c259996db0..7aca79853d 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptAppService.cs
@@ -10,4 +10,5 @@ public interface IAIPromptAppService : ICrudAppService<
     PagedAndSortedResultRequestDto,
     CreateUpdateAIPromptDto>
 {
+    System.Threading.Tasks.Task<ListResultDto<AIPromptDto>> GetByPromptAsync(Guid promptId);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptVersionAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptVersionAppService.cs
deleted file mode 100644
index 269029e5ec..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptVersionAppService.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-
-namespace Unity.AI.Prompts;
-
-public interface IAIPromptVersionAppService : ICrudAppService<
-    AIPromptVersionDto,
-    Guid,
-    PagedAndSortedResultRequestDto,
-    CreateUpdateAIPromptVersionDto>
-{
-    System.Threading.Tasks.Task<ListResultDto<AIPromptVersionDto>> GetByPromptAsync(Guid promptId);
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Extraction/TextExtractionService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Extraction/TextExtractionService.cs
index 1da60206a2..4733c05dc5 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Extraction/TextExtractionService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Extraction/TextExtractionService.cs
@@ -37,7 +37,6 @@ public Task<string> ExtractTextAsync(string fileName, Stream fileContent, string
         {
             if (fileContent == null)
             {
-                _logger.LogDebug("File content stream is null for {FileName}", fileName);
                 return Task.FromResult(string.Empty);
             }
 
@@ -49,7 +48,6 @@ public Task<string> ExtractTextAsync(string fileName, Stream fileContent, string
 
                 if (extension == ".doc")
                 {
-                    _logger.LogDebug("Legacy .doc extraction is not supported for {FileName}", fileName);
                     return Task.FromResult(string.Empty);
                 }
 
@@ -63,13 +61,7 @@ public Task<string> ExtractTextAsync(string fileName, Stream fileContent, string
                     _ => ExtractByContentType(fileName, fileContent, normalizedContentType, cancellationToken)
                 };
 
-                if (string.IsNullOrEmpty(rawText))
-                {
-                    _logger.LogDebug("No text extraction available for content type {ContentType} with extension {Extension}",
-                        contentType, extension);
-                }
-
-                return Task.FromResult(NormalizeAndLimitText(rawText, fileName));
+                return Task.FromResult(NormalizeAndLimitText(rawText));
             }
             catch (OperationCanceledException)
             {
@@ -138,12 +130,9 @@ private string ExtractTextFromTextFile(Stream fileContent, CancellationToken can
                     builder.Append(buffer, 0, Math.Min(read, remaining));
                     if (builder.Length >= MaxExtractedTextLength)
                     {
-                        _logger.LogDebug("Truncated text content to {MaxLength} characters", MaxExtractedTextLength);
                         break;
                     }
                 }
-
-                _logger.LogDebug("Extracted {CharacterCount} characters from text-based content.", builder.Length);
                 return builder.ToString();
             }
             catch (Exception ex)
@@ -180,7 +169,6 @@ private string ExtractTextFromPdfFile(string fileName, Stream fileContent, Cance
                     }
                 }
 
-                _logger.LogDebug("Extracted PDF text from {ProcessedPageCount} pages for {FileName}", processedPageCount, fileName);
                 return builder.ToString();
             }
             catch (Exception ex)
@@ -200,11 +188,6 @@ private string ExtractTextFromWordDocx(string fileName, Stream fileContent, Canc
                 var processedParagraphCount = AppendDocxParagraphText(document, builder, cancellationToken);
                 var processedTableRowCount = AppendDocxTableText(document, builder, cancellationToken);
 
-                _logger.LogDebug(
-                    "Extracted Word text from {ProcessedParagraphCount} paragraphs and {ProcessedTableRowCount} table rows for {FileName}",
-                    processedParagraphCount,
-                    processedTableRowCount,
-                    fileName);
                 return builder.ToString();
             }
             catch (Exception ex)
@@ -324,11 +307,6 @@ private string ExtractTextFromExcelFile(string fileName, Stream fileContent, Can
                     }
                 }
 
-                _logger.LogDebug(
-                    "Extracted Excel text from {ProcessedSheetCount} sheets and {ProcessedRowCount} rows for {FileName}",
-                    processedSheetCount,
-                    processedRowCount,
-                    fileName);
                 return builder.ToString();
             }
             catch (Exception ex)
@@ -371,7 +349,6 @@ private string ExtractTextFromPowerPointFile(string fileName, Stream fileContent
                     }
                 }
 
-                _logger.LogDebug("Extracted PowerPoint text from {ProcessedSlideCount} slides for {FileName}", processedSlideCount, fileName);
                 return builder.ToString();
             }
             catch (Exception ex)
@@ -390,14 +367,12 @@ private IEnumerable<ZipArchiveEntry> GetOrderedPowerPointSlideEntries(ZipArchive
 
             if (slideEntriesByName.Count == 0)
             {
-                _logger.LogDebug("No slide entries found in PowerPoint archive.");
                 return Enumerable.Empty<ZipArchiveEntry>();
             }
 
             var orderedSlideNames = TryGetPowerPointSlideOrder(archive);
             if (orderedSlideNames.Count == 0)
             {
-                _logger.LogDebug("Using PowerPoint part-name order fallback for {SlideCount} slides.", slideEntriesByName.Count);
                 return slideEntriesByName.Values
                     .OrderBy(entry => GetPowerPointSlideNumber(entry.FullName))
                     .ToList();
@@ -417,8 +392,6 @@ private IEnumerable<ZipArchiveEntry> GetOrderedPowerPointSlideEntries(ZipArchive
             {
                 orderedEntries.AddRange(slideEntriesByName.Values.OrderBy(entry => GetPowerPointSlideNumber(entry.FullName)));
             }
-
-            _logger.LogDebug("Resolved PowerPoint presentation order for {SlideCount} slides.", orderedEntries.Count);
             return orderedEntries;
         }
 
@@ -583,7 +556,7 @@ private List<string> TryGetPowerPointSlideOrder(ZipArchive archive)
             }
             catch (Exception ex)
             {
-                _logger.LogDebug(ex, "Falling back to part-name slide order for PowerPoint extraction.");
+                _logger.LogDebug(ex, "Could not determine PowerPoint slide order from relationships; falling back to part-name order.");
                 return new List<string>();
             }
         }
@@ -683,15 +656,13 @@ private static string GetCellText(NPOI.SS.UserModel.ICell cell)
             }) ?? string.Empty;
         }
 
-        private string NormalizeAndLimitText(string text, string fileName)
+        private string NormalizeAndLimitText(string text)
         {
             var normalized = NormalizeExtractedText(text);
-            normalized = RemoveLeadingFileNameArtifact(normalized, fileName);
 
             if (normalized.Length > MaxExtractedTextLength)
             {
                 normalized = normalized.Substring(0, MaxExtractedTextLength);
-                _logger.LogDebug("Truncated extracted content to {MaxLength} characters", MaxExtractedTextLength);
             }
 
             return normalized;
@@ -709,11 +680,6 @@ private static string NormalizeExtractedText(string text)
                 .Replace("\r\n", "\n")
                 .Replace('\r', '\n');
 
-            normalized = LowerToUpperWordBoundaryRegex().Replace(normalized, " ");
-            normalized = PunctuationToWordBoundaryRegex().Replace(normalized, " ");
-            normalized = ColonDashSpacingRegex().Replace(normalized, ": - ");
-            normalized = HyphenSpacingRegex().Replace(normalized, " - ");
-            normalized = KeywordBoundaryRegex().Replace(normalized, " ");
             normalized = MultipleSpacesRegex().Replace(normalized, " ");
             normalized = NewlineWhitespaceRegex().Replace(normalized, "\n");
             normalized = MultipleNewlinesRegex().Replace(normalized, "\n");
@@ -721,55 +687,6 @@ private static string NormalizeExtractedText(string text)
             return normalized.Trim();
         }
 
-        private static string RemoveLeadingFileNameArtifact(string text, string fileName)
-        {
-            if (string.IsNullOrWhiteSpace(text) || string.IsNullOrWhiteSpace(fileName))
-            {
-                return text;
-            }
-
-            var rawStem = Path.GetFileNameWithoutExtension(fileName)?.Trim();
-            if (string.IsNullOrWhiteSpace(rawStem))
-            {
-                return text;
-            }
-
-            var decodedStem = Uri.UnescapeDataString(rawStem);
-            foreach (var candidate in new[] { rawStem, decodedStem })
-            {
-                if (string.IsNullOrWhiteSpace(candidate))
-                {
-                    continue;
-                }
-
-                if (text.StartsWith(candidate, StringComparison.OrdinalIgnoreCase))
-                {
-                    var stripped = text.Substring(candidate.Length).TrimStart(' ', '-', ':', '.', '\t');
-                    if (!string.IsNullOrWhiteSpace(stripped))
-                    {
-                        return stripped;
-                    }
-                }
-            }
-
-            return text;
-        }
-
-        [GeneratedRegex(@"(?<=[a-z])(?=[A-Z])")]
-        private static partial Regex LowerToUpperWordBoundaryRegex();
-
-        [GeneratedRegex(@"(?<=[\.\,\:\;\)])(?=[A-Za-z0-9])")]
-        private static partial Regex PunctuationToWordBoundaryRegex();
-
-        [GeneratedRegex(@":-")]
-        private static partial Regex ColonDashSpacingRegex();
-
-        [GeneratedRegex(@"(?<=\S)- (?=[A-Za-z])")]
-        private static partial Regex HyphenSpacingRegex();
-
-        [GeneratedRegex(@"(?<=[a-z])(?=(project|funding|budget|community|summary|notes|details|planning|outcomes|background|services)\b)", RegexOptions.IgnoreCase)]
-        private static partial Regex KeywordBoundaryRegex();
-
         [GeneratedRegex(@"[ \t]+")]
         private static partial Regex MultipleSpacesRegex();
 
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIApplicationInputBuilder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIApplicationInputBuilder.cs
new file mode 100644
index 0000000000..1378b5bbd5
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIApplicationInputBuilder.cs
@@ -0,0 +1,154 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.AI.Models;
+using Unity.AI.Prompts;
+using Volo.Abp;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.Operations;
+
+public class AIApplicationInputBuilder(
+    IAIApplicationInputDataProvider dataProvider,
+    ILogger<AIApplicationInputBuilder> logger) : IAIApplicationInputBuilder, ITransientDependency
+{
+    public async Task<ApplicationAnalysisOperationInputDto> BuildApplicationAnalysisInputAsync(AIApplicationPromptDataDto application, string? promptVersion)
+    {
+        var formSubmission = await dataProvider.GetApplicationSubmissionAsync(application.ApplicationId);
+        var attachments = PromptDataPayloadBuilder.BuildAttachmentSummaries(await dataProvider.GetAttachmentSummariesAsync(application.ApplicationId));
+        var formSchema = await GetFormSchemaAsync(formSubmission?.ApplicationFormVersionId);
+
+        return new ApplicationAnalysisOperationInputDto
+        {
+            ApplicationId = application.ApplicationId,
+            Schema = JsonSerializer.SerializeToElement(PromptDataPayloadBuilder.BuildFormFieldConfiguration(formSchema, logger)),
+            Data = PromptDataPayloadBuilder.BuildPromptDataPayload(application, formSubmission?.Submission, formSchema, logger),
+            Attachments = attachments,
+            PromptVersion = promptVersion
+        };
+    }
+
+    public async Task<ApplicationScoringOperationInputDto> BuildApplicationScoringInputAsync(AIApplicationPromptDataDto application, string? promptVersion)
+    {
+        var applicationForm = await dataProvider.GetApplicationFormAsync(application.ApplicationId);
+        if (applicationForm?.ScoresheetId == null)
+        {
+            throw new UserFriendlyException("Scoring requires a configured scoresheet.");
+        }
+
+        var scoresheet = await dataProvider.GetScoresheetAsync(applicationForm.ScoresheetId.Value);
+        if (scoresheet == null || !scoresheet.Sections.Any() || !scoresheet.Sections.SelectMany(s => s.Fields).Any())
+        {
+            throw new UserFriendlyException("Scoring requires a scoresheet with fields.");
+        }
+
+        var attachments = await dataProvider.GetAttachmentSummariesAsync(application.ApplicationId);
+        var attachmentSummaries = PromptDataPayloadBuilder.BuildAttachmentSummaries(attachments);
+
+        var formSubmission = await dataProvider.GetApplicationSubmissionAsync(application.ApplicationId);
+        var formSchema = await GetFormSchemaAsync(formSubmission?.ApplicationFormVersionId);
+        var promptData = PromptDataPayloadBuilder.BuildPromptDataPayload(application, formSubmission?.Submission, formSchema, logger);
+
+        var sections = scoresheet.Sections
+            .OrderBy(s => s.Order)
+            .Select(section => new ApplicationScoringSectionOperationInputDto
+            {
+                SectionName = section.Name,
+                SectionSchema = JsonSerializer.SerializeToElement(BuildSectionQuestionsData(section))
+            })
+            .ToList();
+
+        return new ApplicationScoringOperationInputDto
+        {
+            ApplicationId = application.ApplicationId,
+            Data = promptData,
+            Attachments = attachmentSummaries,
+            Sections = sections,
+            PromptVersion = promptVersion
+        };
+    }
+
+    private async Task<string?> GetFormSchemaAsync(Guid? formVersionId)
+    {
+        if (formVersionId == null)
+        {
+            return null;
+        }
+
+        try
+        {
+            var formVersion = await dataProvider.GetApplicationFormVersionAsync(formVersionId);
+            return string.IsNullOrWhiteSpace(formVersion?.FormSchema) ? null : formVersion.FormSchema;
+        }
+        catch (Exception ex)
+        {
+            logger.LogWarning(ex, "Unable to load form schema for AI input generation for form version {FormVersionId}.", formVersionId);
+            return null;
+        }
+    }
+
+    private static List<object> BuildSectionQuestionsData(ScoresheetSectionSnapshot section)
+    {
+        var sectionQuestionsData = new List<object>();
+        foreach (var field in section.Fields.OrderBy(f => f.Order))
+        {
+            var options = ExtractSelectListOptions(field);
+            sectionQuestionsData.Add(new
+            {
+                id = field.Id.ToString(),
+                section = section.Name,
+                question = field.Label,
+                description = field.Description,
+                type = field.Type.ToString(),
+                options,
+                allowed_answers = ExtractSelectListOptionNumbers(options)
+            });
+        }
+
+        return sectionQuestionsData;
+    }
+
+    private static object[]? ExtractSelectListOptions(ScoresheetFieldSnapshot field)
+    {
+        if (field.Type != Unity.Flex.Scoresheets.Enums.QuestionType.SelectList.ToString() || 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) =>
+                        (object)new
+                        {
+                            number = index + 1,
+                            value = option.Value
+                        })
+                    .ToArray();
+            }
+        }
+        catch (JsonException)
+        {
+        }
+
+        return null;
+    }
+
+    private static string[]? ExtractSelectListOptionNumbers(object[]? options)
+    {
+        if (options == null || options.Length == 0)
+        {
+            return null;
+        }
+
+        return options
+            .Select((_, index) => (index + 1).ToString())
+            .ToArray();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIExecutionStrategy.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIExecutionStrategy.cs
index 96078d8970..c6465ac29b 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIExecutionStrategy.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIExecutionStrategy.cs
@@ -28,19 +28,21 @@ public static async Task<List<TResult>> RunAsync<T, TResult>(
 
         switch (mode)
         {
-            case AIExecutionMode.Parallel:
-                return [.. await Task.WhenAll(items.Select(operation))];
-
-            case AIExecutionMode.Batch:
-                return await batchOperation(items);
-
-            default:
+            case AIExecutionMode.Sequential:
                 var sequential = new List<TResult>(items.Count);
                 foreach (var item in items)
                 {
                     sequential.Add(await operation(item));
                 }
                 return sequential;
+
+            case AIExecutionMode.Batch:
+                return await batchOperation(items);
+
+            case AIExecutionMode.Parallel:
+                return [.. await Task.WhenAll(items.Select(operation))];
         }
+
+        throw new ArgumentOutOfRangeException(nameof(mode), mode, "Unsupported AI execution mode.");
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIGenerationPrerequisiteValidator.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIGenerationPrerequisiteValidator.cs
new file mode 100644
index 0000000000..eb882c8cae
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AIGenerationPrerequisiteValidator.cs
@@ -0,0 +1,45 @@
+using Microsoft.Extensions.Localization;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.AI.Localization;
+using Volo.Abp;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.Operations;
+
+public class AIGenerationPrerequisiteValidator(
+    IAIApplicationInputDataProvider dataProvider,
+    IStringLocalizer<AIResource> localizer) : IAIGenerationPrerequisiteValidator, ITransientDependency
+{
+    public async Task EnsureAttachmentSummaryAvailableAsync(Guid applicationId)
+    {
+        if (!await dataProvider.HasAttachmentsAsync(applicationId))
+        {
+            throw new UserFriendlyException(localizer[AILocalizationKeys.NoAttachmentsAvailable]);
+        }
+    }
+
+    public async Task EnsureApplicationAnalysisAvailableAsync(Guid applicationId)
+    {
+        if (!await dataProvider.HasSubmissionAsync(applicationId))
+        {
+            throw new UserFriendlyException(localizer[AILocalizationKeys.ApplicationAnalysisRequiresSubmission]);
+        }
+    }
+
+    public async Task EnsureApplicationScoringAvailableAsync(Guid applicationId)
+    {
+        var applicationForm = await dataProvider.GetApplicationFormAsync(applicationId);
+        if (applicationForm?.ScoresheetId == null)
+        {
+            throw new UserFriendlyException(localizer[AILocalizationKeys.ScoringRequiresScoresheet]);
+        }
+
+        var scoresheet = await dataProvider.GetScoresheetAsync(applicationForm.ScoresheetId.Value);
+        if (scoresheet == null || !scoresheet.Sections.Any() || !scoresheet.Sections.SelectMany(s => s.Fields).Any())
+        {
+            throw new UserFriendlyException(localizer[AILocalizationKeys.ScoringRequiresScoresheetFields]);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/ApplicationAnalysisService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/ApplicationAnalysisService.cs
index 12b9b24342..b2ce118946 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/ApplicationAnalysisService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/ApplicationAnalysisService.cs
@@ -1,198 +1,33 @@
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Unity.AI;
 using Unity.AI.Models;
-using Unity.AI.Prompts;
 using Unity.AI.Requests;
 using Unity.AI.Runtime;
-using Unity.GrantManager.Applications;
 using Volo.Abp.DependencyInjection;
 
 namespace Unity.AI.Operations
 {
     public class ApplicationAnalysisService(
-        IApplicationRepository applicationRepository,
-        IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
-        IApplicationFormVersionRepository applicationFormVersionRepository,
-        IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
         IAIService aiService,
-        ILogger<ApplicationAnalysisService> logger) : IApplicationAnalysisService, ITransientDependency
+        IAIGenerationPrerequisiteValidator aiGenerationPrerequisiteValidator) : IApplicationAnalysisService, ITransientDependency
     {
-        private const string ComponentsKey = "components";
-        private static readonly HashSet<string> ExcludedSchemaKeys = new(StringComparer.OrdinalIgnoreCase)
+        public async Task<string> RegenerateAsync(ApplicationAnalysisOperationInputDto input, CancellationToken cancellationToken = default)
         {
-            "applicantAgent"
-        };
-
-        public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, CancellationToken cancellationToken = default)
-        {
-            var application = await applicationRepository.GetAsync(applicationId);
-            var formSubmission = await applicationFormSubmissionRepository.GetByApplicationAsync(applicationId);
-            var attachments = await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId);
-            var formSchema = await GetFormSchemaAsync(formSubmission?.ApplicationFormVersionId);
-
-            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();
-
-            object formFieldConfiguration = new { message = "Form configuration not available." };
-            if (formSubmission?.ApplicationFormVersionId != null)
-            {
-                formFieldConfiguration = await ExtractFormFieldConfigurationAsync(formSubmission.ApplicationFormVersionId.Value);
-            }
+            await aiGenerationPrerequisiteValidator.EnsureApplicationAnalysisAvailableAsync(input.ApplicationId);
 
             var analysis = await aiService.GenerateApplicationAnalysisAsync(new ApplicationAnalysisRequest
             {
-                Schema = JsonSerializer.SerializeToElement(formFieldConfiguration),
-                Data = PromptDataPayloadBuilder.BuildPromptDataPayload(application, formSubmission, formSchema, logger),
-                Attachments = attachmentSummaries,
-                PromptVersion = promptVersion,
+                Schema = input.Schema,
+                Data = input.Data,
+                Attachments = input.Attachments,
+                PromptVersion = input.PromptVersion,
             }, cancellationToken);
 
             var analysisJson = JsonSerializer.Serialize(analysis, AIJsonDefaults.Indented);
-            application.AIAnalysis = analysisJson;
-            await applicationRepository.UpdateAsync(application);
             return analysisJson;
         }
 
-        private async Task<string?> GetFormSchemaAsync(Guid? formVersionId)
-        {
-            if (formVersionId == null)
-            {
-                return null;
-            }
-
-            try
-            {
-                var formVersion = await applicationFormVersionRepository.GetAsync(formVersionId.Value);
-                return string.IsNullOrWhiteSpace(formVersion?.FormSchema) ? null : formVersion.FormSchema;
-            }
-            catch (Exception ex)
-            {
-                logger.LogWarning(ex, "Unable to load form schema for prompt data generation for form version {FormVersionId}.", formVersionId);
-                return null;
-            }
-        }
-
-        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) || ExcludedSchemaKeys.Contains(key))
-                {
-                    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/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/ApplicationScoringService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/ApplicationScoringService.cs
index f6188f689b..ec6bb55e8d 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/ApplicationScoringService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/ApplicationScoringService.cs
@@ -5,64 +5,29 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Unity.Flex.Domain.Scoresheets;
+using Unity.AI;
 using Unity.AI.Models;
-using Unity.AI.Prompts;
 using Unity.AI.Requests;
 using Unity.AI.Runtime;
-using Unity.GrantManager.Applications;
 using Volo.Abp.DependencyInjection;
 
 namespace Unity.AI.Operations
 {
     public class ApplicationScoringService(
-        IApplicationRepository applicationRepository,
-        IApplicationFormRepository applicationFormRepository,
-        IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
-        IApplicationFormVersionRepository applicationFormVersionRepository,
-        IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
-        IScoresheetRepository scoresheetRepository,
         IAIService aiService,
         AIExecutionModeResolver executionModeResolver,
         ILogger<ApplicationScoringService> logger) : IApplicationScoringService, ITransientDependency
     {
-        public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, CancellationToken cancellationToken = default)
+        public async Task<string> RegenerateAsync(ApplicationScoringOperationInputDto input, CancellationToken cancellationToken = default)
         {
-            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 formSchema = await GetFormSchemaAsync(formSubmission?.ApplicationFormVersionId);
-            var promptData = PromptDataPayloadBuilder.BuildPromptDataPayload(application, formSubmission, formSchema, logger);
-
-            var sections = scoresheet.Sections.OrderBy(s => s.Order).ToList();
+            var sections = input.Sections;
             var mode = executionModeResolver.ResolveMode(AIExecutionModeResolver.ApplicationScoringOperation);
 
             var perSectionResults = await AIExecutionStrategy.RunAsync(
                 sections,
                 mode,
-                section => ProcessSectionAsync(applicationId, section, promptData, attachmentSummaries, promptVersion, cancellationToken),
-                batch => ProcessSectionsAsync(applicationId, batch, promptData, attachmentSummaries, promptVersion, cancellationToken));
+                section => ProcessSectionAsync(input.ApplicationId, section, input.Data, input.Attachments, input.PromptVersion, cancellationToken),
+                batch => ProcessSectionsAsync(input.ApplicationId, batch, input.Data, input.Attachments, input.PromptVersion, cancellationToken));
 
             var allSectionResults = new Dictionary<string, object>();
             foreach (var sectionResult in perSectionResults)
@@ -75,14 +40,12 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? pro
 
             var combinedResults = JsonSerializer.Serialize(allSectionResults, AIJsonDefaults.Indented);
             var validatedJson = ValidateApplicationScoringJson(combinedResults);
-            application.AIScoresheetAnswers = validatedJson;
-            await applicationRepository.UpdateAsync(application);
             return validatedJson;
         }
 
         private async Task<Dictionary<string, object>> ProcessSectionAsync(
             Guid applicationId,
-            ScoresheetSection section,
+            ApplicationScoringSectionOperationInputDto section,
             JsonElement promptData,
             List<AIAttachmentItem> attachmentSummaries,
             string? promptVersion,
@@ -95,8 +58,8 @@ private async Task<Dictionary<string, object>> ProcessSectionAsync(
                 {
                     Data = promptData,
                     Attachments = attachmentSummaries,
-                    SectionName = section.Name,
-                    SectionSchema = JsonSerializer.SerializeToElement(BuildSectionQuestionsData(section), AIJsonDefaults.IndentedCamelCase),
+                    SectionName = section.SectionName,
+                    SectionSchema = section.SectionSchema,
                     PromptVersion = promptVersion,
                 };
                 var applicationScoringResponse = await aiService.GenerateApplicationScoringAsync(applicationScoringRequest, cancellationToken);
@@ -112,14 +75,15 @@ private async Task<Dictionary<string, object>> ProcessSectionAsync(
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "Error processing AI application scoring section {SectionName} for application {ApplicationId}", section.Name, applicationId);
+                logger.LogError(ex, "Error processing AI application scoring section {SectionName} for application {ApplicationId}", section.SectionName, applicationId);
             }
+
             return sectionResults;
         }
 
         private async Task<List<Dictionary<string, object>>> ProcessSectionsAsync(
             Guid applicationId,
-            IReadOnlyCollection<ScoresheetSection> sections,
+            IReadOnlyCollection<ApplicationScoringSectionOperationInputDto> sections,
             JsonElement promptData,
             List<AIAttachmentItem> attachmentSummaries,
             string? promptVersion,
@@ -128,17 +92,14 @@ private async Task<List<Dictionary<string, object>>> ProcessSectionsAsync(
             var sectionResults = new Dictionary<string, object>();
             try
             {
-                var questions = sections
-                    .OrderBy(s => s.Order)
-                    .SelectMany(BuildSectionQuestionsData)
-                    .ToList();
+                var questions = BuildBatchSectionSchema(sections);
 
                 var applicationScoringRequest = new ApplicationScoringRequest
                 {
                     Data = promptData,
                     Attachments = attachmentSummaries,
                     SectionName = "All Sections",
-                    SectionSchema = JsonSerializer.SerializeToElement(questions, AIJsonDefaults.IndentedCamelCase),
+                    SectionSchema = questions,
                     PromptVersion = promptVersion,
                 };
                 var applicationScoringResponse = await aiService.GenerateApplicationScoringAsync(applicationScoringRequest, cancellationToken);
@@ -160,25 +121,24 @@ private async Task<List<Dictionary<string, object>>> ProcessSectionsAsync(
             return [sectionResults];
         }
 
-        private static List<object> BuildSectionQuestionsData(ScoresheetSection section)
+        private static JsonElement BuildBatchSectionSchema(IReadOnlyCollection<ApplicationScoringSectionOperationInputDto> sections)
         {
-            var sectionQuestionsData = new List<object>();
-            foreach (var field in section.Fields.OrderBy(f => f.Order))
+            var questions = new List<JsonElement>();
+            foreach (var section in sections)
             {
-                var options = ExtractSelectListOptions(field);
-                sectionQuestionsData.Add(new
+                if (section.SectionSchema.ValueKind != JsonValueKind.Array)
                 {
-                    id = field.Id.ToString(),
-                    section = section.Name,
-                    question = field.Label,
-                    description = field.Description,
-                    type = field.Type.ToString(),
-                    options,
-                    allowed_answers = ExtractSelectListOptionNumbers(options)
-                });
+                    throw new InvalidOperationException(
+                        $"Section schema for '{section.SectionName}' must be a JSON array.");
+                }
+
+                foreach (var question in section.SectionSchema.EnumerateArray())
+                {
+                    questions.Add(question.Clone());
+                }
             }
 
-            return sectionQuestionsData;
+            return JsonSerializer.SerializeToElement(questions, AIJsonDefaults.IndentedCamelCase);
         }
 
         private void CopyAnswers(Dictionary<string, ApplicationScoringAnswer> answers, Dictionary<string, object> results)
@@ -191,25 +151,6 @@ private void CopyAnswers(Dictionary<string, ApplicationScoringAnswer> answers, D
             }
         }
 
-        private async Task<string?> GetFormSchemaAsync(Guid? formVersionId)
-        {
-            if (formVersionId == null)
-            {
-                return null;
-            }
-
-            try
-            {
-                var formVersion = await applicationFormVersionRepository.GetAsync(formVersionId.Value);
-                return string.IsNullOrWhiteSpace(formVersion?.FormSchema) ? null : formVersion.FormSchema;
-            }
-            catch (Exception ex)
-            {
-                logger.LogWarning(ex, "Unable to load form schema for application scoring prompt data generation for form version {FormVersionId}.", formVersionId);
-                return null;
-            }
-        }
-
         private static string ValidateApplicationScoringJson(string scoresheetAnswers)
         {
             try
@@ -227,45 +168,5 @@ private static string ValidateApplicationScoringJson(string scoresheetAnswers)
 
             return "{}";
         }
-
-        private static object[]? 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) =>
-                            (object)new
-                            {
-                                number = index + 1,
-                                value = option.Value
-                            })
-                        .ToArray();
-                }
-            }
-            catch (JsonException)
-            {
-                // Ignore malformed definition and return null options.
-            }
-
-            return null;
-        }
-
-        private static string[]? ExtractSelectListOptionNumbers(object[]? options)
-        {
-            if (options == null || options.Length == 0)
-            {
-                return null;
-            }
-
-            return options
-                .Select((_, index) => (index + 1).ToString())
-                .ToArray();
-        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AttachmentSummaryPersistence.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AttachmentSummaryPersistence.cs
new file mode 100644
index 0000000000..5b7cfa2bae
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AttachmentSummaryPersistence.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Uow;
+
+namespace Unity.AI.Operations;
+
+public class AttachmentSummaryPersistence(
+    IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
+    IUnitOfWorkManager unitOfWorkManager) : IAttachmentSummaryPersistence, ITransientDependency
+{
+    public async Task<AttachmentSummarySource> LoadAsync(Guid attachmentId)
+    {
+        using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
+        var attachment = await applicationChefsFileAttachmentRepository.GetAsync(attachmentId);
+        var source = new AttachmentSummarySource(
+            attachment.Id,
+            attachment.FileName,
+            attachment.ChefsSubmissionId,
+            attachment.ChefsFileId);
+        await uow.CompleteAsync();
+        return source;
+    }
+
+    public async Task SaveSummaryAsync(Guid attachmentId, string summary)
+    {
+        using var uow = unitOfWorkManager.Begin(requiresNew: true);
+        var attachment = await applicationChefsFileAttachmentRepository.GetAsync(attachmentId);
+        attachment.AISummary = summary;
+        await applicationChefsFileAttachmentRepository.UpdateAsync(attachment);
+        await uow.CompleteAsync();
+    }
+
+    public async Task<List<Guid>> LoadApplicationAttachmentIdsAsync(Guid applicationId)
+    {
+        using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
+        var ids = (await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId))
+            .Select(a => a.Id)
+            .ToList();
+        await uow.CompleteAsync();
+        return ids;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AttachmentSummaryService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AttachmentSummaryService.cs
index 78762cea48..0f5a437289 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AttachmentSummaryService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AttachmentSummaryService.cs
@@ -1,34 +1,48 @@
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Unity.AI.Extraction;
+using Unity.AI.Localization;
 using Unity.AI.Requests;
-using Unity.GrantManager.Applications;
 using Unity.GrantManager.Intakes;
+using Volo.Abp;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Uow;
 
 namespace Unity.AI.Operations;
 
 public class AttachmentSummaryService(
-    IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
+    IAttachmentSummaryDataProvider attachmentSummaryDataProvider,
     IChefsFileAttachmentStreamProvider chefsFileAttachmentStreamProvider,
     ITextExtractionService textExtractionService,
     IAIService aiService,
+    IAIGenerationPrerequisiteValidator aiGenerationPrerequisiteValidator,
     AIExecutionModeResolver executionModeResolver,
-    ILogger<AttachmentSummaryService> logger) : IAttachmentSummaryService, ITransientDependency
+    IUnitOfWorkManager unitOfWorkManager,
+    ILogger<AttachmentSummaryService> logger,
+    IStringLocalizer<AIResource> localizer) : IAttachmentSummaryService, ITransientDependency
 {
     private const string SummaryGenerationFailedMessage = "AI summary generation failed.";
+    private const string TextExtractionFailedSummary = "Attachment text could not be extracted for AI summary generation.";
 
     public async Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null, CancellationToken cancellationToken = default)
     {
-        var attachment = await applicationChefsFileAttachmentRepository.GetAsync(attachmentId);
+        var attachment = await LoadAttachmentAsync(attachmentId);
         var fileName = string.IsNullOrWhiteSpace(attachment.FileName) ? "unknown" : attachment.FileName;
 
         await using var attachmentStream = await OpenAttachmentStreamAsync(attachment, fileName, cancellationToken);
         var extractedText = await textExtractionService.ExtractTextAsync(fileName, attachmentStream.Content, attachmentStream.ContentType, cancellationToken);
+        if (ShouldStopOnEmptyExtraction(fileName, extractedText))
+        {
+            LogEmptyExtraction(attachmentId, fileName, attachmentStream);
+            await SaveSummaryAsync(attachmentId, TextExtractionFailedSummary);
+            return TextExtractionFailedSummary;
+        }
 
         var summaryResponse = await aiService.GenerateAttachmentSummaryAsync(new AttachmentSummaryRequest
         {
@@ -38,8 +52,7 @@ public async Task<string> GenerateAndSaveAsync(Guid attachmentId, string? prompt
             PromptVersion = promptVersion,
         }, cancellationToken);
 
-        attachment.AISummary = summaryResponse.Summary;
-        await applicationChefsFileAttachmentRepository.UpdateAsync(attachment);
+        await SaveSummaryAsync(attachmentId, summaryResponse.Summary);
 
         return summaryResponse.Summary;
     }
@@ -47,7 +60,17 @@ public async Task<string> GenerateAndSaveAsync(Guid attachmentId, string? prompt
     public async Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null, CancellationToken cancellationToken = default)
     {
         var ids = attachmentIds as IReadOnlyCollection<Guid> ?? attachmentIds.ToList();
+        if (ids.Count == 0)
+        {
+            throw new UserFriendlyException(localizer[AILocalizationKeys.SelectAttachmentForSummaries]);
+        }
+
         var mode = executionModeResolver.ResolveMode(AIExecutionModeResolver.AttachmentSummaryOperation);
+        if (mode == AIExecutionMode.Batch)
+        {
+            return await GenerateBatchAsync(ids, promptVersion, cancellationToken);
+        }
+
         if (mode != AIExecutionMode.Sequential)
         {
             logger.LogWarning(
@@ -63,6 +86,91 @@ public async Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmen
             batch => GenerateSequentiallyAsync(batch, promptVersion, cancellationToken));
     }
 
+    private async Task<List<string>> GenerateBatchAsync(
+        IReadOnlyCollection<Guid> attachmentIds,
+        string? promptVersion,
+        CancellationToken cancellationToken)
+    {
+        var attachments = new List<(Guid Id, AttachmentSummarySource Source, string ContentType, string ExtractedText)>(attachmentIds.Count);
+        var failures = new Dictionary<Guid, string>();
+
+        foreach (var attachmentId in attachmentIds)
+        {
+            try
+            {
+                var attachment = await LoadAttachmentAsync(attachmentId);
+                var fileName = string.IsNullOrWhiteSpace(attachment.FileName) ? "unknown" : attachment.FileName;
+                await using var attachmentStream = await OpenAttachmentStreamAsync(attachment, fileName, cancellationToken);
+                var extractedText = await textExtractionService.ExtractTextAsync(fileName, attachmentStream.Content, attachmentStream.ContentType, cancellationToken);
+                if (ShouldStopOnEmptyExtraction(fileName, extractedText))
+                {
+                    LogEmptyExtraction(attachmentId, fileName, attachmentStream);
+                    failures[attachmentId] = TextExtractionFailedSummary;
+                    continue;
+                }
+
+                attachments.Add((attachmentId, attachment, attachmentStream.ContentType, extractedText));
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Error preparing AI summary batch item {AttachmentId}", attachmentId);
+                failures[attachmentId] = SummaryGenerationFailedMessage;
+            }
+        }
+
+        if (attachments.Count == 0)
+        {
+            return attachmentIds.Select(id => failures.TryGetValue(id, out var failure) ? failure : SummaryGenerationFailedMessage).ToList();
+        }
+
+        var batchRequest = new AttachmentSummaryBatchRequest
+        {
+            PromptVersion = promptVersion,
+            Attachments = attachments.Select(item => new AttachmentSummaryBatchItemRequest
+            {
+                AttachmentId = item.Id.ToString(),
+                FileName = string.IsNullOrWhiteSpace(item.Source.FileName) ? "unknown" : item.Source.FileName!,
+                ContentType = item.ContentType,
+                ExtractedText = item.ExtractedText
+            }).ToList()
+        };
+
+        var batchResponse = await aiService.GenerateAttachmentSummaryBatchAsync(batchRequest, cancellationToken);
+        var responseMap = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var item in batchResponse.Attachments)
+        {
+            if (!string.IsNullOrWhiteSpace(item.AttachmentId))
+            {
+                responseMap[item.AttachmentId] = item.Summary;
+            }
+        }
+
+        var results = new List<string>(attachmentIds.Count);
+        foreach (var attachmentId in attachmentIds)
+        {
+            if (failures.TryGetValue(attachmentId, out var failure))
+            {
+                results.Add(failure);
+                continue;
+            }
+
+            if (responseMap.TryGetValue(attachmentId.ToString(), out var summary))
+            {
+                await SaveSummaryAsync(attachmentId, summary);
+                results.Add(summary);
+                continue;
+            }
+
+            results.Add(SummaryGenerationFailedMessage);
+        }
+
+        return results;
+    }
+
     private async Task<List<string>> GenerateSequentiallyAsync(
         IReadOnlyCollection<Guid> attachmentIds,
         string? promptVersion,
@@ -103,9 +211,9 @@ public async Task<List<string>> GenerateForApplicationAsync(
         IReadOnlyCollection<Guid>? attachmentIds = null,
         CancellationToken cancellationToken = default)
     {
-        var applicationAttachmentIds = (await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId))
-            .Select(a => a.Id)
-            .ToList();
+        await WithUnitOfWorkAsync(() => aiGenerationPrerequisiteValidator.EnsureAttachmentSummaryAvailableAsync(applicationId));
+
+        var applicationAttachmentIds = await LoadApplicationAttachmentIdsAsync(applicationId);
 
         if (attachmentIds is not { Count: > 0 })
         {
@@ -123,8 +231,31 @@ public async Task<List<string>> GenerateForApplicationAsync(
         return await GenerateAndSaveAsync(selectedIds, promptVersion, cancellationToken);
     }
 
+    private async Task<AttachmentSummarySource> LoadAttachmentAsync(Guid attachmentId)
+    {
+        var attachment = await attachmentSummaryDataProvider.GetAttachmentAsync(attachmentId);
+        return attachment ?? throw new UserFriendlyException(localizer[AILocalizationKeys.AttachmentNotFound]);
+    }
+
+    private async Task SaveSummaryAsync(Guid attachmentId, string summary)
+    {
+        await attachmentSummaryDataProvider.UpdateAttachmentSummaryAsync(attachmentId, summary);
+    }
+
+    private async Task<List<Guid>> LoadApplicationAttachmentIdsAsync(Guid applicationId)
+    {
+        return await attachmentSummaryDataProvider.GetApplicationAttachmentIdsAsync(applicationId);
+    }
+
+    private async Task WithUnitOfWorkAsync(Func<Task> operation)
+    {
+        using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
+        await operation();
+        await uow.CompleteAsync();
+    }
+
     private async Task<ChefsFileAttachmentStream> OpenAttachmentStreamAsync(
-        ApplicationChefsFileAttachment attachment,
+        AttachmentSummarySource attachment,
         string fileName,
         CancellationToken cancellationToken)
     {
@@ -156,4 +287,46 @@ private async Task<ChefsFileAttachmentStream> OpenAttachmentStreamAsync(
             return ChefsFileAttachmentStream.Empty;
         }
     }
+
+    private static bool ShouldStopOnEmptyExtraction(string fileName, string extractedText)
+    {
+        return string.IsNullOrWhiteSpace(extractedText) && IsSupportedOfficeOrPdf(fileName);
+    }
+
+    private static bool IsSupportedOfficeOrPdf(string fileName)
+    {
+        var extension = Path.GetExtension(fileName)?.ToLowerInvariant();
+        return extension is ".pdf" or ".docx" or ".xlsx" or ".xls" or ".pptx";
+    }
+
+    private void LogEmptyExtraction(
+        Guid attachmentId,
+        string fileName,
+        ChefsFileAttachmentStream attachmentStream)
+    {
+        logger.LogWarning(
+            "No text extracted for supported attachment {AttachmentId} ({FileName}). Skipping AI summary generation. ContentType: {ContentType}; StreamCanSeek: {StreamCanSeek}; StreamLength: {StreamLength}.",
+            attachmentId,
+            fileName,
+            attachmentStream.ContentType,
+            attachmentStream.Content.CanSeek,
+            TryGetStreamLength(attachmentStream.Content));
+    }
+
+    private static long? TryGetStreamLength(Stream stream)
+    {
+        if (!stream.CanSeek)
+        {
+            return null;
+        }
+
+        try
+        {
+            return stream.Length;
+        }
+        catch
+        {
+            return null;
+        }
+    }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/IApplicationAnalysisService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/IApplicationAnalysisService.cs
index ac02842761..ddff668f03 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/IApplicationAnalysisService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/IApplicationAnalysisService.cs
@@ -6,6 +6,6 @@ namespace Unity.AI.Operations
 {
     public interface IApplicationAnalysisService
     {
-        Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, CancellationToken cancellationToken = default);
+        Task<string> RegenerateAsync(ApplicationAnalysisOperationInputDto input, CancellationToken cancellationToken = default);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/IApplicationScoringService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/IApplicationScoringService.cs
index 2b2bc1796f..a7890b76a3 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/IApplicationScoringService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/IApplicationScoringService.cs
@@ -6,6 +6,6 @@ namespace Unity.AI.Operations
 {
     public interface IApplicationScoringService
     {
-        Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, CancellationToken cancellationToken = default);
+        Task<string> RegenerateAsync(ApplicationScoringOperationInputDto input, CancellationToken cancellationToken = default);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/PromptDataPayloadBuilder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/PromptDataPayloadBuilder.cs
index 315a26fc92..cb769ece99 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/PromptDataPayloadBuilder.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/PromptDataPayloadBuilder.cs
@@ -4,7 +4,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
-using Unity.GrantManager.Applications;
+using Unity.AI.Operations;
+using Unity.AI.Models;
 
 namespace Unity.AI.Prompts
 {
@@ -33,14 +34,31 @@ internal static class PromptDataPayloadBuilder
             "simpleseparator"
         };
 
+        private static readonly HashSet<string> NonFieldRequirementComponentTypes = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "button",
+            "simplebuttonadvanced",
+            "html",
+            "htmlelement",
+            "content",
+            "simpleseparator"
+        };
+
+        private const string ComponentsKey = "components";
+
+        private static readonly HashSet<string> ExcludedSchemaKeys = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "applicantAgent"
+        };
+
         public static JsonElement BuildPromptDataPayload(
-            Application application,
-            ApplicationFormSubmission? formSubmission,
+            AIApplicationPromptDataDto application,
+            string? submissionJson,
             string? formSchema,
             ILogger logger)
         {
             var fallbackPayload = BuildFallbackPromptDataPayload(application);
-            if (TryBuildPromptDataValues(formSubmission?.Submission, formSchema, out var values, out var exception))
+            if (TryBuildPromptDataValues(submissionJson, formSchema, out var values, out var exception))
             {
                 return JsonSerializer.SerializeToElement(values);
             }
@@ -50,13 +68,61 @@ public static JsonElement BuildPromptDataPayload(
                 logger.LogWarning(
                     exception,
                     "Failed to parse form submission JSON for prompt payload generation for application {ApplicationId}.",
-                    application.Id);
+                    application.ApplicationId);
             }
 
             return JsonSerializer.SerializeToElement(fallbackPayload);
         }
 
-        private static object BuildFallbackPromptDataPayload(Application application)
+        public static List<AIAttachmentItem> BuildAttachmentSummaries(
+            IEnumerable<AttachmentSummarySnapshot> attachments)
+        {
+            return attachments
+                .Where(a => !string.IsNullOrWhiteSpace(a.Summary))
+                .Select(a => new AIAttachmentItem
+                {
+                    Name = string.IsNullOrWhiteSpace(a.FileName) ? "attachment" : a.FileName.Trim(),
+                    Summary = a.Summary!.Trim()
+                })
+                .ToList();
+        }
+
+        public static object BuildFormFieldConfiguration(
+            string? formSchema,
+            ILogger logger)
+        {
+            if (string.IsNullOrWhiteSpace(formSchema))
+            {
+                return new { message = "Form configuration not available." };
+            }
+
+            try
+            {
+                var schema = JObject.Parse(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 from form schema.");
+                return new { message = "Form configuration could not be extracted." };
+            }
+        }
+
+        private static object BuildFallbackPromptDataPayload(AIApplicationPromptDataDto application)
         {
             var notSpecified = "Not specified";
             return new
@@ -164,7 +230,7 @@ private static HashSet<string> ExtractAllowedSchemaKeys(string? formSchema)
             try
             {
                 var schema = JObject.Parse(formSchema);
-                if (schema["components"] is not JArray components)
+                if (schema[ComponentsKey] is not JArray components)
                 {
                     return new HashSet<string>(StringComparer.OrdinalIgnoreCase);
                 }
@@ -217,5 +283,81 @@ private static void ProcessNestedSchemaComponents(JObject component, HashSet<str
                 }
             }
         }
+
+        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();
+
+                if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(type) || NonFieldRequirementComponentTypes.Contains(type) || ExcludedSchemaKeys.Contains(key))
+                {
+                    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/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/README.md b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/README.md
deleted file mode 100644
index 21255c7dff..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Runtime Prompt Templates
-
-These files are the source of truth for runtime prompts.
-`OpenAIRuntimeService` resolves templates from:
-
-- `AI/Prompts/Versions/<version>/<template>.txt`
-
-Current templates:
-
-- `application-analysis.system.txt`
-- `application-analysis.user.txt`
-- `application-analysis.rubric.txt` (optional, when `{{RUBRIC}}` is used)
-- `application-analysis.score.txt` (optional, when `{{SCORE}}` is used)
-- `application-analysis.output.txt` (optional, when `{{OUTPUT}}` is used)
-- `application-analysis.rules.txt` (optional, when `{{RULES}}` is used)
-- `common.*.txt` (optional shared fragments for `{{COMMON_*}}` placeholders)
-- `attachment-summary.system.txt`
-- `attachment-summary.user.txt`
-- `attachment-summary.output.txt` (optional, when `{{OUTPUT}}` is used)
-- `attachment-summary.rules.txt` (optional, when `{{RULES}}` is used)
-- `application-scoring.system.txt`
-- `application-scoring.user.txt`
-- `application-scoring.output.txt` (optional, when `{{OUTPUT}}` is used)
-- `application-scoring.rules.txt` (optional, when `{{RULES}}` is used)
-
-Placeholders:
-
-- `{{SCHEMA}}`
-- `{{DATA}}`
-- `{{ATTACHMENTS}}`
-- `{{RUBRIC}}`
-- `{{SCORE}}`
-- `{{OUTPUT}}`
-- `{{RULES}}`
-- `{{ATTACHMENT}}`
-- `{{DATA}}`
-- `{{ATTACHMENTS}}`
-- `{{SECTION}}`
-- `{{RESPONSE}}`
-
-Version selection:
-
-- Required: `Azure:Operations:Defaults:PromptVersion = v0|v1`, with optional overrides under `Azure:Operations:<Operation>:PromptVersion`.
-- Unknown or missing version values fail at runtime.
-
-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: `application-analysis.user.txt` with `{{RULES}}` resolves `application-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/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v0/attachment-summary.user.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v0/attachment-summary.user.txt
index 500fc5ec7a..98da3a726e 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v0/attachment-summary.user.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v0/attachment-summary.user.txt
@@ -1,2 +1,2 @@
-ATTACHMENT
-{{ATTACHMENT}}
+ATTACHMENTS
+{{ATTACHMENTS}}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt
index 5840d215c8..f1627fb26f 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt
@@ -22,7 +22,8 @@
 - Summaries and recommendations must be concrete, distinct, reviewer-relevant, and specific to this application's evidence.
 - Avoid generic praise, checklist language, and repeated conclusions across lists.
 - Do not use a summary merely to say that supporting documents were provided; summarize the specific substantive evidence they add, or omit the finding.
-- If no findings exist, return empty arrays.
+- Errors and warnings may be empty.
+- Summaries and recommendations must each include at least one item.
 - Decision must be PROCEED or HOLD.
 - Use summaries for overall application quality/readiness synthesis.
 - Use recommendations for concrete reviewer-facing next actions based on the provided evidence.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.system.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.system.txt
index cfd2fe2d47..b05196b8ab 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.system.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.system.txt
@@ -3,7 +3,7 @@ You are a careful grant review assistant for human reviewers. Do not fill gaps,
 
 TASK
 Using SCHEMA, DATA, ATTACHMENTS, RUBRIC, SCORE, OUTPUT, and RULES:
-1. Review the application and attachments for the strongest reviewer-relevant evidence.
+1. Review the application and any provided attachments for the strongest reviewer-relevant evidence.
 2. Determine which conclusions are directly supported by that evidence.
 3. Exclude weak, repetitive, or loosely supported conclusions.
-4. Return only the strongest evidence-backed reviewer conclusions.
\ No newline at end of file
+4. Return only the strongest evidence-backed reviewer conclusions.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-scoring.system.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-scoring.system.txt
index 297a9f351f..aefebf06d5 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-scoring.system.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-scoring.system.txt
@@ -5,7 +5,7 @@ TASK
 Using DATA, ATTACHMENTS, SECTION, RESPONSE, OUTPUT, and RULES:
 1. Review each question in SECTION one at a time.
 2. Identify the exact condition the question asks about.
-3. Consider only the most relevant evidence in DATA and ATTACHMENTS for that condition.
+3. Consider only the most relevant evidence in DATA and any provided ATTACHMENTS for that condition.
 4. Choose the most conservative valid answer supported by that evidence.
 5. If evidence is incomplete or indirect, explain the uncertainty in the rationale.
-6. Repeat for every question in SECTION.
\ No newline at end of file
+6. Repeat for every question in SECTION.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/attachment-summary.user.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/attachment-summary.user.txt
index acf4c67f3e..13cf1e6773 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/attachment-summary.user.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/attachment-summary.user.txt
@@ -1,5 +1,5 @@
-ATTACHMENT
-{{ATTACHMENT}}
+ATTACHMENTS
+{{ATTACHMENTS}}
 
 RESPONSE
 {{RESPONSE}}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/common.rules.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/common.rules.txt
index ada24e7e87..790f34fb73 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/common.rules.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/common.rules.txt
@@ -1,4 +1,5 @@
 - Any narrative text response must be at least 12 words.
+- If ATTACHMENTS is empty, use DATA only and do not mention missing attachments unless their absence is material to the specific conclusion or question.
 - Return values exactly as specified in OUTPUT.
 - Do not return keys outside OUTPUT.
 - Return valid JSON only.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIOperationResult.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIOperationResult.cs
index d0c2a2ceec..efd964c51d 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIOperationResult.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIOperationResult.cs
@@ -8,9 +8,19 @@ public enum AIOperationOutcome
         InvalidOutput
     }
 
+    public enum AIFailureCategory
+    {
+        None,
+        ProviderUnavailable,
+        TransientProviderFailure,
+        PermanentProviderFailure,
+        InvalidOutput
+    }
+
     public sealed record AIOperationResult(
         AIOperationOutcome Outcome,
-        AIProviderResult Response)
+        AIProviderResult Response,
+        AIFailureCategory FailureCategory = AIFailureCategory.None)
     {
         public string Content => Response.Content;
 
@@ -20,14 +30,30 @@ public static AIOperationResult Success(AIProviderResult? response = null) =>
             new(AIOperationOutcome.Success, response ?? AIProviderResult.Empty);
 
         public static AIOperationResult TransientFailure(AIProviderResult? response = null) =>
-            new(AIOperationOutcome.TransientFailure, response ?? AIProviderResult.Empty);
+            new(AIOperationOutcome.TransientFailure, response ?? AIProviderResult.Empty, AIFailureCategory.TransientProviderFailure);
 
         public static AIOperationResult PermanentFailure(AIProviderResult? response = null) =>
-            new(AIOperationOutcome.PermanentFailure, response ?? AIProviderResult.Empty);
+            new(AIOperationOutcome.PermanentFailure, response ?? AIProviderResult.Empty, AIFailureCategory.PermanentProviderFailure);
+
+        public static AIOperationResult ProviderUnavailable(AIProviderResult? response = null) =>
+            new(AIOperationOutcome.PermanentFailure, response ?? AIProviderResult.Empty, AIFailureCategory.ProviderUnavailable);
 
         public static AIOperationResult InvalidOutput(AIProviderResult? response = null) =>
-            new(AIOperationOutcome.InvalidOutput, response ?? AIProviderResult.Empty);
+            new(AIOperationOutcome.InvalidOutput, response ?? AIProviderResult.Empty, AIFailureCategory.InvalidOutput);
+
+        public AIOperationResult WithOutcome(AIOperationOutcome outcome, AIFailureCategory? failureCategory = null) =>
+            new(outcome, Response, failureCategory ?? ResolveFailureCategory(outcome));
 
-        public AIOperationResult WithOutcome(AIOperationOutcome outcome) => new(outcome, Response);
+        private static AIFailureCategory ResolveFailureCategory(AIOperationOutcome outcome)
+        {
+            return outcome switch
+            {
+                AIOperationOutcome.Success => AIFailureCategory.None,
+                AIOperationOutcome.TransientFailure => AIFailureCategory.TransientProviderFailure,
+                AIOperationOutcome.PermanentFailure => AIFailureCategory.PermanentProviderFailure,
+                AIOperationOutcome.InvalidOutput => AIFailureCategory.InvalidOutput,
+                _ => AIFailureCategory.None
+            };
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateProvider.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateProvider.cs
new file mode 100644
index 0000000000..68a08cf2e9
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateProvider.cs
@@ -0,0 +1,15 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.Runtime;
+
+public class AIPromptTemplateProvider(
+    IAIPromptTemplateStore promptTemplateStore) : IAIPromptTemplateProvider, ITransientDependency
+{
+    public Task<AIPromptTemplateSnapshot> GetRequiredPromptAsync(
+        string promptType,
+        string promptVersion,
+        CancellationToken cancellationToken = default)
+        => promptTemplateStore.GetRequiredPromptAsync(promptType, promptVersion, cancellationToken);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateRenderer.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateRenderer.cs
new file mode 100644
index 0000000000..e915cad4e8
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateRenderer.cs
@@ -0,0 +1,203 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+
+namespace Unity.AI.Runtime;
+
+public static class AIPromptTemplateRenderer
+{
+    public static string BuildApplicationAnalysisUserPrompt(
+        string userPromptTemplate,
+        string schema,
+        string data,
+        string attachments,
+        string? metadataJson = null)
+    {
+        return RenderPromptTemplate(
+            userPromptTemplate,
+            metadataJson,
+            new Dictionary<string, string>
+            {
+                ["SCHEMA"] = schema,
+                ["DATA"] = data,
+                ["ATTACHMENTS"] = attachments
+            });
+    }
+
+    public static string BuildAttachmentSummaryUserPrompt(
+        string userPromptTemplate,
+        string attachment,
+        string? metadataJson = null)
+    {
+        return RenderPromptTemplate(
+            userPromptTemplate,
+            metadataJson,
+            new Dictionary<string, string>
+            {
+                ["ATTACHMENT"] = attachment,
+                ["ATTACHMENTS"] = attachment
+            });
+    }
+
+    public static string BuildAttachmentSummaryBatchUserPrompt(
+        string userPromptTemplate,
+        string attachments,
+        string? metadataJson = null)
+    {
+        return RenderPromptTemplate(
+            userPromptTemplate,
+            metadataJson,
+            new Dictionary<string, string>
+            {
+                ["ATTACHMENTS"] = attachments
+            });
+    }
+
+    public static string BuildApplicationScoringUserPrompt(
+        string userPromptTemplate,
+        string data,
+        string attachments,
+        string section,
+        string response,
+        string? metadataJson = null)
+    {
+        return RenderPromptTemplate(
+            userPromptTemplate,
+            metadataJson,
+            new Dictionary<string, string>
+            {
+                ["DATA"] = data,
+                ["ATTACHMENTS"] = attachments,
+                ["SECTION"] = section,
+                ["RESPONSE"] = response
+            });
+    }
+
+    private static string RenderPromptTemplate(
+        string template,
+        string? metadataJson,
+        IReadOnlyDictionary<string, string> runtimeReplacements)
+    {
+        var placeholders = GetTemplatePlaceholders(template);
+        var replacements = new Dictionary<string, string>(runtimeReplacements, StringComparer.Ordinal);
+
+        foreach (var (key, value) in ExtractMetadataSections(metadataJson))
+        {
+            replacements.TryAdd(key, value);
+        }
+
+        if (!replacements.ContainsKey("RESPONSE") && replacements.TryGetValue("OUTPUT", out var outputTemplate))
+        {
+            replacements["RESPONSE"] = outputTemplate;
+        }
+        else if (!replacements.ContainsKey("OUTPUT") && replacements.TryGetValue("RESPONSE", out var responseTemplate))
+        {
+            replacements["OUTPUT"] = responseTemplate;
+        }
+
+        var unresolved = placeholders
+            .Where(placeholder => !replacements.ContainsKey(placeholder))
+            .OrderBy(placeholder => placeholder)
+            .ToList();
+        if (unresolved.Count > 0)
+        {
+            throw new InvalidOperationException(
+                $"Unresolved prompt placeholders: {string.Join(", ", unresolved)}");
+        }
+
+        var rendered = template;
+        foreach (var placeholder in placeholders)
+        {
+            rendered = rendered.Replace($"{{{{{placeholder}}}}}", replacements[placeholder] ?? string.Empty, StringComparison.Ordinal);
+        }
+
+        return rendered;
+    }
+
+    private static Dictionary<string, string> ExtractMetadataSections(string? metadataJson)
+    {
+        if (string.IsNullOrWhiteSpace(metadataJson))
+        {
+            return new Dictionary<string, string>(StringComparer.Ordinal);
+        }
+
+        try
+        {
+            using var doc = JsonDocument.Parse(metadataJson);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object)
+            {
+                return new Dictionary<string, string>(StringComparer.Ordinal);
+            }
+
+            return ExtractStringProperties(root);
+        }
+        catch (JsonException ex)
+        {
+            throw new InvalidOperationException("Invalid prompt metadata JSON.", ex);
+        }
+    }
+
+    private static Dictionary<string, string> ExtractStringProperties(JsonElement element)
+    {
+        var values = new Dictionary<string, string>(StringComparer.Ordinal);
+        foreach (var property in element.EnumerateObject())
+        {
+            if (property.Value.ValueKind == JsonValueKind.String)
+            {
+                values[property.Name] = property.Value.GetString() ?? string.Empty;
+            }
+        }
+
+        return values;
+    }
+
+    private static HashSet<string> GetTemplatePlaceholders(string template)
+    {
+        var placeholders = new HashSet<string>(StringComparer.Ordinal);
+        var invalidPlaceholders = new List<string>();
+        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 (IsPromptPlaceholder(placeholder))
+            {
+                placeholders.Add(placeholder);
+            }
+            else
+            {
+                invalidPlaceholders.Add(placeholder);
+            }
+
+            searchIndex = end + 2;
+        }
+
+        if (invalidPlaceholders.Count > 0)
+        {
+            throw new InvalidOperationException(
+                $"Invalid prompt placeholders: {string.Join(", ", invalidPlaceholders.OrderBy(item => item))}");
+        }
+
+        return placeholders;
+    }
+
+    private static bool IsPromptPlaceholder(string placeholder)
+    {
+        return !string.IsNullOrWhiteSpace(placeholder) &&
+               placeholder.All(character => char.IsUpper(character) || char.IsDigit(character) || character == '_');
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateSnapshot.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateSnapshot.cs
new file mode 100644
index 0000000000..115cc229fe
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateSnapshot.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Text.Json;
+using Unity.AI.Prompts;
+
+namespace Unity.AI.Runtime;
+
+public sealed record AIPromptTemplateSnapshot(
+    string PromptVersion,
+    string SystemPrompt,
+    string UserPrompt,
+    string? MetadataJson)
+{
+    public UnityPromptAssetManifest? Manifest { get; } = ParseManifest(MetadataJson);
+
+    private static UnityPromptAssetManifest? ParseManifest(string? metadataJson)
+        => string.IsNullOrWhiteSpace(metadataJson)
+            ? null
+            : TryDeserialize(metadataJson);
+
+    private static UnityPromptAssetManifest? TryDeserialize(string metadataJson)
+    {
+        try
+        {
+            return JsonSerializer.Deserialize<UnityPromptAssetManifest>(metadataJson);
+        }
+        catch
+        {
+            return null;
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateStore.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateStore.cs
new file mode 100644
index 0000000000..bd7d0c5037
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIPromptTemplateStore.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.AI.Runtime;
+
+public class AIPromptTemplateStore(
+    IRepository<AIPrompt, Guid> promptRepository,
+    IDataFilter<IMultiTenant> multiTenantDataFilter) : IAIPromptTemplateStore, ITransientDependency
+{
+    public async Task<AIPromptTemplateSnapshot> GetRequiredPromptAsync(
+        string promptType,
+        string promptVersion,
+        CancellationToken cancellationToken = default)
+    {
+        var normalizedPromptVersion = OpenAIPromptRenderer.ResolvePromptVersion(promptVersion);
+        var versionNumber = OpenAIPromptRenderer.ResolvePromptVersionNumber(normalizedPromptVersion);
+
+        using (multiTenantDataFilter.Disable())
+        {
+            var prompt = await promptRepository.FindAsync(p =>
+                p.TenantId == null && p.Name == promptType && p.VersionNumber == versionNumber,
+                cancellationToken: cancellationToken);
+            if (prompt == null || !prompt.IsActive)
+            {
+                throw new InvalidOperationException(
+                    $"AI prompt '{promptType}' version '{normalizedPromptVersion}' is not configured.");
+            }
+
+            return new AIPromptTemplateSnapshot(
+                normalizedPromptVersion,
+                prompt.SystemPrompt,
+                prompt.UserPrompt,
+                prompt.MetadataJson);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderPayloadValidator.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderPayloadValidator.cs
index 06016a9705..e481ee5823 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderPayloadValidator.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderPayloadValidator.cs
@@ -5,94 +5,144 @@
 
 namespace Unity.AI.Runtime
 {
-    internal static class AIProviderPayloadValidator
+    public static class AIProviderPayloadValidator
     {
-        public static bool IsValidAttachmentSummaryText(string response)
+        public static AIResponseValidationResult ValidateAttachmentSummaryText(string response)
         {
-            return !string.IsNullOrWhiteSpace(response);
+            return !string.IsNullOrWhiteSpace(response)
+                ? AIResponseValidationResult.Success()
+                : AIResponseValidationResult.Invalid("Attachment summary response was empty.");
         }
 
-        public static bool IsValidApplicationAnalysisJson(string response)
+        public static AIResponseValidationResult ValidateAttachmentSummaryBatchJson(string response)
         {
             if (!TryParseRootObject(response, out var root))
             {
-                return false;
+                return AIResponseValidationResult.Invalid("Attachment summary batch response was not valid JSON.");
             }
 
-            return HasStringProperty(root, AIJsonKeys.Decision) &&
-                   HasArrayProperty(root, AIJsonKeys.Errors) &&
-                   HasArrayProperty(root, AIJsonKeys.Warnings) &&
-                   HasArrayProperty(root, AIJsonKeys.Summaries) &&
-                   HasArrayProperty(root, AIJsonKeys.Recommendations);
+            if (!root.TryGetProperty("attachments", out var attachments) || attachments.ValueKind != JsonValueKind.Array)
+            {
+                return AIResponseValidationResult.Invalid("Attachment summary batch response is missing required field 'attachments' (expected array).");
+            }
+
+            foreach (var attachment in attachments.EnumerateArray())
+            {
+                if (attachment.ValueKind != JsonValueKind.Object)
+                {
+                    return AIResponseValidationResult.Invalid("Attachment summary batch response includes an invalid attachment item.");
+                }
+
+                if (!attachment.TryGetProperty("attachmentId", out var attachmentId) || attachmentId.ValueKind != JsonValueKind.String || string.IsNullOrWhiteSpace(attachmentId.GetString()))
+                {
+                    return AIResponseValidationResult.Invalid("Attachment summary batch response is missing a valid attachmentId.");
+                }
+
+                if (!attachment.TryGetProperty(AIJsonKeys.Summary, out var summary) || summary.ValueKind != JsonValueKind.String)
+                {
+                    return AIResponseValidationResult.Invalid("Attachment summary batch response is missing a valid summary.");
+                }
+            }
+
+            return AIResponseValidationResult.Success();
         }
 
-        public static bool IsValidApplicationScoringJson(string response, string sectionJson)
+        public static AIResponseValidationResult ValidateApplicationAnalysisJson(string response)
         {
             if (!TryParseRootObject(response, out var root))
             {
-                return false;
+                return AIResponseValidationResult.Invalid("Application analysis response was not valid JSON.");
+            }
+
+            if (!root.TryGetProperty(AIJsonKeys.Decision, out var decision) || decision.ValueKind != JsonValueKind.String)
+            {
+                return AIResponseValidationResult.Invalid($"Application analysis response is missing or invalid required field '{AIJsonKeys.Decision}' (expected string).");
+            }
+
+            var normalizedDecision = (decision.GetString() ?? string.Empty).Trim().ToUpperInvariant();
+            if (normalizedDecision != "PROCEED" && normalizedDecision != "HOLD")
+            {
+                return AIResponseValidationResult.Invalid(
+                    $"Application analysis response has invalid '{AIJsonKeys.Decision}' value. Expected 'PROCEED' or 'HOLD'.");
+            }
+
+            if (!root.TryGetProperty(AIJsonKeys.Errors, out var errors) || errors.ValueKind != JsonValueKind.Array)
+            {
+                return AIResponseValidationResult.Invalid($"Application analysis response is missing or invalid required field '{AIJsonKeys.Errors}' (expected array).");
+            }
+
+            if (!root.TryGetProperty(AIJsonKeys.Warnings, out var warnings) || warnings.ValueKind != JsonValueKind.Array)
+            {
+                return AIResponseValidationResult.Invalid($"Application analysis response is missing or invalid required field '{AIJsonKeys.Warnings}' (expected array).");
+            }
+
+            if (!root.TryGetProperty(AIJsonKeys.Summaries, out var summaries) || summaries.ValueKind != JsonValueKind.Array)
+            {
+                return AIResponseValidationResult.Invalid($"Application analysis response is missing or invalid required field '{AIJsonKeys.Summaries}' (expected array).");
+            }
+
+            if (!root.TryGetProperty(AIJsonKeys.Recommendations, out var recommendations) || recommendations.ValueKind != JsonValueKind.Array)
+            {
+                return AIResponseValidationResult.Invalid($"Application analysis response is missing or invalid required field '{AIJsonKeys.Recommendations}' (expected array).");
+            }
+
+            if (summaries.GetArrayLength() == 0)
+            {
+                return AIResponseValidationResult.Invalid(
+                    $"Application analysis response must include at least one item in '{AIJsonKeys.Summaries}'.");
+            }
+
+            if (recommendations.GetArrayLength() == 0)
+            {
+                return AIResponseValidationResult.Invalid(
+                    $"Application analysis response must include at least one item in '{AIJsonKeys.Recommendations}'.");
+            }
+
+            return AIResponseValidationResult.Success();
+        }
+
+        public static AIResponseValidationResult ValidateApplicationScoringJson(string response, string sectionJson)
+        {
+            if (!TryParseRootObject(response, out var root))
+            {
+                return AIResponseValidationResult.Invalid("Application scoring response was not valid JSON.");
             }
 
             var expectedQuestionIds = ExtractQuestionIds(sectionJson);
             if (expectedQuestionIds.Count == 0)
             {
-                return false;
+                return AIResponseValidationResult.Invalid("Application scoring section schema could not be parsed or did not contain any question ids.");
             }
 
             foreach (var questionId in expectedQuestionIds)
             {
-                if (!TryGetRequiredObject(root, questionId, out var answerObject))
+                if (!root.TryGetProperty(questionId, out var answerObject) || answerObject.ValueKind != JsonValueKind.Object)
                 {
-                    return false;
+                    return AIResponseValidationResult.Invalid(
+                        $"Application scoring response is missing required answer object for question id '{questionId}'.");
                 }
 
-                if (!HasPrimitiveProperty(answerObject, AIJsonKeys.Answer))
+                if (!answerObject.TryGetProperty(AIJsonKeys.Answer, out var answerValue)
+                    || answerValue.ValueKind == JsonValueKind.Null
+                    || answerValue.ValueKind == JsonValueKind.Object
+                    || answerValue.ValueKind == JsonValueKind.Array)
                 {
-                    return false;
+                    return AIResponseValidationResult.Invalid(
+                        $"Application scoring response is missing a valid answer for question id '{questionId}'.");
                 }
 
-                if (!IsValidConfidenceProperty(answerObject, AIJsonKeys.Confidence))
+                if (!answerObject.TryGetProperty(AIJsonKeys.Confidence, out var confidenceValue)
+                    || confidenceValue.ValueKind != JsonValueKind.Number
+                    || !confidenceValue.TryGetDecimal(out var confidence)
+                    || confidence < 0m
+                    || confidence > 1m)
                 {
-                    return false;
+                    return AIResponseValidationResult.Invalid(
+                        $"Application scoring response is missing a valid confidence score for question id '{questionId}'.");
                 }
             }
 
-            return true;
-        }
-
-        private static bool HasStringProperty(JsonElement element, string name)
-        {
-            return element.TryGetProperty(name, out var property) &&
-                   property.ValueKind == JsonValueKind.String;
-        }
-
-        private static bool HasArrayProperty(JsonElement element, string name)
-        {
-            return element.TryGetProperty(name, out var property) &&
-                   property.ValueKind == JsonValueKind.Array;
-        }
-
-        private static bool TryGetRequiredObject(JsonElement element, string name, out JsonElement value)
-        {
-            return element.TryGetProperty(name, out value) &&
-                   value.ValueKind == JsonValueKind.Object;
-        }
-
-        private static bool HasPrimitiveProperty(JsonElement element, string name)
-        {
-            return element.TryGetProperty(name, out var property) &&
-                   property.ValueKind != JsonValueKind.Null &&
-                   property.ValueKind != JsonValueKind.Object &&
-                   property.ValueKind != JsonValueKind.Array;
-        }
-
-        private static bool IsValidConfidenceProperty(JsonElement element, string name)
-        {
-            return element.TryGetProperty(name, out var property) &&
-                   property.ValueKind == JsonValueKind.Number &&
-                   property.TryGetInt32(out var confidence) &&
-                   confidence >= 0 &&
-                   confidence <= 100;
+            return AIResponseValidationResult.Success();
         }
 
         private static HashSet<string> ExtractQuestionIds(string sectionJson)
@@ -169,5 +219,6 @@ private static bool TryParseRootObject(string response, out JsonElement root)
                 return false;
             }
         }
+
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIResponseValidationResult.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIResponseValidationResult.cs
new file mode 100644
index 0000000000..ab0a542056
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIResponseValidationResult.cs
@@ -0,0 +1,16 @@
+namespace Unity.AI.Runtime
+{
+    public sealed record AIResponseValidationResult(
+        bool IsValid,
+        AIFailureCategory FailureCategory = AIFailureCategory.None,
+        string? Reason = null)
+    {
+        public static AIResponseValidationResult Success() =>
+            new(true);
+
+        public static AIResponseValidationResult Invalid(
+            string reason,
+            AIFailureCategory failureCategory = AIFailureCategory.InvalidOutput) =>
+            new(false, failureCategory, reason);
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IAIPromptTemplateProvider.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IAIPromptTemplateProvider.cs
new file mode 100644
index 0000000000..44c8bded92
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IAIPromptTemplateProvider.cs
@@ -0,0 +1,12 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Unity.AI.Runtime;
+
+public interface IAIPromptTemplateProvider
+{
+    Task<AIPromptTemplateSnapshot> GetRequiredPromptAsync(
+        string promptType,
+        string promptVersion,
+        CancellationToken cancellationToken = default);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IAIPromptTemplateStore.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IAIPromptTemplateStore.cs
new file mode 100644
index 0000000000..96d583b756
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IAIPromptTemplateStore.cs
@@ -0,0 +1,12 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Unity.AI.Runtime;
+
+public interface IAIPromptTemplateStore
+{
+    Task<AIPromptTemplateSnapshot> GetRequiredPromptAsync(
+        string promptType,
+        string promptVersion,
+        CancellationToken cancellationToken = default);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIChatClientFactory.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIChatClientFactory.cs
new file mode 100644
index 0000000000..d97311e3fb
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIChatClientFactory.cs
@@ -0,0 +1,18 @@
+using Azure.AI.OpenAI;
+using OpenAI.Chat;
+using System.ClientModel;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.Runtime;
+
+public class OpenAIChatClientFactory : ITransientDependency
+{
+    public ChatClient Create(OpenAIOperationSettings settings)
+    {
+        return new AzureOpenAIClient(
+            settings.Endpoint,
+            new ApiKeyCredential(settings.ApiKey),
+            new AzureOpenAIClientOptions())
+            .GetChatClient(settings.DeploymentName);
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs
index fc12e4cd99..7490142fbe 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs
@@ -1,123 +1,254 @@
 using Microsoft.Extensions.Configuration;
 using System;
-using System.Globalization;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Unity.AI.Operations;
+using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
 
 namespace Unity.AI.Runtime;
 
-public class OpenAIConfigurationResolver(IConfiguration configuration) : ITransientDependency
+public class OpenAIConfigurationResolver(
+    IRepository<AIModel, Guid> modelRepository,
+    IRepository<AIOperation, Guid> operationRepository,
+    IRepository<AIPrompt, Guid> promptRepository,
+    IConfiguration configuration,
+    IDataFilter<IMultiTenant> multiTenantDataFilter) : ITransientDependency
 {
-    private static readonly string[] SupportedReasoningEfforts = ["minimal", "low", "medium", "high"];
-    private static readonly string[] SupportedVerbosityValues = ["low", "medium", "high"];
+    private static readonly JsonSerializerOptions JsonOptions = new()
+    {
+        PropertyNameCaseInsensitive = true
+    };
 
+    private readonly IRepository<AIModel, Guid> _modelRepository = modelRepository;
+    private readonly IRepository<AIOperation, Guid> _operationRepository = operationRepository;
+    private readonly IRepository<AIPrompt, Guid> _promptRepository = promptRepository;
     private readonly IConfiguration _configuration = configuration;
+    private readonly IDataFilter<IMultiTenant> _multiTenantDataFilter = multiTenantDataFilter;
+
+    public string ResolveProviderName() => Required("Azure:Operations:Defaults:Provider");
+
+    public Task<string> ResolveApiKeyAsync(string? modelName = null, CancellationToken cancellationToken = default)
+    {
+        var providerName = Required("Azure:Operations:Defaults:Provider");
+        return Task.FromResult(Required($"Azure:{providerName}:ApiKey"));
+    }
 
-    public string ResolveProviderName(string? operationName = null)
+    public async Task<OpenAIOperationSettings> ResolveOperationSettingsAsync(
+        string operationName,
+        CancellationToken cancellationToken = default)
     {
-        if (!string.IsNullOrWhiteSpace(operationName))
+        var operation = await ResolveOperationAsync(operationName, cancellationToken);
+        if (operation == null)
         {
-            var operationProvider = Optional($"Azure:Operations:{operationName}:Provider");
-            if (operationProvider != null)
-            {
-                return operationProvider;
-            }
+            throw new InvalidOperationException($"AI operation '{operationName}' is not configured.");
+        }
+
+        var model = await _modelRepository.GetAsync(operation.AIModelId, cancellationToken: cancellationToken);
+        if (!model.IsActive)
+        {
+            throw new InvalidOperationException($"AI model '{model.Name}' is inactive.");
         }
 
-        return Required("Azure:Operations:Defaults:Provider");
+        var modelSettings = ResolveModelSettings(model);
+        var providerName = Required("Azure:Operations:Defaults:Provider");
+        var endpoint = Required($"Azure:{providerName}:Endpoint");
+        if (!Uri.TryCreate(endpoint, UriKind.Absolute, out _))
+        {
+            throw new InvalidOperationException($"Azure:{providerName}:Endpoint must be a valid absolute URI.");
+        }
+        var prompt = await LoadPromptAsync(operation.AIPromptId, cancellationToken);
+        if (!prompt.IsActive)
+        {
+            throw new InvalidOperationException($"AI prompt '{prompt.Name}' v{prompt.VersionNumber} is not active.");
+        }
+
+        if (operation.CompletionTokens <= 0)
+        {
+            throw new InvalidOperationException($"AI operation '{operation.Name}' must define a positive CompletionTokens value.");
+        }
+
+        var apiKey = Required($"Azure:{providerName}:ApiKey");
+        return new OpenAIOperationSettings(
+            providerName,
+            model.Name,
+            apiKey,
+            new Uri(endpoint),
+            Required($"Azure:{providerName}:Profiles:{model.Name}:DeploymentName"),
+            modelSettings.MaxOutputTokenCountSupported,
+            modelSettings.Temperature,
+            operation.CompletionTokens,
+            $"v{prompt.VersionNumber}");
     }
 
-    public string ResolveApiKey(string? operationName = null)
+    public async Task<double?> ResolveConfiguredTemperatureAsync(string? modelName = null, CancellationToken cancellationToken = default)
     {
-        var providerName = ResolveProviderName(operationName);
-        return Required($"Azure:{providerName}:ApiKey");
+        var modelConfiguration = await ResolveModelConfigurationAsync(modelName, cancellationToken);
+        if (modelConfiguration != null)
+        {
+            return modelConfiguration.Value.Settings.Temperature;
+        }
+
+        throw new InvalidOperationException("AI model is not configured.");
     }
 
-    public string ResolveMaxTokensParameterNameForOperation(string? operationName = null)
+    public async Task<bool> ResolveMaxOutputTokenCountSupportedAsync(string? modelName = null, CancellationToken cancellationToken = default)
     {
-        var providerName = ResolveProviderName(operationName);
-        var profileName = ResolveProfileName(operationName);
-        return RequiredProfile(providerName, profileName, "MaxTokensParameter");
+        var modelConfiguration = await ResolveModelConfigurationAsync(modelName, cancellationToken);
+        if (modelConfiguration != null)
+        {
+            var providerName = Required("Azure:Operations:Defaults:Provider");
+            var profileName = modelConfiguration.Value.Model.Name;
+            var configuredValue = Optional($"Azure:{providerName}:Profiles:{profileName}:MaxOutputTokenCountSupported");
+            if (configuredValue != null)
+            {
+                if (bool.TryParse(configuredValue, out var parsedValue))
+                {
+                    return parsedValue;
+                }
+
+                throw new InvalidOperationException($"Azure:{providerName}:Profiles:{profileName}:MaxOutputTokenCountSupported is not a valid boolean.");
+            }
+
+            return modelConfiguration.Value.Settings.MaxOutputTokenCountSupported;
+        }
+
+        throw new InvalidOperationException("AI model is not configured.");
     }
 
-    public double? ResolveConfiguredTemperature(string? operationName = null)
+    public async Task<int> ResolveCompletionTokensAsync(string operationName, CancellationToken cancellationToken = default)
     {
-        var providerName = ResolveProviderName(operationName);
-        var profileName = ResolveProfileName(operationName);
-        var profileTemperature = OptionalProfile(providerName, profileName, "Temperature");
-        if (profileTemperature != null
-            && double.TryParse(profileTemperature, NumberStyles.Float, CultureInfo.InvariantCulture, out var parsedTemperature))
+        var operation = await ResolveOperationAsync(operationName, cancellationToken);
+        if (operation == null)
         {
-            return parsedTemperature;
+            throw new InvalidOperationException($"AI operation '{operationName}' is not configured.");
         }
 
-        return null;
+        var model = await _modelRepository.GetAsync(operation.AIModelId, cancellationToken: cancellationToken);
+        if (!model.IsActive)
+        {
+            throw new InvalidOperationException($"AI model '{model.Name}' is inactive.");
+        }
+
+        if (operation.CompletionTokens <= 0)
+        {
+            throw new InvalidOperationException($"AI operation '{operation.Name}' must define a positive CompletionTokens value.");
+        }
+
+        return operation.CompletionTokens;
     }
 
-    public string? ResolveConfiguredReasoningEffort(string? operationName = null)
+    public Task<string> ResolvePromptVersionAsync(string operationName, CancellationToken cancellationToken = default)
     {
-        return ResolveOptionalProfileValue(operationName, "ReasoningEffort", SupportedReasoningEfforts);
+        return ResolvePromptVersionAsyncCore(operationName, cancellationToken);
     }
 
-    public string? ResolveConfiguredVerbosity(string? operationName = null)
+    public async Task<Uri> ResolveEndpointAsync(string? modelName = null, CancellationToken cancellationToken = default)
     {
-        return ResolveOptionalProfileValue(operationName, "Verbosity", SupportedVerbosityValues);
+        var modelConfiguration = await ResolveModelConfigurationAsync(modelName, cancellationToken);
+        if (modelConfiguration != null)
+        {
+            var providerName = Required("Azure:Operations:Defaults:Provider");
+            return new Uri(Required($"Azure:{providerName}:Endpoint"));
+        }
+
+        throw new InvalidOperationException("AI model is not configured.");
     }
 
-    public int ResolveCompletionTokens(string operationName)
+    public async Task<string> ResolveDeploymentNameAsync(string? modelName = null, CancellationToken cancellationToken = default)
     {
-        var configuredValue = OptionalPositiveInt($"Azure:Operations:{operationName}:MaxCompletionTokens");
-        if (configuredValue is > 0)
+        var modelConfiguration = await ResolveModelConfigurationAsync(modelName, cancellationToken);
+        if (modelConfiguration != null)
         {
-            return configuredValue.Value;
+            var providerName = Required("Azure:Operations:Defaults:Provider");
+            return Required($"Azure:{providerName}:Profiles:{modelConfiguration.Value.Model.Name}:DeploymentName");
         }
 
-        var defaultConfiguredValue = OptionalPositiveInt("Azure:Operations:Defaults:MaxCompletionTokens");
-        if (defaultConfiguredValue is > 0)
+        throw new InvalidOperationException("AI model is not configured.");
+    }
+
+    public async Task<string> ResolveProfileNameAsync(string? modelName = null, CancellationToken cancellationToken = default)
+    {
+        var modelConfiguration = await ResolveModelConfigurationAsync(modelName, cancellationToken);
+        if (modelConfiguration != null)
         {
-            return defaultConfiguredValue.Value;
+            return modelConfiguration.Value.Model.Name;
         }
 
-        throw new InvalidOperationException($"AI max completion tokens are not configured for operation '{operationName}'.");
+        throw new InvalidOperationException("AI model is not configured.");
     }
 
-    public string ResolvePromptVersion(string operationName)
+    private async Task<(AIModel Model, AIModelSettings Settings)?> ResolveModelConfigurationAsync(
+        string? modelName,
+        CancellationToken cancellationToken)
     {
-        return Optional($"Azure:Operations:{operationName}:PromptVersion")
-            ?? Required("Azure:Operations:Defaults:PromptVersion");
+        var model = await ResolveModelAsync(modelName, cancellationToken);
+        if (model == null)
+        {
+            return null;
+        }
+
+        var settings = JsonSerializer.Deserialize<AIModelSettings>(model.SettingsJson, JsonOptions);
+        if (settings == null)
+        {
+            throw new InvalidOperationException($"AI model '{model.Name}' has invalid settings JSON.");
+        }
+
+        return (model, settings);
     }
 
-    public string ResolveApiUrl(string? operationName = null)
+    private async Task<AIOperation?> ResolveOperationAsync(string operationName, CancellationToken cancellationToken)
     {
-        var providerName = ResolveProviderName(operationName);
-        var endpoint = Required($"Azure:{providerName}:Endpoint");
-        var profileName = ResolveProfileName(operationName);
-        var profileApiUrl = RequiredProfile(providerName, profileName, "ApiUrl");
-        return CombineEndpointAndPath(endpoint, profileApiUrl);
+        var operations = await _operationRepository.GetListAsync(
+            operation => operation.IsActive,
+            cancellationToken: cancellationToken);
+
+        return operations.FirstOrDefault(operation =>
+            string.Equals(operation.Name, operationName, StringComparison.OrdinalIgnoreCase));
     }
 
-    private string ResolveProfileName(string? operationName)
+    private static AIModelSettings ResolveModelSettings(AIModel model)
     {
-        if (!string.IsNullOrWhiteSpace(operationName))
+        var settings = JsonSerializer.Deserialize<AIModelSettings>(model.SettingsJson, JsonOptions);
+        if (settings == null)
         {
-            var operationProfile = Optional($"Azure:Operations:{operationName}:Profile");
-            if (operationProfile != null)
-            {
-                return operationProfile;
-            }
+            throw new InvalidOperationException($"AI model '{model.Name}' has invalid settings JSON.");
         }
 
-        return Required("Azure:Operations:Defaults:Profile");
+        return settings;
     }
 
-    private string RequiredProfile(string providerName, string profileName, string settingName)
+    private async Task<AIModel?> ResolveModelAsync(string? modelName, CancellationToken cancellationToken)
     {
-        var key = ProfileKey(providerName, profileName, settingName);
-        return Required(key);
-    }
+        var activeModels = await _modelRepository.GetListAsync(model => model.IsActive, cancellationToken: cancellationToken);
+        if (activeModels.Count == 0)
+        {
+            return null;
+        }
 
-    private string? OptionalProfile(string providerName, string profileName, string settingName)
-    {
-        return Optional(ProfileKey(providerName, profileName, settingName));
+        if (!string.IsNullOrWhiteSpace(modelName))
+        {
+            return activeModels.FirstOrDefault(model =>
+                string.Equals(model.Name, modelName, StringComparison.OrdinalIgnoreCase));
+        }
+
+        var configuredDefaultProfile = Optional("Azure:Operations:Defaults:Profile");
+        if (!string.IsNullOrWhiteSpace(configuredDefaultProfile))
+        {
+            var configuredDefaultModel = activeModels.FirstOrDefault(model =>
+                string.Equals(model.Name, configuredDefaultProfile, StringComparison.OrdinalIgnoreCase));
+            if (configuredDefaultModel != null)
+            {
+                return configuredDefaultModel;
+            }
+        }
+
+        return null;
     }
 
     private string Required(string key)
@@ -131,43 +262,28 @@ private string Required(string key)
         return string.IsNullOrWhiteSpace(value) ? null : value.Trim();
     }
 
-    private int? OptionalPositiveInt(string key)
+    private async Task<string> ResolvePromptVersionAsyncCore(string operationName, CancellationToken cancellationToken)
     {
-        var value = _configuration.GetValue<int?>(key);
-        return value is > 0 ? value : null;
-    }
-
-    private static string ProfileKey(string providerName, string profileName, string settingName)
-    {
-        return $"Azure:{providerName}:Profiles:{profileName}:{settingName}";
-    }
-
-    private string? ResolveOptionalProfileValue(string? operationName, string settingName, string[] supportedValues)
-    {
-        var providerName = ResolveProviderName(operationName);
-        var profileName = ResolveProfileName(operationName);
-        var configuredValue = OptionalProfile(providerName, profileName, settingName);
-        if (configuredValue == null)
+        var operation = await ResolveOperationAsync(operationName, cancellationToken);
+        if (operation == null)
         {
-            return null;
+            throw new InvalidOperationException($"AI operation '{operationName}' is not configured.");
         }
 
-        var trimmedValue = configuredValue.Trim();
-        if (Array.Exists(supportedValues, supportedValue => string.Equals(supportedValue, trimmedValue, StringComparison.Ordinal)))
+        var prompt = await LoadPromptAsync(operation.AIPromptId, cancellationToken);
+        if (!prompt.IsActive)
         {
-            return trimmedValue;
+            throw new InvalidOperationException($"AI prompt '{prompt.Name}' v{prompt.VersionNumber} is not active.");
         }
 
-        throw new InvalidOperationException(
-            $"AI {settingName} value '{configuredValue}' is not supported. Use one of: {string.Join(", ", supportedValues)}.");
+        return $"v{prompt.VersionNumber}";
     }
 
-    private static string CombineEndpointAndPath(string endpoint, string profilePath)
+    private async Task<AIPrompt> LoadPromptAsync(Guid promptId, CancellationToken cancellationToken)
     {
-        const char UrlPathSeparator = '/';
-
-        return endpoint.Trim().TrimEnd(UrlPathSeparator)
-            + UrlPathSeparator
-            + profilePath.Trim().TrimStart(UrlPathSeparator);
+        using (_multiTenantDataFilter.Disable())
+        {
+            return await _promptRepository.GetAsync(promptId, cancellationToken: cancellationToken);
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIOperationSettings.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIOperationSettings.cs
new file mode 100644
index 0000000000..e98b6ca104
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIOperationSettings.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Unity.AI.Runtime;
+
+public sealed record OpenAIOperationSettings(
+    string ProviderName,
+    string ProfileName,
+    string ApiKey,
+    Uri Endpoint,
+    string DeploymentName,
+    bool MaxOutputTokenCountSupported,
+    double? Temperature,
+    int CompletionTokens,
+    string PromptVersion);
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptFileLogger.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptFileLogger.cs
new file mode 100644
index 0000000000..a7317c13c2
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptFileLogger.cs
@@ -0,0 +1,215 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.Runtime;
+
+public class OpenAIPromptFileLogger(
+    IConfiguration configuration,
+    ILogger<OpenAIPromptFileLogger> logger) : ITransientDependency
+{
+    private readonly IConfiguration _configuration = configuration;
+    private readonly ILogger<OpenAIPromptFileLogger> _logger = logger;
+    private const string PromptLogDirectoryName = "logs";
+    private static readonly string PromptLogFileName = $"ai-prompts-{DateTime.UtcNow:yyyyMMdd-HHmmss}-{Environment.ProcessId}.log";
+
+    public Task LogPromptInputAsync(string promptType, string promptVersion, string? systemPrompt, string userPrompt, CancellationToken cancellationToken = default)
+    {
+        return WritePromptLogFileAsync(promptType, promptVersion, "INPUT", FormatPromptInputForLog(systemPrompt, userPrompt), cancellationToken);
+    }
+
+    public Task LogPromptOutputAsync(string promptType, string promptVersion, string output, CancellationToken cancellationToken = default)
+    {
+        return WritePromptLogFileAsync(promptType, promptVersion, "OUTPUT", FormatPromptOutputForLog(output), cancellationToken);
+    }
+
+    private bool CanWritePromptFileLog()
+    {
+        return _configuration.GetValue<bool?>("Azure:Logging:EnablePromptFileLog") ?? false;
+    }
+
+    private async Task WritePromptLogFileAsync(string promptType, string promptVersion, string payloadType, string payload, CancellationToken cancellationToken = default)
+    {
+        if (!CanWritePromptFileLog())
+        {
+            return;
+        }
+
+        try
+        {
+            var now = DateTimeOffset.Now.ToString("yyyy-MM-dd HH:mm:ss zzz");
+            var logDirectory = Path.Combine(AppContext.BaseDirectory, PromptLogDirectoryName);
+            Directory.CreateDirectory(logDirectory);
+
+            var logPath = Path.Combine(logDirectory, PromptLogFileName);
+            var entry = $"{now} [{promptType}] [{promptVersion}] {payloadType}\n{payload}\n\n";
+            await File.AppendAllTextAsync(logPath, entry, cancellationToken);
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "Failed to write AI prompt log file.");
+        }
+    }
+
+    private static string FormatPromptInputForLog(string? systemPrompt, string userPrompt)
+    {
+        var normalizedSystemPrompt = string.IsNullOrWhiteSpace(systemPrompt) ? string.Empty : systemPrompt.Trim();
+        var normalizedUserPrompt = string.IsNullOrWhiteSpace(userPrompt) ? string.Empty : userPrompt.Trim();
+        return $"SYSTEM_PROMPT\n{normalizedSystemPrompt}\n\nUSER_PROMPT\n{normalizedUserPrompt}";
+    }
+
+    private static string FormatPromptOutputForLog(string output)
+    {
+        if (string.IsNullOrWhiteSpace(output))
+        {
+            return string.Empty;
+        }
+
+        if (TryFormatProviderOutput(output, out var formattedProviderOutput))
+        {
+            return formattedProviderOutput;
+        }
+
+        if (TryParseJsonObjectFromResponse(output, out var jsonObject))
+        {
+            return JsonSerializer.Serialize(jsonObject, AIJsonDefaults.Indented);
+        }
+
+        return output.Trim();
+    }
+
+    private static bool TryFormatProviderOutput(string output, out string formattedOutput)
+    {
+        formattedOutput = string.Empty;
+
+        try
+        {
+            using var doc = JsonDocument.Parse(output);
+            var root = doc.RootElement;
+            if (root.ValueKind != JsonValueKind.Object
+                || !root.TryGetProperty("choices", out var choices)
+                || choices.ValueKind != JsonValueKind.Array
+                || choices.GetArrayLength() == 0)
+            {
+                return false;
+            }
+
+            var firstChoice = choices[0];
+            var content = TryGetChoiceContent(firstChoice);
+            if (string.IsNullOrWhiteSpace(content))
+            {
+                return false;
+            }
+
+            var lines = new List<string>();
+
+            if (root.TryGetProperty("usage", out var usage) && usage.ValueKind == JsonValueKind.Object)
+            {
+                var promptTokens = TryGetInt32(usage, "prompt_tokens");
+                var completionTokens = TryGetInt32(usage, "completion_tokens");
+                int? reasoningTokens = null;
+
+                if (usage.TryGetProperty("completion_tokens_details", out var completionTokenDetails)
+                    && completionTokenDetails.ValueKind == JsonValueKind.Object)
+                {
+                    reasoningTokens = TryGetInt32(completionTokenDetails, "reasoning_tokens");
+                }
+
+                if (promptTokens.HasValue)
+                {
+                    lines.Add($"PromptTokens: {promptTokens.Value}");
+                }
+
+                if (completionTokens.HasValue)
+                {
+                    lines.Add($"CompletionTokens: {completionTokens.Value}");
+                }
+
+                if (reasoningTokens.HasValue)
+                {
+                    lines.Add($"ReasoningTokens: {reasoningTokens.Value}");
+                }
+            }
+
+            var normalizedContent = FormatPromptOutputContent(content);
+            lines.Add("Output:");
+            lines.Add(normalizedContent);
+            formattedOutput = string.Join(Environment.NewLine, lines);
+            return true;
+        }
+        catch (JsonException)
+        {
+            return false;
+        }
+    }
+
+    private static string? TryGetChoiceContent(JsonElement firstChoice)
+    {
+        if (!firstChoice.TryGetProperty("message", out var message) || message.ValueKind != JsonValueKind.Object)
+        {
+            return null;
+        }
+
+        if (!message.TryGetProperty("content", out var contentProp) || contentProp.ValueKind != JsonValueKind.String)
+        {
+            return null;
+        }
+
+        return contentProp.GetString();
+    }
+
+    private static string FormatPromptOutputContent(string content)
+    {
+        if (TryParseJsonObjectFromResponse(content, out var contentObject))
+        {
+            return JsonSerializer.Serialize(contentObject, AIJsonDefaults.Indented);
+        }
+
+        return content.Trim();
+    }
+
+    private static bool TryParseJsonObjectFromResponse(string response, out JsonElement objectElement)
+    {
+        objectElement = default;
+        var cleaned = AIResponseJson.CleanJsonResponse(response);
+        if (string.IsNullOrWhiteSpace(cleaned))
+        {
+            return false;
+        }
+
+        try
+        {
+            using var doc = JsonDocument.Parse(cleaned);
+            if (doc.RootElement.ValueKind != JsonValueKind.Object)
+            {
+                return false;
+            }
+
+            objectElement = doc.RootElement.Clone();
+            return true;
+        }
+        catch (JsonException)
+        {
+            return false;
+        }
+    }
+
+    private static int? TryGetInt32(JsonElement element, string propertyName)
+    {
+        return element.TryGetProperty(propertyName, out var prop)
+            && prop.ValueKind == JsonValueKind.Number
+            && prop.TryGetInt32(out var value)
+            ? value
+            : null;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
index c90ed92916..9080271150 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Concurrent;
-using System.IO;
-using System.Linq;
 using System.Text.Json;
 using Volo.Abp.DependencyInjection;
 
@@ -10,70 +7,6 @@ namespace Unity.AI.Runtime;
 
 public class OpenAIPromptRenderer : ITransientDependency
 {
-    private const string PromptVersionV0 = "v0";
-    private const string PromptVersionV1 = "v1";
-    private static readonly string PromptTemplatesFolder = Path.Combine("AI", "Prompts", "Versions");
-    private const string ApplicationAnalysisSystemTemplateName = "application-analysis.system";
-    private const string ApplicationAnalysisUserTemplateName = "application-analysis.user";
-    private const string AttachmentSummarySystemTemplateName = "attachment-summary.system";
-    private const string AttachmentSummaryUserTemplateName = "attachment-summary.user";
-    private const string ApplicationScoringSystemTemplateName = "application-scoring.system";
-    private const string ApplicationScoringUserTemplateName = "application-scoring.user";
-    private static readonly Dictionary<string, string> PromptProfiles =
-        new(StringComparer.Ordinal)
-        {
-            [PromptVersionV0] = PromptVersionV0,
-            [PromptVersionV1] = PromptVersionV1
-        };
-    private static readonly ConcurrentDictionary<string, string> PromptTemplateCache = new(StringComparer.OrdinalIgnoreCase);
-
-
-    public static string BuildApplicationAnalysisSystemPrompt(string version)
-    {
-        return GetRequiredPromptTemplate(version, ApplicationAnalysisSystemTemplateName);
-    }
-
-    public static string BuildApplicationAnalysisUserPrompt(string version, string schema, string data, string attachments)
-    {
-        var replacements = new Dictionary<string, string>
-        {
-            ["SCHEMA"] = schema,
-            ["DATA"] = data,
-            ["ATTACHMENTS"] = attachments
-        };
-
-        return RenderPromptTemplate(version, ApplicationAnalysisUserTemplateName, replacements);
-    }
-
-    public static string BuildAttachmentSummarySystemPrompt(string version)
-    {
-        return GetRequiredPromptTemplate(version, AttachmentSummarySystemTemplateName);
-    }
-
-    public static string BuildAttachmentSummaryUserPrompt(string version, string attachment)
-    {
-        return RenderPromptTemplate(version, AttachmentSummaryUserTemplateName, new Dictionary<string, string>
-        {
-            ["ATTACHMENT"] = attachment
-        });
-    }
-
-    public static string BuildApplicationScoringSystemPrompt(string version)
-    {
-        return GetRequiredPromptTemplate(version, ApplicationScoringSystemTemplateName);
-    }
-
-    public static string BuildApplicationScoringUserPrompt(string version, string data, string attachments, string section, string response)
-    {
-        return RenderPromptTemplate(version, ApplicationScoringUserTemplateName, new Dictionary<string, string>
-        {
-            ["DATA"] = data,
-            ["ATTACHMENTS"] = attachments,
-            ["SECTION"] = section,
-            ["RESPONSE"] = response
-        });
-    }
-
     public static string BuildApplicationScoringResponseTemplate(string sectionPayloadJson)
     {
         try
@@ -189,194 +122,25 @@ public static string ResolvePromptVersion(string? version)
             throw new InvalidOperationException("AI prompt version is not configured.");
         }
 
-        if (PromptProfiles.TryGetValue(version.Trim(), out var selectedVersion))
+        var normalizedVersion = version.Trim();
+        if (normalizedVersion.Length >= 2 &&
+            normalizedVersion[0] == 'v' &&
+            int.TryParse(normalizedVersion.AsSpan(1), out _))
         {
-            return selectedVersion;
+            return normalizedVersion;
         }
 
         throw new InvalidOperationException($"AI prompt version '{version}' is not supported.");
     }
 
-    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)
+    public static int ResolvePromptVersionNumber(string version)
     {
-        if (!resolutionStack.Add(templateName))
+        var normalizedVersion = ResolvePromptVersion(version);
+        if (normalizedVersion.Length < 2 || !int.TryParse(normalizedVersion.AsSpan(1), out var versionNumber))
         {
-            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).TrimEnd();
-            }
-        }
-
-        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 (string.Equals(placeholderName, "RESPONSE", StringComparison.Ordinal))
-        {
-            var outputCandidate = $"{baseTemplateName}.output";
-            if (TryGetPromptTemplate(version, outputCandidate, out _))
-            {
-                return outputCandidate;
-            }
-        }
-
-        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;
+            throw new InvalidOperationException($"AI prompt version '{version}' is not supported.");
         }
 
-        return placeholders;
+        return versionNumber;
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
index 1abacf8dda..05c1ebb027 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
@@ -131,7 +131,7 @@ public static ApplicationScoringResponse ParseApplicationScoringResponse(string
                 : string.Empty;
             var confidence = property.Value.TryGetProperty("confidence", out var confidenceProp) &&
                              confidenceProp.ValueKind == JsonValueKind.Number &&
-                             confidenceProp.TryGetInt32(out var parsedConfidence)
+                             confidenceProp.TryGetDecimal(out var parsedConfidence)
                 ? NormalizeConfidence(parsedConfidence)
                 : 0;
 
@@ -151,6 +151,49 @@ public static ApplicationScoringResponse ParseApplicationScoringResponse(string
         return response;
     }
 
+    public static AttachmentSummaryBatchResponse ParseAttachmentSummaryBatchResponse(string raw)
+    {
+        var response = new AttachmentSummaryBatchResponse();
+        if (!TryParseJsonObjectFromResponse(raw, out var root))
+        {
+            return response;
+        }
+
+        if (!root.TryGetProperty("attachments", out var attachments) || attachments.ValueKind != JsonValueKind.Array)
+        {
+            return response;
+        }
+
+        foreach (var attachment in attachments.EnumerateArray())
+        {
+            if (attachment.ValueKind != JsonValueKind.Object)
+            {
+                continue;
+            }
+
+            var attachmentId = attachment.TryGetProperty("attachmentId", out var idProp) && idProp.ValueKind == JsonValueKind.String
+                ? idProp.GetString() ?? string.Empty
+                : string.Empty;
+
+            if (string.IsNullOrWhiteSpace(attachmentId))
+            {
+                continue;
+            }
+
+            var summary = attachment.TryGetProperty(AIJsonKeys.Summary, out var summaryProp) && summaryProp.ValueKind == JsonValueKind.String
+                ? summaryProp.GetString() ?? string.Empty
+                : string.Empty;
+
+            response.Attachments.Add(new AttachmentSummaryBatchItemResponse
+            {
+                AttachmentId = attachmentId,
+                Summary = summary
+            });
+        }
+
+        return response;
+    }
+
     private static IEnumerable<ApplicationAnalysisFinding> ParseFindings(JsonElement findingsArray)
     {
         foreach (var item in findingsArray.EnumerateArray())
@@ -242,10 +285,11 @@ private static bool TryGetArrayProperty(JsonElement element, string propertyName
         return true;
     }
 
-    private static int NormalizeConfidence(int confidence)
+    private static int NormalizeConfidence(decimal confidence)
     {
-        var clamped = Math.Clamp(confidence, 0, 100);
-        var rounded = (int)Math.Round(clamped / 5.0, MidpointRounding.AwayFromZero) * 5;
+        var clamped = Math.Clamp(confidence, 0m, 1m);
+        var percentage = clamped * 100m;
+        var rounded = (int)Math.Round(percentage / 10m, MidpointRounding.AwayFromZero) * 10;
         return Math.Clamp(rounded, 0, 100);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index b61fed77c1..3cafa504d9 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -1,8 +1,6 @@
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text.Json;
 using System.Threading;
@@ -11,6 +9,7 @@
 using Unity.AI.Prompts;
 using Unity.AI.Requests;
 using Unity.AI.Responses;
+using Volo.Abp;
 using Volo.Abp.DependencyInjection;
 
 namespace Unity.AI.Runtime
@@ -18,95 +17,114 @@ namespace Unity.AI.Runtime
     [ExposeServices(typeof(IAIService))]
     public class OpenAIRuntimeService : IAIService, ITransientDependency
     {
-        private readonly IConfiguration _configuration;
         private readonly ILogger<OpenAIRuntimeService> _logger;
         private readonly OpenAITransportService _openAITransportService;
         private readonly OpenAIConfigurationResolver _openAIConfigurationResolver;
+        private readonly IAIPromptTemplateProvider _promptTemplateProvider;
+        private readonly OpenAIPromptFileLogger _promptFileLogger;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
         private const string AttachmentSummaryPromptType = AIPromptTypes.AttachmentSummary;
         private const string ApplicationScoringPromptType = AIPromptTypes.ApplicationScoring;
         private const int MaxAiAttempts = 3;
 
-        private int AttachmentSummaryCompletionTokens => _openAIConfigurationResolver.ResolveCompletionTokens(AttachmentSummaryPromptType);
-        private int ApplicationAnalysisCompletionTokens => _openAIConfigurationResolver.ResolveCompletionTokens(ApplicationAnalysisPromptType);
-        private int ApplicationScoringCompletionTokens => _openAIConfigurationResolver.ResolveCompletionTokens(ApplicationScoringPromptType);
-        // Optional local debugging sink for prompt payload logs to a local file.
-        // Not intended for deployed/shared environments.
-        private bool IsPromptFileLoggingEnabled => _configuration.GetValue<bool?>("Azure:Logging:EnablePromptFileLog") ?? false;
-        private const string PromptLogDirectoryName = "logs";
-        private static readonly string PromptLogFileName = $"ai-prompts-{DateTime.UtcNow:yyyyMMdd-HHmmss}-{Environment.ProcessId}.log";
-
-
-
         public OpenAIRuntimeService(
-            IConfiguration configuration,
             ILogger<OpenAIRuntimeService> logger,
             OpenAITransportService openAITransportService,
-            OpenAIConfigurationResolver openAIConfigurationResolver)
+            OpenAIConfigurationResolver openAIConfigurationResolver,
+            IAIPromptTemplateProvider promptTemplateProvider,
+            OpenAIPromptFileLogger promptFileLogger)
         {
-            _configuration = configuration;
             _logger = logger;
             _openAITransportService = openAITransportService;
             _openAIConfigurationResolver = openAIConfigurationResolver;
+            _promptTemplateProvider = promptTemplateProvider;
+            _promptFileLogger = promptFileLogger;
         }
 
         public Task<bool> IsAvailableAsync()
         {
-            try
-            {
-                _openAIConfigurationResolver.ResolveApiKey();
-                return Task.FromResult(true);
-            }
-            catch (InvalidOperationException ex)
-            {
-                _logger.LogWarning(ex, "AI is unavailable because the OpenAI configuration could not be resolved.");
-                return Task.FromResult(false);
-            }
+            return IsAvailableCoreAsync();
         }
 
         public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(ApplicationAnalysisRequest request, CancellationToken cancellationToken = default)
         {
-            ArgumentNullException.ThrowIfNull(request);
-            var promptVersion = OpenAIPromptRenderer.ResolvePromptVersion(
-                request.PromptVersion ?? _openAIConfigurationResolver.ResolvePromptVersion(ApplicationAnalysisPromptType));
-            var data = JsonSerializer.Serialize(request.Data, AIJsonDefaults.Indented);
-            var schema = JsonSerializer.Serialize(request.Schema, AIJsonDefaults.Indented);
+            try
+            {
+                ArgumentNullException.ThrowIfNull(request);
+                var settings = await _openAIConfigurationResolver.ResolveOperationSettingsAsync(ApplicationAnalysisPromptType, cancellationToken);
+                var promptTemplate = await _promptTemplateProvider.GetRequiredPromptAsync(
+                    ApplicationAnalysisPromptType,
+                    request.PromptVersion ?? settings.PromptVersion,
+                    cancellationToken);
+                var promptVersion = promptTemplate.PromptVersion;
+                var data = JsonSerializer.Serialize(request.Data, AIJsonDefaults.Indented);
+                var schema = JsonSerializer.Serialize(request.Schema, AIJsonDefaults.Indented);
+
+                var attachmentsPayload = request.Attachments
+                    .Select(a => new
+                    {
+                        name = string.IsNullOrWhiteSpace(a.Name) ? "attachment" : a.Name.Trim(),
+                        summary = string.IsNullOrWhiteSpace(a.Summary) ? string.Empty : a.Summary.Trim()
+                    })
+                    .Cast<object>();
+
+                var attachments = JsonSerializer.Serialize(attachmentsPayload, AIJsonDefaults.Indented);
+                var systemPrompt = promptTemplate.SystemPrompt;
+                var applicationAnalysisContent = AIPromptTemplateRenderer.BuildApplicationAnalysisUserPrompt(
+                    promptTemplate.UserPrompt,
+                    schema,
+                    data,
+                    attachments,
+                    promptTemplate.MetadataJson);
+
+                await _promptFileLogger.LogPromptInputAsync(ApplicationAnalysisPromptType, promptVersion, systemPrompt, applicationAnalysisContent, cancellationToken);
+                var result = await GenerateWithRetryAsync(
+                    () => _openAITransportService.GenerateSummaryAsync(
+                        applicationAnalysisContent,
+                        systemPrompt,
+                        settings,
+                        settings.CompletionTokens,
+                        cancellationToken: cancellationToken),
+                    AIProviderPayloadValidator.ValidateApplicationAnalysisJson,
+                    "application analysis",
+                    cancellationToken);
+
+                await _promptFileLogger.LogPromptOutputAsync(ApplicationAnalysisPromptType, promptVersion, result.CaptureOutput, cancellationToken);
 
-            var attachmentsPayload = request.Attachments
-                .Select(a => new
+                if (result.Outcome != AIOperationOutcome.Success)
                 {
-                    name = string.IsNullOrWhiteSpace(a.Name) ? "attachment" : a.Name.Trim(),
-                    summary = string.IsNullOrWhiteSpace(a.Summary) ? string.Empty : a.Summary.Trim()
-                })
-                .Cast<object>();
-
-            var attachments = JsonSerializer.Serialize(attachmentsPayload, AIJsonDefaults.Indented);
-            var systemPrompt = OpenAIPromptRenderer.BuildApplicationAnalysisSystemPrompt(promptVersion);
-            var applicationAnalysisContent = OpenAIPromptRenderer.BuildApplicationAnalysisUserPrompt(
-                promptVersion,
-                schema,
-                data,
-                attachments);
-            await LogPromptInputAsync(ApplicationAnalysisPromptType, promptVersion, systemPrompt, applicationAnalysisContent, cancellationToken);
-            var result = await GenerateWithRetryAsync(
-                () => _openAITransportService.GenerateSummaryAsync(
-                    applicationAnalysisContent,
-                    systemPrompt,
-                    ApplicationAnalysisCompletionTokens,
-                    operationName: ApplicationAnalysisPromptType,
-                    promptVersion: promptVersion,
-                    cancellationToken: cancellationToken),
-                AIProviderPayloadValidator.IsValidApplicationAnalysisJson,
-                "application analysis",
-                cancellationToken);
-            await LogPromptOutputAsync(ApplicationAnalysisPromptType, promptVersion, result.CaptureOutput, cancellationToken);
-
-            if (result.Outcome != AIOperationOutcome.Success)
+                    var providerDetails = result.Response?.RawResponse;
+                    if (string.IsNullOrWhiteSpace(providerDetails))
+                    {
+                        providerDetails = result.Response?.Content;
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(providerDetails) && providerDetails.Length > 400)
+                    {
+                        providerDetails = providerDetails[..400];
+                    }
+
+                    _logger.LogError(
+                        "Application analysis generation failed with outcome {Outcome} and failure category {FailureCategory}. HTTP status {HttpStatusCode}. Provider details: {ProviderDetails}",
+                        result.Outcome,
+                        result.FailureCategory,
+                        result.Response?.HttpStatusCode?.ToString() ?? "n/a",
+                        providerDetails ?? "n/a");
+
+                    throw new UserFriendlyException("Application analysis generation failed.");
+                }
+
+                return OpenAIResponseParser.ParseApplicationAnalysisResponse(result.Content);
+            }
+            catch (OperationCanceledException)
             {
-                return new ApplicationAnalysisResponse();
+                throw;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Application analysis generation failed.");
+                throw;
             }
-
-            return OpenAIResponseParser.ParseApplicationAnalysisResponse(result.Content);
         }
 
         public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(AttachmentSummaryRequest request, CancellationToken cancellationToken = default)
@@ -114,47 +132,46 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
             ArgumentNullException.ThrowIfNull(request);
             var fileName = request.FileName ?? string.Empty;
             var contentType = request.ContentType ?? "application/octet-stream";
-            var promptVersion = OpenAIPromptRenderer.ResolvePromptVersion(
-                request.PromptVersion ?? _openAIConfigurationResolver.ResolvePromptVersion(AttachmentSummaryPromptType));
 
             try
             {
+                var settings = await _openAIConfigurationResolver.ResolveOperationSettingsAsync(AttachmentSummaryPromptType, cancellationToken);
+                var promptTemplate = await _promptTemplateProvider.GetRequiredPromptAsync(
+                    AttachmentSummaryPromptType,
+                    request.PromptVersion ?? settings.PromptVersion,
+                    cancellationToken);
+                var promptVersion = promptTemplate.PromptVersion;
                 var extractedText = request.ExtractedText;
-                var prompt = OpenAIPromptRenderer.BuildAttachmentSummarySystemPrompt(promptVersion);
+                var prompt = promptTemplate.SystemPrompt;
 
                 var attachmentText = string.IsNullOrWhiteSpace(extractedText) ? null : extractedText;
-                if (attachmentText != null)
+                var attachmentPayload = new[]
                 {
-                    _logger.LogDebug("Received {TextLength} extracted characters for {FileName}", attachmentText.Length, fileName);
-                }
-                else
-                {
-                    _logger.LogDebug("No text extracted from {FileName}, analyzing metadata only", fileName);
-                }
-
-                var attachmentPayload = new
-                {
-                    name = fileName,
-                    contentType,
-                    text = attachmentText
+                    new
+                    {
+                        name = fileName,
+                        contentType,
+                        text = attachmentText
+                    }
                 };
-                var attachment = JsonSerializer.Serialize(attachmentPayload, AIJsonDefaults.Indented);
-                var contentToAnalyze = OpenAIPromptRenderer.BuildAttachmentSummaryUserPrompt(promptVersion, attachment);
+                var attachments = JsonSerializer.Serialize(attachmentPayload, AIJsonDefaults.Indented);
+                var contentToAnalyze = AIPromptTemplateRenderer.BuildAttachmentSummaryBatchUserPrompt(
+                    promptTemplate.UserPrompt,
+                    attachments,
+                    promptTemplate.MetadataJson);
 
-                await LogPromptInputAsync(AttachmentSummaryPromptType, promptVersion, prompt, contentToAnalyze, cancellationToken);
+                await _promptFileLogger.LogPromptInputAsync(AttachmentSummaryPromptType, promptVersion, prompt, contentToAnalyze, cancellationToken);
                 var result = await GenerateWithRetryAsync(
                     () => _openAITransportService.GenerateSummaryAsync(
                         contentToAnalyze,
                         prompt,
-                        AttachmentSummaryCompletionTokens,
-                        operationName: AttachmentSummaryPromptType,
-                        promptVersion: promptVersion,
-                        fileName: fileName,
+                        settings,
+                        settings.CompletionTokens,
                         cancellationToken: cancellationToken),
-                    AIProviderPayloadValidator.IsValidAttachmentSummaryText,
+                    AIProviderPayloadValidator.ValidateAttachmentSummaryText,
                     "attachment summary",
                     cancellationToken);
-                await LogPromptOutputAsync(AttachmentSummaryPromptType, promptVersion, result.CaptureOutput, cancellationToken);
+                await _promptFileLogger.LogPromptOutputAsync(AttachmentSummaryPromptType, promptVersion, result.CaptureOutput, cancellationToken);
 
                 if (result.Outcome != AIOperationOutcome.Success)
                 {
@@ -175,7 +192,7 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error generating attachment summary for {FileName}", fileName);
+                _logger.LogError(ex, "Attachment summary generation failed for {FileName}.", fileName);
                 return new AttachmentSummaryResponse
                 {
                     Summary = $"AI analysis not available for this attachment ({fileName})."
@@ -183,22 +200,88 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
             }
         }
 
+        public async Task<AttachmentSummaryBatchResponse> GenerateAttachmentSummaryBatchAsync(AttachmentSummaryBatchRequest request, CancellationToken cancellationToken = default)
+        {
+            ArgumentNullException.ThrowIfNull(request);
+            try
+            {
+                if (request.Attachments is null || request.Attachments.Count == 0)
+                {
+                    return new AttachmentSummaryBatchResponse();
+                }
+
+                var settings = await _openAIConfigurationResolver.ResolveOperationSettingsAsync(AttachmentSummaryPromptType, cancellationToken);
+                var promptTemplate = await _promptTemplateProvider.GetRequiredPromptAsync(
+                    AttachmentSummaryPromptType,
+                    request.PromptVersion ?? settings.PromptVersion,
+                    cancellationToken);
+                var promptVersion = promptTemplate.PromptVersion;
+
+                var attachmentsPayload = request.Attachments.Select(attachment => new
+                {
+                    attachmentId = attachment.AttachmentId,
+                    name = string.IsNullOrWhiteSpace(attachment.FileName) ? "attachment" : attachment.FileName.Trim(),
+                    contentType = attachment.ContentType ?? "application/octet-stream",
+                    text = string.IsNullOrWhiteSpace(attachment.ExtractedText) ? null : attachment.ExtractedText
+                });
+
+                var attachments = JsonSerializer.Serialize(attachmentsPayload, AIJsonDefaults.Indented);
+                var contentToAnalyze = AIPromptTemplateRenderer.BuildAttachmentSummaryBatchUserPrompt(
+                    promptTemplate.UserPrompt,
+                    attachments,
+                    promptTemplate.MetadataJson);
+
+                await _promptFileLogger.LogPromptInputAsync(AttachmentSummaryPromptType, promptVersion, promptTemplate.SystemPrompt, contentToAnalyze, cancellationToken);
+                var result = await GenerateWithRetryAsync(
+                    () => _openAITransportService.GenerateSummaryAsync(
+                        contentToAnalyze,
+                        promptTemplate.SystemPrompt,
+                        settings,
+                        settings.CompletionTokens,
+                        cancellationToken: cancellationToken),
+                    AIProviderPayloadValidator.ValidateAttachmentSummaryBatchJson,
+                    "attachment summary batch",
+                    cancellationToken);
+                await _promptFileLogger.LogPromptOutputAsync(AttachmentSummaryPromptType, promptVersion, result.CaptureOutput, cancellationToken);
+
+                if (result.Outcome != AIOperationOutcome.Success)
+                {
+                    return new AttachmentSummaryBatchResponse();
+                }
+
+                return OpenAIResponseParser.ParseAttachmentSummaryBatchResponse(result.Content);
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Attachment summary batch generation failed.");
+                return new AttachmentSummaryBatchResponse();
+            }
+        }
+
         public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(ApplicationScoringRequest request, CancellationToken cancellationToken = default)
         {
             ArgumentNullException.ThrowIfNull(request);
-            var promptVersion = OpenAIPromptRenderer.ResolvePromptVersion(
-                request.PromptVersion ?? _openAIConfigurationResolver.ResolvePromptVersion(ApplicationScoringPromptType));
-            var dataJson = JsonSerializer.Serialize(request.Data, AIJsonDefaults.Indented);
-            var sectionJson = JsonSerializer.Serialize(request.SectionSchema, AIJsonDefaults.Indented);
-
-            var attachmentSummaries = request.Attachments
-                .Select(a => $"{a.Name}: {a.Summary}")
-                .ToList();
             try
             {
+                var settings = await _openAIConfigurationResolver.ResolveOperationSettingsAsync(ApplicationScoringPromptType, cancellationToken);
+                var promptTemplate = await _promptTemplateProvider.GetRequiredPromptAsync(
+                    ApplicationScoringPromptType,
+                    request.PromptVersion ?? settings.PromptVersion,
+                    cancellationToken);
+                var promptVersion = promptTemplate.PromptVersion;
+                var dataJson = JsonSerializer.Serialize(request.Data, AIJsonDefaults.Indented);
+                var sectionJson = JsonSerializer.Serialize(request.SectionSchema, AIJsonDefaults.Indented);
+
+                var attachmentSummaries = request.Attachments
+                    .Select(a => $"{a.Name}: {a.Summary}")
+                    .ToList();
                 var attachments = attachmentSummaries.Count > 0
                     ? string.Join("\n- ", attachmentSummaries.Select((summary, index) => $"Attachment {index + 1}: {summary}"))
-                    : "No attachments provided.";
+                    : "[]";
 
                 var section = OpenAIPromptRenderer.BuildAliasedApplicationScoringSection(request.SectionName, sectionJson, out var questionIdAliasMap);
                 var response = OpenAIPromptRenderer.BuildApplicationScoringResponseTemplate(section);
@@ -210,27 +293,27 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
                     return new ApplicationScoringResponse();
                 }
 
-                var applicationScoringContent = OpenAIPromptRenderer.BuildApplicationScoringUserPrompt(
-                    promptVersion,
+                var applicationScoringContent = AIPromptTemplateRenderer.BuildApplicationScoringUserPrompt(
+                    promptTemplate.UserPrompt,
                     dataJson,
                     attachments,
                     section,
-                    response);
-                var systemPrompt = OpenAIPromptRenderer.BuildApplicationScoringSystemPrompt(promptVersion);
+                    response,
+                    promptTemplate.MetadataJson);
+                var systemPrompt = promptTemplate.SystemPrompt;
 
-                await LogPromptInputAsync(ApplicationScoringPromptType, promptVersion, systemPrompt, applicationScoringContent, cancellationToken);
+                await _promptFileLogger.LogPromptInputAsync(ApplicationScoringPromptType, promptVersion, systemPrompt, applicationScoringContent, cancellationToken);
                 var result = await GenerateWithRetryAsync(
-                () => _openAITransportService.GenerateSummaryAsync(
-                    applicationScoringContent,
-                    systemPrompt,
-                    ApplicationScoringCompletionTokens,
-                    operationName: ApplicationScoringPromptType,
-                    promptVersion: promptVersion,
-                    cancellationToken: cancellationToken),
-                    content => AIProviderPayloadValidator.IsValidApplicationScoringJson(content, section),
+                    () => _openAITransportService.GenerateSummaryAsync(
+                        applicationScoringContent,
+                        systemPrompt,
+                        settings,
+                        settings.CompletionTokens,
+                        cancellationToken: cancellationToken),
+                    content => AIProviderPayloadValidator.ValidateApplicationScoringJson(content, section),
                     $"application scoring section {request.SectionName}",
                     cancellationToken);
-                await LogPromptOutputAsync(ApplicationScoringPromptType, promptVersion, result.CaptureOutput, cancellationToken);
+                await _promptFileLogger.LogPromptOutputAsync(ApplicationScoringPromptType, promptVersion, result.CaptureOutput, cancellationToken);
 
                 if (result.Outcome != AIOperationOutcome.Success)
                 {
@@ -245,14 +328,14 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error generating application scoring answers for section {SectionName}", request.SectionName);
+                _logger.LogError(ex, "Application scoring generation failed for section {SectionName}.", request.SectionName);
                 return new ApplicationScoringResponse();
             }
         }
 
         private async Task<AIOperationResult> GenerateWithRetryAsync(
             Func<Task<AIOperationResult>> operation,
-            Func<string, bool> validator,
+            Func<string, AIResponseValidationResult> validator,
             string operationName,
             CancellationToken cancellationToken = default)
         {
@@ -263,14 +346,23 @@ private async Task<AIOperationResult> GenerateWithRetryAsync(
                 cancellationToken.ThrowIfCancellationRequested();
                 lastResult = await operation();
 
-                if (lastResult.Outcome == AIOperationOutcome.Success && validator(lastResult.Content))
-                {
-                    return lastResult;
-                }
-
                 if (lastResult.Outcome == AIOperationOutcome.Success)
                 {
-                    lastResult = lastResult.WithOutcome(AIOperationOutcome.InvalidOutput);
+                    var validationResult = validator(lastResult.Content);
+                    if (validationResult.IsValid)
+                    {
+                        return lastResult;
+                    }
+
+                    lastResult = lastResult.WithOutcome(AIOperationOutcome.InvalidOutput, validationResult.FailureCategory);
+
+                    _logger.LogWarning(
+                        "AI {OperationName} attempt {Attempt}/{MaxAttempts} returned invalid response shape ({FailureCategory}): {Reason}; will retry if attempts remain",
+                        operationName,
+                        attempt,
+                        MaxAiAttempts,
+                        validationResult.FailureCategory,
+                        validationResult.Reason ?? "No validation reason provided");
                 }
 
                 if (lastResult.Outcome == AIOperationOutcome.PermanentFailure)
@@ -283,198 +375,57 @@ private async Task<AIOperationResult> GenerateWithRetryAsync(
                     if (lastResult.Outcome == AIOperationOutcome.TransientFailure)
                     {
                         _logger.LogWarning(
-                            "AI {OperationName} attempt {Attempt}/{MaxAttempts} failed transiently; retrying",
+                            "AI {OperationName} attempt {Attempt}/{MaxAttempts} failed transiently ({FailureCategory}); retrying",
                             operationName,
                             attempt,
-                            MaxAiAttempts);
+                            MaxAiAttempts,
+                            lastResult.FailureCategory);
                     }
                     else if (lastResult.Outcome == AIOperationOutcome.InvalidOutput)
                     {
                         _logger.LogWarning(
-                            "AI {OperationName} attempt {Attempt}/{MaxAttempts} returned invalid response shape; retrying",
+                            "AI {OperationName} attempt {Attempt}/{MaxAttempts} returned invalid output ({FailureCategory}); retrying",
                             operationName,
                             attempt,
-                            MaxAiAttempts);
+                            MaxAiAttempts,
+                            lastResult.FailureCategory);
                     }
                 }
             }
 
             _logger.LogWarning(
-                "AI {OperationName} exhausted retries with outcome {Outcome}; returning last result",
+                "AI {OperationName} exhausted retries with outcome {Outcome} and failure category {FailureCategory}; HTTP status {HttpStatusCode}; model {Model}; returning last result",
                 operationName,
-                lastResult.Outcome);
+                lastResult.Outcome,
+                lastResult.FailureCategory,
+                lastResult.Response.HttpStatusCode,
+                lastResult.Response.Model);
             return lastResult;
         }
 
-        private static int? TryGetInt32(JsonElement element, string propertyName)
-        {
-            return element.TryGetProperty(propertyName, out var property)
-                && property.ValueKind == JsonValueKind.Number
-                && property.TryGetInt32(out var value)
-                ? value
-                : null;
-        }
-
-        private async Task LogPromptInputAsync(string promptType, string promptVersion, string? systemPrompt, string userPrompt, CancellationToken cancellationToken = default)
-        {
-            var formattedInput = FormatPromptInputForLog(systemPrompt, userPrompt);
-            _logger.LogInformation("AI {PromptType} ({PromptVersion}) input payload: {PromptInput}", promptType, promptVersion, formattedInput);
-            await WritePromptLogFileAsync(promptType, promptVersion, "INPUT", formattedInput, cancellationToken);
-        }
-
-        private async Task LogPromptOutputAsync(string promptType, string promptVersion, string output, CancellationToken cancellationToken = default)
-        {
-            var formattedOutput = FormatPromptOutputForLog(output);
-            _logger.LogInformation("AI {PromptType} ({PromptVersion}) model output payload: {ModelOutput}", promptType, promptVersion, formattedOutput);
-            await WritePromptLogFileAsync(promptType, promptVersion, "OUTPUT", formattedOutput, cancellationToken);
-        }
-
-        private async Task WritePromptLogFileAsync(string promptType, string promptVersion, string payloadType, string payload, CancellationToken cancellationToken = default)
-        {
-            if (!CanWritePromptFileLog())
-            {
-                return;
-            }
-
-            try
-            {
-                var now = DateTimeOffset.Now.ToString("yyyy-MM-dd HH:mm:ss zzz");
-                var logDirectory = Path.Combine(AppContext.BaseDirectory, PromptLogDirectoryName);
-                Directory.CreateDirectory(logDirectory);
-
-                var logPath = Path.Combine(logDirectory, PromptLogFileName);
-                var entry = $"{now} [{promptType}] [{promptVersion}] {payloadType}\n{payload}\n\n";
-                await File.AppendAllTextAsync(logPath, entry, cancellationToken);
-            }
-            catch (OperationCanceledException)
-            {
-                throw;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Failed to write AI prompt log file.");
-            }
-        }
-
-        private bool CanWritePromptFileLog()
-        {
-            return IsPromptFileLoggingEnabled;
-        }
-        private static string FormatPromptInputForLog(string? systemPrompt, string userPrompt)
-        {
-            var normalizedSystemPrompt = string.IsNullOrWhiteSpace(systemPrompt) ? string.Empty : systemPrompt.Trim();
-            var normalizedUserPrompt = string.IsNullOrWhiteSpace(userPrompt) ? string.Empty : userPrompt.Trim();
-            return $"SYSTEM_PROMPT\n{normalizedSystemPrompt}\n\nUSER_PROMPT\n{normalizedUserPrompt}";
-        }
-
-        private static string FormatPromptOutputForLog(string output)
-        {
-            if (string.IsNullOrWhiteSpace(output))
-            {
-                return string.Empty;
-            }
-
-            if (TryFormatProviderOutput(output, out var formattedProviderOutput))
-            {
-                return formattedProviderOutput;
-            }
-
-            if (TryParseJsonObjectFromResponse(output, out var jsonObject))
-            {
-                return JsonSerializer.Serialize(jsonObject, AIJsonDefaults.Indented);
-            }
-
-            return output.Trim();
-        }
-
-        private static bool TryFormatProviderOutput(string output, out string formattedOutput)
+        private async Task<bool> IsAvailableCoreAsync()
         {
-            formattedOutput = string.Empty;
-
             try
             {
-                using var doc = JsonDocument.Parse(output);
-                var root = doc.RootElement;
-                if (root.ValueKind != JsonValueKind.Object
-                    || !root.TryGetProperty("choices", out var choices)
-                    || choices.ValueKind != JsonValueKind.Array
-                    || choices.GetArrayLength() == 0)
-                {
-                    return false;
-                }
-
-                var firstChoice = choices[0];
-                var content = TryGetChoiceContent(firstChoice);
-                if (string.IsNullOrWhiteSpace(content))
-                {
-                    return false;
-                }
-
-                var lines = new List<string>();
-
-                if (root.TryGetProperty("usage", out var usage) && usage.ValueKind == JsonValueKind.Object)
-                {
-                    var promptTokens = TryGetInt32(usage, "prompt_tokens");
-                    var completionTokens = TryGetInt32(usage, "completion_tokens");
-                    int? reasoningTokens = null;
-
-                    if (usage.TryGetProperty("completion_tokens_details", out var completionTokenDetails)
-                        && completionTokenDetails.ValueKind == JsonValueKind.Object)
-                    {
-                        reasoningTokens = TryGetInt32(completionTokenDetails, "reasoning_tokens");
-                    }
-
-                    if (promptTokens.HasValue)
-                    {
-                        lines.Add($"PromptTokens: {promptTokens.Value}");
-                    }
-
-                    if (completionTokens.HasValue)
-                    {
-                        lines.Add($"CompletionTokens: {completionTokens.Value}");
-                    }
-
-                    if (reasoningTokens.HasValue)
-                    {
-                        lines.Add($"ReasoningTokens: {reasoningTokens.Value}");
-                    }
-                }
-
-                var normalizedContent = FormatPromptOutputContent(content);
-                lines.Add("Output:");
-                lines.Add(normalizedContent);
-                formattedOutput = string.Join(Environment.NewLine, lines);
+                await _openAIConfigurationResolver.ResolveApiKeyAsync();
                 return true;
             }
-            catch (JsonException)
+            catch (InvalidOperationException ex)
             {
+                _logger.LogWarning(ex, "AI is unavailable because the OpenAI configuration could not be resolved.");
                 return false;
             }
         }
 
-        private static string? TryGetChoiceContent(JsonElement firstChoice)
+        private static string ResolveNarrativeContent(AIOperationResult result)
         {
-            if (!firstChoice.TryGetProperty("message", out var message) || message.ValueKind != JsonValueKind.Object)
+            return result.Outcome switch
             {
-                return null;
-            }
-
-            if (!message.TryGetProperty("content", out var contentProp) || contentProp.ValueKind != JsonValueKind.String)
-            {
-                return null;
-            }
-
-            return contentProp.GetString();
-        }
-
-        private static string FormatPromptOutputContent(string content)
-        {
-            if (TryParseJsonObjectFromResponse(content, out var contentObject))
-            {
-                return JsonSerializer.Serialize(contentObject, AIJsonDefaults.Indented);
-            }
-
-            return content.Trim();
+                AIOperationOutcome.Success => result.Content,
+                AIOperationOutcome.PermanentFailure => "AI service not available - service not configured.",
+                AIOperationOutcome.TransientFailure => "AI request failed - service temporarily unavailable.",
+                _ => "AI request failed - please try again later."
+            };
         }
 
         private static bool TryParseJsonObjectFromResponse(string response, out JsonElement objectElement)
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
index b3cafcae36..769a538af1 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
@@ -1,9 +1,9 @@
 using Microsoft.Extensions.Logging;
+using OpenAI.Chat;
 using System;
+using System.ClientModel;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -12,120 +12,61 @@
 namespace Unity.AI.Runtime;
 
 public class OpenAITransportService(
-    HttpClient httpClient,
-    OpenAIConfigurationResolver configurationResolver,
+    OpenAIChatClientFactory chatClientFactory,
     ILogger<OpenAITransportService> logger) : ITransientDependency
 {
-    private readonly HttpClient _httpClient = httpClient;
-    private readonly OpenAIConfigurationResolver _configurationResolver = configurationResolver;
+    private readonly OpenAIChatClientFactory _chatClientFactory = chatClientFactory;
     private readonly ILogger<OpenAITransportService> _logger = logger;
 
     public async Task<AIOperationResult> GenerateSummaryAsync(
         string content,
         string? systemPrompt,
+        OpenAIOperationSettings settings,
         int maxTokens = 150,
-        double? temperature = null,
-        string? operationName = null,
-        string? promptVersion = null,
-        string? fileName = null,
         CancellationToken cancellationToken = default)
     {
-        var providerName = _configurationResolver.ResolveProviderName(operationName);
-        if (!string.Equals(providerName, "OpenAI", StringComparison.Ordinal))
-        {
-            _logger.LogWarning("Provider {ProviderName} is not supported by OpenAI transport.", providerName);
-            return AIOperationResult.PermanentFailure(new AIProviderResult($"Unsupported provider: {providerName}"));
-        }
-
-        var apiKey = _configurationResolver.ResolveApiKey(operationName);
         try
         {
+            if (!string.Equals(settings.ProviderName, "OpenAI", StringComparison.Ordinal))
+            {
+                _logger.LogWarning("Provider {ProviderName} is not supported by OpenAI transport.", settings.ProviderName);
+                return AIOperationResult.PermanentFailure(new AIProviderResult($"Unsupported provider: {settings.ProviderName}"));
+            }
+
             var resolvedSystemPrompt = string.IsNullOrWhiteSpace(systemPrompt)
                 ? "You are a professional grant analyst for the BC Government."
                 : systemPrompt;
 
-            var requestPayload = new Dictionary<string, object?>
+            var messages = new List<ChatMessage>
             {
-                ["messages"] = new[]
-                {
-                    new { role = "system", content = resolvedSystemPrompt },
-                    new { role = "user", content = content ?? string.Empty }
-                },
-                [_configurationResolver.ResolveMaxTokensParameterNameForOperation(operationName)] = maxTokens
+                new SystemChatMessage(resolvedSystemPrompt),
+                new UserChatMessage(content ?? string.Empty)
             };
 
-            var profileTemperature = _configurationResolver.ResolveConfiguredTemperature(operationName);
-            var resolvedTemperature = profileTemperature.HasValue ? temperature ?? profileTemperature : null;
-            if (resolvedTemperature.HasValue)
-            {
-                requestPayload["temperature"] = resolvedTemperature.Value;
-            }
-
-            var reasoningEffort = _configurationResolver.ResolveConfiguredReasoningEffort(operationName);
-            if (!string.IsNullOrWhiteSpace(reasoningEffort))
-            {
-                requestPayload["reasoning_effort"] = reasoningEffort;
-            }
-
-            var verbosity = _configurationResolver.ResolveConfiguredVerbosity(operationName);
-            if (!string.IsNullOrWhiteSpace(verbosity))
-            {
-                requestPayload["verbosity"] = verbosity;
-            }
+            var result = await CompleteChatWithTemperatureFallbackAsync(
+                settings,
+                messages,
+                maxTokens,
+                cancellationToken);
 
-            var json = JsonSerializer.Serialize(requestPayload);
-            var httpContent = new StringContent(json, Encoding.UTF8, "application/json");
-
-            using var request = new HttpRequestMessage(HttpMethod.Post, _configurationResolver.ResolveApiUrl(operationName))
-            {
-                Content = httpContent
-            };
-            request.Headers.TryAddWithoutValidation("Authorization", apiKey);
-
-            using var response = await _httpClient.SendAsync(request, cancellationToken);
-            var responseContent = await response.Content.ReadAsStringAsync(cancellationToken);
-            var metadata = TryExtractProviderMetadata(responseContent);
+            var completion = result.Value;
+            var rawResponse = result.GetRawResponse();
+            var responseContent = rawResponse.Content.ToString();
+            var modelOutput = ExtractModelOutput(completion, responseContent);
             var providerResponse = BuildProviderResponseFromMetadata(
-                string.Empty,
+                modelOutput ?? string.Empty,
                 responseContent,
-                metadata,
-                (int)response.StatusCode);
-
-            if (!response.IsSuccessStatusCode)
-            {
-                _logger.LogError("OpenAI API request failed: {StatusCode} - {Content}", response.StatusCode, responseContent);
-                return MapFailureOutcome(response.StatusCode, providerResponse);
-            }
+                TryExtractProviderMetadata(responseContent),
+                rawResponse.Status);
 
-            if (string.IsNullOrWhiteSpace(responseContent))
+            if (string.IsNullOrWhiteSpace(modelOutput))
             {
-                return AIOperationResult.InvalidOutput(providerResponse);
+                LogEmptyModelOutput(completion, providerResponse, rawResponse.Status);
             }
 
-            try
-            {
-                using var jsonDoc = JsonDocument.Parse(responseContent);
-                var choices = jsonDoc.RootElement.GetProperty("choices");
-                if (choices.GetArrayLength() > 0)
-                {
-                    var message = choices[0].GetProperty("message");
-                    var modelOutput = message.GetProperty("content").GetString();
-                    return string.IsNullOrWhiteSpace(modelOutput)
-                        ? AIOperationResult.InvalidOutput(providerResponse)
-                        : AIOperationResult.Success(BuildProviderResponseFromMetadata(
-                            modelOutput,
-                            responseContent,
-                            metadata,
-                            (int)response.StatusCode));
-                }
-
-                return AIOperationResult.InvalidOutput(providerResponse);
-            }
-            catch (Exception ex) when (ex is JsonException || ex is KeyNotFoundException || ex is InvalidOperationException)
-            {
-                _logger.LogWarning(ex, "AI response payload had an invalid output shape");
-                return AIOperationResult.InvalidOutput(providerResponse);
-            }
+            return string.IsNullOrWhiteSpace(modelOutput)
+                ? AIOperationResult.InvalidOutput(providerResponse)
+                : AIOperationResult.Success(providerResponse);
         }
         catch (OperationCanceledException)
         {
@@ -136,6 +77,25 @@ public async Task<AIOperationResult> GenerateSummaryAsync(
             _logger.LogError(ex, "AI request configuration is invalid.");
             return AIOperationResult.PermanentFailure(new AIProviderResult(ex.Message));
         }
+        catch (ClientResultException ex)
+        {
+            int? statusCode = ex.Status > 0 ? ex.Status : null;
+            var responseContent = ex.GetRawResponse()?.Content?.ToString() ?? ex.Message;
+            var providerResponse = BuildProviderResponseFromMetadata(
+                string.Empty,
+                responseContent,
+                TryExtractProviderMetadata(responseContent),
+                statusCode);
+
+            _logger.LogError(
+                ex,
+                "OpenAI API request failed with status {StatusCode}. Response body length: {ResponseLength}.",
+                statusCode,
+                responseContent.Length);
+            return statusCode.HasValue
+                ? MapFailureOutcome((HttpStatusCode)statusCode.Value, providerResponse)
+                : AIOperationResult.TransientFailure(providerResponse);
+        }
         catch (Exception ex)
         {
             _logger.LogError(ex, "Error generating AI summary");
@@ -143,6 +103,70 @@ public async Task<AIOperationResult> GenerateSummaryAsync(
         }
     }
 
+    private async Task<ClientResult<ChatCompletion>> CompleteChatWithTemperatureFallbackAsync(
+        OpenAIOperationSettings settings,
+        IReadOnlyList<ChatMessage> messages,
+        int maxTokens,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            return await _chatClientFactory.Create(settings).CompleteChatAsync(
+                messages,
+                BuildOptions(settings, maxTokens, includeTemperature: true),
+                cancellationToken);
+        }
+        catch (ClientResultException ex)
+        {
+            var responseContent = ex.GetRawResponse()?.Content?.ToString() ?? ex.Message;
+            if (!ShouldRetryWithoutTemperature(settings, ex.Status, responseContent))
+            {
+                throw;
+            }
+
+            _logger.LogWarning(
+                ex,
+                "Retrying OpenAI request without temperature after provider rejected the temperature parameter for profile {ProfileName}.",
+                settings.ProfileName);
+
+            return await _chatClientFactory.Create(settings).CompleteChatAsync(
+                messages,
+                BuildOptions(settings, maxTokens, includeTemperature: false),
+                cancellationToken);
+        }
+    }
+
+    private static ChatCompletionOptions BuildOptions(OpenAIOperationSettings settings, int maxTokens, bool includeTemperature)
+    {
+        var options = new ChatCompletionOptions();
+        if (settings.MaxOutputTokenCountSupported)
+        {
+            options.MaxOutputTokenCount = maxTokens;
+        }
+
+        if (includeTemperature && settings.Temperature.HasValue)
+        {
+            options.Temperature = (float)settings.Temperature.Value;
+        }
+
+        return options;
+    }
+
+    private static bool ShouldRetryWithoutTemperature(OpenAIOperationSettings settings, int statusCode, string responseContent)
+    {
+        if (!settings.Temperature.HasValue || statusCode != 400 || string.IsNullOrWhiteSpace(responseContent))
+        {
+            return false;
+        }
+
+        var lowered = responseContent.ToLowerInvariant();
+        return lowered.Contains("temperature")
+            && (lowered.Contains("unsupported")
+                || lowered.Contains("not supported")
+                || lowered.Contains("not allowed")
+                || lowered.Contains("invalid"));
+    }
+
     private static AIOperationResult MapFailureOutcome(HttpStatusCode statusCode, AIProviderResult response)
     {
         var statusCodeValue = (int)statusCode;
@@ -172,6 +196,103 @@ private static AIProviderResult BuildProviderResponseFromMetadata(
             metadata?.ReasoningTokens);
     }
 
+    private void LogEmptyModelOutput(ChatCompletion completion, AIProviderResult response, int statusCode)
+    {
+        _logger.LogWarning(
+            "AI model output was empty. StatusCode: {StatusCode}; FinishReason: {FinishReason}; ContentPartCount: {ContentPartCount}; PromptTokens: {PromptTokens}; CompletionTokens: {CompletionTokens}; TotalTokens: {TotalTokens}; ReasoningTokens: {ReasoningTokens}.",
+            statusCode,
+            response.FinishReason,
+            completion.Content.Count,
+            response.PromptTokens,
+            response.CompletionTokens,
+            response.TotalTokens,
+            response.ReasoningTokens);
+    }
+
+    private static string? ExtractModelOutput(ChatCompletion completion, string? responseContent)
+    {
+        var contentParts = new List<string>();
+        foreach (var part in completion.Content)
+        {
+            if (!string.IsNullOrWhiteSpace(part.Text))
+            {
+                contentParts.Add(part.Text!);
+            }
+        }
+
+        if (contentParts.Count > 0)
+        {
+            return string.Concat(contentParts);
+        }
+
+        return TryExtractMessageContent(responseContent);
+    }
+
+    private static string? TryExtractMessageContent(string? responseContent)
+    {
+        if (string.IsNullOrWhiteSpace(responseContent))
+        {
+            return null;
+        }
+
+        try
+        {
+            using var jsonDoc = JsonDocument.Parse(responseContent);
+            if (!TryGetFirstChoice(jsonDoc.RootElement, out var firstChoice)
+                || !firstChoice.TryGetProperty("message", out var message)
+                || !message.TryGetProperty("content", out var content))
+            {
+                return null;
+            }
+
+            if (content.ValueKind == JsonValueKind.String)
+            {
+                return content.GetString();
+            }
+
+            if (content.ValueKind == JsonValueKind.Array)
+            {
+                return ExtractTextContentParts(content);
+            }
+        }
+        catch (JsonException)
+        {
+            return null;
+        }
+
+        return null;
+    }
+
+    private static bool TryGetFirstChoice(JsonElement root, out JsonElement firstChoice)
+    {
+        firstChoice = default;
+        if (!root.TryGetProperty("choices", out var choices)
+            || choices.ValueKind != JsonValueKind.Array
+            || choices.GetArrayLength() == 0)
+        {
+            return false;
+        }
+
+        firstChoice = choices[0];
+        return true;
+    }
+
+    private static string? ExtractTextContentParts(JsonElement content)
+    {
+        var parts = new List<string>();
+        foreach (var part in content.EnumerateArray())
+        {
+            if (part.ValueKind == JsonValueKind.Object
+                && part.TryGetProperty("text", out var text)
+                && text.ValueKind == JsonValueKind.String)
+            {
+                parts.Add(text.GetString() ?? string.Empty);
+            }
+        }
+
+        return parts.Count > 0 ? string.Concat(parts) : null;
+    }
+
     private static AIProviderResponseMetadata? TryExtractProviderMetadata(string? responseContent)
     {
         if (string.IsNullOrWhiteSpace(responseContent))
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationMapperlyProfile.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationMapperlyProfile.cs
index 092ea879d1..b799fbd3ea 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationMapperlyProfile.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationMapperlyProfile.cs
@@ -21,55 +21,22 @@ public partial class CreateUpdateAIPromptDtoToAIPromptMapper : MapperBase<Create
     private static AIPrompt CreateAIPrompt() =>
         (AIPrompt)RuntimeHelpers.GetUninitializedObject(typeof(AIPrompt));
 
-    [MapperIgnoreTarget(nameof(AIPrompt.Versions))]
     [MapperIgnoreTarget(nameof(AIPrompt.TenantId))]
     [MapperIgnoreTarget(nameof(AIPrompt.ConcurrencyStamp))]
     [MapperIgnoreTarget(nameof(AIPrompt.CreationTime))]
     [MapperIgnoreTarget(nameof(AIPrompt.CreatorId))]
     [MapperIgnoreTarget(nameof(AIPrompt.LastModificationTime))]
     [MapperIgnoreTarget(nameof(AIPrompt.LastModifierId))]
+    [MapperIgnoreTarget(nameof(AIPrompt.Name))]
     public override partial AIPrompt Map(CreateUpdateAIPromptDto source);
 
-    [MapperIgnoreTarget(nameof(AIPrompt.Versions))]
     [MapperIgnoreTarget(nameof(AIPrompt.TenantId))]
     [MapperIgnoreTarget(nameof(AIPrompt.ConcurrencyStamp))]
     [MapperIgnoreTarget(nameof(AIPrompt.CreationTime))]
     [MapperIgnoreTarget(nameof(AIPrompt.CreatorId))]
     [MapperIgnoreTarget(nameof(AIPrompt.LastModificationTime))]
     [MapperIgnoreTarget(nameof(AIPrompt.LastModifierId))]
+    [MapperIgnoreTarget(nameof(AIPrompt.Name))]
     public override partial void Map(CreateUpdateAIPromptDto source, AIPrompt destination);
 }
 
-[Mapper]
-public partial class AIPromptVersionToAIPromptVersionDtoMapper : MapperBase<AIPromptVersion, AIPromptVersionDto>
-{
-    public override partial AIPromptVersionDto Map(AIPromptVersion source);
-
-    public override partial void Map(AIPromptVersion source, AIPromptVersionDto destination);
-}
-
-[Mapper]
-public partial class CreateUpdateAIPromptVersionDtoToAIPromptVersionMapper : MapperBase<CreateUpdateAIPromptVersionDto, AIPromptVersion>
-{
-    [ObjectFactory]
-    private static AIPromptVersion CreateAIPromptVersion() =>
-        (AIPromptVersion)RuntimeHelpers.GetUninitializedObject(typeof(AIPromptVersion));
-
-    [MapperIgnoreTarget(nameof(AIPromptVersion.Prompt))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.TenantId))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.ConcurrencyStamp))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.CreationTime))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.CreatorId))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.LastModificationTime))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.LastModifierId))]
-    public override partial AIPromptVersion Map(CreateUpdateAIPromptVersionDto source);
-
-    [MapperIgnoreTarget(nameof(AIPromptVersion.Prompt))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.TenantId))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.ConcurrencyStamp))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.CreationTime))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.CreatorId))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.LastModificationTime))]
-    [MapperIgnoreTarget(nameof(AIPromptVersion.LastModifierId))]
-    public override partial void Map(CreateUpdateAIPromptVersionDto source, AIPromptVersion destination);
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Attachments/AttachmentSummaryAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Attachments/AttachmentSummaryAppService.cs
deleted file mode 100644
index 1a5cdbfe4d..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Attachments/AttachmentSummaryAppService.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Unity.AI;
-using Unity.AI.Operations;
-using Unity.AI.Permissions;
-using Unity.AI.Settings;
-using Volo.Abp;
-using Volo.Abp.DependencyInjection;
-
-namespace Unity.GrantManager.Attachments;
-
-[Authorize(AIPermissions.Analysis.GenerateAttachmentSummaries)]
-[ExposeServices(typeof(AttachmentSummaryAppService), typeof(IAttachmentSummaryAppService))]
-public class AttachmentSummaryAppService(
-    IAttachmentSummaryService attachmentSummaryService) : AIAppService, IAttachmentSummaryAppService
-{
-    // Internal-only: no HTTP endpoint, no auth check — safe for background job callers
-    [AllowAnonymous]
-    [RemoteService(IsEnabled = false)]
-    public virtual async Task<List<AttachmentSummaryResultDto>> GenerateAttachmentSummariesForPipelineAsync(List<System.Guid> attachmentIds, string? promptVersion = null)
-    {
-        if (attachmentIds.Count == 0)
-        {
-            return [];
-        }
-
-        var results = new List<AttachmentSummaryResultDto>();
-        foreach (var attachmentId in attachmentIds)
-        {
-            await attachmentSummaryService.GenerateAndSaveAsync(attachmentId, promptVersion);
-            results.Add(new AttachmentSummaryResultDto { Completed = true });
-        }
-
-        return results;
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIDataSeeder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIDataSeeder.cs
new file mode 100644
index 0000000000..07b0a29f08
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIDataSeeder.cs
@@ -0,0 +1,18 @@
+using System.Threading.Tasks;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.DataSeed;
+
+public class AIDataSeeder(
+    AIPromptDataSeeder promptDataSeeder,
+    AIModelDataSeeder modelDataSeeder,
+    AIOperationDataSeeder operationDataSeeder) : IDataSeedContributor, ITransientDependency
+{
+    public async Task SeedAsync(DataSeedContext context)
+    {
+        await promptDataSeeder.SeedAsync(context);
+        await modelDataSeeder.SeedAsync(context);
+        await operationDataSeeder.SeedAsync(context);
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIModelDataSeeder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIModelDataSeeder.cs
new file mode 100644
index 0000000000..7839db8e01
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIModelDataSeeder.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+
+namespace Unity.AI.DataSeed;
+
+public class AIModelDataSeeder(
+    IRepository<AIModel, Guid> modelRepository) : ITransientDependency
+{
+    private static readonly BuiltInModelDefinition[] BuiltInModels =
+    [
+        new("Gpt4oMini", true, 0.3d),
+        new("Gpt5Mini", false, null),
+        new("Gpt5Nano", false, null)
+    ];
+
+    public async Task SeedAsync(DataSeedContext context)
+    {
+        if (context.TenantId != null)
+        {
+            return;
+        }
+
+        foreach (var model in BuiltInModels)
+        {
+            await EnsureModelAsync(model);
+        }
+    }
+
+    private async Task EnsureModelAsync(BuiltInModelDefinition definition)
+    {
+        var settings = new AIModelSettings
+        {
+            MaxOutputTokenCountSupported = definition.MaxOutputTokenCountSupported,
+            Temperature = definition.Temperature
+        };
+
+        var existing = await modelRepository.FirstOrDefaultAsync(model => model.Name == definition.Name);
+        if (existing != null)
+        {
+            existing.IsActive = true;
+            existing.SettingsJson = JsonSerializer.Serialize(settings);
+            await modelRepository.UpdateAsync(existing, autoSave: true);
+            return;
+        }
+
+        await modelRepository.InsertAsync(
+            new AIModel(Guid.CreateVersion7(), definition.Name)
+            {
+                IsActive = true,
+                SettingsJson = JsonSerializer.Serialize(settings)
+            },
+            autoSave: true);
+    }
+
+    private sealed record BuiltInModelDefinition(
+        string Name,
+        bool MaxOutputTokenCountSupported,
+        double? Temperature);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIOperationDataSeeder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIOperationDataSeeder.cs
new file mode 100644
index 0000000000..bf8357a391
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIOperationDataSeeder.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Logging;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Unity.AI.Operations;
+using Unity.AI.Prompts;
+using Unity.GrantManager.GrantApplications;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.AI.DataSeed;
+
+public class AIOperationDataSeeder(
+    IRepository<AIOperation, Guid> operationRepository,
+    IRepository<AIModel, Guid> modelRepository,
+    IRepository<AIPrompt, Guid> promptRepository,
+    ICurrentTenant currentTenant,
+    ILogger<AIOperationDataSeeder> logger) : ITransientDependency
+{
+    private const string DefaultModelName = "Gpt5Mini";
+
+    private static readonly BuiltInOperationDefinition[] BuiltInOperations =
+    [
+        new(AIPromptTypes.ApplicationAnalysis, AIPromptTypes.ApplicationAnalysis, 1, 4000),
+        new(AIPromptTypes.AttachmentSummary, AIPromptTypes.AttachmentSummary, 1, 2000),
+        new(AIPromptTypes.ApplicationScoring, AIPromptTypes.ApplicationScoring, 1, 8000)
+    ];
+
+    public async Task SeedAsync(DataSeedContext context)
+    {
+        if (context.TenantId != null)
+        {
+            return;
+        }
+
+        using (currentTenant.Change(null))
+        {
+            var model = await EnsureModelAsync(DefaultModelName);
+            if (model == null)
+            {
+                logger.LogWarning("AI operation seeding skipped: model '{ModelName}' is missing.", DefaultModelName);
+                return;
+            }
+
+            foreach (var definition in BuiltInOperations)
+            {
+                await EnsureOperationAsync(definition, model);
+            }
+        }
+    }
+
+    private async Task EnsureOperationAsync(BuiltInOperationDefinition definition, AIModel model)
+    {
+        var prompt = await ResolvePromptAsync(definition.PromptName, definition.PromptVersionNumber);
+        if (prompt == null)
+        {
+            logger.LogWarning(
+                "AI operation seeding skipped: no active prompt found for operation '{OperationName}' and prompt '{PromptName}' version '{PromptVersionNumber}'.",
+                definition.OperationName,
+                definition.PromptName,
+                definition.PromptVersionNumber);
+            return;
+        }
+
+        var existing = await operationRepository.FirstOrDefaultAsync(op => op.Name == definition.OperationName);
+        if (existing != null)
+        {
+            existing.AIModelId = model.Id;
+            existing.AIPromptId = prompt.Id;
+            existing.ExecutionMode = definition.ExecutionMode;
+            existing.CompletionTokens = definition.CompletionTokens;
+            existing.IsActive = true;
+            await operationRepository.UpdateAsync(existing, autoSave: true);
+            return;
+        }
+
+        await operationRepository.InsertAsync(
+            new AIOperation(Guid.CreateVersion7(), definition.OperationName, model.Id, prompt.Id)
+            {
+                ExecutionMode = definition.ExecutionMode,
+                CompletionTokens = definition.CompletionTokens,
+                IsActive = true
+            },
+            autoSave: true);
+    }
+
+    private async Task<AIModel?> EnsureModelAsync(string modelName)
+    {
+        var models = await modelRepository.GetListAsync(model => model.Name == modelName && model.IsActive);
+        return models.FirstOrDefault();
+    }
+
+    private async Task<AIPrompt?> ResolvePromptAsync(string promptName, int promptVersionNumber)
+    {
+        return await promptRepository.FirstOrDefaultAsync(item =>
+            item.Name == promptName &&
+            item.VersionNumber == promptVersionNumber &&
+            item.IsActive);
+    }
+
+    private sealed record BuiltInOperationDefinition(
+        string OperationName,
+        string PromptName,
+        int PromptVersionNumber,
+        int CompletionTokens,
+        AIExecutionMode ExecutionMode = AIExecutionMode.Sequential);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
index 58859a5e83..64041c1d0b 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
@@ -3,6 +3,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Unity.AI.Domain;
+using Unity.AI.Prompts;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
@@ -11,21 +12,13 @@
 namespace Unity.AI.DataSeed;
 
 /// <summary>
-/// Seeds the built-in AI prompts (analysis, attachment, scoresheet) into the host database.
-/// Each prompt is seeded with two versions — v0 (original single-file prompts) and v1 (modular
-/// prompts with separate rubric, score, output, and rules sections stored in MetadataJson).
-/// The seeder is idempotent: it checks by fixed GUID before inserting.
+/// Seeds the built-in AI prompts (application analysis, attachment summary, application scoring) into the host database.
+/// Each prompt family is represented as versioned rows in AIPrompts.
 /// </summary>
 public class AIPromptDataSeeder(
     IRepository<AIPrompt, Guid> promptRepository,
-    IRepository<AIPromptVersion, Guid> versionRepository,
-    ICurrentTenant currentTenant) : IDataSeedContributor, ITransientDependency
+    ICurrentTenant currentTenant) : ITransientDependency
 {
-    // Fixed deterministic GUIDs — never change these; they ensure idempotent re-seeding
-    private static readonly Guid AnalysisPromptId   = new("4a100001-1000-4000-a000-000000000001");
-    private static readonly Guid AttachmentPromptId = new("4a100001-1000-4000-a000-000000000002");
-    private static readonly Guid ScoresheetPromptId = new("4a100001-1000-4000-a000-000000000003");
-
     public async Task SeedAsync(DataSeedContext context)
     {
         if (context.TenantId != null) return; // host database only
@@ -42,101 +35,79 @@ public async Task SeedAsync(DataSeedContext context)
 
     private async Task SeedAnalysisPromptAsync()
     {
-        if (await promptRepository.AnyAsync(p => p.Id == AnalysisPromptId)) return;
-
-        await promptRepository.InsertAsync(new AIPrompt(AnalysisPromptId, "analysis", PromptType.Skill)
-        {
-            Description = "Grant application analysis and review",
-            IsActive = true
-        });
-
-        await versionRepository.InsertAsync(new AIPromptVersion(
-            Guid.CreateVersion7(), AnalysisPromptId, 0,
-            AnalysisSystemV0, AnalysisUserV0)
-        {
-            DeveloperNotes = "v0 — initial single-file analysis prompt",
-            IsPublished = true
-        });
-
-        await versionRepository.InsertAsync(new AIPromptVersion(
-            Guid.CreateVersion7(), AnalysisPromptId, 1,
-            AnalysisSystemV1, AnalysisUserV1)
-        {
-            DeveloperNotes = "v1 — modular prompt with separate rubric, score, output, and rules sections",
-            IsPublished = true,
-            MetadataJson = BuildSections(
+        await EnsurePromptAsync(AIPromptTypes.ApplicationAnalysis, 0, AnalysisSystemV0, AnalysisUserV0);
+        await EnsurePromptAsync(
+            AIPromptTypes.ApplicationAnalysis,
+            1,
+            AnalysisSystemV1,
+            AnalysisUserV1,
+            BuildSections(
                 rubric: AnalysisRubric,
                 score: AnalysisScore,
                 output: AnalysisOutput,
                 rules: AnalysisRules,
-                commonRules: CommonRules)
-        });
+                commonRules: CommonRules));
+        await EnsurePromptAsync(
+            AIPromptTypes.ApplicationAnalysis,
+            2,
+            AnalysisSystemV2,
+            AnalysisUserV2,
+            BuildSections(
+                rubric: AnalysisRubricV2,
+                score: AnalysisScoreV2,
+                output: AnalysisOutputV2,
+                rules: AnalysisRulesV2,
+                commonRules: CommonRules));
     }
 
     // ─── ATTACHMENT ───────────────────────────────────────────────────────────
 
     private async Task SeedAttachmentPromptAsync()
     {
-        if (await promptRepository.AnyAsync(p => p.Id == AttachmentPromptId)) return;
-
-        await promptRepository.InsertAsync(new AIPrompt(AttachmentPromptId, "attachment", PromptType.Skill)
-        {
-            Description = "Attachment summarization for grant review",
-            IsActive = true
-        });
-
-        await versionRepository.InsertAsync(new AIPromptVersion(
-            Guid.CreateVersion7(), AttachmentPromptId, 0,
-            AttachmentSystemV0, AttachmentUserV0)
-        {
-            DeveloperNotes = "v0 — initial single-file attachment prompt",
-            IsPublished = true
-        });
-
-        await versionRepository.InsertAsync(new AIPromptVersion(
-            Guid.CreateVersion7(), AttachmentPromptId, 1,
-            AttachmentSystemV1, AttachmentUserV1)
-        {
-            DeveloperNotes = "v1 — modular prompt with separate output and rules sections",
-            IsPublished = true,
-            MetadataJson = BuildSections(
+        await EnsurePromptAsync(AIPromptTypes.AttachmentSummary, 0, AttachmentSystemV0, AttachmentUserV0);
+        await EnsurePromptAsync(
+            AIPromptTypes.AttachmentSummary,
+            1,
+            AttachmentSystemV1,
+            AttachmentUserV1,
+            BuildSections(
                 output: AttachmentOutput,
                 rules: AttachmentRules,
-                commonRules: CommonRules)
-        });
+                commonRules: CommonRules));
+        await EnsurePromptAsync(
+            AIPromptTypes.AttachmentSummary,
+            2,
+            AttachmentSystemV2,
+            AttachmentUserV2,
+            BuildSections(
+                output: AttachmentOutputV2,
+                rules: AttachmentRulesV2,
+                commonRules: CommonRules));
     }
 
     // ─── SCORESHEET ───────────────────────────────────────────────────────────
 
     private async Task SeedScoresheetPromptAsync()
     {
-        if (await promptRepository.AnyAsync(p => p.Id == ScoresheetPromptId)) return;
-
-        await promptRepository.InsertAsync(new AIPrompt(ScoresheetPromptId, "scoresheet", PromptType.Skill)
-        {
-            Description = "Scoresheet section answering assistant",
-            IsActive = true
-        });
-
-        await versionRepository.InsertAsync(new AIPromptVersion(
-            Guid.CreateVersion7(), ScoresheetPromptId, 0,
-            ScoresheetSystemV0, ScoresheetUserV0)
-        {
-            DeveloperNotes = "v0 — initial single-file scoresheet prompt",
-            IsPublished = true
-        });
-
-        await versionRepository.InsertAsync(new AIPromptVersion(
-            Guid.CreateVersion7(), ScoresheetPromptId, 1,
-            ScoresheetSystemV1, ScoresheetUserV1)
-        {
-            DeveloperNotes = "v1 — modular prompt with separate output and rules sections",
-            IsPublished = true,
-            MetadataJson = BuildSections(
+        await EnsurePromptAsync(AIPromptTypes.ApplicationScoring, 0, ScoresheetSystemV0, ScoresheetUserV0);
+        await EnsurePromptAsync(
+            AIPromptTypes.ApplicationScoring,
+            1,
+            ScoresheetSystemV1,
+            ScoresheetUserV1,
+            BuildSections(
                 output: ScoresheetOutput,
                 rules: ScoresheetRules,
-                commonRules: CommonRules)
-        });
+                commonRules: CommonRules));
+        await EnsurePromptAsync(
+            AIPromptTypes.ApplicationScoring,
+            2,
+            ScoresheetSystemV2,
+            ScoresheetUserV2,
+            BuildSections(
+                output: ScoresheetOutputV2,
+                rules: ScoresheetRulesV2,
+                commonRules: CommonRules));
     }
 
     // ─── HELPERS ──────────────────────────────────────────────────────────────
@@ -151,7 +122,38 @@ private static string BuildSections(
         if (output != null)      dict["OUTPUT"]       = output;
         if (rules != null)       dict["RULES"]        = rules;
         if (commonRules != null) dict["COMMON_RULES"] = commonRules;
-        return JsonSerializer.Serialize(new { sections = dict });
+        return JsonSerializer.Serialize(dict);
+    }
+
+    private async Task EnsurePromptAsync(
+        string promptName,
+        int versionNumber,
+        string systemPrompt,
+        string userPrompt,
+        string? metadataJson = null)
+    {
+        var prompt = await promptRepository.FirstOrDefaultAsync(
+            p => p.Name == promptName && p.VersionNumber == versionNumber);
+        if (prompt != null)
+        {
+            prompt.SystemPrompt = systemPrompt;
+            prompt.UserPrompt = userPrompt;
+            prompt.MetadataJson = metadataJson ?? "{}";
+            prompt.IsActive = true;
+            await promptRepository.UpdateAsync(prompt, autoSave: true);
+            return;
+        }
+
+        await promptRepository.InsertAsync(new AIPrompt(
+            Guid.CreateVersion7(),
+            promptName,
+            versionNumber,
+            systemPrompt,
+            userPrompt)
+        {
+            MetadataJson = metadataJson ?? "{}",
+            IsActive = true
+        });
     }
 
     // ═════════════════════════════════════════════════════════════════════════
@@ -278,7 +280,7 @@ OPTIONAL FIELDS (may be left blank):
 
         TASK
         Using SCHEMA, DATA, ATTACHMENTS, RUBRIC, SCORE, OUTPUT, and RULES:
-        1. Review the application and attachments for the strongest reviewer-relevant evidence.
+        1. Review the application and any provided attachments for the strongest reviewer-relevant evidence.
         2. Determine which conclusions are directly supported by that evidence.
         3. Exclude weak, repetitive, or loosely supported conclusions.
         4. Return only the strongest evidence-backed reviewer conclusions.
@@ -363,26 +365,128 @@ 4. Return only the strongest evidence-backed reviewer conclusions.
         - Prefer, in order: direct evidence from DATA, specific supporting evidence from ATTACHMENTS, then broader context only when necessary.
         - Treat missing or empty values as findings only when they weaken rubric evidence.
         - Prefer material findings; avoid nitpicking.
-        - Do not restate basic application facts as findings unless they support a specific reviewer conclusion about readiness, feasibility, budget credibility, eligibility, or confidence in proceeding.
         - Prefer direct evidence from DATA over derivative statements in ATTACHMENTS when both address the same point.
         - If ATTACHMENTS evidence is used, cite the attachment by name in detail.
         - Each detail must cite concrete evidence from DATA or ATTACHMENTS.
         - Write reviewer-facing natural language. Do not refer to prompt section names, internal field keys, or schema labels such as DATA, ATTACHMENTS, ProjectSummary, CustomField1, or OrganizationType.
         - Refer to evidence by its plain-language meaning, quoted text, or attachment name rather than internal key names.
         - Only include warnings when the evidence shows a specific, concrete risk, inconsistency, or meaningful uncertainty; a stated risk label alone is not enough.
-        - Do not state that one amount exceeds, matches, or conflicts with another unless the comparison is directly supported by the provided values.
-        - Do not treat ordinary lack of detailed supporting explanation as a material gap unless the provided evidence creates real uncertainty about feasibility, eligibility, or budget credibility.
-        - Prefer neutral evidence descriptions over evaluative adjectives unless the evidence directly supports a strong conclusion.
-        - Do not describe capacity, feasibility, or justification as strong, detailed, or well-supported unless the evidence shows more than the existence of basic organizational, budget, or timeline information.
-        - Do not infer community support, established partnerships, or delivery capacity from a single partner reference, staff count, or basic organizational status alone.
-        - Do not describe a timeline as realistic or feasible based only on start and end dates unless additional evidence supports deliverability.
         - Use 3-6 words for title.
         - Summary titles should name the specific substantive reviewer conclusion, strength, or risk, not a generic evaluation label or abstract category.
         - Each detail must be 1-2 complete sentences.
         - Summaries and recommendations must be concrete, distinct, reviewer-relevant, and specific to this application's evidence.
         - Avoid generic praise, checklist language, and repeated conclusions across lists.
         - Do not use a summary merely to say that supporting documents were provided; summarize the specific substantive evidence they add, or omit the finding.
-        - If no findings exist, return empty arrays.
+        - Errors and warnings may be empty.
+        - Summaries and recommendations must each include at least one item.
+        - Decision must be PROCEED or HOLD.
+        - Use summaries for overall application quality/readiness synthesis.
+        - Use recommendations for concrete reviewer-facing next actions based on the provided evidence.
+        - Recommendations may include proceeding with the normal review process when the application appears ready for that step.
+        - When evidence shows a meaningful gap, inconsistency, or uncertainty, use recommendations for specific follow-up or verification actions.
+        - Return an empty array only when no concrete next action would help the reviewer.
+        """;
+
+    // ── v2/analysis.system.txt ───────────────────────────────────────────────
+    private const string AnalysisSystemV2 = """
+        You are a careful grant review assistant for human reviewers.
+        Review the application and attachments for the strongest evidence-backed reviewer conclusions.
+        Do not fill gaps, assume compliance, or treat relevance as proof.
+        """;
+
+    // ── v2/analysis.user.txt ─────────────────────────────────────────────────
+    private const string AnalysisUserV2 = """
+        SCHEMA
+        {{SCHEMA}}
+
+        DATA
+        {{DATA}}
+
+        ATTACHMENTS
+        {{ATTACHMENTS}}
+
+        RUBRIC
+        {{RUBRIC}}
+
+        SCORE
+        {{SCORE}}
+
+        RESPONSE
+        {{RESPONSE}}
+
+        RULES
+        {{RULES}}
+        {{COMMON_RULES}}
+        """;
+
+    // ── v2/analysis.rubric.txt ───────────────────────────────────────────────
+    private const string AnalysisRubricV2 = """
+        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.
+        """;
+
+    // ── v2/analysis.score.txt ────────────────────────────────────────────────
+    private const string AnalysisScoreV2 = """
+        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.
+        """;
+
+    // ── v2/analysis.output.txt ───────────────────────────────────────────────
+    private const string AnalysisOutputV2 = """
+        {
+          "decision": "<PROCEED|HOLD>",
+          "errors": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "warnings": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "summaries": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "recommendations": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ]
+        }
+        """;
+
+    // ── v2/analysis.rules.txt ────────────────────────────────────────────────
+    private const string AnalysisRulesV2 = """
+        - Use only provided input sections as evidence.
+        - Do not invent fields, documents, requirements, or facts.
+        - Prefer, in order: direct evidence from DATA, specific supporting evidence from ATTACHMENTS, then broader context only when necessary.
+        - Treat missing or empty values as findings only when they weaken rubric evidence.
+        - Prefer material findings; avoid nitpicking.
+        - Prefer direct evidence from DATA over derivative statements in ATTACHMENTS when both address the same point.
+        - If ATTACHMENTS evidence is used, cite the attachment by name in detail.
+        - Each detail must cite concrete evidence from DATA or ATTACHMENTS.
+        - Write reviewer-facing natural language. Do not refer to prompt section names, internal field keys, or schema labels such as DATA, ATTACHMENTS, ProjectSummary, CustomField1, or OrganizationType.
+        - Refer to evidence by its plain-language meaning, quoted text, or attachment name rather than internal key names.
+        - Only include warnings when the evidence shows a specific, concrete risk, inconsistency, or meaningful uncertainty; a stated risk label alone is not enough.
+        - Use 3-6 words for title.
+        - Summary titles should name the specific substantive reviewer conclusion, strength, or risk, not a generic evaluation label or abstract category.
+        - Each detail must be 1-2 complete sentences.
+        - Summaries and recommendations must be concrete, distinct, reviewer-relevant, and specific to this application's evidence.
+        - Avoid generic praise, checklist language, and repeated conclusions across lists.
+        - Do not use a summary merely to say that supporting documents were provided; summarize the specific substantive evidence they add, or omit the finding.
+        - Errors and warnings may be empty.
+        - Summaries and recommendations must each include at least one item.
         - Decision must be PROCEED or HOLD.
         - Use summaries for overall application quality/readiness synthesis.
         - Use recommendations for concrete reviewer-facing next actions based on the provided evidence.
@@ -460,6 +564,48 @@ 3. Return a concise reviewer-facing summary.
         - Return exactly one object with only the key: summary.
         """;
 
+    // ── v2/attachment.system.txt ─────────────────────────────────────────────
+    private const string AttachmentSystemV2 = """
+        You are a careful grant review assistant for human reviewers.
+        Summarize the attachment itself, not the overall project.
+        Return a concise reviewer-facing summary.
+        """;
+
+    // ── v2/attachment.user.txt ───────────────────────────────────────────────
+    private const string AttachmentUserV2 = """
+        ATTACHMENT
+        {{ATTACHMENT}}
+
+        RESPONSE
+        {{RESPONSE}}
+
+        RULES
+        {{RULES}}
+        {{COMMON_RULES}}
+        """;
+
+    // ── v2/attachment.output.txt ─────────────────────────────────────────────
+    private const string AttachmentOutputV2 = """
+        {
+          "summary": "<string>"
+        }
+        """;
+
+    // ── v2/attachment.rules.txt ──────────────────────────────────────────────
+    private const string AttachmentRulesV2 = """
+        - Use only ATTACHMENT as evidence.
+        - Summarize actual content when ATTACHMENT.text is present; otherwise provide a conservative file-level summary.
+        - Describe the attachment itself rather than summarizing the overall project.
+        - Begin with what the attachment contains or provides, not the file name or file type, unless that metadata is necessary to describe the evidence.
+        - Do not invent missing details.
+        - Do not calculate or restate totals, sums, or aggregates unless they are explicitly present in ATTACHMENT.text.
+        - Write reviewer-facing natural language. Do not refer to prompt section names, internal field keys, or schema labels such as ATTACHMENT or ATTACHMENT.text.
+        - Refer to evidence by its plain-language meaning, quoted text, or file name rather than internal key names.
+        - Write 1-2 complete sentences.
+        - Summary must be grounded in concrete ATTACHMENT evidence.
+        - Return exactly one object with only the key: summary.
+        """;
+
     // ── v0/scoresheet.system.txt ─────────────────────────────────────────────
     private const string ScoresheetSystemV0 = """
         You are an expert grant application reviewer for the BC Government.
@@ -488,14 +634,14 @@ Respond only with valid JSON in the exact format requested.
         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
+        3. A confidence score as a decimal fraction from 0.0 to 1.0.
 
         OUTPUT
         {
-          "<question_id>": {
+            "<question_id>": {
             "answer": "<string | number>",
             "rationale": "<evidence-based rationale>",
-            "confidence": <integer 0-100 step 5>
+            "confidence": <decimal 0.0-1.0>
           }
         }
 
@@ -507,10 +653,64 @@ 2. A brief rationale (1-2 complete sentences) citing concrete supporting evidenc
         - 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.
+        - confidence must be a decimal fraction from 0.0 to 1.0.
         - Return valid plain JSON only in the exact OUTPUT shape.
         """;
 
+    // ── v2/scoresheet.system.txt ─────────────────────────────────────────────
+    private const string ScoresheetSystemV2 = """
+        You are a careful grant review assistant for human reviewers.
+        Answer each question in SECTION using only the provided DATA and ATTACHMENTS.
+        Choose the most conservative valid answer supported by the evidence.
+        If evidence is incomplete or indirect, explain the uncertainty in the rationale.
+        """;
+
+    // ── v2/scoresheet.user.txt ───────────────────────────────────────────────
+    private const string ScoresheetUserV2 = """
+        DATA
+        {{DATA}}
+
+        ATTACHMENTS
+        {{ATTACHMENTS}}
+
+        SECTION
+        {{SECTION}}
+
+        RESPONSE
+        {{RESPONSE}}
+
+        RULES
+        {{RULES}}
+        {{COMMON_RULES}}
+        """;
+
+    // ── v2/scoresheet.output.txt ─────────────────────────────────────────────
+    private const string ScoresheetOutputV2 = """
+        {
+          "<question_id>": {
+            "answer": "<string | number>",
+            "rationale": "<evidence-based rationale>",
+            "confidence": <decimal 0.0-1.0>
+          }
+        }
+        """;
+
+    // ── v2/scoresheet.rules.txt ──────────────────────────────────────────────
+    private const string ScoresheetRulesV2 = """
+        - Use only DATA and ATTACHMENTS as evidence.
+        - Do not invent missing application details.
+        - Prefer direct evidence of the exact condition asked.
+        - If evidence is insufficient, partial, indirect, missing, or non-specific, choose the most conservative valid answer and explain the uncertainty.
+        - 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 the exact question IDs from RESPONSE and SECTION.questions without alteration.
+        - Use RESPONSE as the output contract and fill every placeholder value.
+        - Each answer object must include: "answer", "rationale", and "confidence".
+        - Confidence is mandatory for every question and must always be a numeric decimal between 0.0 and 1.0.
+        - The "answer" value type must match question type: Number => numeric; YesNo/SelectList/Text/TextArea => string.
+        """;
+
     // ── v1/scoresheet.system.txt ─────────────────────────────────────────────
     private const string ScoresheetSystemV1 = """
         ROLE
@@ -520,7 +720,7 @@ 2. A brief rationale (1-2 complete sentences) citing concrete supporting evidenc
         Using DATA, ATTACHMENTS, SECTION, RESPONSE, OUTPUT, and RULES:
         1. Review each question in SECTION one at a time.
         2. Identify the exact condition the question asks about.
-        3. Consider only the most relevant evidence in DATA and ATTACHMENTS for that condition.
+        3. Consider only the most relevant evidence in DATA and any provided ATTACHMENTS for that condition.
         4. Choose the most conservative valid answer supported by that evidence.
         5. If evidence is incomplete or indirect, explain the uncertainty in the rationale.
         6. Repeat for every question in SECTION.
@@ -551,7 +751,7 @@ 4. Choose the most conservative valid answer supported by that evidence.
           "<question_id>": {
             "answer": "<string | number>",
             "rationale": "<evidence-based rationale>",
-            "confidence": <integer 0-100 step 5>
+            "confidence": <decimal 0.0-1.0>
           }
         }
         """;
@@ -583,6 +783,7 @@ 4. Choose the most conservative valid answer supported by that evidence.
     // ── v1/common.rules.txt ──────────────────────────────────────────────────
     private const string CommonRules = """
         - Any narrative text response must be at least 12 words.
+        - If ATTACHMENTS is empty, use DATA only and do not mention missing attachments unless their absence is material to the specific conclusion or question.
         - Return values exactly as specified in OUTPUT.
         - Do not return keys outside OUTPUT.
         - Return valid JSON only.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIModel.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIModel.cs
new file mode 100644
index 0000000000..511ba071ec
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIModel.cs
@@ -0,0 +1,24 @@
+using System;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Unity.AI.Domain;
+
+public class AIModel : AuditedAggregateRoot<Guid>
+{
+    public string Name { get; set; } = default!;
+
+    public bool IsActive { get; set; } = true;
+
+    /// <summary>Free-form model settings stored as JSON for dynamic runtime options.</summary>
+    public string SettingsJson { get; set; } = "{}";
+
+    protected AIModel()
+    {
+    }
+
+    public AIModel(Guid id, string name)
+    {
+        Id = id;
+        Name = name;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIModelSettings.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIModelSettings.cs
new file mode 100644
index 0000000000..7a9c268eac
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIModelSettings.cs
@@ -0,0 +1,8 @@
+namespace Unity.AI.Domain;
+
+public class AIModelSettings
+{
+    public bool MaxOutputTokenCountSupported { get; set; } = true;
+
+    public double? Temperature { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIOperation.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIOperation.cs
new file mode 100644
index 0000000000..c4aa1f229f
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIOperation.cs
@@ -0,0 +1,36 @@
+using System;
+using Unity.AI.Operations;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Unity.AI.Domain;
+
+public class AIOperation : AuditedAggregateRoot<Guid>
+{
+    public string Name { get; set; } = default!;
+
+    public Guid AIModelId { get; set; }
+
+    public AIModel AIModel { get; set; } = default!;
+
+    public Guid AIPromptId { get; set; }
+
+    public AIPrompt? AIPrompt { get; set; }
+
+    public AIExecutionMode ExecutionMode { get; set; } = AIExecutionMode.Sequential;
+
+    public int CompletionTokens { get; set; }
+
+    public bool IsActive { get; set; } = true;
+
+    protected AIOperation()
+    {
+    }
+
+    public AIOperation(Guid id, string name, Guid aiModelId, Guid aiPromptId)
+    {
+        Id = id;
+        Name = name;
+        AIModelId = aiModelId;
+        AIPromptId = aiPromptId;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPrompt.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPrompt.cs
index 8aeb74d3d2..3ece069435 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPrompt.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPrompt.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.MultiTenancy;
 
@@ -7,25 +6,36 @@ namespace Unity.AI.Domain;
 
 public class AIPrompt : AuditedAggregateRoot<Guid>, IMultiTenant
 {
-    public virtual Guid? TenantId { get; protected set; }
+    public Guid? TenantId { get; protected set; }
 
     public string Name { get; set; } = default!;
 
-    public string? Description { get; set; }
+    public int VersionNumber { get; set; }
 
-    public PromptType Type { get; set; }
+    public string SystemPrompt { get; set; } = default!;
 
-    public bool IsActive { get; set; } = true;
+    public string UserPrompt { get; set; } = default!;
+
+    public string MetadataJson { get; set; } = "{}";
 
-    public ICollection<AIPromptVersion> Versions { get; set; } = new List<AIPromptVersion>();
+    public bool IsActive { get; set; } = true;
 
     protected AIPrompt() { }
 
-    public AIPrompt(Guid id, string name, PromptType type, Guid? tenantId = null)
+    public AIPrompt(
+        Guid id,
+        string name,
+        int versionNumber,
+        string systemPrompt,
+        string userPrompt,
+        Guid? tenantId = null)
     {
         Id = id;
         Name = name;
-        Type = type;
+        VersionNumber = versionNumber;
+        SystemPrompt = systemPrompt;
+        UserPrompt = userPrompt;
+        MetadataJson = "{}";
         TenantId = tenantId;
         IsActive = true;
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPromptVersion.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPromptVersion.cs
deleted file mode 100644
index 440aec6e0c..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPromptVersion.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using Volo.Abp.Domain.Entities.Auditing;
-using Volo.Abp.MultiTenancy;
-
-namespace Unity.AI.Domain;
-
-public class AIPromptVersion : AuditedAggregateRoot<Guid>, IMultiTenant
-{
-    public virtual Guid? TenantId { get; protected set; }
-
-    public Guid PromptId { get; set; }
-    public AIPrompt? Prompt { get; set; }
-
-    public int VersionNumber { get; set; }
-
-    public string SystemPrompt { get; set; } = default!;
-    public string UserPromptTemplate { get; set; } = default!;
-    public string? DeveloperNotes { get; set; }
-
-    public string? TargetModel { get; set; }
-    public string? TargetProvider { get; set; }
-
-    public double Temperature { get; set; } = 0.2;
-    public int? MaxTokens { get; set; }
-
-    public bool IsPublished { get; set; }
-    public bool IsDeprecated { get; set; }
-
-    /// <summary>Optional JSON metadata for extensibility (stored as Postgres jsonb).</summary>
-    public string? MetadataJson { get; set; }
-
-    protected AIPromptVersion() { }
-
-    public AIPromptVersion(
-        Guid id,
-        Guid promptId,
-        int versionNumber,
-        string systemPrompt,
-        string userPromptTemplate,
-        Guid? tenantId = null)
-    {
-        Id = id;
-        PromptId = promptId;
-        VersionNumber = versionNumber;
-        SystemPrompt = systemPrompt;
-        UserPromptTemplate = userPromptTemplate;
-        TenantId = tenantId;
-        Temperature = 0.2;
-    }
-}
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
index 94ccefb672..7184e09c74 100644
--- 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
@@ -21,38 +21,83 @@ public static void ConfigureAI(this ModelBuilder modelBuilder)
                 .IsRequired()
                 .HasMaxLength(200);
 
-            b.Property(x => x.Description)
-                .HasMaxLength(2000);
+            b.Property(x => x.VersionNumber)
+                .IsRequired();
+
+            b.Property(x => x.SystemPrompt)
+                .IsRequired()
+                .HasColumnType("text");
+
+            b.Property(x => x.UserPrompt)
+                .IsRequired()
+                .HasColumnType("text");
 
-            b.Property(x => x.Type)
+            b.Property(x => x.MetadataJson)
+                .IsRequired()
+                .HasColumnType("jsonb")
+                .HasDefaultValue("{}");
+
+            b.Property(x => x.IsActive)
                 .IsRequired();
 
-            b.HasMany(x => x.Versions)
-                .WithOne(x => x.Prompt)
-                .HasForeignKey(x => x.PromptId)
-                .OnDelete(DeleteBehavior.Cascade);
+            b.HasIndex(x => new { x.TenantId, x.Name, x.VersionNumber })
+                .IsUnique();
         });
 
-        modelBuilder.Entity<AIPromptVersion>(b =>
+        modelBuilder.Entity<AIModel>(b =>
         {
-            b.ToTable(AIDbProperties.DbTablePrefix + "AIPromptVersions", AIDbProperties.DbSchema);
+            b.ToTable(AIDbProperties.DbTablePrefix + "AIModels", AIDbProperties.DbSchema);
 
             b.ConfigureByConvention();
 
-            b.Property(x => x.SystemPrompt).IsRequired().HasColumnType("text");
-            b.Property(x => x.UserPromptTemplate).IsRequired().HasColumnType("text");
-
-            b.Property(x => x.TargetModel)
-                .HasMaxLength(100);
+            b.Property(x => x.Name)
+                .IsRequired()
+                .HasMaxLength(200);
 
-            b.Property(x => x.TargetProvider)
-                .HasMaxLength(100);
+            b.Property(x => x.IsActive)
+                .IsRequired();
 
-            b.Property(x => x.MetadataJson)
+            b.Property(x => x.SettingsJson)
+                .IsRequired()
                 .HasColumnType("jsonb");
 
-            b.HasIndex(x => new { x.PromptId, x.VersionNumber })
+            b.HasIndex(x => x.Name)
                 .IsUnique();
         });
+
+        modelBuilder.Entity<AIOperation>(b =>
+        {
+            b.ToTable(AIDbProperties.DbTablePrefix + "AIOperations", AIDbProperties.DbSchema);
+
+            b.ConfigureByConvention();
+
+            b.Property(x => x.Name)
+                .IsRequired()
+                .HasMaxLength(200);
+
+            b.Property(x => x.ExecutionMode)
+                .IsRequired()
+                .HasConversion<string>()
+                .HasMaxLength(20);
+
+            b.Property(x => x.CompletionTokens)
+                .IsRequired();
+
+            b.Property(x => x.IsActive)
+                .IsRequired();
+
+            b.HasIndex(x => x.Name)
+                .IsUnique();
+
+            b.HasOne(x => x.AIModel)
+                .WithMany()
+                .HasForeignKey(x => x.AIModelId)
+                .OnDelete(DeleteBehavior.Restrict);
+
+            b.HasOne(x => x.AIPrompt)
+                .WithMany()
+                .HasForeignKey(x => x.AIPromptId)
+                .OnDelete(DeleteBehavior.Restrict);
+        });
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Generation/AIGenerationAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Generation/AIGenerationAppService.cs
new file mode 100644
index 0000000000..443b3602cc
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Generation/AIGenerationAppService.cs
@@ -0,0 +1,135 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.AI.Automation;
+using Unity.AI.Features;
+using Unity.AI.Localization;
+using Unity.AI.Operations;
+using Unity.AI.Permissions;
+using Unity.AI.RateLimit;
+using Unity.AI.Settings;
+using Unity.GrantManager.Attachments;
+using Unity.GrantManager.GrantApplications;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp;
+using Volo.Abp.Features;
+
+namespace Unity.AI.Generation;
+
+[Route("api/app/ai/generation")]
+public class AIGenerationAppService(
+    IApplicationAIGenerationQueue aiGenerationQueue,
+    IAIGenerationStatusAppService aiGenerationStatusAppService,
+    IAIRateLimiter aiRateLimiter,
+    AIFeatureGuard featureGuard,
+    ICurrentTenant currentTenant)
+    : AIAppService, IAIGenerationAppService
+{
+    private const string ApplicationAnalysisOperationType = "application-analysis";
+    private const string AttachmentSummaryOperationType = "attachment-summary";
+    private const string ApplicationScoringOperationType = "application-scoring";
+
+    [Authorize(AIPermissions.Analysis.GenerateAttachmentSummaries)]
+    [HttpPost("attachment-summary")]
+    public virtual async Task<List<AttachmentSummaryResultDto>> GenerateAttachmentSummariesAsync(GenerateAttachmentSummariesInputDto input)
+    {
+        await featureGuard.EnsureEnabledAsync(
+            AIFeatures.AttachmentSummaries,
+            AILocalizationKeys.AttachmentSummariesDisabled);
+
+        if (input.AttachmentIds.Count == 0)
+        {
+            return [];
+        }
+
+        await aiGenerationQueue.QueueAttachmentSummaryAsync(
+            input.ApplicationId,
+            currentTenant.Id,
+            input.PromptVersion,
+            input.AttachmentIds);
+
+        return input.AttachmentIds
+            .Select(_ => new AttachmentSummaryResultDto { Completed = false })
+            .ToList();
+    }
+
+    [Authorize(AIPermissions.Analysis.GenerateApplicationAnalysis)]
+    [HttpPost("application-analysis")]
+    public virtual async Task<ApplicationAnalysisResultDto> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null)
+    {
+        await featureGuard.EnsureEnabledAsync(
+            AIFeatures.ApplicationAnalysis,
+            AILocalizationKeys.ApplicationAnalysisDisabled);
+
+        await aiGenerationQueue.QueueApplicationAnalysisAsync(applicationId, currentTenant.Id, promptVersion);
+        return new ApplicationAnalysisResultDto { Completed = false };
+    }
+
+    [Authorize(AIPermissions.Analysis.GenerateScoring)]
+    [HttpPost("application-scoring")]
+    public virtual async Task<ApplicationScoringResultDto> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null)
+    {
+        await featureGuard.EnsureEnabledAsync(
+            AIFeatures.Scoring,
+            AILocalizationKeys.ScoringDisabled);
+
+        await aiGenerationQueue.QueueApplicationScoringAsync(applicationId, currentTenant.Id, promptVersion);
+        return new ApplicationScoringResultDto { Completed = false };
+    }
+
+    [Authorize]
+    [HttpGet("status")]
+    public virtual async Task<AIGenerationStatusDto> GetStatusAsync(Guid applicationId, string operationType)
+    {
+        await EnsureStatusAccessAsync(operationType);
+
+        var request = await aiGenerationStatusAppService.GetLatestAsync(applicationId, operationType, currentTenant.Id);
+        var state = await aiRateLimiter.GetStateAsync();
+
+        return new AIGenerationStatusDto
+        {
+            GenerationRequest = request == null
+                ? null
+                : new AIGenerationStatusRequestDto
+                {
+                    Id = request.Id,
+                    ApplicationId = request.ApplicationId,
+                    OperationId = request.OperationId,
+                    OperationType = operationType,
+                    Status = request.Status.ToString(),
+                    StartedAt = request.StartedAt,
+                    CompletedAt = request.CompletedAt,
+                    FailureReason = request.FailureReason,
+                    IsActive = request.IsActive
+                },
+            FailureReason = request?.FailureReason,
+            IsGenerating = state.IsGenerating,
+            RetryAfterSeconds = state.RetryAfterSeconds
+        };
+    }
+
+    private async Task EnsureStatusAccessAsync(string operationType)
+    {
+        var permission = operationType switch
+        {
+            ApplicationAnalysisOperationType => AIPermissions.Analysis.ViewApplicationAnalysis,
+            AttachmentSummaryOperationType => AIPermissions.Analysis.ViewAttachmentSummary,
+            ApplicationScoringOperationType => AIPermissions.Analysis.ViewScoringResult,
+            AIGenerationRequestKeyHelper.PipelineOperationType => null,
+            _ => throw new UserFriendlyException($"Unsupported AI generation operation type: {operationType}")
+        };
+
+        if (permission is null)
+        {
+            await CheckPolicyAsync(AIPermissions.Analysis.ViewApplicationAnalysis);
+            await CheckPolicyAsync(AIPermissions.Analysis.ViewAttachmentSummary);
+            await CheckPolicyAsync(AIPermissions.Analysis.ViewScoringResult);
+            return;
+        }
+
+        await CheckPolicyAsync(permission);
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs
deleted file mode 100644
index 843d4a89fa..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using System;
-using System.Threading.Tasks;
-using Unity.AI;
-using Unity.AI.Automation;
-using Unity.AI.Features;
-using Unity.AI.Localization;
-using Unity.AI.Permissions;
-using Unity.AI.Settings;
-using Volo.Abp;
-using Volo.Abp.MultiTenancy;
-
-namespace Unity.GrantManager.GrantApplications;
-
-[Authorize(AIPermissions.Analysis.GenerateApplicationAnalysis)]
-public class ApplicationAnalysisAppService(
-    Unity.AI.Operations.IApplicationAnalysisService applicationAnalysisService,
-    IApplicationAIGenerationQueue aiGenerationQueue,
-    AIFeatureGuard featureGuard,
-    ICurrentTenant currentTenant)
-    : AIAppService, IApplicationAnalysisAppService
-{
-    public virtual async Task<ApplicationAnalysisResultDto> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null)
-    {
-        await featureGuard.EnsureEnabledAsync(
-            AIFeatures.ApplicationAnalysis,
-            AILocalizationKeys.ApplicationAnalysisDisabled);
-
-        await aiGenerationQueue.QueueApplicationAnalysisAsync(applicationId, currentTenant.Id, promptVersion);
-        return new ApplicationAnalysisResultDto { Completed = false };
-    }
-
-    // Internal-only: no HTTP endpoint, no auth check — safe for background job callers
-    [AllowAnonymous]
-    [RemoteService(IsEnabled = false)]
-    public virtual async Task<ApplicationAnalysisResultDto> GenerateApplicationAnalysisForPipelineAsync(Guid applicationId, string? promptVersion = null)
-    {
-        await applicationAnalysisService.RegenerateAndSaveAsync(applicationId, promptVersion);
-        return new ApplicationAnalysisResultDto { Completed = true };
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs
deleted file mode 100644
index 72c01b8c18..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using System;
-using System.Threading.Tasks;
-using Unity.AI;
-using Unity.AI.Automation;
-using Unity.AI.Features;
-using Unity.AI.Localization;
-using Unity.AI.Permissions;
-using Unity.AI.Settings;
-using Volo.Abp.MultiTenancy;
-
-namespace Unity.GrantManager.GrantApplications;
-
-[Authorize(AIPermissions.Analysis.ViewAttachmentSummary)]
-[Authorize(AIPermissions.Analysis.ViewApplicationAnalysis)]
-[Authorize(AIPermissions.Analysis.ViewScoringResult)]
-public class ApplicationContentAppService(
-    IApplicationAIGenerationQueue aiGenerationQueue,
-    AIFeatureGuard featureGuard,
-    ICurrentTenant currentTenant)
-    : AIAppService, IApplicationContentAppService
-{
-    public virtual async Task<ApplicationContentResultDto> GenerateContentAsync(Guid applicationId, string? promptVersion = null)
-    {
-        await featureGuard.EnsureEnabledAsync(AIFeatures.AttachmentSummaries, AILocalizationKeys.GenerateAllDisabled);
-        await featureGuard.EnsureEnabledAsync(AIFeatures.ApplicationAnalysis, AILocalizationKeys.GenerateAllDisabled);
-        await featureGuard.EnsureEnabledAsync(AIFeatures.Scoring, AILocalizationKeys.GenerateAllDisabled);
-
-        await aiGenerationQueue.QueueAllAIStagesAsync(applicationId, currentTenant.Id, promptVersion);
-
-        return new ApplicationContentResultDto
-        {
-            Completed = true
-        };
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationScoringAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationScoringAppService.cs
deleted file mode 100644
index 9c65c1d1f4..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationScoringAppService.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using System;
-using System.Threading.Tasks;
-using Unity.AI;
-using Unity.AI.Features;
-using Unity.AI.Localization;
-using Unity.AI.Operations;
-using Unity.AI.Permissions;
-using Unity.AI.Settings;
-using Unity.GrantManager.GrantApplications.Automation.Events;
-using Volo.Abp;
-using Volo.Abp.EventBus.Local;
-
-namespace Unity.GrantManager.GrantApplications;
-
-[Authorize(AIPermissions.Analysis.GenerateScoring)]
-public class ApplicationScoringAppService(
-    IApplicationScoringService applicationScoringService,
-    AIFeatureGuard featureGuard,
-    ILocalEventBus localEventBus)
-    : AIAppService, IApplicationScoringAppService
-{
-    public virtual async Task<ApplicationScoringResultDto> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null)
-    {
-        await featureGuard.EnsureEnabledAsync(
-            AIFeatures.Scoring,
-            AILocalizationKeys.ScoringDisabled);
-
-        await applicationScoringService.RegenerateAndSaveAsync(applicationId, promptVersion);
-
-        if (UnitOfWorkManager.Current != null)
-        {
-            var capturedId = applicationId;
-            UnitOfWorkManager.Current.OnCompleted(async () =>
-            {
-                await localEventBus.PublishAsync(new ApplicationAIScoringGeneratedEvent
-                {
-                    ApplicationId = capturedId
-                });
-            });
-        }
-        else
-        {
-            await localEventBus.PublishAsync(new ApplicationAIScoringGeneratedEvent
-            {
-                ApplicationId = applicationId
-            });
-        }
-
-        return new ApplicationScoringResultDto
-        {
-            Completed = true
-        };
-    }
-
-    // Internal-only: no HTTP endpoint, no auth check — safe for background job callers
-    [AllowAnonymous]
-    [RemoteService(IsEnabled = false)]
-    public virtual async Task<ApplicationScoringResultDto> GenerateApplicationScoringForPipelineAsync(Guid applicationId, string? promptVersion = null)
-    {
-        await applicationScoringService.RegenerateAndSaveAsync(applicationId, promptVersion);
-        return new ApplicationScoringResultDto { Completed = true };
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptAppService.cs
index 5167d1b136..0d6c9b02f9 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptAppService.cs
@@ -1,15 +1,22 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Unity.AI.Domain;
 using Unity.Modules.Shared.Permissions;
+using Volo.Abp.Data;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp;
 
 namespace Unity.AI.Prompts;
 
 [Authorize(IdentityConsts.ITOperationsPolicyName)]
+[Route("api/app/ai/prompts")]
 public class AIPromptAppService :
     CrudAppService<
         AIPrompt,
@@ -19,9 +26,14 @@ public class AIPromptAppService :
         CreateUpdateAIPromptDto>,
     IAIPromptAppService
 {
-    public AIPromptAppService(IRepository<AIPrompt, Guid> repository)
+    private readonly IDataFilter<IMultiTenant> _multiTenantDataFilter;
+
+    public AIPromptAppService(
+        IRepository<AIPrompt, Guid> repository,
+        IDataFilter<IMultiTenant> multiTenantDataFilter)
         : base(repository)
     {
+        _multiTenantDataFilter = multiTenantDataFilter;
         GetPolicyName = IdentityConsts.ITOperationsPolicyName;
         GetListPolicyName = IdentityConsts.ITOperationsPolicyName;
         CreatePolicyName = IdentityConsts.ITOperationsPolicyName;
@@ -29,41 +41,101 @@ public AIPromptAppService(IRepository<AIPrompt, Guid> repository)
         DeletePolicyName = IdentityConsts.ITOperationsPolicyName;
     }
 
+    [HttpGet("by-prompt/{promptId}")]
+    public virtual async Task<ListResultDto<AIPromptDto>> GetByPromptAsync(Guid promptId)
+    {
+        using (_multiTenantDataFilter.Disable())
+        {
+            var selected = await Repository.GetAsync(promptId);
+            var items = await Repository.GetListAsync(v => v.TenantId == selected.TenantId && v.Name == selected.Name);
+            var sorted = items.OrderBy(v => v.VersionNumber).ToList();
+            return new ListResultDto<AIPromptDto>(
+                ObjectMapper.Map<List<AIPrompt>, List<AIPromptDto>>(sorted));
+        }
+    }
+
+    [HttpGet("{id}")]
     public override async Task<AIPromptDto> GetAsync(Guid id)
     {
-        using (CurrentTenant.Change(null))
+        using (_multiTenantDataFilter.Disable())
         {
             return await base.GetAsync(id);
         }
     }
 
+    [HttpGet]
     public override async Task<PagedResultDto<AIPromptDto>> GetListAsync(PagedAndSortedResultRequestDto input)
     {
-        using (CurrentTenant.Change(null))
+        using (_multiTenantDataFilter.Disable())
         {
             return await base.GetListAsync(input);
         }
     }
 
+    [HttpPost]
     public override async Task<AIPromptDto> CreateAsync(CreateUpdateAIPromptDto input)
     {
-        using (CurrentTenant.Change(null))
+        using (_multiTenantDataFilter.Disable())
         {
-            return await base.CreateAsync(input);
+            var prompt = await Repository.GetAsync(input.PromptId);
+            var existingVersion = await Repository.FirstOrDefaultAsync(p =>
+                p.TenantId == prompt.TenantId &&
+                p.Name == prompt.Name &&
+                p.VersionNumber == input.VersionNumber);
+            if (existingVersion != null)
+            {
+                throw new UserFriendlyException(
+                    $"AI prompt '{prompt.Name}' already has version {input.VersionNumber}.");
+            }
+
+            var entity = await Repository.InsertAsync(
+                new AIPrompt(
+                    Guid.CreateVersion7(),
+                    prompt.Name,
+                    input.VersionNumber,
+                    input.SystemPrompt,
+                    input.UserPrompt,
+                    prompt.TenantId)
+                {
+                    MetadataJson = string.IsNullOrWhiteSpace(input.MetadataJson) ? "{}" : input.MetadataJson,
+                    IsActive = input.IsActive
+                });
+
+            return ObjectMapper.Map<AIPrompt, AIPromptDto>(entity);
         }
     }
 
+    [HttpPut("{id}")]
     public override async Task<AIPromptDto> UpdateAsync(Guid id, CreateUpdateAIPromptDto input)
     {
-        using (CurrentTenant.Change(null))
+        using (_multiTenantDataFilter.Disable())
         {
-            return await base.UpdateAsync(id, input);
+            var entity = await Repository.GetAsync(id);
+            var conflictingVersion = await Repository.FirstOrDefaultAsync(p =>
+                p.Id != id &&
+                p.TenantId == entity.TenantId &&
+                p.Name == entity.Name &&
+                p.VersionNumber == input.VersionNumber);
+            if (conflictingVersion != null)
+            {
+                throw new UserFriendlyException(
+                    $"AI prompt '{entity.Name}' already has version {input.VersionNumber}.");
+            }
+
+            entity.VersionNumber = input.VersionNumber;
+            entity.SystemPrompt = input.SystemPrompt;
+            entity.UserPrompt = input.UserPrompt;
+            entity.MetadataJson = string.IsNullOrWhiteSpace(input.MetadataJson) ? "{}" : input.MetadataJson;
+            entity.IsActive = input.IsActive;
+            entity = await Repository.UpdateAsync(entity);
+            return ObjectMapper.Map<AIPrompt, AIPromptDto>(entity);
         }
     }
 
+    [HttpDelete("{id}")]
     public override async Task DeleteAsync(Guid id)
     {
-        using (CurrentTenant.Change(null))
+        using (_multiTenantDataFilter.Disable())
         {
             await base.DeleteAsync(id);
         }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptVersionAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptVersionAppService.cs
deleted file mode 100644
index a44218d410..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptVersionAppService.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Unity.AI.Domain;
-using Unity.Modules.Shared.Permissions;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-
-namespace Unity.AI.Prompts;
-
-[Authorize(IdentityConsts.ITOperationsPolicyName)]
-public class AIPromptVersionAppService :
-    CrudAppService<
-        AIPromptVersion,
-        AIPromptVersionDto,
-        Guid,
-        PagedAndSortedResultRequestDto,
-        CreateUpdateAIPromptVersionDto>,
-    IAIPromptVersionAppService
-{
-    public AIPromptVersionAppService(IRepository<AIPromptVersion, Guid> repository)
-        : base(repository)
-    {
-        GetPolicyName = IdentityConsts.ITOperationsPolicyName;
-        GetListPolicyName = IdentityConsts.ITOperationsPolicyName;
-        CreatePolicyName = IdentityConsts.ITOperationsPolicyName;
-        UpdatePolicyName = IdentityConsts.ITOperationsPolicyName;
-        DeletePolicyName = IdentityConsts.ITOperationsPolicyName;
-    }
-
-    public async Task<ListResultDto<AIPromptVersionDto>> GetByPromptAsync(Guid promptId)
-    {
-        using (CurrentTenant.Change(null))
-        {
-            var items = await Repository.GetListAsync(v => v.PromptId == promptId);
-            var sorted = items.OrderBy(v => v.VersionNumber).ToList();
-            return new ListResultDto<AIPromptVersionDto>(
-                ObjectMapper.Map<List<AIPromptVersion>, List<AIPromptVersionDto>>(sorted));
-        }
-    }
-
-    public override async Task<AIPromptVersionDto> GetAsync(Guid id)
-    {
-        using (CurrentTenant.Change(null))
-        {
-            return await base.GetAsync(id);
-        }
-    }
-
-    public override async Task<PagedResultDto<AIPromptVersionDto>> GetListAsync(PagedAndSortedResultRequestDto input)
-    {
-        using (CurrentTenant.Change(null))
-        {
-            return await base.GetListAsync(input);
-        }
-    }
-
-    public override async Task<AIPromptVersionDto> CreateAsync(CreateUpdateAIPromptVersionDto input)
-    {
-        using (CurrentTenant.Change(null))
-        {
-            return await base.CreateAsync(input);
-        }
-    }
-
-    public override async Task<AIPromptVersionDto> UpdateAsync(Guid id, CreateUpdateAIPromptVersionDto input)
-    {
-        using (CurrentTenant.Change(null))
-        {
-            return await base.UpdateAsync(id, input);
-        }
-    }
-
-    public override async Task DeleteAsync(Guid id)
-    {
-        using (CurrentTenant.Change(null))
-        {
-            await base.DeleteAsync(id);
-        }
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/RateLimit/AIRateLimiter.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/RateLimit/AIRateLimiter.cs
index fe5a68b569..2f0f06f309 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/RateLimit/AIRateLimiter.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/RateLimit/AIRateLimiter.cs
@@ -86,15 +86,11 @@ public virtual async Task<AIRateLimitStateDto> GetStateAsync()
             return new AIRateLimitStateDto { RetryAfterSeconds = 0, IsGenerating = false };
         }
 
-        var userLock = distributedLockProvider.CreateLock(CooldownLockPrefix + userId);
-        using (await userLock.AcquireAsync())
+        return new AIRateLimitStateDto
         {
-            return new AIRateLimitStateDto
-            {
-                RetryAfterSeconds = await GetRemainingSecondsAsync(userId),
-                IsGenerating = await HasActiveGenerationAsync()
-            };
-        }
+            RetryAfterSeconds = await GetRemainingSecondsAsync(userId),
+            IsGenerating = await HasActiveGenerationAsync()
+        };
     }
 
     private async Task<bool> HasActiveGenerationAsync()
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AIConfigurationAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AIConfigurationAppService.cs
index 931f787553..f7bca0af75 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AIConfigurationAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AIConfigurationAppService.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Unity.AI.Permissions;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Settings;
@@ -7,6 +8,7 @@
 
 namespace Unity.AI.Settings;
 
+[Route("api/app/ai/configuration")]
 public class AIConfigurationAppService(
     ISettingProvider settingProvider,
     ISettingManager settingManager,
@@ -16,6 +18,8 @@ public class AIConfigurationAppService(
     private readonly ISettingManager _settingManager = settingManager;
     private readonly ICurrentTenant _currentTenant = currentTenant;
 
+    [Authorize(AIPermissions.Configuration.ConfigureAI)]
+    [HttpGet("tenant")]
     public virtual async Task<AITenantConfigurationDto> GetTenantConfigurationAsync()
     {
         return new AITenantConfigurationDto
@@ -28,6 +32,7 @@ public virtual async Task<AITenantConfigurationDto> GetTenantConfigurationAsync(
     }
 
     [Authorize(AIPermissions.Configuration.ConfigureAI)]
+    [HttpPut("tenant")]
     public virtual async Task UpdateTenantConfigurationAsync(UpdateAITenantConfigurationDto input)
     {
         await _settingManager.SetAsync(
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
index 78d3c1414f..83d79cee4d 100644
--- 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
@@ -7,6 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
+    <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NPOI" Version="2.7.5" />
     <PackageReference Include="PdfPig" Version="0.1.13" />
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
index c9b41c00d7..3f72aff220 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
@@ -3,6 +3,7 @@
   "texts": {
     "Permission:AI": "AI",
     "Permission:AI.Reporting": "AI Reporting",
+    "Permission:AI.Reporting.CreateEditDataModel": "Create/Edit Data Model",
     "Permission:AI.ViewApplicationAnalysis": "View AI Application Analysis",
     "Permission:AI.ViewAttachmentSummary": "View AI Attachment Summary",
     "Permission:AI.ViewScoringResult": "View AI Scoring Result",
@@ -23,24 +24,24 @@
     "AI:ApplicationAnalysisDisabled": "AI application analysis is not enabled.",
     "AI:ScoringDisabled": "AI scoring is not enabled.",
     "AI:GenerateAllDisabled": "AI generation is not enabled.",
+    "AI:NoAttachmentsAvailable": "No attachments are available to summarize.",
+    "AI:ApplicationAnalysisRequiresSubmission": "AI application analysis requires application submission data.",
+    "AI:ScoringRequiresScoresheet": "AI scoring requires a configured scoresheet.",
+    "AI:ScoringRequiresScoresheetFields": "AI scoring requires a scoresheet with scoring fields.",
+    "AI:AttachmentNotFound": "Attachment not found.",
+    "AI:SelectAttachmentForSummaries": "Select at least one attachment to generate summaries.",
 
     "AIPrompts": "AI Prompts",
     "AIPrompt": "AI Prompt",
     "AIPromptVersion": "Prompt Version",
     "AIPromptVersions": "Prompt Versions",
-    "PromptType": "Type",
     "PromptName": "Name",
-    "PromptDescription": "Description",
     "PromptIsActive": "Active",
     "VersionNumber": "Version Number",
     "SystemPrompt": "System Prompt",
-    "UserPromptTemplate": "User Prompt Template",
-    "DeveloperNotes": "Developer Notes",
-    "TargetModel": "Target Model",
-    "TargetProvider": "Target Provider",
+    "UserPrompt": "User Prompt",
+    "MetadataJson": "Metadata JSON",
     "Temperature": "Temperature",
-    "MaxTokens": "Max Tokens",
-    "IsPublished": "Published",
-    "IsDeprecated": "Deprecated"
+    "MaxTokens": "Max Tokens"
   }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AILocalizationKeys.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AILocalizationKeys.cs
index 1b099e5fe8..07b526d9a4 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AILocalizationKeys.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AILocalizationKeys.cs
@@ -6,4 +6,10 @@ public static class AILocalizationKeys
     public const string ApplicationAnalysisDisabled = "AI:ApplicationAnalysisDisabled";
     public const string ScoringDisabled = "AI:ScoringDisabled";
     public const string GenerateAllDisabled = "AI:GenerateAllDisabled";
+    public const string NoAttachmentsAvailable = "AI:NoAttachmentsAvailable";
+    public const string ApplicationAnalysisRequiresSubmission = "AI:ApplicationAnalysisRequiresSubmission";
+    public const string ScoringRequiresScoresheet = "AI:ScoringRequiresScoresheet";
+    public const string ScoringRequiresScoresheetFields = "AI:ScoringRequiresScoresheetFields";
+    public const string AttachmentNotFound = "AI:AttachmentNotFound";
+    public const string SelectAttachmentForSummaries = "AI:SelectAttachmentForSummaries";
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs
index bf7f06d896..a60007085a 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs
@@ -2,6 +2,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Unity.AI.Localization;
 using Unity.AI.Permissions;
+using Unity.Modules.Shared.Navigation;
+using Unity.Modules.Shared.Specializations;
 using Unity.Modules.Shared.Permissions;
 using Volo.Abp.Features;
 using Volo.Abp.UI.Navigation;
@@ -23,14 +25,17 @@ private static async Task ConfigureMainMenuAsync(MenuConfigurationContext contex
         var l = context.GetLocalizer<AIResource>();
         var featureChecker = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
 
-        context.Menu.AddItem(new ApplicationMenuItem(
-            name: AIMenus.Prompts,
-            displayName: "AI Prompts",
-            url: "~/Prompts",
-            icon: "fl fl-ai-prompts",
-            order: 900,
-            requiredPermissionName: IdentityConsts.ITOperationsPermissionName
-        ));
+        var specializationChecker = context.ServiceProvider.GetRequiredService<ISpecializationChecker>();
+        if (!await specializationChecker.IsEnabledAsync(SpecializationConsts.Onboarding))
+        {
+            await context.AddItemAsync(new ApplicationMenuItem(
+                name: AIMenus.Prompts,
+                displayName: "AI Prompts",
+                url: "~/Prompts",
+                icon: "fl fl-ai-prompts",
+                order: 900
+            ).OnlyWhenInRole(IdentityConsts.ITOperationsRoleName));
+        }
 
         if (await featureChecker.IsEnabledAsync("Unity.AIReporting"))
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml.cs
index 1279b7a691..b99da8ecf8 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml.cs
@@ -27,9 +27,10 @@ public async Task OnGetAsync()
         var dto = await _promptAppService.GetAsync(Id);
         Prompt = new CreateUpdateAIPromptDto
         {
-            Name = dto.Name,
-            Description = dto.Description,
-            Type = dto.Type,
+            VersionNumber = dto.VersionNumber,
+            SystemPrompt = dto.SystemPrompt,
+            UserPrompt = dto.UserPrompt,
+            MetadataJson = dto.MetadataJson,
             IsActive = dto.IsActive
         };
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/CreateEntryModal.cshtml
similarity index 70%
rename from applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml
rename to applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/CreateEntryModal.cshtml
index 38acee10e0..85da100816 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/CreateEntryModal.cshtml
@@ -1,17 +1,17 @@
 @page
 @using Unity.AI.Localization
-@using Unity.AI.Web.Pages.Prompts.Versions
+@using Unity.AI.Web.Pages.Prompts.Entries
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
-@model CreateVersionModalModel
+@model CreateEntryModalModel
 @inject IStringLocalizer<AIResource> L
 @{
     Layout = null;
 }
 
-<abp-dynamic-form abp-model="Version" asp-page="/Prompts/Versions/CreateVersionModal">
+<abp-dynamic-form abp-model="Prompt" asp-page="/Prompts/Entries/CreateEntryModal">
     <abp-modal>
-        <abp-modal-header title="@L["AIPromptVersion"].Value"></abp-modal-header>
+        <abp-modal-header title="@L["AIPrompt"].Value"></abp-modal-header>
         <abp-modal-body>
             <abp-form-content />
         </abp-modal-body>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/CreateEntryModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/CreateEntryModal.cshtml.cs
new file mode 100644
index 0000000000..ee1e53654a
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/CreateEntryModal.cshtml.cs
@@ -0,0 +1,34 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Threading.Tasks;
+using Unity.AI.Prompts;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.AI.Web.Pages.Prompts.Entries;
+
+public class CreateEntryModalModel : AbpPageModel
+{
+    [BindProperty]
+    public CreateUpdateAIPromptDto Prompt { get; set; } = new();
+
+    private readonly IAIPromptAppService _promptAppService;
+
+    public CreateEntryModalModel(IAIPromptAppService promptAppService)
+    {
+        _promptAppService = promptAppService;
+    }
+
+    public void OnGet(Guid promptId)
+    {
+        Prompt = new CreateUpdateAIPromptDto
+        {
+            PromptId = promptId
+        };
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        await _promptAppService.CreateAsync(Prompt);
+        return NoContent();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/EditEntryModal.cshtml
similarity index 72%
rename from applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml
rename to applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/EditEntryModal.cshtml
index 2f1e96ea4f..6ca56cf1c7 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/EditEntryModal.cshtml
@@ -1,17 +1,17 @@
 @page
 @using Unity.AI.Localization
-@using Unity.AI.Web.Pages.Prompts.Versions
+@using Unity.AI.Web.Pages.Prompts.Entries
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
-@model EditVersionModalModel
+@model EditEntryModalModel
 @inject IStringLocalizer<AIResource> L
 @{
     Layout = null;
 }
 
-<abp-dynamic-form abp-model="Version" asp-page="/Prompts/Versions/EditVersionModal">
+<abp-dynamic-form abp-model="Prompt" asp-page="/Prompts/Entries/EditEntryModal">
     <abp-modal>
-        <abp-modal-header title="@L["AIPromptVersion"].Value"></abp-modal-header>
+        <abp-modal-header title="@L["AIPrompt"].Value"></abp-modal-header>
         <abp-modal-body>
             <abp-input asp-for="Id" />
             <abp-form-content />
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/EditEntryModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/EditEntryModal.cshtml.cs
new file mode 100644
index 0000000000..b2f2a5dcc0
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Entries/EditEntryModal.cshtml.cs
@@ -0,0 +1,44 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Threading.Tasks;
+using Unity.AI.Prompts;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.AI.Web.Pages.Prompts.Entries;
+
+public class EditEntryModalModel : AbpPageModel
+{
+    [HiddenInput]
+    [BindProperty(SupportsGet = true)]
+    public Guid Id { get; set; }
+
+    [BindProperty]
+    public CreateUpdateAIPromptDto Prompt { get; set; } = new();
+
+    private readonly IAIPromptAppService _promptAppService;
+
+    public EditEntryModalModel(IAIPromptAppService promptAppService)
+    {
+        _promptAppService = promptAppService;
+    }
+
+    public async Task OnGetAsync()
+    {
+        var dto = await _promptAppService.GetAsync(Id);
+        Prompt = new CreateUpdateAIPromptDto
+        {
+            PromptId = dto.Id,
+            VersionNumber = dto.VersionNumber,
+            SystemPrompt = dto.SystemPrompt,
+            UserPrompt = dto.UserPrompt,
+            MetadataJson = dto.MetadataJson,
+            IsActive = dto.IsActive
+        };
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        await _promptAppService.UpdateAsync(Id, Prompt);
+        return NoContent();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml
index 0099f5cf0e..1b4d2bddd8 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml
@@ -67,36 +67,6 @@
 
                         <div class="row g-3">
 
-                            <div class="col-sm-6">
-                                <label for="versionTargetModel" class="form-label small fw-semibold mb-1">@L["TargetModel"]</label>
-                                <input type="text" id="versionTargetModel" class="form-control form-control-sm" maxlength="100" placeholder="e.g. gpt-4o" />
-                            </div>
-                            <div class="col-sm-6">
-                                <label for="versionTargetProvider" class="form-label small fw-semibold mb-1">@L["TargetProvider"]</label>
-                                <input type="text" id="versionTargetProvider" class="form-control form-control-sm" maxlength="100" placeholder="e.g. openai" />
-                            </div>
-
-                            <div class="col-6 col-sm-3">
-                                <label for="versionTemperature" class="form-label small fw-semibold mb-1">@L["Temperature"]</label>
-                                <input type="number" id="versionTemperature" class="form-control form-control-sm" step="0.05" min="0" max="2" placeholder="0.2" />
-                            </div>
-                            <div class="col-6 col-sm-3">
-                                <label for="versionMaxTokens" class="form-label small fw-semibold mb-1">@L["MaxTokens"]</label>
-                                <input type="number" id="versionMaxTokens" class="form-control form-control-sm" min="1" placeholder="unlimited" />
-                            </div>
-                            <div class="col-6 col-sm-3 d-flex align-items-end pb-1">
-                                <div class="form-check">
-                                    <input type="checkbox" id="versionIsPublished" class="form-check-input" />
-                                    <label class="form-check-label small" for="versionIsPublished">@L["IsPublished"]</label>
-                                </div>
-                            </div>
-                            <div class="col-6 col-sm-3 d-flex align-items-end pb-1">
-                                <div class="form-check">
-                                    <input type="checkbox" id="versionIsDeprecated" class="form-check-input" />
-                                    <label class="form-check-label small" for="versionIsDeprecated">@L["IsDeprecated"]</label>
-                                </div>
-                            </div>
-
                             <div class="col-12">
                                 <label for="versionSystemPrompt" class="form-label small fw-semibold mb-1">@L["SystemPrompt"] <span class="text-danger">*</span></label>
                                 <textarea id="versionSystemPrompt" class="form-control version-textarea version-textarea--code" rows="7" spellcheck="false"></textarea>
@@ -104,26 +74,28 @@
                             </div>
 
                             <div class="col-12">
-                                <label for="versionUserPromptTemplate" class="form-label small fw-semibold mb-1">@L["UserPromptTemplate"] <span class="text-danger">*</span></label>
-                                <textarea id="versionUserPromptTemplate" class="form-control version-textarea version-textarea--code" rows="7" spellcheck="false"></textarea>
-                                <div class="invalid-feedback">User Prompt Template is required.</div>
+                                <label for="versionUserPrompt" class="form-label small fw-semibold mb-1">@L["UserPrompt"] <span class="text-danger">*</span></label>
+                                <textarea id="versionUserPrompt" class="form-control version-textarea version-textarea--code" rows="7" spellcheck="false"></textarea>
+                                <div class="invalid-feedback">User Prompt is required.</div>
                             </div>
 
-                            <div class="col-12">
-                                <label for="versionDeveloperNotes" class="form-label small fw-semibold mb-1">@L["DeveloperNotes"]</label>
-                                <textarea id="versionDeveloperNotes" class="form-control version-textarea" rows="3" spellcheck="false"></textarea>
+                            <div class="col-6 col-sm-3 d-flex align-items-end pb-1">
+                                <div class="form-check">
+                                    <input type="checkbox" id="versionIsActive" class="form-check-input" checked="checked" />
+                                    <label class="form-check-label small" for="versionIsActive">@L["PromptIsActive"]</label>
+                                </div>
                             </div>
 
                             <div class="col-12">
                                 <div class="d-flex align-items-center gap-2 mb-1">
-                                    <label for="versionMetadataJson" class="form-label small fw-semibold mb-0">Metadata JSON</label>
+                                    <label for="versionMetadataJson" class="form-label small fw-semibold mb-0">@L["MetadataJson"]</label>
                                     <span class="badge bg-secondary" style="font-size:0.6rem;">jsonb</span>
                                     <button type="button" id="formatJsonBtn" class="btn btn-link btn-sm p-0 ms-1" title="Format JSON">
                                         <i class="fa fa-indent"></i> Format
                                     </button>
                                     <span id="jsonValidationMsg" class="small text-danger ms-1" style="display:none;"></span>
                                 </div>
-                                <textarea id="versionMetadataJson" class="form-control version-textarea version-textarea--json" rows="10" spellcheck="false" placeholder='{"sections": {...}}'></textarea>
+                                <textarea id="versionMetadataJson" class="form-control version-textarea version-textarea--json" rows="10" spellcheck="false" placeholder='{"RULES": "...", "COMMON_RULES": "..."}'></textarea>
                             </div>
 
                         </div>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.js b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.js
index 28062f58cf..07f1c714c1 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.js
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.js
@@ -1,7 +1,7 @@
 $(function () {
     const l = abp.localization.getResource('AI');
 
-    // Prompt-level modals (create / edit prompt metadata only)
+    // Prompt-level modals (create / edit prompt rows)
     let createModal = new abp.ModalManager(abp.appPath + 'Prompts/CreateModal');
     let editModal   = new abp.ModalManager(abp.appPath + 'Prompts/EditModal');
 
@@ -19,27 +19,32 @@ $(function () {
             index: 0
         },
         {
-            title: l('PromptType'),
-            name: 'type',
-            data: 'type',
+            title: l('VersionNumber'),
+            name: 'versionNumber',
+            data: 'versionNumber',
             index: 1,
-            render: (data) => {
-                const types = ['Orchestrator', 'Skill', 'Instruction', 'Agent'];
-                return types[data] ?? data;
-            }
         },
         {
-            title: l('PromptDescription'),
-            name: 'description',
-            data: 'description',
+            title: l('SystemPrompt'),
+            name: 'systemPrompt',
+            data: 'systemPrompt',
             index: 2,
-            defaultContent: ''
+            defaultContent: '',
+            render: (data) => (data ?? '').slice(0, 80)
+        },
+        {
+            title: l('UserPrompt'),
+            name: 'userPrompt',
+            data: 'userPrompt',
+            index: 3,
+            defaultContent: '',
+            render: (data) => (data ?? '').slice(0, 80)
         },
         {
             title: l('PromptIsActive'),
             name: 'isActive',
             data: 'isActive',
-            index: 3,
+            index: 4,
             render: (data) => data
                 ? '<span class="badge bg-success">Active</span>'
                 : '<span class="badge bg-secondary">Inactive</span>'
@@ -50,7 +55,7 @@ $(function () {
             orderable: false,
             className: 'text-center',
             name: 'rowActions',
-            index: 4,
+            index: 5,
             rowAction: {
                 items: [
                     {
@@ -78,7 +83,7 @@ $(function () {
         }
     ];
 
-    const defaultVisibleColumns = ['name', 'type', 'description', 'isActive', 'rowActions'];
+    const defaultVisibleColumns = ['name', 'versionNumber', 'systemPrompt', 'userPrompt', 'isActive', 'rowActions'];
     const dt = $('#AIPromptsTable');
 
     const dataTable = initializeDataTable({
@@ -132,7 +137,7 @@ $(function () {
     }
 
     function loadVersions(promptId) {
-        unity.aI.prompts.aIPromptVersion.getByPrompt(promptId).then(function (result) {
+        unity.aI.prompts.aIPrompt.getByPrompt(promptId).then(function (result) {
             cachedVersions = result.items || [];
             const $select  = $('#versionSelect');
             $select.empty();
@@ -166,7 +171,7 @@ $(function () {
             populateVersionForm(v);
         } else {
             // fallback: fetch from server
-            unity.aI.prompts.aIPromptVersion.get(id).then(populateVersionForm);
+            unity.aI.prompts.aIPrompt.get(id).then(populateVersionForm);
         }
     });
 
@@ -177,15 +182,9 @@ $(function () {
 
         $('#versionId').val(v.id);
         $('#versionNumber').val(v.versionNumber);
-        $('#versionTargetModel').val(v.targetModel ?? '');
-        $('#versionTargetProvider').val(v.targetProvider ?? '');
-        $('#versionTemperature').val(v.temperature ?? 0.2);
-        $('#versionMaxTokens').val(v.maxTokens ?? '');
-        $('#versionIsPublished').prop('checked', v.isPublished ?? false);
-        $('#versionIsDeprecated').prop('checked', v.isDeprecated ?? false);
         $('#versionSystemPrompt').val(v.systemPrompt ?? '').removeClass('is-invalid');
-        $('#versionUserPromptTemplate').val(v.userPromptTemplate ?? '').removeClass('is-invalid');
-        $('#versionDeveloperNotes').val(v.developerNotes ?? '');
+        $('#versionUserPrompt').val(v.userPrompt ?? '').removeClass('is-invalid');
+        $('#versionIsActive').prop('checked', v.isActive ?? true);
 
         // Pretty-print MetadataJson if valid
         let meta = v.metadataJson ?? '';
@@ -204,15 +203,9 @@ $(function () {
         currentVersionId = null;
 
         $('#versionId').val('');
-        $('#versionTargetModel').val('');
-        $('#versionTargetProvider').val('');
-        $('#versionTemperature').val(0.2);
-        $('#versionMaxTokens').val('');
-        $('#versionIsPublished').prop('checked', false);
-        $('#versionIsDeprecated').prop('checked', false);
         $('#versionSystemPrompt').val('');
-        $('#versionUserPromptTemplate').val('');
-        $('#versionDeveloperNotes').val('');
+        $('#versionUserPrompt').val('');
+        $('#versionIsActive').prop('checked', true);
         $('#versionMetadataJson').val('');
 
         clearJsonError();
@@ -239,8 +232,8 @@ $(function () {
         if (!promptId) return;
 
         // Required-field validation
-        const systemPrompt       = $('#versionSystemPrompt').val().trim();
-        const userPromptTemplate = $('#versionUserPromptTemplate').val().trim();
+        const systemPrompt = $('#versionSystemPrompt').val().trim();
+        const userPrompt   = $('#versionUserPrompt').val().trim();
         let valid = true;
         if (systemPrompt) {
             $('#versionSystemPrompt').removeClass('is-invalid');
@@ -248,14 +241,14 @@ $(function () {
             $('#versionSystemPrompt').addClass('is-invalid');
             valid = false;
         }
-        if (userPromptTemplate) {
-            $('#versionUserPromptTemplate').removeClass('is-invalid');
+        if (userPrompt) {
+            $('#versionUserPrompt').removeClass('is-invalid');
         } else {
-            $('#versionUserPromptTemplate').addClass('is-invalid');
+            $('#versionUserPrompt').addClass('is-invalid');
             valid = false;
         }
         if (!valid) {
-            $('#versionSystemPrompt.is-invalid, #versionUserPromptTemplate.is-invalid')[0]?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+            $('#versionSystemPrompt.is-invalid, #versionUserPrompt.is-invalid')[0]?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
             return;
         }
 
@@ -263,25 +256,19 @@ $(function () {
         if (metaRaw && !validateJson(metaRaw)) return;
 
         const dto = {
-            promptId:            promptId,
-            versionNumber:       Number.parseInt($('#versionNumber').val()) || 0,
-            systemPrompt:        systemPrompt,
-            userPromptTemplate:  userPromptTemplate,
-            developerNotes:      $('#versionDeveloperNotes').val() || null,
-            targetModel:         $('#versionTargetModel').val() || null,
-            targetProvider:      $('#versionTargetProvider').val() || null,
-            temperature:         Number.parseFloat($('#versionTemperature').val()) || 0.2,
-            maxTokens:           $('#versionMaxTokens').val() ? Number.parseInt($('#versionMaxTokens').val()) : null,
-            isPublished:         $('#versionIsPublished').is(':checked'),
-            isDeprecated:        $('#versionIsDeprecated').is(':checked'),
-            metadataJson:        metaRaw || null
+            promptId:     promptId,
+            versionNumber: Number.parseInt($('#versionNumber').val()) || 0,
+            systemPrompt:  systemPrompt,
+            userPrompt:    userPrompt,
+            metadataJson:  metaRaw || null,
+            isActive:      $('#versionIsActive').is(':checked')
         };
 
         if (isNewVersion) {
             const newOpt = $('#versionSelect option[data-new]');
             dto.versionNumber = newOpt.length ? Number.parseInt(newOpt.data('num')) : 0;
 
-            unity.aI.prompts.aIPromptVersion.create(dto)
+            unity.aI.prompts.aIPrompt.create(dto)
                 .then(function () {
                     abp.notify.success('Version created');
                     loadVersions(promptId);
@@ -290,7 +277,7 @@ $(function () {
                     abp.notify.error(err?.message || 'Failed to create version');
                 });
         } else {
-            unity.aI.prompts.aIPromptVersion.update(currentVersionId, dto)
+            unity.aI.prompts.aIPrompt.update(currentVersionId, dto)
                 .then(function () {
                     abp.notify.success('Version saved');
                     loadVersions(promptId);
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml.cs
deleted file mode 100644
index ba49f50d0a..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
-using Unity.AI.Prompts;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-
-namespace Unity.AI.Web.Pages.Prompts.Versions;
-
-public class CreateVersionModalModel : AbpPageModel
-{
-    [BindProperty]
-    public CreateUpdateAIPromptVersionDto Version { get; set; } = new();
-
-    private readonly IAIPromptVersionAppService _versionAppService;
-
-    public CreateVersionModalModel(IAIPromptVersionAppService versionAppService)
-    {
-        _versionAppService = versionAppService;
-    }
-
-    public void OnGet(Guid promptId)
-    {
-        Version = new CreateUpdateAIPromptVersionDto
-        {
-            PromptId = promptId,
-            Temperature = 0.2
-        };
-    }
-
-    public async Task<IActionResult> OnPostAsync()
-    {
-        await _versionAppService.CreateAsync(Version);
-        return NoContent();
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml.cs
deleted file mode 100644
index 40390dd976..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
-using Unity.AI.Prompts;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-
-namespace Unity.AI.Web.Pages.Prompts.Versions;
-
-public class EditVersionModalModel : AbpPageModel
-{
-    [HiddenInput]
-    [BindProperty(SupportsGet = true)]
-    public Guid Id { get; set; }
-
-    [BindProperty]
-    public CreateUpdateAIPromptVersionDto Version { get; set; } = new();
-
-    private readonly IAIPromptVersionAppService _versionAppService;
-
-    public EditVersionModalModel(IAIPromptVersionAppService versionAppService)
-    {
-        _versionAppService = versionAppService;
-    }
-
-    public async Task OnGetAsync()
-    {
-        var dto = await _versionAppService.GetAsync(Id);
-        Version = new CreateUpdateAIPromptVersionDto
-        {
-            PromptId = dto.PromptId,
-            VersionNumber = dto.VersionNumber,
-            SystemPrompt = dto.SystemPrompt,
-            UserPromptTemplate = dto.UserPromptTemplate,
-            DeveloperNotes = dto.DeveloperNotes,
-            TargetModel = dto.TargetModel,
-            TargetProvider = dto.TargetProvider,
-            Temperature = dto.Temperature,
-            MaxTokens = dto.MaxTokens,
-            IsPublished = dto.IsPublished,
-            IsDeprecated = dto.IsDeprecated,
-            MetadataJson = dto.MetadataJson
-        };
-    }
-
-    public async Task<IActionResult> OnPostAsync()
-    {
-        await _versionAppService.UpdateAsync(Id, Version);
-        return NoContent();
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/IScoresheetAppService.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/IScoresheetAppService.cs
index 5faabc4abe..1d7c9b6e20 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/IScoresheetAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/IScoresheetAppService.cs
@@ -22,6 +22,7 @@ public interface IScoresheetAppService : IApplicationService
         Task<List<QuestionDto>> GetSelectListQuestionsAsync(List<Guid> questionIdsToCheck);
         Task ValidateChangeableScoresheet(Guid scoresheetId);
         Task PublishScoresheetAsync(Guid id);
+        Task<bool> ArchiveAsync(Guid id, bool archive);
         Task<ExportScoresheetDto> ExportScoresheet(Guid scoresheetId);
         Task ImportScoresheetAsync(ScoresheetImportDto scoresheetImportDto);
         Task SaveScoresheetOrder(List<Guid> scoresheetIds);
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/ScoresheetDto.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/ScoresheetDto.cs
index 15f36c75db..ff455aa482 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/ScoresheetDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/ScoresheetDto.cs
@@ -10,6 +10,7 @@ public class ScoresheetDto : ExtensibleFullAuditedEntityDto<Guid>
         public string Name { get; set; } = string.Empty;
         public uint Version { get; set; }
         public bool Published { get; set; }
+        public bool IsArchived { get; set; }
         public Collection<ScoresheetSectionDto> Sections { get; private set; } = [];
 
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/WorksheetInstances/IWorksheetInstanceAppService.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/WorksheetInstances/IWorksheetInstanceAppService.cs
index c19a67de98..0463a2d8ff 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/WorksheetInstances/IWorksheetInstanceAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/WorksheetInstances/IWorksheetInstanceAppService.cs
@@ -1,5 +1,7 @@
-using System.Threading.Tasks;
-using System;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 
 namespace Unity.Flex.WorksheetInstances
@@ -9,5 +11,10 @@ public interface IWorksheetInstanceAppService : IApplicationService
         Task<WorksheetInstanceDto> GetByCorrelationAnchorAsync(Guid correlationId, string correlationProvider, Guid worksheetId, string uiAnchor);
         Task<WorksheetInstanceDto> CreateAsync(CreateWorksheetInstanceDto dto);
         Task UpdateAsync(PersistWorksheetIntanceValuesDto dto);
+        Task<List<WorksheetInstanceDataDto>> GetListByCorrelationIdsAsync(List<Guid> correlationIds, string correlationProvider);
+        Task<List<Guid>> GetDistinctWorksheetIdsByCorrelationProviderAsync(string correlationProvider);
+        Task<List<Guid>> GetDistinctWorksheetIdsByCorrelationIdsAsync(List<Guid> correlationIds, string correlationProvider);
+        Task<PagedResultDto<WorksheetInstanceDataDto>> GetPagedListByCorrelationProviderAsync(string correlationProvider, int skipCount, int maxResultCount);
+        Task<WorksheetInstanceDataDto?> GetDataByIdAsync(Guid id);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/WorksheetInstances/WorksheetInstanceDataDto.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/WorksheetInstances/WorksheetInstanceDataDto.cs
new file mode 100644
index 0000000000..4255e6135d
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/WorksheetInstances/WorksheetInstanceDataDto.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Unity.Flex.WorksheetInstances
+{
+    public class WorksheetInstanceDataDto
+    {
+        public Guid Id { get; set; }
+        public Guid CorrelationId { get; set; }
+        public Guid WorksheetId { get; set; }
+        public string CurrentValue { get; set; } = "{}";
+        public DateTime CreationTime { get; set; }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/Scoresheets/Scoresheet.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/Scoresheets/Scoresheet.cs
index 73c693b271..f271ad0aef 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/Scoresheets/Scoresheet.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/Scoresheets/Scoresheet.cs
@@ -17,6 +17,7 @@ public class Scoresheet : FullAuditedAggregateRoot<Guid>, IMultiTenant, IReporta
         public virtual uint Version { get; set; } = 1;
         public virtual uint Order { get; set; } = 0;
         public virtual bool Published { get; set; } = false;
+        public virtual bool IsArchived { get; private set; } = false;
         public Guid? TenantId { get; set; }
 
         // For reporting purposes
@@ -88,6 +89,12 @@ public Scoresheet IncreaseVersion()
             return this;
         }
 
+        public Scoresheet SetArchived(bool archived)
+        {
+            IsArchived = archived;
+            return this;
+        }
+
         public Scoresheet SetName(string name)
         {
             this.Name = name;
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/IWorksheetInstanceRepository.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/IWorksheetInstanceRepository.cs
index 4201df50ed..f6399f2f1a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/IWorksheetInstanceRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/IWorksheetInstanceRepository.cs
@@ -12,5 +12,10 @@ public interface IWorksheetInstanceRepository : IBasicRepository<WorksheetInstan
         Task<WorksheetInstance?> GetWithValuesAsync(Guid worksheetInstanceId);
         Task<bool> ExistsAsync(Guid worksheetId, Guid instanceCorrelationId, string instanceCorrelationProvider, Guid sheetCorrelationId, string sheetCorrelationProvider, string? uiAnchor);
         Task<bool> AnyByWorksheetAndFormVersionAsync(Guid worksheetId, Guid formVersionId);
+        Task<List<WorksheetInstance>> GetByCorrelationIdsAsync(IEnumerable<Guid> correlationIds, string correlationProvider);
+        Task<List<Guid>> GetDistinctWorksheetIdsByCorrelationProviderAsync(string correlationProvider);
+        Task<List<Guid>> GetDistinctWorksheetIdsByCorrelationIdsAsync(IEnumerable<Guid> correlationIds, string correlationProvider);
+        Task<List<WorksheetInstance>> GetPagedListByCorrelationProviderAsync(string correlationProvider, int skipCount, int maxResultCount);
+        Task<int> GetCountByCorrelationProviderAsync(string correlationProvider);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetInstanceRepository.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetInstanceRepository.cs
index 71edcca8b6..60fdfb448f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetInstanceRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetInstanceRepository.cs
@@ -76,5 +76,52 @@ public async Task<bool> AnyByWorksheetAndFormVersionAsync(Guid worksheetId, Guid
                 && s.WorksheetCorrelationId == formVersionId
                 && s.WorksheetCorrelationProvider == CorrelationConsts.FormVersion);
         }
+
+        public async Task<List<WorksheetInstance>> GetByCorrelationIdsAsync(IEnumerable<Guid> correlationIds, string correlationProvider)
+        {
+            var dbSet = await GetDbSetAsync();
+            var ids = correlationIds.ToList();
+            return await dbSet
+                .Where(wi => ids.Contains(wi.CorrelationId) && wi.CorrelationProvider == correlationProvider)
+                .ToListAsync();
+        }
+
+        public async Task<List<Guid>> GetDistinctWorksheetIdsByCorrelationProviderAsync(string correlationProvider)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet
+                .Where(wi => wi.CorrelationProvider == correlationProvider)
+                .Select(wi => wi.WorksheetId)
+                .Distinct()
+                .ToListAsync();
+        }
+
+        public async Task<List<Guid>> GetDistinctWorksheetIdsByCorrelationIdsAsync(IEnumerable<Guid> correlationIds, string correlationProvider)
+        {
+            var dbSet = await GetDbSetAsync();
+            var ids = correlationIds.ToList();
+            return await dbSet
+                .Where(wi => ids.Contains(wi.CorrelationId) && wi.CorrelationProvider == correlationProvider)
+                .Select(wi => wi.WorksheetId)
+                .Distinct()
+                .ToListAsync();
+        }
+
+        public async Task<List<WorksheetInstance>> GetPagedListByCorrelationProviderAsync(string correlationProvider, int skipCount, int maxResultCount)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet
+                .Where(wi => wi.CorrelationProvider == correlationProvider)
+                .OrderByDescending(wi => wi.CreationTime)
+                .Skip(skipCount)
+                .Take(maxResultCount)
+                .ToListAsync();
+        }
+
+        public async Task<int> GetCountByCorrelationProviderAsync(string correlationProvider)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet.CountAsync(wi => wi.CorrelationProvider == correlationProvider);
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Scoresheets/ScoresheetAppService.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Scoresheets/ScoresheetAppService.cs
index da85afbcf9..2f166258d7 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Scoresheets/ScoresheetAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Scoresheets/ScoresheetAppService.cs
@@ -195,6 +195,18 @@ public async Task ValidateChangeableScoresheet(Guid scoresheetId)
             {
                 throw new UserFriendlyException("Cannot change scoresheet.  Scoresheet is already published.");
             }
+            if (scoresheet.IsArchived)
+            {
+                throw new UserFriendlyException("Cannot change scoresheet.  Scoresheet is archived.");
+            }
+        }
+
+        public virtual async Task<bool> ArchiveAsync(Guid id, bool archive)
+        {
+            var scoresheet = await scoresheetRepository.GetAsync(id);
+            scoresheet.SetArchived(archive);
+            await scoresheetRepository.UpdateAsync(scoresheet);
+            return true;
         }
 
         public async Task PublishScoresheetAsync(Guid id)
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetInstanceAppService.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetInstanceAppService.cs
index da2c963a19..7c760c2560 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetInstanceAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetInstanceAppService.cs
@@ -1,8 +1,12 @@
-using System.Threading.Tasks;
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Unity.Flex.Domain.WorksheetInstances;
 using Unity.Flex.Domain.Services;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
 
 namespace Unity.Flex.WorksheetInstances
 {
@@ -29,5 +33,60 @@ public virtual async Task UpdateAsync(PersistWorksheetIntanceValuesDto dto)
         {
             await worksheetsManager.PersistWorksheetData(ObjectMapper.Map<PersistWorksheetIntanceValuesDto, PersistWorksheetIntanceValuesEto>(dto));
         }
+
+        [RemoteService(false)]
+        public virtual async Task<List<WorksheetInstanceDataDto>> GetListByCorrelationIdsAsync(List<Guid> correlationIds, string correlationProvider)
+        {
+            var instances = await worksheetInstanceRepository.GetByCorrelationIdsAsync(correlationIds, correlationProvider);
+            return instances.Select(wi => new WorksheetInstanceDataDto
+            {
+                CorrelationId = wi.CorrelationId,
+                WorksheetId = wi.WorksheetId,
+                CurrentValue = wi.CurrentValue
+            }).ToList();
+        }
+
+        [RemoteService(false)]
+        public virtual async Task<List<Guid>> GetDistinctWorksheetIdsByCorrelationProviderAsync(string correlationProvider)
+        {
+            return await worksheetInstanceRepository.GetDistinctWorksheetIdsByCorrelationProviderAsync(correlationProvider);
+        }
+
+        [RemoteService(false)]
+        public virtual async Task<List<Guid>> GetDistinctWorksheetIdsByCorrelationIdsAsync(List<Guid> correlationIds, string correlationProvider)
+        {
+            return await worksheetInstanceRepository.GetDistinctWorksheetIdsByCorrelationIdsAsync(correlationIds, correlationProvider);
+        }
+
+        [RemoteService(false)]
+        public virtual async Task<PagedResultDto<WorksheetInstanceDataDto>> GetPagedListByCorrelationProviderAsync(string correlationProvider, int skipCount, int maxResultCount)
+        {
+            var totalCount = await worksheetInstanceRepository.GetCountByCorrelationProviderAsync(correlationProvider);
+            var instances = await worksheetInstanceRepository.GetPagedListByCorrelationProviderAsync(correlationProvider, skipCount, maxResultCount);
+            var items = instances.Select(wi => new WorksheetInstanceDataDto
+            {
+                Id = wi.Id,
+                CorrelationId = wi.CorrelationId,
+                WorksheetId = wi.WorksheetId,
+                CurrentValue = wi.CurrentValue,
+                CreationTime = wi.CreationTime
+            }).ToList();
+            return new PagedResultDto<WorksheetInstanceDataDto>(totalCount, items);
+        }
+
+        [RemoteService(false)]
+        public virtual async Task<WorksheetInstanceDataDto?> GetDataByIdAsync(Guid id)
+        {
+            var wi = await worksheetInstanceRepository.FindAsync(id);
+            if (wi == null) return null;
+            return new WorksheetInstanceDataDto
+            {
+                Id = wi.Id,
+                CorrelationId = wi.CorrelationId,
+                WorksheetId = wi.WorksheetId,
+                CurrentValue = wi.CurrentValue,
+                CreationTime = wi.CreationTime
+            };
+        }
     }
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/Localization/Flex/en.json b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/Localization/Flex/en.json
index eb026f2630..abec19b96e 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/Localization/Flex/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/Localization/Flex/en.json
@@ -16,6 +16,16 @@
     "Scoresheet:Configuration:CloneScoresheetButtonText": "CLONE",
     "Scoresheet:Configuration:PublishScoresheetButtonText": "PUBLISH",
     "Scoresheet:Configuration:ExportScoresheetButtonText": "EXPORT",
+    "Scoresheet:Configuration:ArchiveScoresheetButtonText": "ARCHIVE",
+    "Scoresheet:Configuration:UnarchiveScoresheetButtonText": "UNARCHIVE",
+    "Scoresheet:Configuration:ArchiveModal.Message": "Archived scoresheets are hidden from the default view. You can find them using the Archived filter.",
+    "Scoresheet:Configuration:UnarchiveModal.Message": "Unarchived scoresheets are shown in the default view. You can find them using the All filter.",
+    "Scoresheet:Configuration:ArchivedSuccess": "Scoresheet has been archived.",
+    "Scoresheet:Configuration:UnarchivedSuccess": "Scoresheet has been unarchived.",
+    "Scoresheet:Configuration:ArchiveFailed": "Failed to archive the scoresheet.",
+    "Scoresheet:Configuration:UnarchiveFailed": "Failed to unarchive the scoresheet.",
+    "Scoresheet:Configuration:ArchiveModal.Confirm": "Confirm",
+    "Scoresheet:Configuration:ArchiveModal.Cancel": "Cancel",
     "Scoresheet:Configuration:SaveChangesButtonText": "SAVE CHANGES",
     "Scoresheet:Configuration:DiscardChangesButtonText": "DISCARD CHANGES",
     "Worksheet:Configuration:SaveChangesButtonText": "SAVE CHANGES",
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/DataGridWriteService.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/DataGridWriteService.cs
index 6a1440df97..7489f231e2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/DataGridWriteService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/DataGridWriteService.cs
@@ -279,6 +279,22 @@ internal async Task<WriteDataRowResponse> UpdateRowAsync(RowInputData rowInputDa
             };
         }
 
+        internal async Task DeleteRowAsync(Guid valueId, uint row, Guid worksheetInstanceId)
+        {
+            var currentValue = await customFieldValueAppService.GetAsync(valueId);
+            var dataGridValue = DataGridServiceUtils.DeserializeDataGridValue(currentValue.CurrentValue);
+            if (dataGridValue == null) return;
+
+            var dataGridRowsValue = DataGridServiceUtils.DeserializeDataGridRowsValue(dataGridValue.Value?.ToString());
+            if (dataGridRowsValue == null || row >= (uint)dataGridRowsValue.Rows.Count) return;
+
+            dataGridRowsValue.Rows.RemoveAt((int)row);
+            dataGridValue.Value = dataGridRowsValue;
+
+            await customFieldValueAppService.ExplicitSetAsync(valueId, JsonSerializer.Serialize(dataGridValue));
+            await customFieldValueAppService.SyncWorksheetInstanceValueAsync(worksheetInstanceId);
+        }
+
         internal async Task<List<Tuple<string, string, CustomFieldType>>> GenerateKeyValueTypesAsync(Guid customFieldId, Dictionary<string, string>? keyValuePairs)
         {
             var result = new List<Tuple<string, string, CustomFieldType>>();
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/ScoresheetConfiguration/Index.js b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/ScoresheetConfiguration/Index.js
index b78866304a..681b5597f9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/ScoresheetConfiguration/Index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/ScoresheetConfiguration/Index.js
@@ -44,7 +44,7 @@ $(function () {
         });
     }
 
-    // --- Scoresheet name filter & published toggle ---
+    // --- Scoresheet name filter, published toggle, and archived toggle ---
     $(document).on('input', '#scoresheet-name-filter', applyScoresheetFilters);
 
     $(document).on('click', '#scoresheet-published-toggle button', function () {
@@ -53,6 +53,12 @@ $(function () {
         applyScoresheetFilters();
     });
 
+    $(document).on('click', '.archive-scoresheet-btn', function () {
+        const scoresheetId = $(this).data('scoresheet-id');
+        const isArchived = $(this).data('is-archived') === true || $(this).data('is-archived') === 'true';
+        handleArchiveScoresheet(scoresheetId, isArchived);
+    });
+
     applyScoresheetFilters();
 });
 
@@ -66,12 +72,17 @@ function applyScoresheetFilters() {
         const title = $item.find('.scoresheet-title').text().toLowerCase();
         const name = $item.find('.scoresheet-name').text().toLowerCase();
         const isPublished = !$item.find('.scoresheet-published-icon').hasClass('hidden');
+        const isArchived = $item.data('is-archived') === true || $item.data('is-archived') === 'true';
 
         const matchesText = !searchText || title.includes(searchText) || name.includes(searchText);
         const matchesFilter =
-            publishedFilter === 'all' ||
-            (publishedFilter === 'published' && isPublished) ||
-            (publishedFilter === 'unpublished' && !isPublished);
+            publishedFilter === 'archived'
+                ? isArchived
+                : !isArchived && (
+                    publishedFilter === 'all' ||
+                    (publishedFilter === 'published' && isPublished) ||
+                    (publishedFilter === 'unpublished' && !isPublished)
+                );
 
         const visible = matchesText && matchesFilter;
         $item.toggle(visible);
@@ -81,6 +92,40 @@ function applyScoresheetFilters() {
     $('#scoresheet-no-results').toggle(visibleCount === 0);
 }
 
+function handleArchiveScoresheet(scoresheetId, currentlyArchived) {
+    const l = abp.localization.getResource('Flex');
+    const label = currentlyArchived ? l('Scoresheet:Configuration:UnarchiveScoresheetButtonText') : l('Scoresheet:Configuration:ArchiveScoresheetButtonText');
+    const message = currentlyArchived
+        ? l('Scoresheet:Configuration:UnarchiveModal.Message')
+        : l('Scoresheet:Configuration:ArchiveModal.Message');
+
+    Swal.fire({
+        title: label + '?',
+        text: message,
+        showCancelButton: true,
+        confirmButtonText: l('Scoresheet:Configuration:ArchiveModal.Confirm'),
+        cancelButtonText: l('Scoresheet:Configuration:ArchiveModal.Cancel'),
+        customClass: {
+            confirmButton: 'btn btn-primary',
+            cancelButton: 'btn btn-secondary'
+        }
+    }).then((result) => {
+        if (result.isConfirmed) {
+            unity.flex.scoresheets.scoresheet.archive(scoresheetId, !currentlyArchived)
+                .done(function () {
+                    PubSub.publish('refresh_scoresheet_list', { scoresheetId: null });
+                    abp.notify.success(
+                        currentlyArchived ? l('Scoresheet:Configuration:UnarchivedSuccess') : l('Scoresheet:Configuration:ArchivedSuccess'),
+                        label
+                    );
+                })
+                .fail(function () {
+                    abp.notify.error(currentlyArchived ? l('Scoresheet:Configuration:UnarchiveFailed') : l('Scoresheet:Configuration:ArchiveFailed'));
+                });
+        }
+    });
+}
+
 function importScoresheetFile(inputId) {
     importFlexFile(inputId, "/api/app/scoresheet/import", "Scoresheet", 'refresh_scoresheet_list');
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
index 349cb06a44..1b9333d47f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Unity.Flex.Web.csproj
@@ -43,6 +43,10 @@
 		<ProjectReference Include="..\Unity.Flex.Application.Contracts\Unity.Flex.Application.Contracts.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<InternalsVisibleTo Include="Unity.Flex.Application.Tests" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<Content Update="Views\Shared\Components\RadioDefinitionWidget\Default.cshtml">
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.cshtml
index 3b7a384844..40e498b845 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.cshtml
@@ -22,8 +22,8 @@
                 @foreach (var option in Model.CheckboxOptions)
                 {
                     <tr>
-                        <td><input type="text" class="form-control key-input" name="CheckboxKeys" pattern="[a-zA-Z0-9 ]+" value="@option.Key" minlength="1" maxlength="25" required id="key-@option.Key" /></td>
-                        <td><input type="text" class="form-control" name="CheckboxLabels" value="@option.Label" maxlength="25" required id="label-@option.Key" /></td>
+                        <td><input type="text" class="form-control key-input" name="CheckboxKeys" pattern="[a-zA-Z0-9 ]+" value="@option.Key" minlength="1" maxlength="60" required id="key-@option.Key" /></td>
+                        <td><input type="text" class="form-control" name="CheckboxLabels" value="@option.Label" maxlength="100" required id="label-@option.Key" /></td>
                         <td>
                             <abp-button id="data-btn-@option.Key"
                                         class="delete-checkbox-option btn-danger"
@@ -45,8 +45,8 @@
         <th></th>
         </thead>
         <tr id="new-checkbox-row">
-            <td><input type="text" class="form-control" id="new-row-key" placeholder="Key" /></td>
-            <td><input type="text" class="form-control" id="new-row-label" placeholder="Label" /></td>
+            <td><input type="text" class="form-control" id="new-row-key" pattern="[a-zA-Z0-9 ]+" minlength="1" maxlength="60" placeholder="Key" /></td>
+            <td><input type="text" class="form-control" id="new-row-label" maxlength="100" placeholder="Label" /></td>
             <td class="new-row-actions">
                 <abp-button id="save-checkbox-option-btn" icon-type="Other" icon="fl fl-checkmark"
                             abp-tooltip="Confirm"
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.js b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.js
index 28245ca778..27f7801f58 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.js
@@ -22,11 +22,14 @@ $(function () {
                 let row = getNewInputRow(newRowControl);
 
                 if (!validateInputCharacters(newRowControl))
-                    return;                    
+                    return;
+
+                let sanitizedLabel = sanitizeInput(row.label);
+                let sanitizedKey = sanitizeInput(row.key);
 
                 // Add valid row to table
                 $('#checkbox-options-table').find('tbody')
-                    .append(getRowTemplate(row.key, row.label));
+                    .append(getCheckboxGroupRowTemplate(sanitizedKey, sanitizedLabel));
 
                 cancelAddRow();
 
@@ -37,13 +40,6 @@ $(function () {
         }
     }
 
-    function getRowTemplate(key, label) {
-        return `<tr><td><input type="text" class="form-control key-input" name="CheckboxKeys" value="${key}" minlength="1" maxlength="25" required id="new-chk-key-${key}" />
-        </td><td><input type="text" class="form-control" name="CheckboxLabels" value="${label}" maxlength="25" required id="new-chk-label-${key}" />
-        </td><td><button id="data-btn-${key}" class="delete-checkbox-option btn btn-danger" type="button" data-busy-text="Processing..." data-bs-toggle="tooltip" data-bs-placement="top" aria-label="Delete" data-bs-original-title="Delete">
-        <i class="fl fl-delete"></i></button></td></tr>`
-    }
-
     function bindCancelOption() {
         let cancel = $('#cancel-checkbox-option-btn');
         if (cancel) {
@@ -101,3 +97,11 @@ $(function () {
     );
 });
 
+function getCheckboxGroupRowTemplate(key, label) {
+    return `<tr>
+        <td><input type="text" class="form-control key-input" name="CheckboxKeys" value="${key}" minlength="1" maxlength="60" required pattern="[a-zA-Z0-9 ]+" id="new-chk-key-${key}" /></td>
+        <td><input type="text" class="form-control" name="CheckboxLabels" value="${label}" maxlength="100" required id="new-chk-label-${key}" /></td>
+        <td><button id="data-btn-${key}" class="delete-checkbox-option btn btn-danger" type="button" data-busy-text="Processing..." data-bs-toggle="tooltip" data-bs-placement="top" aria-label="Delete" data-bs-original-title="Delete"><i class="fl fl-delete"></i></button></td>
+    </tr>`;
+}
+
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/DataGridWidgetController.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/DataGridWidgetController.cs
index e128b73cdb..9b265278cf 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/DataGridWidgetController.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/DataGridWidgetController.cs
@@ -1,14 +1,22 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System;
+using System.Threading.Tasks;
+using Unity.Flex.Web.Pages.Flex;
 using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget.ViewModels;
+using Unity.Flex.Worksheets;
+using Unity.Flex.WorksheetInstances;
 using Volo.Abp.AspNetCore.Mvc;
 
 namespace Unity.Flex.Web.Views.Shared.Components.DataGridWidget
 {
     [ApiExplorerSettings(IgnoreApi = true)]
     [Route("Flex/Widgets/DataGrid")]
-    public class DataGridWidgetController : AbpController
+    public class DataGridWidgetController(
+        ICustomFieldAppService customFieldAppService,
+        ICustomFieldValueAppService customFieldValueAppService,
+        DataGridWriteService dataGridWriteService) : AbpController
     {
         [HttpGet]
         [Route("Refresh")]
@@ -33,5 +41,54 @@ public IActionResult Refresh(WorksheetFieldViewModel? fieldModel,
                 worksheetInstanceId
             });
         }
+
+        [Authorize]
+        [HttpPost]
+        [Route("DeleteRow")]
+        public async Task<IActionResult> DeleteRow(
+            Guid valueId,
+            uint row,
+            Guid worksheetInstanceId)
+        {
+            await dataGridWriteService.DeleteRowAsync(valueId, row, worksheetInstanceId);
+            return new OkObjectResult(new { row, worksheetInstanceId });
+        }
+
+        [Authorize]
+        [HttpGet]
+        [Route("RefreshByField")]
+        public async Task<IActionResult> RefreshByField(
+            Guid valueId,
+            Guid fieldId,
+            string modelName,
+            Guid worksheetId,
+            Guid worksheetInstanceId,
+            string uiAnchor)
+        {
+            var field = await customFieldAppService.GetAsync(fieldId);
+            var value = await customFieldValueAppService.GetAsync(valueId);
+
+            var fieldModel = new WorksheetFieldViewModel
+            {
+                Id = field.Id,
+                Name = field.Name,
+                Label = field.Label,
+                Type = field.Type,
+                Order = field.Order,
+                Enabled = field.Enabled,
+                Definition = field.Definition,
+                CurrentValue = value.CurrentValue,
+                CurrentValueId = valueId,
+                UiAnchor = uiAnchor
+            };
+
+            return ViewComponent(typeof(DataGridWidget), new
+            {
+                fieldModel,
+                modelName,
+                worksheetId,
+                worksheetInstanceId
+            });
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/Default.css b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/Default.css
index 856b7c5a22..99348aa925 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/Default.css
@@ -33,6 +33,17 @@
 .custom-grid-container {
     display: flex;
     flex-direction: column;
+    position: relative;
+}
+
+.grid-loading-overlay {
+    position: absolute;
+    inset: 0;
+    background: rgba(255, 255, 255, 0.75);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10;
 }
 
 .grid-position {
@@ -61,4 +72,31 @@
     color: #8a8886;
     margin-left: 4px;
     vertical-align: middle;
+}
+
+.custom-dynamic-table .dropdown {
+    display: inline-block;
+}
+
+.custom-dynamic-table .dropdown-content {
+    display: none;
+    position: fixed;
+    right: auto;
+    background-color: #f9f9f9;
+    min-width: 160px;
+    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+    z-index: 1039;
+    --bs-btn-active-color: var(--bc-colors-white-primary-500);
+    --bs-btn-active-bg: var(--bc-colors-blue-primary-500);
+}
+
+.custom-dynamic-table .dropdown:hover .dropdown-content {
+    display: block;
+}
+
+.custom-dynamic-table .dropdown-content .btn.fullWidth {
+    width: calc(100% - 16px);
+    display: block;
+    text-align: left;
+    margin: 10px 8px;
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/Default.js b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/Default.js
index 7fd001ce6c..ba2d1bcb57 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridWidget/Default.js
@@ -1,9 +1,61 @@
+function getDatagridActionsRowButtonTemplate(actions) {
+    if (actions.length === 0) return '';
+
+    if (actions.length === 1) {
+        if (actions.includes('EDIT'))
+            return '<input type="button" class="btn btn-edit row-edit-btn" value="Edit">';
+        if (actions.includes('DELETE'))
+            return '<input type="button" class="btn btn-delete row-delete-btn" value="Delete">';
+        return '';
+    }
+
+    let items = '';
+    if (actions.includes('EDIT'))
+        items += '<button type="button" class="btn fullWidth row-edit-btn"><i class="fl fl-edit"></i><span>Edit</span></button>';
+    if (actions.includes('DELETE'))
+        items += '<button type="button" class="btn fullWidth row-delete-btn"><i class="fl fl-cancel"></i><span>Delete</span></button>';
+
+    return `<div class="dropdown" style="float:right;">` +
+               `<button type="button" class="btn btn-light dropbtn"><i class="fl fl-attachment-more"></i></button>` +
+               `<div class="dropdown-content">${items}</div>` +
+           `</div>`;
+}
+
+// Function to set data attributes on the row
+function setRowDataAttributes(row, rowIndex) {
+    row.attr('data-row-no', rowIndex);
+}
+
+// Function to format currency as CAD
+function formatDatagridCurrency(value) {
+    return new Intl.NumberFormat('en-CA',
+        { style: 'currency', currency: 'CAD', minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(value);
+}
+
+// Function to check if a value is numeric
+function isDatagridCellNumeric(value) {
+    return Number.isFinite(Number.parseFloat(value));
+}
+
+// Function to calculate sum for a specific column
+function calculateDatagridColumnSum(table, columnIndex) {
+    let total = 0;
+    table.column(columnIndex).data().each(function (value) {
+        // Remove currency symbols and commas for numeric check
+        let cleanedValue = value.replace(/[^\d.-]/g, '');
+        if (isDatagridCellNumeric(cleanedValue)) {
+            total += Number.parseFloat(cleanedValue);
+        }
+    });
+    return total;
+}
+
 $(function () {
     const UIElements = {
         tables: $('.custom-dynamic-table'),
         tableSearches: $('.custom-tbl-search')
     };
-
+    
     let editDatagridRowModal = new abp.ModalManager({
         viewUrl: '../Components/DataGrid/EditDataRowModal'
     });
@@ -19,23 +71,13 @@ $(function () {
         // Refresh any update table level attributes
         resetTableAttributes($(newRowNode), response);
 
-        // Create the edit button HTML and append it to the last cell of the new row
-        $(newRowNode).find('td:last').html(getEditRowButtonTemplate());
-
-        // Attach click event handler to the newly added button 
-        $(newRowNode).find('.row-edit-btn').on('click', function () {
-            let button = this; // `this` refers to the button element 
-            editDataRow(button);
-        });
+        // Configure action buttons on the last cell of the new row
+        let fieldId = $(newRowNode).closest('table')[0].id;
+        configureActionButtonsForCell($(newRowNode).find('td:last')[0], getTableActions(fieldId));
 
         abp.notify.success('Row added successfully.', 'New Row');
     }
 
-    // Function to set data attributes on the row
-    function setRowDataAttributes(row, rowIndex) {
-        row.attr('data-row-no', rowIndex);
-    }
-
     // Function to reset the table level attributes
     function resetTableAttributes(row, response) {
         let table = row.closest('table');
@@ -62,10 +104,10 @@ $(function () {
     function updateRow(table, dataToUpdate, rowIndex) {
         $.each(dataToUpdate, function (columnName, newValue) {
             let columnIndex = getColumnIndex(table, columnName);
-            if (columnIndex !== -1) {
-                table.cell(rowIndex, columnIndex).data(newValue);
-            } else {
+            if (columnIndex === -1) {
                 console.warn('Column not found:', columnName);
+            } else {
+                table.cell(rowIndex, columnIndex).data(newValue);
             }
         });
 
@@ -105,18 +147,6 @@ $(function () {
         handleEditDatagridRowModalResult(response);
     });
 
-    // Function to calculate sum for a specific column
-    function calculateColumnSum(table, columnIndex) {
-        let total = 0;
-        table.column(columnIndex).data().each(function (value) {
-            // Remove currency symbols and commas for numeric check
-            let cleanedValue = value.replace(/[^\d.-]/g, '');
-            if (isNumeric(cleanedValue)) {
-                total += parseFloat(cleanedValue);
-            }
-        });
-        return total;
-    }
 
     // Function to update totals
     function updateTotals(table, fieldId) {
@@ -129,11 +159,11 @@ $(function () {
             let columnIndex = getColumnIndex(table, key);
             
             if (columnIndex !== -1) {
-                let total = calculateColumnSum(table, columnIndex);
+                let total = calculateDatagridColumnSum(table, columnIndex);
                 
                 // Update the input field with the calculated total
                 if ($(this).data('field-type') === 'Currency') {
-                    $(this).val(formatCurrency(total));
+                    $(this).val(formatDatagridCurrency(total));
                 } else {
                     $(this).val(total);
                 }
@@ -141,17 +171,6 @@ $(function () {
         });
     }
 
-    // Function to format currency as CAD 
-    function formatCurrency(value) {
-        return new Intl.NumberFormat('en-CA',
-            { style: 'currency', currency: 'CAD', minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(value);
-    }
-
-    // Function to check if a value is numeric
-    function isNumeric(value) {
-        return !isNaN(value) && isFinite(value);
-    }
-
     // Function to get the index of a column by its key
     function getColumnIndex(table, key) {
         let headers = table.columns().header().toArray();
@@ -274,28 +293,37 @@ $(function () {
     }
 
     function configureButtons(fieldId) {
-        let options = ($(`#table-options-${fieldId}`).val()).split(',');
+        let options = new Set(($(`#table-options-${fieldId}`).val()).split(','));
         // Always include ColumnVisibility button regardless of options
-        let availableOptions = actionButtons.filter(item => options.includes(item.id) || item.id === 'ColumnVisibility');
+        let availableOptions = actionButtons.filter(item => options.has(item.id) || item.id === 'ColumnVisibility');
         return availableOptions;
     }
 
+    function getTableActions(fieldId) {
+        let options = new Set(($(`#table-options-${fieldId}`).val()).split(','));
+        let actions = ['EDIT'];
+        if (options.has('AddRecord')) actions.push('DELETE');
+        return actions;
+    }
+
     // Function to configure action buttons for a table cell
-    function configureActionButtonForCell(cell) {
-        cell.innerHTML = getEditRowButtonTemplate(); // Add edit button to each cell
+    function configureActionButtonsForCell(cell, actions) {
+        cell.innerHTML = getDatagridActionsRowButtonTemplate(actions);
 
-        // Attach click event handler to the newly added button 
         $(cell).find('.row-edit-btn').on('click', function () {
-            let button = this; // `this` refers to the button element 
-            editDataRow(button);
+            editDataRow(this);
+        });
+
+        $(cell).find('.row-delete-btn').on('click', function () {
+            deleteDataRow(this);
         });
     }
 
     // Function to setup the actions column
-    function setupActionsColumn(table, columnIndex) {
-        table.column(columnIndex).header().innerHTML = 'Actions'; // Update column header if needed
+    function setupActionsColumn(table, columnIndex, actions) {
+        table.column(columnIndex).header().innerHTML = 'Actions';
         table.column(columnIndex).nodes().each(function (cell) {
-            configureActionButtonForCell(cell);
+            configureActionButtonsForCell(cell, actions);
         });
     }
 
@@ -303,18 +331,15 @@ $(function () {
         // Move buttons to custom container
         table.buttons().container().prependTo(`#btn-container-${fieldId}`);
 
-        // Add edit buttons to the last column (Actions)
+        let actions = getTableActions(fieldId);
+
         table.columns().every(function (index) {
-            if (index === table.columns().count() - 1) { // Check if it is the last column
-                setupActionsColumn(table, index);
+            if (index === table.columns().count() - 1) {
+                setupActionsColumn(table, index, actions);
             }
         });
     }
 
-    function getEditRowButtonTemplate() {
-        return '<input type="button" class="btn btn-edit row-edit-btn" value="Edit"></input>';
-    }
-
     function editDataRow(button) {
         // Get the parent <tr> element of the button
         let row = $(button).closest('tr');
@@ -336,6 +361,75 @@ $(function () {
         });
     }
 
+    function refreshGridAfterDelete(fieldId, tableDataSet, container) {
+        $.ajax({
+            url: abp.appPath + 'Flex/Widgets/DataGrid/RefreshByField',
+            type: 'GET',
+            data: {
+                valueId: tableDataSet.valueId,
+                fieldId: fieldId,
+                modelName: fieldId,
+                worksheetId: tableDataSet.wsId,
+                worksheetInstanceId: tableDataSet.wsiId,
+                uiAnchor: tableDataSet.wsAnchor
+            },
+            success: function (html) {
+                $('#' + fieldId).DataTable().destroy();
+                $('#table-options-' + fieldId).parent().html(html);
+                buildDataTables($('#' + fieldId));
+                abp.notify.success('Row deleted successfully.', 'Delete Row');
+            },
+            error: function () {
+                container.find('.grid-loading-overlay').remove();
+                abp.notify.error('Failed to refresh the grid.', 'Delete Row');
+            }
+        });
+    }
+
+    function deleteDataRow(button) {
+        let row = $(button).closest('tr');
+        let rowDataSet = row[0].dataset;
+        let table = $(button).closest('table');
+        let tableDataSet = table[0].dataset;
+        let fieldId = tableDataSet.fieldId;
+        let container = table.closest('.custom-grid-container');
+
+        abp.message.confirm(
+            'Are you sure you want to delete this row?',
+            'Delete Row',
+            function (confirmed) {
+                if (!confirmed) return;
+
+                container.append('<div class="grid-loading-overlay"><div class="spinner-border text-primary" role="status"><span class="visually-hidden">Loading...</span></div></div>');
+
+                $.ajax({
+                    url: abp.appPath + 'Flex/Widgets/DataGrid/DeleteRow',
+                    type: 'POST',
+                    data: {
+                        valueId: tableDataSet.valueId,
+                        row: rowDataSet.rowNo,
+                        worksheetInstanceId: tableDataSet.wsiId,
+                    },
+                    success: function () {
+                        refreshGridAfterDelete(fieldId, tableDataSet, container);
+                    },
+                    error: function () {
+                        container.find('.grid-loading-overlay').remove();
+                        abp.notify.error('Failed to delete the row.', 'Delete Row');
+                    }
+                });
+            }
+        );
+    }
+
+    $(document).on('mouseenter', '.custom-dynamic-table .dropdown', function () {
+        let rect = this.getBoundingClientRect();
+        $(this).find('.dropdown-content').css({
+            top: rect.bottom + 'px',
+            left: rect.left + 'px'
+        });
+    });
+
     PubSub.subscribe(
         'worksheet_preview_datagrid_refresh',
         () => {
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/RadioDefinitionWidget/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/RadioDefinitionWidget/Default.cshtml
index 1f5295287b..18c5eed1da 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/RadioDefinitionWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/RadioDefinitionWidget/Default.cshtml
@@ -12,7 +12,7 @@
             {
                 <div class="option-container" id="option@(Model.Options.IndexOf(option) + 1)Container">
                     <input type="radio" name="radio_input" />
-                    <input type="text" id="option@(Model.Options.IndexOf(option) + 1)" name="Options" class="form-control" value="@option" />
+                    <input type="text" id="option@(Model.Options.IndexOf(option) + 1)" name="Options" class="form-control" value="@option" minlength="1" maxlength="60" />
                     <button type="button" class="btn btn-danger btn-sm remove-option-btn" data-option-id="option@(Model.Options.IndexOf(option) + 1)Container">Delete Option</button>
                 </div>
             }
@@ -57,7 +57,7 @@
             newOption.id = optionId;
             newOption.innerHTML = `
                             <input type="radio" name="radio_input" />
-                            <input type="text" id="option${optionCount}" name="Options" class="form-control" />
+                            <input type="text" id="option${optionCount}" name="Options" class="form-control" minlength="1" maxlength="60" />
                             <button type="button" class="btn btn-danger btn-sm remove-option-btn" data-option-id="${optionId}">Delete Option</button>`;
             document.getElementById("radioOptions").appendChild(newOption);
         });
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Default.cshtml
index 6a8f2148b4..852d0e2e64 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Default.cshtml
@@ -1,6 +1,5 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Unity.Flex.Localization;
-@using Unity.Flex.Web.Views.Shared.Components.Scoresheet;
 @using Volo.Abp.Authorization.Permissions;
 @inject IHtmlLocalizer<FlexResource> L
 @inject IPermissionChecker PermissionChecker
@@ -17,7 +16,7 @@
     {
         var totalQuestions = scoresheet.Sections.SelectMany(sec => sec.Fields).Count();
         var totalSections = scoresheet.Sections.Count;
-        <div class="accordion-item">
+        <div class="accordion-item @(scoresheet.IsArchived ? "scoresheet-archived" : "")" data-is-archived="@scoresheet.IsArchived.ToString().ToLower()">
             <div class="accordion-header scoresheet-header" id="heading-@scoresheet.Id">
                 <div class="d-flex w-100 align-items-center">
                     <button class="accordion-button collapsed flex-grow-1 scoresheet-accordion-button" id="accordion-button-@scoresheet.Id" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-@scoresheet.Id" aria-expanded="false" aria-controls="collapse-@scoresheet.Id">
@@ -43,21 +42,33 @@
             <div id="collapse-@scoresheet.Id" class="accordion-collapse collapse" data-scoresheet="@scoresheet.Id" aria-labelledby="heading-@scoresheet.Id" data-bs-parent="#scoresheet-accordion">
                 <div class="accordion-body">
                     <div class="button-container">
-                        <button id="edit_scoresheet_btn" onclick="openScoresheetModal('@scoresheet.Id','Edit Scoresheet');" class="btn btn-light" type="button">
-                            <i class="fl fl-edit"></i> <span>@L["Scoresheet:Configuration:EditScoresheetButtonText"].Value</span>
-                        </button>
-                        <button id="clone_scoresheet_btn" onclick="openCloneScoresheetModal('@scoresheet.Id');" class="btn btn-light" type="button">
-                            <i class="fl fl-copy"></i> <span>@L["Scoresheet:Configuration:CloneScoresheetButtonText"].Value</span>
-                        </button>
-                        @if (!@scoresheet.Published)
+                        @if (scoresheet.IsArchived)
                         {
-                            <button id="publish_scoresheet_btn" onclick="openPublishScoresheetModal('@scoresheet.Id');" class="btn btn-light" type="button">
-                                <i class="fl fl-upload"></i> <span>@L["Scoresheet:Configuration:PublishScoresheetButtonText"].Value</span>
+                            <button data-scoresheet-id="@scoresheet.Id" data-is-archived="true" class="btn btn-light archive-scoresheet-btn" type="button">
+                                <i class="fl fl-open-folder"></i> <span>@L["Scoresheet:Configuration:UnarchiveScoresheetButtonText"].Value</span>
+                            </button>
+                        }
+                        else
+                        {
+                            <button id="edit_scoresheet_btn" onclick="openScoresheetModal('@scoresheet.Id','Edit Scoresheet');" class="btn btn-light" type="button">
+                                <i class="fl fl-edit"></i> <span>@L["Scoresheet:Configuration:EditScoresheetButtonText"].Value</span>
+                            </button>
+                            <button id="clone_scoresheet_btn" onclick="openCloneScoresheetModal('@scoresheet.Id');" class="btn btn-light" type="button">
+                                <i class="fl fl-copy"></i> <span>@L["Scoresheet:Configuration:CloneScoresheetButtonText"].Value</span>
+                            </button>
+                            @if (!scoresheet.Published)
+                            {
+                                <button id="publish_scoresheet_btn" onclick="openPublishScoresheetModal('@scoresheet.Id');" class="btn btn-light" type="button">
+                                    <i class="fl fl-upload"></i> <span>@L["Scoresheet:Configuration:PublishScoresheetButtonText"].Value</span>
+                                </button>
+                            }
+                            <button id="export_scoresheet_btn" onclick="exportScoresheet('@scoresheet.Id','@scoresheet.Name','@scoresheet.Title');" class="btn btn-light" type="button">
+                                <i class="fl fl-export"></i> <span>@L["Scoresheet:Configuration:ExportScoresheetButtonText"].Value</span>
+                            </button>
+                            <button data-scoresheet-id="@scoresheet.Id" data-is-archived="false" class="btn btn-light archive-scoresheet-btn" type="button">
+                                <i class="fl fl-folder"></i> <span>@L["Scoresheet:Configuration:ArchiveScoresheetButtonText"].Value</span>
                             </button>
                         }
-                        <button id="export_scoresheet_btn" onclick="exportScoresheet('@scoresheet.Id','@scoresheet.Name','@scoresheet.Title');" class="btn btn-light" type="button">
-                            <i class="fl fl-export"></i> <span>@L["Scoresheet:Configuration:ExportScoresheetButtonText"].Value</span>
-                        </button>
                     </div>
                     <div id="sections-questions" class="list-group col" data-published="@scoresheet.Published" data-scoresheetid="@scoresheet.Id">
                         @foreach (var sec in scoresheet.Sections)
@@ -66,7 +77,7 @@
                                 <div class="col">
                                     <i class="fl fl-draggable"></i>
                                     <span class="p-2"><b>Section:</b> @sec.Name</span>
-                                    @if (!@scoresheet.Published)
+                                    @if (!scoresheet.Published && !scoresheet.IsArchived)
                                     {
                                         <button class="btn question-info-btn float-end" type="button" onclick="openSectionModal('@scoresheet.Id','@sec.Id','Edit Section');">
                                             <i class="fl fl-edit"></i>
@@ -87,14 +98,15 @@
                                         data-maxlength="@question.GetMaxLength()" 
                                         data-yesvalue="@question.GetYesValue()" 
                                         data-novalue="@question.GetNoValue()" 
-                                        data-questiondesc="@question.Description" 
+                                        data-questionlabel="@question.Label"
+                                        data-questiondesc="@question.Description"
                                         data-definition="@question.Definition"
                                         data-rows="@question.GetRowsValue()"
                                         data-required="@question.GetIsRequiredValue()">
                                     <div class="col">
                                         <i class="fl fl-draggable"></i>
                                         <span class="p-2">@question.Label</span>
-                                        @if (!@scoresheet.Published)
+                                        @if (!scoresheet.Published && !scoresheet.IsArchived)
                                         {
                                             <button class="btn question-info-btn float-end" type="button" onclick="openQuestionModal('@scoresheet.Id','@sec.Id','@question.Id','Edit Question');">
                                                 <i class="fl fl-edit"></i>
@@ -106,7 +118,7 @@
                         }
                     </div>
                     <div class="row">
-                        @if (!@scoresheet.Published)
+                        @if (!scoresheet.Published && !scoresheet.IsArchived)
                         {
                             <div class="button-container">
                                 <button id="add_question_btn" onclick="openQuestionModal('@scoresheet.Id',null, null,'Add Question');" class="btn btn-light" type="button" disabled="@scoresheet.Sections.IsNullOrEmpty()">
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.css b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.css
index 616561b5a1..3b221db113 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.css
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.css
@@ -56,6 +56,7 @@
 }
 
 .question-item {
+    padding-left: 5rem;
     cursor: grab;
 }
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js
index 38a4ec7844..5c90f25eb6 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js
@@ -1,9 +1,72 @@
+const _SANITIZE_ALLOWED_TAGS = new Set([
+    'a', 'b', 'blockquote', 'br', 'code', 'del', 'em',
+    'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i',
+    'li', 'ol', 'p', 'pre', 's', 'span', 'strong', 'u', 'ul'
+]);
+const _SANITIZE_ALLOWED_ATTRS = new Set(['href', 'rel', 'target', 'title']);
+const _SANITIZE_ALLOWED_SCHEMES = new Set(['http:', 'https:', 'mailto:']);
+const _SANITIZE_STRIP_WITH_CONTENT = new Set(['script', 'style', 'iframe', 'noscript', 'object', 'embed']);
+
+function _isSafeHref(href) {
+    try {
+        const url = new URL(href, location.href);
+        return _SANITIZE_ALLOWED_SCHEMES.has(url.protocol);
+    } catch (e) {
+        console.warn('sanitizeHtml: invalid href removed:', e);
+        return false;
+    }
+}
+
+function _sanitizeElement(el) {
+    for (const attr of Array.from(el.attributes)) {
+        if (_SANITIZE_ALLOWED_ATTRS.has(attr.name)) {
+            if (attr.name === 'href' && !_isSafeHref(el.getAttribute('href'))) {
+                el.removeAttribute('href');
+            }
+        } else {
+            el.removeAttribute(attr.name);
+        }
+    }
+}
+
+function sanitizeHtml(html) {
+    if (!html) return '';
+    const template = document.createElement('template');
+    template.innerHTML = html;
+    // Process bottom-up so children are handled before their parent is unwrapped/removed
+    const elements = Array.from(template.content.querySelectorAll('*')).reverse();
+    for (const el of elements) {
+        const tag = el.tagName.toLowerCase();
+        if (_SANITIZE_STRIP_WITH_CONTENT.has(tag)) {
+            el.remove();
+        } else if (_SANITIZE_ALLOWED_TAGS.has(tag)) {
+            _sanitizeElement(el);
+        } else {
+            el.replaceWith(...Array.from(el.childNodes));
+        }
+    }
+    const wrapper = document.createElement('div');
+    wrapper.appendChild(template.content);
+    return wrapper.innerHTML;
+}
+
+function escapeHtml(text) {
+    return String(text)
+        .replaceAll('&', '&amp;')
+        .replaceAll('<', '&lt;')
+        .replaceAll('>', '&gt;')
+        .replaceAll('"', '&quot;');
+}
+
 $(function () {
 
     function makeScoresheetsSortable() {
         document.querySelectorAll('[id^="sections-questions"]').forEach(function (div) {
+            const accordionItem = div.closest('.accordion-item');
+            const isArchived = accordionItem?.dataset.isArchived === 'true';
 
             _ = new Sortable(div, {
+                disabled: isArchived,
                 animation: 150,
                 onEnd: function (evt) {
                     const sortedScoresheetId = evt.target.dataset.scoresheetid;
@@ -50,6 +113,9 @@ $(function () {
                 let itemEl = evt.item;
                 itemEl.style.border = "2px solid lightblue";
             },
+            onMove: function (evt) {
+                return evt.dragged.dataset.isArchived !== 'true';
+            }
         });
 
     }
@@ -143,7 +209,7 @@ $(function () {
                 <form method="post" id="section-form-${hashCode(item.innerText)}" onSubmit="return false;">
                 <h2 class="accordion-header" id="panel-${hashCode(item.innerText)}">
                     <button class="accordion-button preview-btn unt-accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-${hashCode(item.innerText)}" aria-expanded="true" aria-controls="collapse-${hashCode(item.innerText)}">
-                        ${sectionNumber}.  ${item.dataset.label}
+                        ${sectionNumber}.  ${escapeHtml(item.dataset.label)}
                     </button>
                 </h2>
                 <div id="collapse-${hashCode(item.innerText)}" class="accordion-collapse collapse show" aria-labelledby="panel-${hashCode(item.innerText)}">
@@ -157,7 +223,7 @@ $(function () {
                     <div class="accordion-item">
                         <h2 class="accordion-header" id="nested-panel${hashCode(item.innerText)}">
                             <button class="accordion-button question-btn collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#nested-collapse${hashCode(item.innerText)}" aria-expanded="true" aria-controls="nested-collapse${hashCode(item.innerText)}">
-                                ${sectionNumber}.${questionNumber}  ${item.innerText} ${item.dataset.required == 'True' ? '*' : ''}
+                                ${sectionNumber}.${questionNumber}  ${sanitizeHtml(item.dataset.questionlabel)} ${item.dataset.required == 'True' ? '*' : ''}
                             </button>
                         </h2>
                         <div id="nested-collapse${hashCode(item.innerText)}" class="accordion-collapse collapse" aria-labelledby="nested-panel${hashCode(item.innerText)}">
@@ -213,7 +279,7 @@ $(function () {
     function buildTextAreaFieldPreview(item) {
         let req = item.dataset.required ? "required" : null;
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-text-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <textarea rows="${item.dataset.rows}" type="text" ${req} class="form-control answer-text-input" minlength="${item.dataset.minlength}" maxlength="${item.dataset.maxlength}" 
@@ -232,7 +298,7 @@ $(function () {
         }).join('');
 
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-selectlist-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <select id="answer-selectlist-${item.dataset.id}"
@@ -248,7 +314,7 @@ $(function () {
     function buildNumberFieldPreview(item) {
         let req = item.dataset.required ? "required" : null;
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-number-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <input type="number" ${req} class="form-control answer-number-input" min="${item.dataset.min}" max="${item.dataset.max}" 
@@ -260,7 +326,7 @@ $(function () {
 
     function buildYesNoFieldPreview(item) {
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-yesno-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <select id="answer-yesno-${item.dataset.id}"
@@ -281,7 +347,7 @@ $(function () {
         let req = item.dataset.required ? "required" : null;
 
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-text-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <input type="text" ${req} class="form-control answer-text-input" minlength="${item.dataset.minlength}" maxlength="${item.dataset.maxlength}" 
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/ScoresheetConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/ScoresheetConfiguration/Default.cshtml
index a80e05c070..fabde53c6c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/ScoresheetConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/ScoresheetConfiguration/Default.cshtml
@@ -36,10 +36,11 @@
                     <div class="scoresheet-filters d-flex gap-2 mb-2 align-items-center px-1">
                         <input type="text" id="scoresheet-name-filter" class="form-control form-control-sm" placeholder="Filter by title or name..." />
                         <fieldset class="btn-group btn-group-sm flex-shrink-0" id="scoresheet-published-toggle">
-                            <legend class="visually-hidden">Published filter</legend>
+                            <legend class="visually-hidden">Scoresheet filter</legend>
                             <button type="button" class="btn btn-outline-secondary active" data-filter="all">All</button>
                             <button type="button" class="btn btn-outline-secondary" data-filter="published">Published</button>
                             <button type="button" class="btn btn-outline-secondary" data-filter="unpublished">Unpublished</button>
+                            <button type="button" class="btn btn-outline-secondary" data-filter="archived">Archived</button>
                         </fieldset>
                     </div>
                 </div>
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/DataGrid/DataGridWriteServiceTests.cs b/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/DataGrid/DataGridWriteServiceTests.cs
new file mode 100644
index 0000000000..c6a7c93642
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/DataGrid/DataGridWriteServiceTests.cs
@@ -0,0 +1,119 @@
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.Flex.Web.Pages.Flex;
+using Unity.Flex.Worksheets;
+using Unity.Flex.Worksheets.Values;
+using Unity.Flex.WorksheetInstances;
+using Xunit;
+
+namespace Unity.Flex.DataGrid;
+
+public class DataGridWriteServiceTests
+{
+    private readonly ICustomFieldAppService _customFieldAppService;
+    private readonly ICustomFieldValueAppService _customFieldValueAppService;
+    private readonly IWorksheetInstanceAppService _worksheetInstanceAppService;
+    private readonly DataGridWriteService _service;
+
+    public DataGridWriteServiceTests()
+    {
+        _customFieldAppService = Substitute.For<ICustomFieldAppService>();
+        _customFieldValueAppService = Substitute.For<ICustomFieldValueAppService>();
+        _worksheetInstanceAppService = Substitute.For<IWorksheetInstanceAppService>();
+        _service = new DataGridWriteService(_customFieldAppService, _customFieldValueAppService, _worksheetInstanceAppService);
+    }
+
+    [Fact]
+    [Trait("Category", "Unit")]
+    public async Task DeleteRowAsync_RemovesCorrectRow()
+    {
+        // Arrange
+        var valueId = Guid.NewGuid();
+        var worksheetInstanceId = Guid.NewGuid();
+
+        SetupValueWithRows(valueId, ["row0", "row1", "row2"]);
+
+        string? capturedJson = null;
+        _customFieldValueAppService
+            .ExplicitSetAsync(valueId, Arg.Do<string>(j => capturedJson = j))
+            .Returns(Task.CompletedTask);
+
+        // Act
+        await _service.DeleteRowAsync(valueId, 1, worksheetInstanceId);
+
+        // Assert
+        var rows = DeserializeRows(capturedJson);
+        rows.Count.ShouldBe(2);
+        rows[0].Cells[0].Value.ShouldBe("row0");
+        rows[1].Cells[0].Value.ShouldBe("row2");
+    }
+
+    [Fact]
+    [Trait("Category", "Unit")]
+    public async Task DeleteRowAsync_LastRow_LeavesEmptyRowsArray()
+    {
+        // Arrange
+        var valueId = Guid.NewGuid();
+        var worksheetInstanceId = Guid.NewGuid();
+
+        SetupValueWithRows(valueId, ["row0"]);
+
+        string? capturedJson = null;
+        _customFieldValueAppService
+            .ExplicitSetAsync(valueId, Arg.Do<string>(j => capturedJson = j))
+            .Returns(Task.CompletedTask);
+
+        // Act
+        await _service.DeleteRowAsync(valueId, 0, worksheetInstanceId);
+
+        // Assert
+        var rows = DeserializeRows(capturedJson);
+        rows.ShouldBeEmpty();
+    }
+
+    [Fact]
+    [Trait("Category", "Unit")]
+    public async Task DeleteRowAsync_OutOfBoundsRow_DoesNotPersist()
+    {
+        // Arrange
+        var valueId = Guid.NewGuid();
+        var worksheetInstanceId = Guid.NewGuid();
+
+        SetupValueWithRows(valueId, ["row0"]);
+
+        // Act
+        await _service.DeleteRowAsync(valueId, 5, worksheetInstanceId);
+
+        // Assert
+        await _customFieldValueAppService
+            .DidNotReceive()
+            .ExplicitSetAsync(Arg.Any<Guid>(), Arg.Any<string>());
+    }
+
+    private void SetupValueWithRows(Guid valueId, IEnumerable<string> rowValues)
+    {
+        var rows = rowValues.Select(v => new DataGridRow
+        {
+            Cells = [new DataGridRowCell("col", v)]
+        }).ToList();
+
+        var json = JsonSerializer.Serialize(new DataGridValue(new DataGridRowsValue(rows)));
+
+        _customFieldValueAppService
+            .GetAsync(valueId)
+            .Returns(new CustomFieldValueDto { Id = valueId, CurrentValue = json });
+    }
+
+    private static List<DataGridRow> DeserializeRows(string? json)
+    {
+        json.ShouldNotBeNull();
+        var grid = JsonSerializer.Deserialize<DataGridValue>(json!);
+        var rowsJson = grid!.Value!.ToString()!;
+        return JsonSerializer.Deserialize<DataGridRowsValue>(rowsJson)!.Rows;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj b/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj
index b52b4f9eee..fbe7add032 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Unity.Flex.Application\Unity.Flex.Application.csproj" />
+    <ProjectReference Include="..\..\src\Unity.Flex.Web\Unity.Flex.Web.csproj" />
     <ProjectReference Include="..\Unity.Flex.TestBase\Unity.Flex.TestBase.csproj" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.3" />
@@ -18,6 +19,8 @@
 	  <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="10.3.0" />
+    <!-- Explicit reference to fix vulnerable transitive dependency -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Worksheets/WorksheetInstanceRepositoryTests.cs b/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Worksheets/WorksheetInstanceRepositoryTests.cs
new file mode 100644
index 0000000000..e0bab07bb1
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Worksheets/WorksheetInstanceRepositoryTests.cs
@@ -0,0 +1,117 @@
+using Shouldly;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.Flex.Domain.WorksheetInstances;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Uow;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.Flex.Worksheets
+{
+    public class WorksheetInstanceRepositoryTests : FlexApplicationTestBase
+    {
+        private readonly IWorksheetInstanceRepository _worksheetInstanceRepository;
+        private readonly ICurrentTenant _currentTenant;
+        private readonly IUnitOfWorkManager _unitOfWorkManager;
+
+        public WorksheetInstanceRepositoryTests(ITestOutputHelper outputHelper) : base(outputHelper)
+        {
+            _worksheetInstanceRepository = GetRequiredService<IWorksheetInstanceRepository>();
+            _currentTenant = GetRequiredService<ICurrentTenant>();
+            _unitOfWorkManager = GetRequiredService<IUnitOfWorkManager>();
+        }
+
+        [Fact]
+        [Trait("Category", "Integration")]
+        public async Task GetByCorrelationIdsAsync_OnlyReturnsRowsForTheExactCorrelationProviderRequested()
+        {
+            var correlationId = Guid.NewGuid();
+
+            await _worksheetInstanceRepository.InsertAsync(new WorksheetInstance(
+                Guid.NewGuid(), Guid.NewGuid(), correlationId, "Application",
+                Guid.NewGuid(), "FormVersion", "anchor"), autoSave: true);
+            await _worksheetInstanceRepository.InsertAsync(new WorksheetInstance(
+                Guid.NewGuid(), Guid.NewGuid(), correlationId, "OtherProvider",
+                Guid.NewGuid(), "FormVersion", "anchor"), autoSave: true);
+
+            var result = await _worksheetInstanceRepository.GetByCorrelationIdsAsync([correlationId], "Application");
+
+            result.ShouldHaveSingleItem();
+            result[0].CorrelationProvider.ShouldBe("Application");
+        }
+
+        [Fact]
+        [Trait("Category", "Integration")]
+        public async Task GetByCorrelationIdsAsync_RespectsMultiTenantFilter()
+        {
+            var tenantA = Guid.NewGuid();
+            var tenantB = Guid.NewGuid();
+            var correlationId = Guid.NewGuid();
+
+            using (_currentTenant.Change(tenantA))
+            {
+                using var uow = _unitOfWorkManager.Begin();
+                await _worksheetInstanceRepository.InsertAsync(new WorksheetInstance(
+                    Guid.NewGuid(), Guid.NewGuid(), correlationId, "Application",
+                    Guid.NewGuid(), "FormVersion", "anchor"), autoSave: true);
+                await uow.CompleteAsync();
+            }
+
+            using (_currentTenant.Change(tenantA))
+            {
+                using var uow = _unitOfWorkManager.Begin();
+                var visibleToOwnTenant = await _worksheetInstanceRepository.GetByCorrelationIdsAsync([correlationId], "Application");
+                visibleToOwnTenant.ShouldHaveSingleItem();
+            }
+
+            using (_currentTenant.Change(tenantB))
+            {
+                using var uow = _unitOfWorkManager.Begin();
+                var visibleToOtherTenant = await _worksheetInstanceRepository.GetByCorrelationIdsAsync([correlationId], "Application");
+                visibleToOtherTenant.ShouldBeEmpty();
+            }
+        }
+
+        [Fact]
+        [Trait("Category", "Integration")]
+        public async Task GetDistinctWorksheetIdsByCorrelationIdsAsync_OnlyReturnsIdsForTheExactCorrelationProviderRequested()
+        {
+            var correlationId = Guid.NewGuid();
+            var worksheetIdForRequestedProvider = Guid.NewGuid();
+            var worksheetIdForOtherProvider = Guid.NewGuid();
+
+            await _worksheetInstanceRepository.InsertAsync(new WorksheetInstance(
+                Guid.NewGuid(), worksheetIdForRequestedProvider, correlationId, "Application",
+                Guid.NewGuid(), "FormVersion", "anchor"), autoSave: true);
+            await _worksheetInstanceRepository.InsertAsync(new WorksheetInstance(
+                Guid.NewGuid(), worksheetIdForOtherProvider, correlationId, "OtherProvider",
+                Guid.NewGuid(), "FormVersion", "anchor"), autoSave: true);
+
+            var result = await _worksheetInstanceRepository.GetDistinctWorksheetIdsByCorrelationIdsAsync([correlationId], "Application");
+
+            result.ShouldBe([worksheetIdForRequestedProvider]);
+        }
+
+        [Fact]
+        [Trait("Category", "Integration")]
+        public async Task GetPagedListByCorrelationProviderAsync_OnlyReturnsRowsForTheExactCorrelationProviderRequested()
+        {
+            var marker = Guid.NewGuid().ToString("N");
+            var correlationProvider = $"Provider-{marker}";
+
+            await _worksheetInstanceRepository.InsertAsync(new WorksheetInstance(
+                Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), correlationProvider,
+                Guid.NewGuid(), "FormVersion", "anchor"), autoSave: true);
+            await _worksheetInstanceRepository.InsertAsync(new WorksheetInstance(
+                Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), "OtherProvider",
+                Guid.NewGuid(), "FormVersion", "anchor"), autoSave: true);
+
+            var result = await _worksheetInstanceRepository.GetPagedListByCorrelationProviderAsync(correlationProvider, 0, 10);
+
+            result.ShouldHaveSingleItem();
+            result[0].CorrelationProvider.ShouldBe(correlationProvider);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs
index 6a7ed8a917..1a9b7088aa 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authorization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -5,10 +6,12 @@
 using Unity.GrantManager.Repositories;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Identity;
 using Volo.Abp.Localization;
 
 namespace Unity.GrantManager.Web.Pages.Identity.Roles;
 
+[Authorize(IdentityPermissions.Roles.Default)]
 public class PermissionRoleMatrixModel(IPermissionRoleMatrixRepository repository, IPermissionDefinitionManager permissionDefinitionManager) : AbpPageModel
 {
     public bool IsExpanded { get; private set; }
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js
index 8ad60b312f..f1465aa9d9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js
@@ -1,5 +1,5 @@
 $(document).ready(function () {
-    const urlParams = new URLSearchParams(window.location.search);
+    const urlParams = new URLSearchParams(globalThis.location.search);
     const isExpanded = urlParams.get('Render') === 'Expanded';
     const exportTitle = `${abp.currentTenant.name}_${(new Date()).toISOString().slice(0, 10)}_Permission-Role Matrix`;
 
@@ -11,7 +11,7 @@
     );
     _permissionsModal.onClose(function () {
         // Refresh the page to show updated permissions
-        window.location.reload();
+        globalThis.location.reload();
     });
 
     const roleColumnIndexes = [];
@@ -34,6 +34,16 @@
         });
     }
 
+    const adjustTableLayout = function () {
+        globalThis.requestAnimationFrame(function () {
+            localTable.columns.adjust();
+
+            if (localTable.fixedHeader) {
+                localTable.fixedHeader.adjust();
+            }
+        });
+    };
+
     $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
     let localTable = $('#permissionTable').DataTable({
         paging: false,
@@ -55,7 +65,7 @@
                     : '<i class="fl fl-fullscreen align-middle"></i> <span>View Expanded</span>',
                 className: 'btn-light rounded-1',
                 action: function (e, dt, button, config) {
-                    window.location = isExpanded
+                    globalThis.location = isExpanded
                         ? '/Identity/Roles/PermissionRoleMatrix'
                         : '/Identity/Roles/PermissionRoleMatrix?Render=Expanded';
                 }
@@ -122,6 +132,11 @@
     // Hide spinner and show table after initialization
     $('.loading-spinner').hide();
     $('#permissionTable').show();
+    adjustTableLayout();
+
+    $(globalThis).on('resize', function () {
+        adjustTableLayout();
+    });
 
     // Add click handlers to role column headers using data-role-header attribute
     $(document).on('click', 'th[data-role-header]', function () {
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js
index d54abb1091..8693dfd7ba 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js
@@ -61,7 +61,7 @@ $(function () {
                             _identityRoleAppService
                                 .delete(data.record.id)
                                 .then(function () {
-                                    _dataTable.ajax.reloadEx();
+                                    _dataTable.ajax.reload();
                                     abp.notify.success(l('SuccessfullyDeleted'));
                                 });
                         },
@@ -123,8 +123,9 @@ $(function () {
         {
             text: '<i class="fl fl-multi-select align-middle"></i><span>View Role Matrix</span>',
             className: 'btn-light rounded-1',
+            available: () => abp.auth.isGranted('AbpIdentity.Roles'),
             action: function (e, dt, button, config) {
-                window.location = '/Identity/Roles/PermissionRoleMatrix'
+                globalThis.location = '/Identity/Roles/PermissionRoleMatrix'
             }
         },
         {
@@ -173,10 +174,10 @@ $(function () {
     });
 
     _createModal.onResult(function () {
-        _dataTable.ajax.reloadEx();
+        _dataTable.ajax.reload();
     });
 
     _editModal.onResult(function () {
-        _dataTable.ajax.reloadEx();
+        _dataTable.ajax.reload();
     });
 });
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml
new file mode 100644
index 0000000000..d090409c1c
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml
@@ -0,0 +1,171 @@
+@page
+
+@using Microsoft.Extensions.Localization
+@using Unity.GrantManager.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@using Volo.Abp.MultiTenancy
+
+@model Unity.Identity.Web.Pages.Identity.Users.PermissionUserMatrixModel
+
+@inject ICurrentTenant CurrentTenant
+@inject IPageLayout PageLayout
+@inject IStringLocalizer<GrantManagerResource> L
+
+@tagHelperPrefix th:
+
+@{
+    PageLayout.Content.Title = "Permission-User Matrix";
+    ViewBag.PageTitle = "Permission-User Matrix";
+    int rowCount = 1;
+    int maxDepth = Model.PermissionUserMatrix.Any() ? Model.PermissionUserMatrix.Max(item => item.Depth) : 0;
+    int headerLevel = maxDepth + 1;
+
+    var filteredPermissions = Model.ShowNotDefined
+        ? Model.PermissionUserMatrix.Where(p => !p.IsDefined)
+        : Model.PermissionUserMatrix.Where(p => p.IsDefined);
+}
+
+@section scripts {
+    <th:abp-script src="/Pages/Identity/Users/PermissionUserMatrix.js" />
+    <th:abp-script src="/Pages/AbpPermissionManagement/permission-management-modal.js" />
+}
+
+@section styles {
+    <style>
+        #permissionTableContainer {
+            position: relative;
+            min-height: 200px;
+        }
+        #permissionUserTable {
+            display: none;
+        }
+        .loading-spinner {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            text-align: center;
+        }
+        #permissionUserTable .pum-roles { display: none; }
+        #permissionUserTable.show-roles .pum-value { display: none; }
+        #permissionUserTable.show-roles .pum-roles { display: inline; }
+    </style>
+}
+
+<div class="container-fluid px-0">
+    <div class="action-bar p-2 filter-search-action-bar">
+        <div class="unity-page-titlebar">
+            <h4 id="PermissionUserMatrixTitle">Permission-User Matrix - @CurrentTenant.Name</h4>
+        </div>
+        <div class="filter-search-action-bar_search-wrapper">
+            <input type="search" id="search" placeholder="Search" class="tbl-search" aria-label="Search permissions">
+        </div>
+
+        <div class="btn-group" id="app_custom_buttons">
+        </div>
+
+        <div id="dynamicButtonContainerId" class="dynamic-buttons-div button-gap-1"></div>
+    </div>
+    <div class="p-3 pt-0">
+        <div id="permissionTableContainer" class="p-3 pt-0">
+            <div class="loading-spinner">
+                <p>Loading permission matrix...</p>
+            </div>
+            <table id="permissionUserTable" class="table table-bordered" aria-describedby="PermissionUserMatrixTitle">
+                @if (!Model.IsExpanded)
+                {
+                    <thead>
+                        <tr>
+                            <th scope="col">#</th>
+                            <th scope="col">L</th>
+                            <th scope="col">Permission Group</th>
+                            <th scope="col">Permission</th>
+                            <th scope="col">Description</th>
+                            @foreach (var user in Model.Users)
+                            {
+                                <th scope="col" class="user-name" data-user-header="@user.UserId" data-user-name="@user.UserName">@user.DisplayLabel</th>
+                            }
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var permission in filteredPermissions)
+                        {
+                            <tr>
+                                <td>@rowCount.ToString("D2")</td>
+                                @{
+                                    rowCount++;
+                                }
+                                <td>@permission.Depth.ToString("D1")</td>
+                                <td>@permission.GroupName</td>
+                                <td>@permission.PermissionName</td>
+                                <td>@(L[permission.PermissionDisplayName].Value)</td>
+                                @foreach (var user in Model.Users)
+                                {
+                                    permission.UserPermissions.TryGetValue(user.UserId, out var summary);
+                                    var hasPermission = summary?.HasPermission ?? false;
+                                    <td class="@(hasPermission ? "pum-has-permission" : "")"><span class="pum-value">@(hasPermission ? "TRUE" : string.Empty)</span>@if (hasPermission) {<span class="pum-roles">@summary!.GrantSources</span>}</td>
+                                }
+                            </tr>
+                        }
+                    </tbody>
+                }
+                else
+                {
+                    <thead>
+                        <tr>
+                            <th scope="col" rowspan="2" data-dt-order="disable">#</th>
+                            <th scope="col" rowspan="2" data-dt-order="disable">L</th>
+                            <th scope="col" rowspan="2">Permission Group</th>
+                            <th scope="colgroup" colspan="@headerLevel" data-dt-order="disable">Permission</th>
+                            <th scope="col" rowspan="2">Description</th>
+                            @foreach (var user in Model.Users)
+                            {
+                                <th scope="col" rowspan="2" class="user-name" data-user-header="@user.UserId" data-user-name="@user.UserName">@user.DisplayLabel</th>
+                            }
+                        </tr>
+                        <tr>
+                            @for (int groupLevel = 1; groupLevel < headerLevel + 1; groupLevel++)
+                            {
+                                <th scope="col">Level @groupLevel</th>
+                            }
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var permission in filteredPermissions)
+                        {
+                            <tr>
+                                <td>
+                                    @rowCount.ToString("D2")
+                                </td>
+                                @{
+                                    rowCount++;
+                                }
+                                <td>@permission.Depth.ToString("D1")</td>
+                                <td>@permission.GroupName</td>
+                                @for (int i = 0; i < permission.Depth; i++)
+                                {
+                                    <td></td>
+                                }
+
+                                <td>@permission.PermissionName</td>
+
+                                @for (int j = permission.Depth; j < maxDepth; j++)
+                                {
+                                    <td></td>
+                                }
+
+                                <td>@permission.PermissionDisplayName</td>
+
+                                @foreach (var user in Model.Users)
+                                {
+                                    permission.UserPermissions.TryGetValue(user.UserId, out var summary);
+                                    var hasPermission = summary?.HasPermission ?? false;
+                                    <td class="@(hasPermission ? "pum-has-permission" : "")"><span class="pum-value">@(hasPermission ? "TRUE" : string.Empty)</span>@if (hasPermission) {<span class="pum-roles">@summary!.GrantSources</span>}</td>
+                                }
+                            </tr>
+                        }
+                    </tbody>
+                }
+            </table>
+        </div>
+    </div>
+</div>
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
new file mode 100644
index 0000000000..1e838812fe
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
@@ -0,0 +1,53 @@
+using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.Repositories;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Identity;
+using Volo.Abp.Localization;
+
+namespace Unity.Identity.Web.Pages.Identity.Users;
+
+[Authorize(IdentityPermissions.Users.Default)]
+public class PermissionUserMatrixModel(IPermissionRoleMatrixRepository repository, IPermissionDefinitionManager permissionDefinitionManager) : AbpPageModel
+{
+    public bool IsExpanded { get; private set; }
+    public bool ShowNotDefined { get; private set; } = false;
+    public required IList<PermissionUserMatrixRowDto> PermissionUserMatrix { get; set; }
+    public required IList<UserInfoDto> Users { get; set; }
+
+    public async Task OnGetAsync()
+    {
+        IsExpanded = Request.Query["Render"].ToString().Equals("Expanded", StringComparison.OrdinalIgnoreCase);
+        ShowNotDefined = Request.Query["Show"].ToString().Equals("NotDefined", StringComparison.OrdinalIgnoreCase);
+
+        var result = await repository.GetPermissionUserMatrixAsync();
+        PermissionUserMatrix = result.Rows;
+        Users = result.Users;
+
+        var definedPermissionSet = await permissionDefinitionManager.GetPermissionsAsync();
+        var definedPermissionNames = new HashSet<string>(definedPermissionSet.Select(x => x.Name));
+
+        foreach (var item in PermissionUserMatrix)
+        {
+            item.IsDefined = definedPermissionNames.Contains(item.PermissionName);
+
+            var displayName = item.PermissionDisplayName;
+            if (displayName.Length > 2 && displayName.StartsWith("L:"))
+            {
+                var parts = displayName.AsSpan(2).ToString().Split(',');
+                if (parts.Length == 2)
+                {
+                    var resourceName = parts[0];
+                    var name = parts[1];
+                    var localizable = new LocalizableString(name, resourceName);
+                    var localized = await localizable.LocalizeAsync(StringLocalizerFactory);
+                    item.PermissionDisplayName = localized?.Value ?? displayName;
+                }
+            }
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
new file mode 100644
index 0000000000..e81dda8495
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
@@ -0,0 +1,184 @@
+$(document).ready(function () {
+    const urlParams = new URLSearchParams(globalThis.location.search);
+    const isExpanded = urlParams.get('Render') === 'Expanded';
+    const exportTitle = `${abp.currentTenant.name}_${(new Date()).toISOString().slice(0, 10)}_Permission-User Matrix`;
+
+    const currentUserName = abp.currentUser.userName;
+
+    let _permissionsModal = new abp.ModalManager(
+        abp.appPath + 'AbpPermissionManagement/PermissionManagementModal'
+    );
+    _permissionsModal.onClose(function () {
+        globalThis.location.reload();
+    });
+
+    const userColumnIndexes = [];
+    $('#permissionUserTable th[data-user-header]').each(function () {
+        userColumnIndexes.push($(this).index());
+    });
+
+    const columnDefs = [
+        {
+            targets: 0,
+            orderable: true,
+            className: 'notexport'
+        }
+    ];
+
+    if (userColumnIndexes.length > 0) {
+        columnDefs.push({
+            targets: userColumnIndexes,
+            orderable: false
+        });
+    }
+
+    const exportOptions = {
+        columns: ':visible:not(.notexport)',
+        format: {
+            body: function (data, row, column, node) {
+                if (!node) {
+                    return data;
+                }
+
+                const $cell = $(node).clone();
+                if (showingRoles) {
+                    $cell.find('.pum-value').remove();
+                } else {
+                    $cell.find('.pum-roles').remove();
+                }
+
+                return $cell.text().trim();
+            }
+        }
+    };
+
+    let showingRoles = false;
+
+    const adjustTableLayout = function () {
+        globalThis.requestAnimationFrame(function () {
+            localTable.columns.adjust();
+
+            if (localTable.fixedHeader) {
+                localTable.fixedHeader.adjust();
+            }
+        });
+    };
+
+    $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
+    let localTable = $('#permissionUserTable').DataTable({
+        paging: false,
+        searching: true,
+        ordering: true,
+        fixedHeader: {
+            header: true,
+            footer: false,
+            headerOffset: 0
+        },
+        scrollX: true,
+        scrollCollapse: true,
+        dom: 'Blfrtip',
+        columnDefs: columnDefs,
+        buttons: [
+            {
+                text: '<i class="fl fl-review-user align-middle"></i> <span class="toggle-roles-text">Show Roles</span>',
+                className: 'btn-light rounded-1',
+                action: function (e, dt, button) {
+                    showingRoles = !showingRoles;
+                    if (showingRoles) {
+                        $('#permissionUserTable').addClass('show-roles');
+                        $(button).find('.toggle-roles-text').text('Hide Roles');
+                    } else {
+                        $('#permissionUserTable').removeClass('show-roles');
+                        $(button).find('.toggle-roles-text').text('Show Roles');
+                    }
+
+                    adjustTableLayout();
+                }
+            },
+            {
+                text: isExpanded
+                    ? '<i class="fl fl-back-to-window align-middle"></i> <span>View Simple</span>'
+                    : '<i class="fl fl-fullscreen align-middle"></i> <span>View Expanded</span>',
+                className: 'btn-light rounded-1',
+                action: function () {
+                    globalThis.location = isExpanded
+                        ? '/Identity/Users/PermissionUserMatrix'
+                        : '/Identity/Users/PermissionUserMatrix?Render=Expanded';
+                }
+            },
+            {
+                extend: 'copy',
+                text: 'Copy',
+                title: exportTitle,
+                className: 'custom-table-btn flex-none btn btn-secondary',
+                exportOptions: exportOptions
+            },
+            {
+                extend: 'csv',
+                text: 'Export',
+                title: exportTitle,
+                className: 'custom-table-btn flex-none btn btn-secondary',
+                exportOptions: exportOptions
+            }
+        ],
+        createdRow: function (row) {
+            $('td.pum-has-permission', row).addClass('bg-success text-dark bg-opacity-25 fw-bold border border-success dt-center');
+        },
+        initComplete: function () {
+            const table = this.api();
+
+            // Disable sorting on user columns
+            $('th[data-user-header]').removeClass('sorting').addClass('sorting_disabled');
+
+            const headers = table.columns().header().toArray().map(header => $(header).text().trim());
+
+            // Highlight the current user's column
+            headers.forEach((header, index) => {
+                const $th = $(table.column(index).header());
+                const userName = $th.attr('data-user-name');
+                if (userName && userName.toLowerCase() === currentUserName?.toLowerCase()) {
+                    $th.addClass('text-decoration-underline');
+                    table.column(index).nodes().to$().filter(function () {
+                        return !$(this).text().trim();
+                    }).addClass('bg-light');
+                }
+            });
+        }
+    });
+
+    localTable.buttons().container().prependTo('#dynamicButtonContainerId');
+
+    $('#search').on('input', function () {
+        localTable.search($(this).val()).draw();
+    });
+
+    // Hide spinner and show table after initialization
+    $('.loading-spinner').hide();
+    $('#permissionUserTable').show();
+    adjustTableLayout();
+
+    $(globalThis).on('resize', function () {
+        adjustTableLayout();
+    });
+
+    // Click on user column header → open ABP permissions modal for that user
+    $(document).on('click', 'th[data-user-header]', function () {
+        const userId = $(this).attr('data-user-header');
+        const userName = $(this).attr('data-user-name');
+        _permissionsModal.open({
+            providerName: 'U',
+            providerKey: userId,
+            providerKeyDisplayName: userName
+        });
+    });
+
+    $(document).on('mouseover', 'th[data-user-header]', function () {
+        $(this).css('cursor', 'pointer');
+        if (!$(this).attr('title')) {
+            $(this).attr('title', 'Click to manage permissions for this user');
+        }
+    });
+
+    // Workaround - required until Datatables.net 2.x
+    $('th[data-user-header]').removeClass('sorting').addClass('sorting_disabled');
+});
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
index ca1c07d2ed..a5189339e8 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
@@ -65,7 +65,7 @@ $(function () {
 
         $('#ImportUserSearchButton').click(function (e) {
             e.preventDefault();
-            _filterDataTable.ajax.reloadEx();
+            _filterDataTable.ajax.reload();
             $('#import-user-btn').attr('disabled', true);
         });
 
@@ -87,7 +87,7 @@ $(function () {
         });
 
         _importModal.onResult(function () {
-            dataTable.ajax.reloadEx();
+            dataTable.ajax.reload();
         });
     }
 
@@ -224,6 +224,14 @@ $(function () {
 
     $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
     let actionButtons = [
+        {
+            text: '<i class="fl fl-multi-select align-middle"></i> <span>View User Matrix</span>',
+            className: 'btn-light rounded-1',
+            available: () => abp.auth.isGranted('AbpIdentity.Users'),
+            action: function (e, dt, button, config) {
+                globalThis.location = '/Identity/Users/PermissionUserMatrix';
+            }
+        },
         {
             text: '<i class="fl fl-add-to align-middle"></i> <span>' + lg('Common:Command:Create') + '</span>',
             titleAttr: lg('Common:Command:Create'),
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroupUsers/IEmailGroupUsersAppService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroupUsers/IEmailGroupUsersAppService.cs
index fadfc0c1cb..0ec76ecc36 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroupUsers/IEmailGroupUsersAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroupUsers/IEmailGroupUsersAppService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
 
 
 namespace Unity.Notifications.EmailGroups
@@ -11,6 +12,7 @@ public interface IEmailGroupUsersAppService
         Task<bool> DeleteUserAsync (Guid id);
         Task<bool> DeleteUsersByGroupIdAsync (Guid id);
         Task<bool> DeleteUsersByUserIdAsync(Guid id);
+        [AllowAnonymous]
         Task<List<EmailGroupUsersDto>> GetEmailGroupUsersByGroupIdAsync(Guid id);
         Task<List<EmailGroupUsersDto>> GetListAsync();
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroups/IEmailGroupsAppService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroups/IEmailGroupsAppService.cs
index c9616322c5..58ca4fba1f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroups/IEmailGroupsAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/EmailGroups/IEmailGroupsAppService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
 
 
 namespace Unity.Notifications.EmailGroups
@@ -10,6 +11,7 @@ public interface IEmailGroupsAppService
         Task<EmailGroupDto> CreateAsync (EmailGroupDto dto);
         Task<EmailGroupDto> UpdateAsync (EmailGroupDto dto);
         Task<bool> DeleteAsync (Guid id);
+        [AllowAnonymous]
         Task<List<EmailGroupDto>> GetListAsync();
         Task<EmailGroupDto> GetEmailGroupByIdAsync(Guid id);
     }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs
index be48289392..96f1ee169d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs
@@ -16,6 +16,8 @@ public class EmailHistoryDto : ExtensibleAuditedEntityDto<Guid>
     public string Body { get; set; } = string.Empty;
     public EmailHistoryUserDto? SentBy { get; set; }
     public string TemplateName { get; set; } = string.Empty;
+    public DateTime? SendOnDateTime { get; set; }
+    public Guid? ScheduledNotificationId { get; set; }
 }
 
 public class EmailHistoryUserDto : EntityDto<Guid>
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentAppService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentAppService.cs
index bb9377063e..9efab060ab 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentAppService.cs
@@ -8,5 +8,6 @@ namespace Unity.Notifications.Emails;
 public interface IEmailLogAttachmentAppService : IApplicationService
 {
     Task<List<EmailLogAttachmentDto>> GetListByEmailLogIdAsync(Guid emailLogId);
+    Task<List<EmailLogAttachmentDto>> GetListByTemplateIdAsync(Guid templateId);
     Task DeleteAsync(Guid id);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentUploadService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentUploadService.cs
index cdea764cb9..93a4e3588f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentUploadService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/IEmailLogAttachmentUploadService.cs
@@ -5,6 +5,6 @@ namespace Unity.Notifications.Emails;
 
 public interface IEmailLogAttachmentUploadService
 {
-    Task<EmailLogAttachmentDto> UploadAsync(Guid emailLogId, Guid? tenantId, string fileName, byte[] content, string contentType);
-    Task<long> GetTotalFileSizeByEmailLogIdAsync(Guid emailLogId);
+    Task<EmailLogAttachmentDto> UploadAsync(Guid? emailLogId, Guid? templateId, Guid? tenantId, string fileName, byte[] content, string contentType);
+    Task<long> GetTotalFileSizeByEmailLogIdAsync(Guid? emailLogId, Guid? templateId);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Permissions/NotificationsPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Permissions/NotificationsPermissionDefinitionProvider.cs
index 328573d47c..ce368255c9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Permissions/NotificationsPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Permissions/NotificationsPermissionDefinitionProvider.cs
@@ -1,5 +1,6 @@
 using Unity.Notifications.Localization;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Features;
 using Volo.Abp.Localization;
 using Volo.Abp.SettingManagement;
 
@@ -12,15 +13,48 @@ public override void Define(IPermissionDefinitionContext context)
         var notificationsPermissionsGroup = context.AddGroup(NotificationsPermissions.GroupName, L("Permission:Notifications"));
 
         var notificationsPermissions = notificationsPermissionsGroup.AddPermission(
-                NotificationsPermissions.Email.Default, 
+                NotificationsPermissions.Email.Default,
                 L($"Permission:{NotificationsPermissions.Email.Default}"));
-        
+
         notificationsPermissions.AddChild(
             NotificationsPermissions.Email.Send,
             L($"Permission:{NotificationsPermissions.Email.Send}"));
 
+        notificationsPermissions.AddChild(
+            NotificationsPermissions.Email.DeleteDraft,
+            L($"Permission:{NotificationsPermissions.Email.DeleteDraft}"));
+
+        notificationsPermissions.AddChild(
+            NotificationsPermissions.Email.CancelScheduled,
+            L($"Permission:{NotificationsPermissions.Email.CancelScheduled}"));
+
+        notificationsPermissions.AddChild(
+            NotificationsPermissions.Email.Schedule,
+            L($"Permission:{NotificationsPermissions.Email.Schedule}"));
+
+
+        var scheduleNotificationsPermissions = notificationsPermissionsGroup.AddPermission(
+                NotificationsPermissions.Email.NotificationsTab,
+                L($"Permission:{NotificationsPermissions.Email.NotificationsTab}"));
+
+        scheduleNotificationsPermissions.AddChild(
+            NotificationsPermissions.Email.ScheduleCreate,
+            L($"Permission:{NotificationsPermissions.Email.ScheduleCreate}"));
+
+        scheduleNotificationsPermissions.AddChild(
+            NotificationsPermissions.Email.ScheduleCancel,
+            L($"Permission:{NotificationsPermissions.Email.ScheduleCancel}"));
+
         var settingManagement = context.GetGroup(SettingManagementPermissions.GroupName);
         settingManagement.AddPermission(NotificationsPermissions.Settings, L("Permission:NotificationsPermissions.Settings"));
+
+        var notificationListPermissions = notificationsPermissionsGroup.AddPermission(
+                NotificationsPermissions.NotificationList.Default,
+                L($"Permission:{NotificationsPermissions.NotificationList.Default}"));
+
+        notificationListPermissions.AddChild(
+            NotificationsPermissions.NotificationList.View,
+            L($"Permission:{NotificationsPermissions.NotificationList.View}"));
     }
 
     private static LocalizableString L(string name)
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Permissions/NotificationsPermissions.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Permissions/NotificationsPermissions.cs
index acb1db42af..20bd2b4ec1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Permissions/NotificationsPermissions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Permissions/NotificationsPermissions.cs
@@ -11,6 +11,18 @@ public static class Email
     {
         public const string Default = "Notifications.Email";
         public const string Send = "Notifications.Email.Send";
+        public const string DeleteDraft = "Notifications.Email.DeleteDraft";
+        public const string CancelScheduled = "Notifications.Email.CancelScheduled";
+        public const string Schedule = "Notifications.Email.Schedule";
+        public const string NotificationsTab = "Notifications.Form.Tab";
+        public const string ScheduleCreate = "Notifications.Form.Email.Schedule.Create";
+        public const string ScheduleCancel = "Notifications.Form.Email.Schedule.Cancel";
+    }
+
+    public static class NotificationList
+    {
+        public const string Default = "Notifications.NotificationList";
+        public const string View = "Notifications.NotificationList.View";
     }
 
     public static string[] GetAll()
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Templates/EmailTempateDto.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Templates/EmailTempateDto.cs
index 8f791b756f..17d90ab9bf 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Templates/EmailTempateDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Templates/EmailTempateDto.cs
@@ -13,5 +13,7 @@ public class EmailTempateDto
         public string BodyText { get; set; } = "";
         public string BodyHTML { get; set; } = "";
         public string SendFrom { get; set; } = "";
+        public string? RecipientCategory { get; set; }
+        public string? RecipientIdentifier { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Unity.Notifications.Application.Contracts.csproj b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Unity.Notifications.Application.Contracts.csproj
index 0a69ee557f..0e41f2f1c4 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Unity.Notifications.Application.Contracts.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Unity.Notifications.Application.Contracts.csproj
@@ -14,6 +14,7 @@
     <PackageReference Include="System.Text.Json" Version="10.0.3" />
     <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.Authorization" Version="10.3.0" />
+    <PackageReference Include="Volo.Abp.Features" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="10.3.0" />
     <ProjectReference Include="..\Unity.Notifications.Domain.Shared\Unity.Notifications.Domain.Shared.csproj" />
   </ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailGroupUsers/EmailGroupUsersAppService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailGroupUsers/EmailGroupUsersAppService.cs
index d3a8969c5c..1f5e70ecb9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailGroupUsers/EmailGroupUsersAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailGroupUsers/EmailGroupUsersAppService.cs
@@ -75,6 +75,7 @@ public async Task<bool> DeleteUsersByGroupIdAsync(Guid id)
             }
         }
 
+        [AllowAnonymous]
         public async Task<List<EmailGroupUsersDto>> GetEmailGroupUsersByGroupIdAsync(Guid id)
         {
             var users = await _emailGroupUsersRepository.GetListAsync(u => u.GroupId == id);
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailGroups/EmailGroupsAppService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailGroups/EmailGroupsAppService.cs
index bec6f37481..42a0eb9beb 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailGroups/EmailGroupsAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailGroups/EmailGroupsAppService.cs
@@ -21,7 +21,7 @@ public EmailGroupsAppService(IEmailGroupsRepository emailGroupsRepository)
             _emailGroupsRepository = emailGroupsRepository;
         }
         public async Task<EmailGroupDto> CreateAsync(EmailGroupDto dto)
-        {
+        {
             var newGroup =  await _emailGroupsRepository.InsertAsync(new EmailGroup
             {
                 Name = dto.Name,
@@ -42,7 +42,7 @@ public async Task<EmailGroupDto> UpdateAsync(EmailGroupDto dto)
             var emailGroup = await _emailGroupsRepository.GetAsync(dto.Id, true);
             emailGroup.Name = dto.Name;
             emailGroup.Description = dto.Description;
-            emailGroup.Type = dto.Type;
+            emailGroup.Type = dto.Type;
             await _emailGroupsRepository.UpdateAsync(emailGroup, autoSave: true);
             return new EmailGroupDto
             {
@@ -66,9 +66,10 @@ public async Task<bool> DeleteAsync(Guid id)
             }
         }
 
+        [AllowAnonymous]
         public async Task<List<EmailGroupDto>> GetListAsync()
         {
-            var groups =  await _emailGroupsRepository.GetListAsync();
+            var groups =  await _emailGroupsRepository.GetListAsync();
             return ObjectMapper.Map<List<EmailGroup>, List<EmailGroupDto>>(groups);
         }
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailMessageParams.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailMessageParams.cs
new file mode 100644
index 0000000000..543fde9c2e
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailMessageParams.cs
@@ -0,0 +1,15 @@
+namespace Unity.Notifications.EmailNotifications
+{
+    /// <summary>
+    /// Groups common email content fields to reduce method parameter count (S107).
+    /// </summary>
+    public sealed record EmailMessageParams(
+        string EmailTo,
+        string Body,
+        string Subject,
+        string? EmailFrom,
+        string? EmailTemplateName,
+        string? EmailCC = null,
+        string? EmailBCC = null,
+        System.DateTime? SendOnDateTime = null);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationManager.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationManager.cs
index 77a905aada..1d75f4b772 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationManager.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Dynamic;
@@ -14,11 +15,11 @@
 using Unity.Notifications.Integrations.RabbitMQ;
 using Unity.Notifications.Settings;
 using Volo.Abp;
+using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Services;
 using Volo.Abp.Settings;
 
-
 namespace Unity.Notifications.EmailNotifications
 {
     /// <summary>
@@ -31,46 +32,45 @@ public class EmailNotificationManager(
         EmailAttachmentService emailAttachmentService,
         ISettingProvider settingProvider) : DomainService, IEmailNotificationManager
     {
-        public async Task<EmailLog?> CreateEmailLogAsync(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+        private static readonly TimeSpan BcPermanentDstOffset = TimeSpan.FromHours(-7);
+
+        public async Task<EmailLog?> CreateEmailLogAsync(EmailMessageParams email, Guid applicationId)
         {
-            return await CreateEmailLogAsync(emailTo, body, subject, applicationId, emailFrom, EmailStatus.Initialized, emailTemplateName, emailCC, emailBCC);
+            return await CreateEmailLogAsync(email, applicationId, EmailStatus.Initialized);
         }
 
         [RemoteService(false)]
-        public async Task<EmailLog?> CreateEmailLogAsync(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+        public async Task<EmailLog?> CreateEmailLogAsync(EmailMessageParams email, Guid applicationId, string? status, Guid? scheduledNotificationId = null)
         {
-            if (string.IsNullOrEmpty(emailTo))
+            if (string.IsNullOrEmpty(email.EmailTo))
             {
                 return null;
             }
-            var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, "html", emailTemplateName, emailCC, emailBCC);
-            EmailLog emailLog = new();
-            emailLog = UpdateMappedEmailLog(emailLog, emailObject);
-            emailLog.ApplicationId = applicationId;
-            emailLog.Status = status ?? EmailStatus.Initialized;
-
-            // When being called here the current tenant is in context - verified by looking at the tenant id
-            EmailLog loggedEmail = await emailLogsRepository.InsertAsync(emailLog, autoSave: true);
-            return loggedEmail;
+            var emailLog = new EmailLog { Id = GuidGenerator.Create() };
+            emailLog = await PopulateEmailLogAsync(emailLog, email, applicationId, status, scheduledNotificationId);
+            return await emailLogsRepository.InsertAsync(emailLog, autoSave: true);
         }
 
-        public async Task<EmailLog?> UpdateEmailLogAsync(Guid emailId, string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+        public async Task<EmailLog?> UpdateEmailLogAsync(Guid emailId, EmailMessageParams email, Guid applicationId, string? status)
         {
-            if (string.IsNullOrEmpty(emailTo))
+            if (string.IsNullOrEmpty(email.EmailTo))
             {
                 return null;
             }
 
-            var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, "html", emailTemplateName, emailCC, emailBCC);
-            EmailLog emailLog = await emailLogsRepository.GetAsync(emailId);
-            emailLog = UpdateMappedEmailLog(emailLog, emailObject);
-            emailLog.ApplicationId = applicationId;
-            emailLog.Id = emailId;
-            emailLog.Status = status ?? EmailStatus.Initialized;
-
-            // When being called here the current tenant is in context - verified by looking at the tenant id
-            EmailLog loggedEmail = await emailLogsRepository.UpdateAsync(emailLog, autoSave: true);
-            return loggedEmail;
+            var existingEmail = await emailLogsRepository.FindAsync(emailId);
+            
+            if (existingEmail == null)
+            {
+                // Email doesn't exist, create a new one instead
+                var newEmailLog = new EmailLog { Id = emailId };
+                newEmailLog = await PopulateEmailLogAsync(newEmailLog, email, applicationId, status);
+                return await emailLogsRepository.InsertAsync(newEmailLog, autoSave: true);
+            }
+            
+            // Email exists, update it
+            existingEmail = await PopulateEmailLogAsync(existingEmail, email, applicationId, status);
+            return await emailLogsRepository.UpdateAsync(existingEmail, autoSave: true);
         }
 
         public async Task<EmailLog?> GetEmailLogByIdAsync(Guid id)
@@ -99,24 +99,52 @@ public async Task<EmailLog> CreateDraftEmailLogAsync(Guid applicationId)
         public async Task DeleteEmailLogAsync(Guid id)
         {
             var emailLog = await emailLogsRepository.GetAsync(id);
-            if (emailLog.Status == EmailStatus.Sent)
+            if (emailLog.Status == EmailStatus.Sent && !emailLog.SendOnDateTime.HasValue)
             {
                 throw new UserFriendlyException("Sent emails cannot be deleted.");
             }
 
-            var attachments = await emailAttachmentService.GetAttachmentsAsync(id);
-            foreach (var s3Key in attachments.Select(attachment => attachment.S3ObjectKey))
+            if (emailLog.SendOnDateTime.HasValue && emailLog.ChesMsgId.HasValue)
             {
-                try
+                var shouldThrow = await SyncScheduledEmailStatusAsync(emailLog);
+                if (shouldThrow)
                 {
-                    await emailAttachmentService.DeleteFromS3Async(s3Key);
+                    // Update the entity in the current context and persist it
+                    await emailLogsRepository.UpdateAsync(emailLog, autoSave: true);
+                    throw new UserFriendlyException(
+                        "This scheduled email has already been sent and cannot be deleted.");
                 }
-                catch (Exception ex)
+            }
+
+            await DeleteEmailAttachmentsAsync(id);
+            
+            try
+            {
+                await emailLogsRepository.DeleteAsync(id);
+            }
+            catch (AbpDbConcurrencyException)
+            {
+                // Handle concurrency exception - entity may have been deleted by another request
+                // Try to get fresh entity and delete it, or silently succeed if it's already gone
+                var freshEmailLog = await emailLogsRepository.FindAsync(id);
+                if (freshEmailLog != null)
                 {
-                    Logger.LogError(ex, "Failed to delete S3 attachment for EmailLog {EmailLogId}", id);
+                    await emailLogsRepository.DeleteAsync(freshEmailLog, autoSave: true);
                 }
+                // If entity doesn't exist, that's fine - it was already deleted
             }
-            await emailLogsRepository.DeleteAsync(id);
+        }
+
+        public async Task CancelEmailLogAsync(Guid id)
+        {
+            var emailLog = await emailLogsRepository.GetAsync(id);
+            if (emailLog.Status == EmailStatus.Sent)
+            {
+                throw new UserFriendlyException("Sent emails cannot be cancelled.");
+            }
+
+            emailLog.Status = EmailStatus.Cancelled;
+            await emailLogsRepository.UpdateAsync(emailLog, autoSave: true);
         }
 
         /// <summary>
@@ -131,36 +159,20 @@ public async Task DeleteEmailLogAsync(Guid id)
         /// <param name="emailCC">CC email addresses</param>
         /// <param name="emailBCC">BCC email addresses</param>
         /// <returns>HttpResponseMessage indicating the result of the operation</returns>
-        public async Task<HttpResponseMessage> SendEmailAsync(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+        public async Task<HttpResponseMessage> SendEmailAsync(EmailMessageParams email, string? emailBodyType = null)
         {
-            try
+            if (string.IsNullOrEmpty(email.EmailTo))
             {
-                if (string.IsNullOrEmpty(emailTo))
+                Logger.LogError("EmailNotificationManager->SendEmailAsync: The 'emailTo' parameter is null or empty.");
+                return new HttpResponseMessage(HttpStatusCode.BadRequest)
                 {
-                    Logger.LogError("EmailNotificationManager->SendEmailAsync: The 'emailTo' parameter is null or empty.");
-                    return new HttpResponseMessage(HttpStatusCode.BadRequest)
-                    {
-                        Content = new StringContent("'emailTo' cannot be null or empty.")
-                    };
-                }
-
-                // Send the email using the CHES client service
-                var emailObject = await GetEmailObjectAsync(
-                    emailTo, body, subject, emailFrom, emailBodyType, emailTemplateName, emailCC, emailBCC, excludeTemplate: true);
-
-                var response = await chesClientService.SendAsync(emailObject);
-
-                // Assuming SendAsync returns a HttpResponseMessage or equivalent:
-                return response;
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "EmailNotificationManager->SendEmailAsync: Exception occurred while sending email.");
-                return new HttpResponseMessage(HttpStatusCode.InternalServerError)
-                {
-                    Content = new StringContent($"An exception occurred while sending the email: {ex.Message}")
+                    Content = new StringContent("'emailTo' cannot be null or empty.")
                 };
             }
+
+            return await SendEmailInternalAsync(
+                () => GetEmailObjectAsync(email, emailBodyType, excludeTemplate: true),
+                "EmailNotificationManager->SendEmailAsync: Exception occurred while sending email.");
         }
 
         /// <summary>
@@ -171,42 +183,18 @@ public async Task<HttpResponseMessage> SendEmailAsync(string emailTo, string bod
         [RemoteService(false)]
         public async Task<HttpResponseMessage> SendEmailAsync(EmailLog emailLog)
         {
-            try
-            {
-                if (emailLog == null)
-                {
-                    Logger.LogError("EmailNotificationManager->SendEmailAsync: The 'emailLog' parameter is null.");
-                    return new HttpResponseMessage(HttpStatusCode.BadRequest)
-                    {
-                        Content = new StringContent("'emailLog' cannot be null.")
-                    };
-                }
-
-                if (string.IsNullOrEmpty(emailLog.ToAddress))
-                {
-                    Logger.LogError("EmailNotificationManager->SendEmailAsync: The 'emailLog.ToAddress' parameter is null or empty.");
-                    return new HttpResponseMessage(HttpStatusCode.BadRequest)
-                    {
-                        Content = new StringContent("'emailLog.ToAddress' cannot be null or empty.")
-                    };
-                }
-
-                // Build email object with attachments from S3
-                var emailObject = await BuildEmailObjectWithAttachmentsAsync(emailLog);
-
-                // Send via CHES
-                var response = await chesClientService.SendAsync(emailObject);
-
-                return response;
-            }
-            catch (Exception ex)
+            if (string.IsNullOrEmpty(emailLog.ToAddress))
             {
-                Logger.LogError(ex, "EmailNotificationManager->SendEmailAsync: Exception occurred while sending email for EmailLog {EmailId}.", emailLog?.Id);
-                return new HttpResponseMessage(HttpStatusCode.InternalServerError)
+                Logger.LogError("EmailNotificationManager->SendEmailAsync: The 'emailLog.ToAddress' parameter is null or empty.");
+                return new HttpResponseMessage(HttpStatusCode.BadRequest)
                 {
-                    Content = new StringContent($"An exception occurred while sending the email: {ex.Message}")
+                    Content = new StringContent("'emailLog.ToAddress' cannot be null or empty.")
                 };
             }
+
+            return await SendEmailInternalAsync(
+                () => BuildEmailObjectWithAttachmentsAsync(emailLog),
+                $"EmailNotificationManager->SendEmailAsync: Exception occurred while sending email for EmailLog {emailLog.Id}.");
         }
 
         /// <summary>
@@ -237,43 +225,33 @@ public async Task<int> GetPendingEmailsCountAsync()
             var allEmailLogs = await emailLogsRepository.GetListAsync();
             var emailLogs = allEmailLogs.Where(filter.Compile()).ToList();
 
-            // Ensure we're returning 0 if no logs are found
-            return emailLogs?.Count ?? 0;
+            return emailLogs.Count;
         }
 
         public async Task<dynamic> BuildEmailObjectWithAttachmentsAsync(EmailLog emailLog)
         {
+            var persistedUtcSendOn = emailLog.SendOnDateTime.HasValue
+                ? DateTime.SpecifyKind(emailLog.SendOnDateTime.Value, DateTimeKind.Utc)
+                : (DateTime?)null;
+
             // Get base email object (without attachments)
             var emailObject = await GetEmailObjectAsync(
-                emailLog.ToAddress,
-                emailLog.Body,
-                emailLog.Subject,
-                emailLog.FromAddress,
+                new EmailMessageParams(emailLog.ToAddress, emailLog.Body, emailLog.Subject,
+                    emailLog.FromAddress, emailLog.TemplateName, emailLog.CC, emailLog.BCC, persistedUtcSendOn),
                 emailLog.BodyType,
-                emailLog.TemplateName,
-                emailLog.CC,
-                emailLog.BCC,
                 excludeTemplate: true);
 
-            // Retrieve attachments from S3
+            // Retrieve and add attachments from S3
             var attachments = await emailAttachmentService.GetAttachmentsAsync(emailLog.Id);
-
             if (attachments.Count != 0)
             {
                 var attachmentList = new List<object>();
-
                 foreach (var attachment in attachments)
                 {
                     byte[]? content = await emailAttachmentService.DownloadFromS3Async(attachment.S3ObjectKey);
                     if (content != null)
                     {
-                        attachmentList.Add(new
-                        {
-                            content = Convert.ToBase64String(content),  // Convert to Base64 for CHES
-                            contentType = attachment.ContentType,
-                            encoding = "base64",
-                            filename = attachment.FileName
-                        });
+                        attachmentList.Add(CreateAttachmentObject(attachment, content));
                     }
                 }
 
@@ -285,31 +263,25 @@ public async Task<dynamic> BuildEmailObjectWithAttachmentsAsync(EmailLog emailLo
         }
 
         protected virtual async Task<dynamic> GetEmailObjectAsync(
-                                                    string emailTo,
-                                                    string body,
-                                                    string subject,
-                                                    string? emailFrom,
-                                                    string? emailBodyType,
-                                                    string? emailTemplateName,
-                                                    string? emailCC = null,
-                                                    string? emailBCC = null,
-                                                    bool excludeTemplate = false)
+            EmailMessageParams email,
+            string? emailBodyType = null,
+            bool excludeTemplate = false)
         {
-            var toList = emailTo.ParseEmailList() ?? [];
-            var ccList = emailCC.ParseEmailList();
-            var bccList = emailBCC.ParseEmailList();
+            var toList = email.EmailTo.ParseEmailList() ?? [];
+            var ccList = email.EmailCC.ParseEmailList();
+            var bccList = email.EmailBCC.ParseEmailList();
 
             var defaultFromAddress = await settingProvider.GetOrNullAsync(NotificationsSettings.Mailing.DefaultFromAddress);
 
             dynamic emailObject = new ExpandoObject();
             var emailObjectDictionary = (IDictionary<string, object?>)emailObject;
 
-            emailObjectDictionary["body"] = body;
+            emailObjectDictionary["body"] = email.Body;
             emailObjectDictionary["bodyType"] = emailBodyType ?? "text";
             emailObjectDictionary["encoding"] = "utf-8";
-            emailObjectDictionary["from"] = emailFrom ?? defaultFromAddress ?? "NoReply@gov.bc.ca";
+            emailObjectDictionary["from"] = email.EmailFrom ?? defaultFromAddress ?? "NoReply@gov.bc.ca";
             emailObjectDictionary["priority"] = "normal";
-            emailObjectDictionary["subject"] = subject;
+            emailObjectDictionary["subject"] = email.Subject;
             emailObjectDictionary["tag"] = "tag";
             emailObjectDictionary["to"] = toList;
 
@@ -323,16 +295,33 @@ protected virtual async Task<dynamic> GetEmailObjectAsync(
                 emailObjectDictionary["bcc"] = bccList;
             }
 
+            // delayTS: desired UTC send time as Unix milliseconds; 0 = send immediately.
+            if (email.SendOnDateTime.HasValue)
+            {
+                var normalizedUtcSendOn = NormalizeToUtc(email.SendOnDateTime.Value);
+                emailObjectDictionary["delayTS"] = new DateTimeOffset(normalizedUtcSendOn).ToUnixTimeMilliseconds();
+            }
+
             // templateName is not part of the CHES MessageObject schema
             // store it on the EmailLog but don't send it to the API.
             if (!excludeTemplate)
             {
-                emailObjectDictionary["templateName"] = emailTemplateName;
+                emailObjectDictionary["templateName"] = email.EmailTemplateName;
             }
 
             return emailObject;
         }
 
+        private static DateTime NormalizeToUtc(DateTime sendOnDateTime)
+        {
+            return sendOnDateTime.Kind switch
+            {
+                DateTimeKind.Utc => sendOnDateTime,
+                DateTimeKind.Local => sendOnDateTime.ToUniversalTime(),
+                _ => new DateTimeOffset(sendOnDateTime, BcPermanentDstOffset).UtcDateTime
+            };
+        }
+
         protected virtual EmailLog UpdateMappedEmailLog(EmailLog emailLog, dynamic emailDynamicObject)
         {
             var dict = (IDictionary<string, object?>)emailDynamicObject;
@@ -347,7 +336,9 @@ protected virtual EmailLog UpdateMappedEmailLog(EmailLog emailLog, dynamic email
             emailLog.BCC = dict.TryGetValue("bcc", out var bcc) && bcc is IEnumerable<string> bccList
                 ? string.Join(",", bccList)
                 : string.Empty;
-            emailLog.TemplateName = emailDynamicObject.templateName;
+            emailLog.TemplateName = dict.TryGetValue("templateName", out var templateName) && templateName is string templateNameStr
+                ? templateNameStr
+                : string.Empty;
             return emailLog;
         }
 
@@ -355,5 +346,256 @@ public async Task<List<EmailLog>> GetEmailLogsByApplicationIdAsync(Guid applicat
         {
             return await emailLogsRepository.GetByApplicationIdAsync(applicationId);
         }
+
+        /// <summary>
+        /// Populates common email log fields used in create and update operations
+        /// </summary>
+        private async Task<EmailLog> PopulateEmailLogAsync(
+            EmailLog emailLog,
+            EmailMessageParams email,
+            Guid applicationId,
+            string? status,
+            Guid? scheduledNotificationId = null)
+        {
+            var emailObject = await GetEmailObjectAsync(email, "html");
+            emailLog = UpdateMappedEmailLog(emailLog, emailObject);
+            emailLog.ApplicationId = applicationId;
+            if (scheduledNotificationId.HasValue)
+            {
+                emailLog.ScheduledNotificationId = scheduledNotificationId.Value;
+            }
+            var normalizedSendOnDateTime = email.SendOnDateTime.HasValue
+                ? NormalizeToUtc(email.SendOnDateTime.Value)
+                : (DateTime?)null;
+
+            emailLog.SendOnDateTime = normalizedSendOnDateTime;
+            emailLog.Status = DetermineSendStatus(normalizedSendOnDateTime, status);
+            emailLog.EmailType = DetermineEmailType(normalizedSendOnDateTime);
+            return emailLog;
+        }
+
+        /// <summary>
+        /// Sends an email via CHES with unified exception handling
+        /// </summary>
+        private async Task<HttpResponseMessage> SendEmailInternalAsync(
+            Func<Task<dynamic>> buildEmailObject,
+            string errorMessage)
+        {
+            try
+            {
+                var emailObject = await buildEmailObject();
+                return await chesClientService.SendAsync(emailObject);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex, errorMessage);
+                return new HttpResponseMessage(HttpStatusCode.InternalServerError)
+                {
+                    Content = new StringContent($"An exception occurred while sending the email: {ex.Message}")
+                };
+            }
+        }
+
+        /// <summary>
+        /// Synchronizes the status of a scheduled email with CHES
+        /// </summary>
+        /// <returns>True if the email has already been sent (completed/accepted), false otherwise</returns>
+        private async Task<bool> SyncScheduledEmailStatusAsync(EmailLog emailLog)
+        {
+            try
+            {
+                var statusResponse = await chesClientService.GetStatusAsync(emailLog.ChesMsgId!.Value);
+                if (statusResponse == null || !statusResponse.IsSuccessStatusCode)
+                {
+                    Logger.LogWarning(
+                        "CHES status check returned unsuccessful status code {StatusCode} for MessageId {MessageId}",
+                        statusResponse?.StatusCode,
+                        emailLog.ChesMsgId);
+                    return false;
+                }
+
+                var responseContent = await statusResponse.Content.ReadAsStringAsync();
+                Logger.LogInformation(
+                    "CHES status check for MessageId {MessageId}: {StatusResponse}",
+                    emailLog.ChesMsgId,
+                    responseContent);
+
+                var status = ExtractChesStatus(responseContent);
+                if (string.IsNullOrWhiteSpace(status))
+                {
+                    return false;
+                }
+
+                if (status.Equals("completed", StringComparison.OrdinalIgnoreCase) ||
+                    status.Equals("accepted", StringComparison.OrdinalIgnoreCase))
+                {
+                    Logger.LogInformation("Email {EmailLogId} CHES status is {ChesStatus}, marking as Sent", emailLog.Id, status);
+                    
+                    // Just update the entity properties - caller will persist it
+                    emailLog.Status = EmailStatus.Sent;
+                    emailLog.ChesStatus = status.Capitalize();
+                    
+                    return true;
+                }
+
+                await UpdateChesStatusAsync(emailLog, status);
+
+                if (status.Equals("pending", StringComparison.OrdinalIgnoreCase))
+                {
+                    await CancelPendingEmailAsync(emailLog);
+                }
+
+                return false;
+            }
+            catch (UserFriendlyException)
+            {
+                throw;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(
+                    ex,
+                    "Error checking CHES status for scheduled email {EmailLogId}",
+                    emailLog.Id);
+                throw new UserFriendlyException(
+                    "Unable to verify the status of the scheduled email. Please try again.");
+            }
+        }
+
+        /// <summary>
+        /// Extracts the status from a CHES status response
+        /// </summary>
+        private static string? ExtractChesStatus(string responseContent)
+        {
+            dynamic? statusData = JsonConvert.DeserializeObject(responseContent);
+            if (statusData != null)
+            {
+                // Handle array response - get first element if it's an array
+                if (statusData is Newtonsoft.Json.Linq.JArray jArray && jArray.Count > 0)
+                {
+                    statusData = jArray[0];
+                }
+                return statusData.status?.ToString();
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Updates the CHES status in the email log
+        /// </summary>
+        private async Task UpdateChesStatusAsync(EmailLog emailLog, string status)
+        {
+            if (string.IsNullOrEmpty(status) || status.Equals("pending", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            emailLog.ChesStatus = status.Capitalize();
+            await emailLogsRepository.UpdateAsync(emailLog);
+            Logger.LogInformation(
+                "Updated email {EmailLogId} status to {Status}",
+                emailLog.Id,
+                emailLog.ChesStatus);
+        }
+
+        /// <summary>
+        /// Cancels a pending email via CHES
+        /// </summary>
+        private async Task CancelPendingEmailAsync(EmailLog emailLog)
+        {
+            try
+            {
+                var cancelResponse = await chesClientService.CancelEmailAsync(emailLog.ChesMsgId!.Value);
+                if (cancelResponse == null || !cancelResponse.IsSuccessStatusCode)
+                {
+                    Logger.LogWarning(
+                        "Failed to cancel pending email {EmailLogId} with MessageId {MessageId}. Status: {StatusCode}",
+                        emailLog.Id,
+                        emailLog.ChesMsgId,
+                        cancelResponse?.StatusCode);
+                    throw new UserFriendlyException(
+                        "Unable to cancel the pending scheduled email. Please try again.");
+                }
+                Logger.LogInformation(
+                    "Successfully cancelled pending email {EmailLogId} with MessageId {MessageId}",
+                    emailLog.Id,
+                    emailLog.ChesMsgId);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(
+                    ex,
+                    "Error cancelling pending email {EmailLogId} with MessageId {MessageId}",
+                    emailLog.Id,
+                    emailLog.ChesMsgId);
+                throw new UserFriendlyException(
+                    "Unable to cancel the pending scheduled email. Please try again.");
+            }
+        }
+
+        /// <summary>
+        /// Deletes all S3 attachments for an email log
+        /// </summary>
+        private async Task DeleteEmailAttachmentsAsync(Guid emailLogId)
+        {
+            var attachments = await emailAttachmentService.GetAttachmentsAsync(emailLogId);
+            foreach (var attachment in attachments)
+            {
+                try
+                {
+                    await emailAttachmentService.DeleteFromS3Async(attachment.S3ObjectKey);
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError(
+                        ex,
+                        "Failed to delete S3 attachment with key: {S3ObjectKey}",
+                        attachment.S3ObjectKey);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates an attachment object for CHES API submission
+        /// </summary>
+        private static object CreateAttachmentObject(EmailLogAttachment attachment, byte[] content)
+        {
+            return new
+            {
+                content = Convert.ToBase64String(content),
+                contentType = attachment.ContentType,
+                encoding = "base64",
+                filename = attachment.FileName
+            };
+        }
+
+        /// <summary>
+        /// Determines the appropriate email status based on scheduled send time
+        /// </summary>
+        /// <param name="sendOnDateTime">The scheduled send time, if any</param>
+        /// <param name="defaultStatus">The default status to use if not scheduled</param>
+        /// <returns>Either Scheduled (if future date) or the default status</returns>
+        private string DetermineSendStatus(DateTime? sendOnDateTime, string? defaultStatus)
+        {
+            if (sendOnDateTime.HasValue && sendOnDateTime.Value > DateTime.UtcNow)
+            {
+                return EmailStatus.Scheduled;
+            }
+            return defaultStatus ?? EmailStatus.Initialized;
+        }
+
+        /// <summary>
+        /// Determines the appropriate email type based on scheduled send time
+        /// </summary>
+        /// <param name="sendOnDateTime">The scheduled send time, if any</param>
+        /// <returns>EmailType.Delayed if future date is set, otherwise EmailType.Manual</returns>
+        private EmailType DetermineEmailType(DateTime? sendOnDateTime)
+        {
+            if (sendOnDateTime.HasValue && sendOnDateTime.Value > DateTime.UtcNow)
+            {
+                return EmailType.Delayed;
+            }
+            return EmailType.Manual;
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
index 0a31ff2c46..1cd1489413 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationService.cs
@@ -43,25 +43,31 @@ public async Task DeleteEmail(Guid id)
         await emailNotificationManager.DeleteEmailLogAsync(id);
     }
 
+    [Authorize(NotificationsPermissions.Email.Send)]
+    public async Task CancelEmail(Guid id)
+    {
+        await emailNotificationManager.CancelEmailLogAsync(id);
+    }
+
     public async Task<int> GetEmailsChesWithNoResponseCountAsync()
     {
         return await emailNotificationManager.GetPendingEmailsCountAsync();
     }
 
-    public async Task<EmailLog?> UpdateEmailLog(Guid emailId, string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+    public async Task<EmailLog?> UpdateEmailLog(Guid emailId, EmailMessageParams email, Guid applicationId, string? status)
     {
-        return await emailNotificationManager.UpdateEmailLogAsync(emailId, emailTo, body, subject, applicationId, emailFrom, status, emailTemplateName, emailCC, emailBCC);
+        return await emailNotificationManager.UpdateEmailLogAsync(emailId, email, applicationId, status);
     }
 
-    public async Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+    public async Task<EmailLog?> InitializeEmailLog(EmailMessageParams email, Guid applicationId)
     {
-        return await emailNotificationManager.CreateEmailLogAsync(emailTo, body, subject, applicationId, emailFrom, emailTemplateName, emailCC, emailBCC);
+        return await emailNotificationManager.CreateEmailLogAsync(email, applicationId);
     }
 
     [RemoteService(false)]
-    public async Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+    public async Task<EmailLog?> InitializeEmailLog(EmailMessageParams email, Guid applicationId, string? status)
     {
-        return await emailNotificationManager.CreateEmailLogAsync(emailTo, body, subject, applicationId, emailFrom, status, emailTemplateName, emailCC, emailBCC);
+        return await emailNotificationManager.CreateEmailLogAsync(email, applicationId, status);
     }
 
     protected virtual async Task NotifyTeamsChannel(string chesEmailError)
@@ -153,7 +159,8 @@ public async Task<HttpResponseMessage> SendCommentNotification(EmailCommentDto i
                 foreach (var email in input.MentionNamesEmail)
                 {
                     var toEmail = email;
-                    res = await emailNotificationManager.SendEmailAsync(toEmail, htmlBody, subject, fromEmail, "html", input.EmailTemplateName);
+                    res = await emailNotificationManager.SendEmailAsync(
+                        new EmailMessageParams(toEmail, htmlBody, subject, fromEmail, input.EmailTemplateName), "html");
                 }
             }
             else
@@ -188,9 +195,9 @@ public async Task<HttpResponseMessage> SendCommentNotification(EmailCommentDto i
     /// <param name="emailCC">CC email addresses</param>
     /// <param name="emailBCC">BCC email addresses</param>
     /// <returns>HttpResponseMessage indicating the result of the operation</returns>
-    public async Task<HttpResponseMessage> SendEmailNotification(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+    public async Task<HttpResponseMessage> SendEmailNotification(EmailMessageParams email, string? emailBodyType = null)
     {
-        return await emailNotificationManager.SendEmailAsync(emailTo, body, subject, emailFrom, emailBodyType, emailTemplateName, emailCC, emailBCC);
+        return await emailNotificationManager.SendEmailAsync(email, emailBodyType);
     }
 
     /// <summary>
@@ -257,6 +264,7 @@ public async Task UpdateSettings(NotificationsSettingsDto settingsDto)
     {
         await UpdateTenantSettings(NotificationsSettings.Mailing.DefaultFromAddress, settingsDto.DefaultFromAddress);
         await UpdateTenantSettings(NotificationsSettings.Mailing.EmailMaxRetryAttempts, settingsDto.MaximumRetryAttempts);
+        await settingManager.SetForCurrentTenantAsync(NotificationsSettings.Mailing.EnableEmailDelay, settingsDto.EnableEmailDelay ? "true" : "false");
     }
 
     private async Task UpdateTenantSettings(string settingKey, string valueString)
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationManager.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationManager.cs
index cc9fe5a31f..f36836ee39 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationManager.cs
@@ -14,17 +14,17 @@ public interface IEmailNotificationManager
         /// <summary>
         /// Creates and initializes a new email log
         /// </summary>
-        Task<EmailLog?> CreateEmailLogAsync(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
+        Task<EmailLog?> CreateEmailLogAsync(EmailMessageParams email, Guid applicationId);
 
         /// <summary>
-        /// Creates and initializes a new email log with status
+        /// Creates and initializes a new email log with status and optional scheduled notification ID
         /// </summary>
-        Task<EmailLog?> CreateEmailLogAsync(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
+        Task<EmailLog?> CreateEmailLogAsync(EmailMessageParams email, Guid applicationId, string? status, Guid? scheduledNotificationId = null);
 
         /// <summary>
         /// Updates an existing email log
         /// </summary>
-        Task<EmailLog?> UpdateEmailLogAsync(Guid emailId, string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
+        Task<EmailLog?> UpdateEmailLogAsync(Guid emailId, EmailMessageParams email, Guid applicationId, string? status);
 
         /// <summary>
         /// Retrieves an email log by ID
@@ -44,7 +44,7 @@ public interface IEmailNotificationManager
         /// <summary>
         /// Sends an email notification using CHES
         /// </summary>
-        Task<HttpResponseMessage> SendEmailAsync(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
+        Task<HttpResponseMessage> SendEmailAsync(EmailMessageParams email, string? emailBodyType = null);
 
         /// <summary>
         /// Sends an email notification from an EmailLog (with S3 attachments support)
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationService.cs
index c598fef948..a4353ed0f1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/IEmailNotificationService.cs
@@ -10,18 +10,19 @@ namespace Unity.Notifications.EmailNotifications
 {
     public interface IEmailNotificationService : IApplicationService
     {
-        Task<EmailLog?> UpdateEmailLog(Guid emailId, string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
-        Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
-        Task<EmailLog?> InitializeEmailLog(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
+        Task<EmailLog?> UpdateEmailLog(Guid emailId, EmailMessageParams email, Guid applicationId, string? status);
+        Task<EmailLog?> InitializeEmailLog(EmailMessageParams email, Guid applicationId, string? status);
+        Task<EmailLog?> InitializeEmailLog(EmailMessageParams email, Guid applicationId);
         Task<EmailLog?> GetEmailLogById(Guid id);
         Task<HttpResponseMessage> SendCommentNotification(EmailCommentDto input);
-        Task<HttpResponseMessage> SendEmailNotification(string emailTo, string body, string subject, string? emailFrom, string? emailBodyType, string? emailTemplateName, string? emailCC = null, string? emailBCC = null);
+        Task<HttpResponseMessage> SendEmailNotification(EmailMessageParams email, string? emailBodyType = null);
         Task<HttpResponseMessage> SendEmailNotification(EmailLog emailLog);        
         Task SendEmailToQueue(EmailLog emailLog);
         Task<List<EmailHistoryDto>> GetHistoryByApplicationId(Guid applicationId);
         Task UpdateSettings(NotificationsSettingsDto settingsDto);
         Task<Guid> InitializeDraftAsync(Guid applicationId);
         Task DeleteEmail(Guid id);
+        Task CancelEmail(Guid id);
         Task<int> GetEmailsChesWithNoResponseCountAsync();
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailAttachmentService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailAttachmentService.cs
index 03793d3383..42c22f5d17 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailAttachmentService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailAttachmentService.cs
@@ -38,13 +38,15 @@ public EmailAttachmentService(
     }
 
     public async Task<EmailLogAttachment> UploadAttachmentAsync(
-        Guid emailLogId,
+        Guid? emailLogId,
+        Guid? templateId,
         Guid? tenantId,
         string fileName,
         byte[] fileContent,
         string contentType)
     {
-        var s3Key = BuildS3Key(tenantId, emailLogId, fileName);
+        var guid = emailLogId ?? templateId ?? throw new ArgumentException("Either emailLogId or templateId must be provided.");
+        var s3Key = BuildS3Key(tenantId, guid, fileName);
         var bucket = _configuration[S3BucketConfigKey];
 
         // Upload to S3
@@ -68,6 +70,7 @@ public async Task<EmailLogAttachment> UploadAttachmentAsync(
         var attachment = new EmailLogAttachment
         {
             EmailLogId = emailLogId,
+            TemplateId = templateId,
             S3ObjectKey = s3Key,
             FileName = fileName,
             DisplayName = fileName,
@@ -102,14 +105,16 @@ public async Task<EmailLogAttachment> UploadAttachmentAsync(
     }
 
     public async Task<EmailLogAttachment> UploadUserAttachmentAsync(
-        Guid emailLogId,
+        Guid? emailLogId,
+        Guid? templateId,
         Guid? tenantId,
         string fileName,
         byte[] fileContent,
         string contentType)
     {
         var uniqueKey = Guid.NewGuid();
-        var s3Key = BuildUserAttachmentS3Key(tenantId, emailLogId, uniqueKey, fileName);
+        Guid generateGuid = emailLogId ?? templateId ?? throw new ArgumentException("Either emailLogId or templateId must be provided.");
+        var s3Key = BuildUserAttachmentS3Key(tenantId, generateGuid, uniqueKey, fileName);
         var bucket = _configuration[S3BucketConfigKey];
 
         using var uploadStream = new MemoryStream(fileContent);
@@ -131,6 +136,7 @@ public async Task<EmailLogAttachment> UploadUserAttachmentAsync(
         var attachment = new EmailLogAttachment
         {
             EmailLogId = emailLogId,
+            TemplateId = templateId,
             S3ObjectKey = s3Key,
             FileName = fileName,
             DisplayName = fileName,
@@ -162,10 +168,22 @@ public async Task<List<EmailLogAttachment>> GetAttachmentsAsync(Guid emailLogId)
         return await _emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId);
     }
 
-    public async Task<long> GetTotalFileSizeAsync(Guid emailLogId)
+    public async Task<long> GetTotalFileSizeAsync(Guid? emailLogId, Guid? templateId)
     {
-        var attachments = await _emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId);
-        return attachments.Sum(a => a.FileSize);
+        if(emailLogId != null)
+        {
+            var attachments = await _emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId.Value);
+            return attachments.Sum(a => a.FileSize);
+        }
+        else if(templateId != null)
+        {
+            var attachments = await _emailLogAttachmentRepository.GetByTemplateIdAsync(templateId.Value);
+            return attachments.Sum(a => a.FileSize);
+        }
+        else
+        {
+            throw new ArgumentException("Either emailLogId or templateId must be provided.");
+        }
     }
 
     private static string BuildUserAttachmentS3Key(Guid? tenantId, Guid emailLogId, Guid attachmentId, string fileName)
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs
index 31a5a9b20b..1933d5e6da 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Emails/EmailLogAttachmentAppService.cs
@@ -8,6 +8,7 @@
 using Volo.Abp;
 using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities;
 using Volo.Abp.Users;
 
 namespace Unity.Notifications.Emails;
@@ -20,9 +21,29 @@ public class EmailLogAttachmentAppService(
     EmailAttachmentService emailAttachmentService,
     IExternalUserLookupServiceProvider externalUserLookupServiceProvider) : ApplicationService, IEmailLogAttachmentAppService, IEmailLogAttachmentUploadService
 {
+
     public async Task<List<EmailLogAttachmentDto>> GetListByEmailLogIdAsync(Guid emailLogId)
     {
-        var attachments = await emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId);
+        return await GetListBydAsync(emailLogId, null);
+    }
+
+    public async Task<List<EmailLogAttachmentDto>> GetListByTemplateIdAsync(Guid templateId)
+    {
+        return await GetListBydAsync(null, templateId);
+    }
+        
+    public async Task<List<EmailLogAttachmentDto>> GetListBydAsync(Guid? emailLogId, Guid? templateId)
+    {
+        var attachments = new List<EmailLogAttachment>();
+        if (emailLogId.HasValue)
+        {
+            attachments = await emailLogAttachmentRepository.GetByEmailLogIdAsync(emailLogId.Value);
+        }
+        else if (templateId.HasValue)
+        {
+            attachments = await emailLogAttachmentRepository.GetByTemplateIdAsync(templateId.Value);
+        }
+
         var dtos = new List<EmailLogAttachmentDto>();
 
         foreach (var attachment in attachments)
@@ -45,9 +66,33 @@ public async Task<List<EmailLogAttachmentDto>> GetListByEmailLogIdAsync(Guid ema
 
     public async Task DeleteAsync(Guid id)
     {
-        var attachment = await emailLogAttachmentRepository.GetAsync(id);
+        // Idempotent delete: if already removed by another request, treat as success.
+        var attachment = await emailLogAttachmentRepository.FindAsync(id);
+        if (attachment == null)
+        {
+            return;
+        }
+
+        if (attachment.TemplateId.HasValue)
+        {
+            await emailAttachmentService.DeleteFromS3Async(attachment.S3ObjectKey);
+            try
+            {
+                await emailLogAttachmentRepository.DeleteAsync(attachment, autoSave: true);
+            }
+            catch (EntityNotFoundException)
+            {
+                // Already deleted by another request.
+            }
+            return;
+        }
+
+        if(attachment.EmailLogId == null)
+        {
+            throw new UserFriendlyException("Invalid email log ID.");
+        }
 
-        var emailLog = await emailLogsRepository.GetAsync(attachment.EmailLogId);
+        var emailLog = await emailLogsRepository.GetAsync(attachment.EmailLogId.Value);
         if (emailLog.Status != EmailStatus.Draft)
         {
             throw new UserFriendlyException("Attachments can only be deleted from draft emails.");
@@ -61,17 +106,25 @@ public async Task DeleteAsync(Guid id)
         {
             Logger.LogError(ex, "Failed to delete S3 object {S3ObjectKey} for attachment {AttachmentId}", attachment.S3ObjectKey, id);
         }
-        await emailLogAttachmentRepository.DeleteAsync(id);
+
+        try
+        {
+            await emailLogAttachmentRepository.DeleteAsync(attachment, autoSave: true);
+        }
+        catch (EntityNotFoundException)
+        {
+            // Already deleted by another request.
+        }
     }
 
-    public async Task<long> GetTotalFileSizeByEmailLogIdAsync(Guid emailLogId)
+    public async Task<long> GetTotalFileSizeByEmailLogIdAsync(Guid? emailLogId, Guid? templateId)
     {
-        return await emailAttachmentService.GetTotalFileSizeAsync(emailLogId);
+        return await emailAttachmentService.GetTotalFileSizeAsync(emailLogId, templateId);
     }
 
-    public async Task<EmailLogAttachmentDto> UploadAsync(Guid emailLogId, Guid? tenantId, string fileName, byte[] content, string contentType)
+    public async Task<EmailLogAttachmentDto> UploadAsync(Guid? emailLogId, Guid? templateId, Guid? tenantId, string fileName, byte[] content, string contentType)
     {
-        var attachment = await emailAttachmentService.UploadUserAttachmentAsync(emailLogId, tenantId, fileName, content, contentType);
+        var attachment = await emailAttachmentService.UploadUserAttachmentAsync(emailLogId, templateId, tenantId, fileName, content, contentType);
 
         return new EmailLogAttachmentDto
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs
index adf4b2dac3..fddfbf8d61 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationEvent.cs
@@ -11,6 +11,7 @@ public class EmailNotificationEvent
         public Guid? TenantId { get; set; }
         public Guid TemplateId { get; set; }
         public Guid ApplicationId { get; set; }
+        public Guid? ScheduledNotificationId { get; set; }
         public int RetryAttempts { get; set; } = 0;
         public string Body { get; set; } = string.Empty;
         public string Subject { get; set; } = string.Empty;
@@ -23,8 +24,15 @@ public class EmailNotificationEvent
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public EmailAction Action { get; set; }
         public string? EmailTemplateName { get; set; } = string.Empty;
+        public RecipientType? Recipient { get; set; }
+        public EmailType? EmailType { get; set; }
         public List<EmailAttachmentData>? EmailAttachments { get; set; }
         public List<Guid>? PaymentRequestIds { get; set; }
+
+        /// <summary>
+        /// Optional specific UTC date/time to send the email.
+        /// </summary>
+        public DateTime? SendOnDateTime { get; set; }
     }
 
     public class EmailAttachmentData
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
index b1f17f60eb..580deb3c88 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Events/EmailNotificationHandler.cs
@@ -3,11 +3,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using Unity.GrantManager.Notifications;
 using Unity.Notifications.EmailNotifications;
 using Unity.Notifications.Emails;
 using Unity.Notifications.Events;
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
 using Volo.Abp.EventBus;
 using Volo.Abp.Features;
 using Volo.Abp.MultiTenancy;
@@ -22,9 +24,11 @@ internal class EmailNotificationHandler(
             IEmailLogsRepository emailLogsRepository,
             ICurrentTenant currentTenant,
             IUnitOfWorkManager unitOfWorkManager,
-            ILogger<EmailNotificationHandler> logger) : ILocalEventHandler<EmailNotificationEvent>, ITransientDependency
+            IRepository<ScheduledNotification, Guid> scheduledNotificationRepository,
+            ILoggerFactory loggerFactory) : ILocalEventHandler<EmailNotificationEvent>, ITransientDependency
     {
         private const string FAILED_PAYMENTS_SUBJECT = "CAS Payment Failure Notification";
+        private readonly ILogger<EmailNotificationHandler> _logger = loggerFactory.CreateLogger<EmailNotificationHandler>();
 
         public async Task HandleEventAsync(EmailNotificationEvent eventData)
         {
@@ -50,19 +54,59 @@ public async Task HandleEventAsync(EmailNotificationEvent eventData)
             }
         }
 
-        private async Task<EmailLog> InitializeEmailAndUploadAttachments(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string? emailTemplateName, string? emailCC = null, string? emailBCC = null, List<EmailAttachmentData>? emailAttachments = null)
+        private sealed record EmailInitParams(
+            string EmailTo,
+            string Body,
+            string Subject,
+            Guid ApplicationId,
+            string? EmailFrom,
+            string? EmailTemplateName,
+            string? EmailCC = null,
+            string? EmailBCC = null,
+            DateTime? SendOnDateTime = null);
+
+        private bool HasRecipients(EmailNotificationEvent eventData, string actionName)
         {
-            EmailLog emailLog = await InitializeEmail(
-                                                emailTo,
-                                                body,
-                                                subject,
-                                                applicationId,
-                                                emailFrom,
-                                                EmailStatus.Initialized,
-                                                emailTemplateName,
-                                                emailCC,
-                                                emailBCC);
+            if (eventData.EmailAddressList?.Count > 0)
+            {
+                return true;
+            }
             
+            _logger.LogWarning(
+                "{Action}: No email addresses provided for Application {ApplicationId}",
+                actionName,
+                eventData.ApplicationId);
+            return false;
+        }
+
+        private static (string To, string? Cc, string? Bcc) BuildAddresses(EmailNotificationEvent e)
+        {
+            return (
+                string.Join(",", e.EmailAddressList!),
+                e.Cc?.Any() == true ? string.Join(",", e.Cc) : null,
+                e.Bcc?.Any() == true ? string.Join(",", e.Bcc) : null
+            );
+        }
+
+        private static EmailType GetEmailType(EmailAction action, DateTime? sendOnDateTime = null)
+        {
+            if (sendOnDateTime.HasValue)
+            {
+                return EmailType.Delayed;
+            }
+
+            return action switch
+            {
+                EmailAction.SendEventDriven => EmailType.EventBased,
+                EmailAction.SendDateDriven => EmailType.DateBased,
+                _ => EmailType.Manual
+            };
+        }
+
+        private async Task<EmailLog> InitializeEmailAndUploadAttachments(EmailInitParams p, List<EmailAttachmentData>? emailAttachments = null)
+        {
+            EmailLog emailLog = await InitializeEmail(p, EmailStatus.Initialized);
+
             try
             {
                 // Upload attachments to S3
@@ -72,6 +116,7 @@ private async Task<EmailLog> InitializeEmailAndUploadAttachments(string emailTo,
                     {
                         await emailAttachmentService.UploadAttachmentAsync(
                             emailLog.Id,
+                            null, // No templateId for user-uploaded attachments
                             emailLog.TenantId,
                             attachmentData.FileName,
                             attachmentData.Content,
@@ -81,7 +126,7 @@ await emailAttachmentService.UploadAttachmentAsync(
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "Failed to upload email attachments for Email {EmailId}. Email will be sent WITHOUT attachments.", emailLog.Id);
+                _logger.LogError(ex, "Failed to upload email attachments for Email {EmailId}. Email will be sent WITHOUT attachments.", emailLog.Id);
                 // DO NOT THROW - email failure should not block calling workflow
                 // Email will still be sent after commit, just without attachments
                 // even if S3 upload failed - recipients will notice missing attachment
@@ -90,18 +135,13 @@ await emailAttachmentService.UploadAttachmentAsync(
             return emailLog;
         }
 
-        private async Task<EmailLog> InitializeEmail(string emailTo, string body, string subject, Guid applicationId, string? emailFrom, string status, string? emailTemplateName, string? emailCC = null, string? emailBCC = null)
+        private async Task<EmailLog> InitializeEmail(EmailInitParams p, string status)
         {
             EmailLog emailLog = await emailNotificationService.InitializeEmailLog(
-                                                emailTo,
-                                                body,
-                                                subject,
-                                                applicationId,
-                                                emailFrom,
-                                                status,
-                                                emailTemplateName,
-                                                emailCC,
-                                                emailBCC) ?? throw new UserFriendlyException("Unable to Initialize Email Log");
+                                                    new EmailMessageParams(p.EmailTo, p.Body, p.Subject,
+                                                        p.EmailFrom, p.EmailTemplateName, p.EmailCC, p.EmailBCC, p.SendOnDateTime),
+                                                    p.ApplicationId,
+                                                    status) ?? throw new UserFriendlyException("Unable to Initialize Email Log");
             return emailLog;
         }
 
@@ -112,130 +152,181 @@ private async Task<EmailLog> InitializeEmail(string emailTo, string body, string
                 return null;
             }
             
-            switch (eventData.Action)
+            return eventData.Action switch
             {
-                case EmailAction.SendFailedSummary:
-                {
-                    string emailToAddress = String.Join(",", eventData.EmailAddressList);
-
-                    return await InitializeEmailAndUploadAttachments(
-                        emailToAddress,
-                        eventData.Body,
-                        FAILED_PAYMENTS_SUBJECT,
-                        eventData.ApplicationId,
-                        eventData.EmailFrom,
-                        eventData.EmailTemplateName);
-                }
-                case EmailAction.SendCustom:
-                    return await HandleSendCustomEmail(eventData);
+                EmailAction.SendFailedSummary => await HandleFailedSummary(eventData),
+                EmailAction.SendCustom or EmailAction.SendEventDriven or EmailAction.SendDateDriven => await HandleSendCustomEmail(eventData),
+                EmailAction.SaveDraft => await HandleSaveDraftAndReturnNull(eventData),
+                EmailAction.SendFsbNotification => await HandleFsbNotification(eventData),
+                _ => null
+            };
+        }
 
-                case EmailAction.SaveDraft:
-                    await HandleSaveDraftEmail(eventData);
-                    return null;
+        private async Task<EmailLog?> HandleFailedSummary(EmailNotificationEvent eventData)
+        {
+            if (!HasRecipients(eventData, nameof(EmailAction.SendFailedSummary)))
+            {
+                return null;
+            }
 
-                case EmailAction.SendFsbNotification:
-                {
-                    string fsbEmailToAddress = String.Join(",", eventData.EmailAddressList);
-                    var emailLog = await InitializeEmailAndUploadAttachments(
-                        fsbEmailToAddress,
-                        eventData.Body,
-                        eventData.Subject ?? "FSB Payment Notification",
-                        eventData.ApplicationId,
-                        eventData.EmailFrom,
-                        eventData.EmailTemplateName,
-                        null, // emailCC
-                        null, // emailBCC
-                        eventData.EmailAttachments);
-
-                    // Store payment request IDs for tracking
-                    if (eventData.PaymentRequestIds != null && eventData.PaymentRequestIds.Count != 0)
-                    {
-                        emailLog.PaymentRequestIds = string.Join(",", eventData.PaymentRequestIds);
-                        await emailLogsRepository.UpdateAsync(emailLog, autoSave: true);
-                    }
+            var (to, cc, bcc) = BuildAddresses(eventData);
+            var emailLog = await InitializeEmailAndUploadAttachments(
+                new EmailInitParams(to, eventData.Body, FAILED_PAYMENTS_SUBJECT,
+                    eventData.ApplicationId, eventData.EmailFrom, eventData.EmailTemplateName, cc, bcc));
+            
+            emailLog.Recipient = RecipientType.Internal;
+            await StampClassificationAsync(emailLog);
+            return emailLog;
+        }
 
-                    return emailLog;
-                }
-                case EmailAction.Retry:
-                default:
-                    return null;
+        private async Task<EmailLog?> HandleFsbNotification(EmailNotificationEvent eventData)
+        {
+            if (!HasRecipients(eventData, nameof(EmailAction.SendFsbNotification)))
+            {
+                return null;
+            }
+
+            var (to, cc, bcc) = BuildAddresses(eventData);
+            var emailLog = await InitializeEmailAndUploadAttachments(
+                new EmailInitParams(to, eventData.Body,
+                    eventData.Subject ?? "FSB Payment Notification",
+                    eventData.ApplicationId, eventData.EmailFrom, eventData.EmailTemplateName, cc, bcc),
+                eventData.EmailAttachments);
+
+            if (eventData.PaymentRequestIds?.Count > 0)
+            {
+                emailLog.PaymentRequestIds = string.Join(",", eventData.PaymentRequestIds);
             }
+
+            emailLog.Recipient = RecipientType.Internal;
+            await StampClassificationAsync(emailLog);
+            return emailLog;
         }
 
         private async Task<EmailLog?> HandleSendCustomEmail(EmailNotificationEvent eventData)
         {
-            string emailToAddress = String.Join(",", eventData.EmailAddressList);
-            string? emailCC = eventData.Cc?.Any() == true ? String.Join(",", eventData.Cc) : null;
-            string? emailBCC = eventData.Bcc?.Any() == true ? String.Join(",", eventData.Bcc) : null;
-            
-            if (eventData.Id == Guid.Empty)
+            if (!HasRecipients(eventData, nameof(EmailAction.SendCustom)))
             {
-                return await InitializeEmailAndUploadAttachments(
-                    emailToAddress,
-                    eventData.Body,
-                    eventData.Subject,
-                    eventData.ApplicationId,
-                    eventData.EmailFrom,
-                    eventData.EmailTemplateName,
-                    emailCC,
-                    emailBCC,
-                    eventData.EmailAttachments);
-            }
-
-            EmailLog? emailLog = await emailNotificationService.UpdateEmailLog(
-                eventData.Id,
-                emailToAddress,
-                eventData.Body,
-                eventData.Subject,
-                eventData.ApplicationId,
-                eventData.EmailFrom,
-                EmailStatus.Initialized,
-                eventData.EmailTemplateName,
-                emailCC,
-                emailBCC);
+                return null;
+            }
 
-            if (emailLog != null)
+            var (to, cc, bcc) = BuildAddresses(eventData);
+            var messageParams = new EmailMessageParams(
+                to, eventData.Body, eventData.Subject,
+                eventData.EmailFrom, eventData.EmailTemplateName, cc, bcc, eventData.SendOnDateTime);
+
+            var emailLog = await CreateOrUpdateEmail(eventData.Id, messageParams, eventData.ApplicationId, eventData.EmailAttachments, EmailStatus.Initialized);
+            
+            if (emailLog == null)
             {
-                return emailLog;
+                return null;
             }
 
-            throw new UserFriendlyException("Unable to update Email Log");
+            emailLog.EmailType = GetEmailType(eventData.Action);
+            
+            if (eventData.ScheduledNotificationId.HasValue && !emailLog.ScheduledNotificationId.HasValue)
+            {
+                emailLog.ScheduledNotificationId = eventData.ScheduledNotificationId.Value;
+                await emailLogsRepository.UpdateAsync(emailLog, autoSave: true);
+            }
+            
+            await StampClassificationAsync(emailLog);
+            return emailLog;
         }
 
-        private async Task HandleSaveDraftEmail(EmailNotificationEvent eventData)
+        private async Task<EmailLog?> CreateOrUpdateEmail(
+            Guid emailId,
+            EmailMessageParams messageParams,
+            Guid applicationId,
+            List<EmailAttachmentData>? attachments,
+            string status)
         {
-                string emailToAddress = String.Join(",", eventData.EmailAddressList);
-                string? emailCC = eventData.Cc?.Any() == true ? String.Join(",", eventData.Cc) : null;
-                string? emailBCC = eventData.Bcc?.Any() == true ? String.Join(",", eventData.Bcc) : null;
+            if (emailId == Guid.Empty)
+            {
+                return await InitializeEmailAndUploadAttachments(
+                    new EmailInitParams(
+                        messageParams.EmailTo,
+                        messageParams.Body,
+                        messageParams.Subject,
+                        applicationId,
+                        messageParams.EmailFrom,
+                        messageParams.EmailTemplateName,
+                        messageParams.EmailCC,
+                        messageParams.EmailBCC,
+                        messageParams.SendOnDateTime),
+                    attachments);
+            }
 
-                if (eventData.Id != Guid.Empty)
-                {
-                    await emailNotificationService.UpdateEmailLog(
-                        eventData.Id,
-                        emailToAddress,
-                        eventData.Body,
-                        eventData.Subject,
-                        eventData.ApplicationId,
-                        eventData.EmailFrom,
-                        EmailStatus.Draft,
-                        eventData.EmailTemplateName,
-                        emailCC,
-                        emailBCC);
-                }
-                else
+            var existingEmail = await emailLogsRepository.FindAsync(emailId);
+            if (existingEmail != null)
+            {
+                return await emailNotificationService.UpdateEmailLog(
+                    emailId,
+                    messageParams,
+                    applicationId,
+                    status);
+            }
+            
+            return await InitializeEmailAndUploadAttachments(
+                new EmailInitParams(
+                    messageParams.EmailTo,
+                    messageParams.Body,
+                    messageParams.Subject,
+                    applicationId,
+                    messageParams.EmailFrom,
+                    messageParams.EmailTemplateName,
+                    messageParams.EmailCC,
+                    messageParams.EmailBCC,
+                    messageParams.SendOnDateTime),
+                attachments);
+        }
+
+        private async Task<EmailLog> StampClassificationAsync(EmailLog emailLog)
+        {
+            emailLog.Recipient = RecipientType.External;
+            
+            if (emailLog.ScheduledNotificationId.HasValue)
+            {
+                var notification = await scheduledNotificationRepository.FindAsync(emailLog.ScheduledNotificationId.Value);
+                if (notification?.RecipientCategory?.Equals("Internal", StringComparison.OrdinalIgnoreCase) == true)
                 {
-                    await InitializeEmail(
-                        emailToAddress,
-                        eventData.Body,
-                        eventData.Subject,
-                        eventData.ApplicationId,
-                        eventData.EmailFrom,
-                        EmailStatus.Draft, 
-                        eventData.EmailTemplateName,
-                        emailCC,
-                        emailBCC);
+                    emailLog.Recipient = RecipientType.Internal;
                 }
+            }
+            else if (emailLog.Recipient == RecipientType.Internal)
+            {
+                // Preserve explicitly set Internal recipient
+            }
+            else
+            {
+                emailLog.Recipient = RecipientType.External;
+            }
             
+            await emailLogsRepository.UpdateAsync(emailLog, autoSave: true);
+            return emailLog;
+        }
+
+        private async Task<EmailLog?> HandleSaveDraftAndReturnNull(EmailNotificationEvent eventData)
+        {
+            if (!HasRecipients(eventData, nameof(EmailAction.SaveDraft)))
+            {
+                return null;
+            }
+
+            var (to, cc, bcc) = BuildAddresses(eventData);
+            var messageParams = new EmailMessageParams(
+                to, eventData.Body, eventData.Subject,
+                eventData.EmailFrom, eventData.EmailTemplateName, cc, bcc, eventData.SendOnDateTime);
+
+            var emailLog = await CreateOrUpdateEmail(eventData.Id, messageParams, eventData.ApplicationId, null, EmailStatus.Draft);
+            
+            if (emailLog != null)
+            {
+                await StampClassificationAsync(emailLog);
+            }
+            
+            return null;
         }
     }
 }
+
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/Ches/ChesClientService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/Ches/ChesClientService.cs
index 1d60223991..33d721f00c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/Ches/ChesClientService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/Ches/ChesClientService.cs
@@ -9,6 +9,7 @@
 using Volo.Abp.Caching;
 using Unity.GrantManager.Integrations;
 using Unity.GrantManager.Integrations.Css;
+using System;
 
 namespace Unity.Notifications.Integrations.Ches
 {
@@ -37,6 +38,35 @@ IOptions<ChesClientOptions> chesClientOptions
             );
             return response;
         }
+
+        public async Task<HttpResponseMessage?> GetStatusAsync(Guid messageId)
+        {
+            string authToken = await GetAuthTokenAsync();
+            string notificationsApiUrl = await endpointManagementAppService.GetUgmUrlByKeyNameAsync(DynamicUrlKeyNames.NOTIFICATION_API_BASE);
+            var resource = $"{notificationsApiUrl}/status?msgId={messageId}";
+            var response = await resilientHttpRequest.HttpAsync(
+                HttpMethod.Get,
+                resource,
+                null,
+                authToken
+            );
+            return response;
+        }
+
+        public async Task<HttpResponseMessage?> CancelEmailAsync(Guid messageId)
+        {
+            string authToken = await GetAuthTokenAsync();
+            string notificationsApiUrl = await endpointManagementAppService.GetUgmUrlByKeyNameAsync(DynamicUrlKeyNames.NOTIFICATION_API_BASE);
+            var resource = $"{notificationsApiUrl}/cancel/{messageId}";
+            var response = await resilientHttpRequest.HttpAsync(
+                HttpMethod.Delete,
+                resource,
+                null,
+                authToken
+            );
+            return response;
+        }
+
         private async Task<string> GetAuthTokenAsync()
         {
             string notificationsAuthUrl = await endpointManagementAppService.GetUgmUrlByKeyNameAsync(DynamicUrlKeyNames.NOTIFICATION_AUTH);
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/Ches/IChesClientService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/Ches/IChesClientService.cs
index 11b92d24a8..5ac47a9327 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/Ches/IChesClientService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/Ches/IChesClientService.cs
@@ -1,4 +1,5 @@
-using System.Net.Http;
+using System;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
@@ -7,6 +8,8 @@ namespace Unity.Notifications.Integrations.Ches
     public interface IChesClientService : IApplicationService
     {
         Task<HttpResponseMessage?> SendAsync(object emailRequest);
+        Task<HttpResponseMessage?> GetStatusAsync(Guid messageId);
+        Task<HttpResponseMessage?> CancelEmailAsync(Guid messageId);
     }
 }
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailConsumer.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailConsumer.cs
index a8a7123614..123334601f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailConsumer.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailConsumer.cs
@@ -1,22 +1,22 @@
+using Amazon.S3;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using System;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Amazon.S3;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using Unity.Modules.Shared.MessageBrokers.RabbitMQ.Interfaces;
 using Unity.Notifications.EmailNotifications;
+using Unity.Notifications.Emails;
 using Unity.Notifications.Events;
 using Unity.Notifications.Integrations.RabbitMQ.QueueMessages;
 using Volo.Abp;
 using Volo.Abp.Data;
+using Volo.Abp.EventBus.Local;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
-using Unity.Notifications.Emails;
-using Volo.Abp.EventBus.Local;
 
 namespace Unity.Notifications.Integrations.RabbitMQ;
 
@@ -178,39 +178,105 @@ private static bool ShouldRetry(HttpStatusCode statusCode) =>
     // -----------------------------
     private async Task UpdateEmailLogStatus(EmailLog log, HttpResponseMessage response)
     {
+        var responseBody = response.Content != null ? await response.Content.ReadAsStringAsync() : null;
+
         log.ChesResponse = JsonConvert.SerializeObject(new
         {
             response.StatusCode,
             Headers = response.Headers?.ToString(),
-            Body = response.Content != null ? await response.Content.ReadAsStringAsync() : null
+            Body = responseBody
         });
 
         log.ChesHttpStatusCode = response.StatusCode.ToString("D");
 
         log.ChesStatus = response.StatusCode.ToString();
 
-        log.Status = response.IsSuccessStatusCode
-            ? EmailStatus.Sent
-            : EmailStatus.Failed;
+        // Update status based on response, but preserve Scheduled status unless send date has passed
+        if (log.Status == EmailStatus.Scheduled)
+        {
+            // If scheduled and send date has passed, update to Sent or Failed based on response
+            if (log.SendOnDateTime.HasValue && log.SendOnDateTime.Value <= DateTime.UtcNow)
+            {
+                log.Status = response.IsSuccessStatusCode
+                    ? EmailStatus.Sent
+                    : EmailStatus.Failed;
+            }
+        }
+        else
+        {
+            // For non-scheduled emails, update status based on response
+            log.Status = response.IsSuccessStatusCode
+                ? EmailStatus.Sent
+                : EmailStatus.Failed;
+        }
 
-        // Publish local event for successful FSB payment notifications
-        if (response.IsSuccessStatusCode && !string.IsNullOrEmpty(log.PaymentRequestIds))
+        // Extract msgId from CHES response if successful
+        if (response.IsSuccessStatusCode && !string.IsNullOrEmpty(responseBody))
         {
-            var paymentIds = log.PaymentRequestIds
-                .Split(',', StringSplitOptions.RemoveEmptyEntries)
-                .Select(id => Guid.Parse(id))
-                .ToList();
+            try
+            {
+                var chesResponse = JsonConvert.DeserializeObject<dynamic>(responseBody);
+                if (chesResponse?.messages != null && chesResponse?.messages.Count > 0)
+                {
+                    string? msgId = chesResponse?.messages[0].msgId;
+                    if (msgId != null && Guid.TryParse(msgId, out var msgIdGuid))
+                    {
+                        log.ChesMsgId = msgIdGuid;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.LogWarning(
+                    ex,
+                    "Failed to extract msgId from CHES response for Email {EmailId}. Response: {Response}",
+                    log.Id,
+                    responseBody
+                );
+            }
+        }
 
-            await localEventBus.PublishAsync(new FsbEmailSentEto
+        // Log SentDateTime on success
+        if (response.IsSuccessStatusCode)
+        {
+            // Use CHES response Date header (response time) or current time as fallback
+            var sentDateTime = SanitizeResponseDateTime(response.Headers?.Date?.UtcDateTime);
+            log.SentDateTime = sentDateTime;
+
+            // Publish local event for successful FSB payment notifications
+            if (!string.IsNullOrEmpty(log.PaymentRequestIds))
             {
-                EmailLogId = log.Id,
-                PaymentRequestIds = paymentIds,
-                SentDate = DateTime.UtcNow,
-                TenantId = log.TenantId
-            });
+                var paymentIds = log.PaymentRequestIds
+                    .Split(',', StringSplitOptions.RemoveEmptyEntries)
+                    .Select(id => Guid.Parse(id))
+                    .ToList();
+
+                await localEventBus.PublishAsync(new FsbEmailSentEto
+                {
+                    EmailLogId = log.Id,
+                    PaymentRequestIds = paymentIds,
+                    SentDate = sentDateTime,
+                    TenantId = log.TenantId
+                });
+            }
         }
     }
 
+    private static readonly TimeSpan _maxFutureSkew = TimeSpan.FromMinutes(5);
+    private static readonly TimeSpan _maxPastAge    = TimeSpan.FromMinutes(15);
+
+    // CHES may return a Date header that is incorrect due to clock skew or environment misconfiguration.
+    // We will sanitize it as an external value by ensuring it's not in the future or past beyond a reasonable threshold.
+    private static DateTime SanitizeResponseDateTime(DateTime? headerDate)
+    {
+        if (headerDate is null) return DateTime.UtcNow;
+
+        var now = DateTime.UtcNow;
+        return headerDate.Value >= now - _maxPastAge && headerDate.Value <= now + _maxFutureSkew
+            ? headerDate.Value
+            : now;
+    }
+
     // -----------------------------
     //      SAFE-CONCURRENCY SAVE
     // -----------------------------
@@ -278,5 +344,5 @@ private static void ValidateMessage(EmailNotificationEvent evt)
     }
 
     private static bool ShouldProcessEmail(EmailLog log)
-        => log != null && log.Status != EmailStatus.Sent;
+        => log != null && log.Status != EmailStatus.Sent && log.Status != EmailStatus.Cancelled;
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailQueueService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailQueueService.cs
index 1eb0693323..6a954be51a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailQueueService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/EmailQueueService.cs
@@ -30,6 +30,7 @@ public async Task<Task> SendToEmailDelayedQueueAsync(EmailNotificationEvent emai
             var message = new EmailMessages
             {
                 TimeToLive = TimeSpan.FromMinutes(TwentyMintues),
+                TenantId = emailNotificationEvent.TenantId ?? Guid.Empty,
                 EmailNotificationEvent = emailNotificationEvent
             };
 
@@ -51,6 +52,7 @@ public Task SendToEmailEventQueueAsync(EmailNotificationEvent emailNotificationE
             var message = new EmailMessages
             {
                 TimeToLive = TimeSpan.FromMinutes(TenMintues),
+                TenantId = emailNotificationEvent.TenantId ?? Guid.Empty,
                 EmailNotificationEvent = emailNotificationEvent
             };
             _queueProducer.PublishMessage(message);
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/QueueMessages/EmailMessages.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/QueueMessages/EmailMessages.cs
index da9d4ae004..fa920ae790 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/QueueMessages/EmailMessages.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Integrations/RabbitMQ/QueueMessages/EmailMessages.cs
@@ -4,10 +4,11 @@
 
 namespace Unity.Notifications.Integrations.RabbitMQ.QueueMessages
 {
-    public class EmailMessages : IQueueMessage
+    public class EmailMessages : ITenantedQueueMessage
     {
         public Guid MessageId { get; set; }
         public TimeSpan TimeToLive { get; set; }
+        public Guid TenantId { get; set; }
         public required EmailNotificationEvent EmailNotificationEvent { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/NotificationsSettingsDataSeedContributor.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/NotificationsSettingsDataSeedContributor.cs
new file mode 100644
index 0000000000..46c304a482
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/NotificationsSettingsDataSeedContributor.cs
@@ -0,0 +1,40 @@
+using System.Threading.Tasks;
+using Unity.Notifications.Settings;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.SettingManagement;
+using Volo.Abp.Settings;
+
+namespace Unity.Notifications;
+
+/// <summary>
+/// Data seed contributor that explicitly writes the default value of EnableEmailDelay
+/// into the Settings table for each tenant that does not already have an explicit row.
+/// This ensures existing tenants get the correct default on deploy rather than relying
+/// on the runtime fallback from SettingDefinitionProvider.
+/// </summary>
+public class NotificationsSettingsDataSeedContributor(ISettingManager settingManager)
+    : IDataSeedContributor, ITransientDependency
+{
+    public async Task SeedAsync(DataSeedContext context)
+    {
+        if (context.TenantId == null)
+        {
+            return;
+        }
+
+        var existingValue = await settingManager.GetOrNullAsync(
+            NotificationsSettings.Mailing.EnableEmailDelay,
+            TenantSettingValueProvider.ProviderName,
+            context.TenantId.Value.ToString(),
+            fallback: false);
+
+        if (string.IsNullOrEmpty(existingValue))
+        {
+            await settingManager.SetForTenantAsync(
+                context.TenantId.Value,
+                NotificationsSettings.Mailing.EnableEmailDelay,
+                "false");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/TeamsNotifications/TeamsNotificationService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/TeamsNotifications/TeamsNotificationService.cs
index f4d319906b..cd89042b76 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/TeamsNotifications/TeamsNotificationService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/TeamsNotifications/TeamsNotificationService.cs
@@ -6,9 +6,10 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
+using Unity.GrantManager.Notifications.Teams;
 
 
-namespace Unity.Notifications.TeamsNotifications
+namespace Unity.Notifications.Teams
 {
     public class TeamsNotificationService
     {
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/ITemplatesService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/ITemplatesService.cs
index 33dec9a293..b6f24d28a9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/ITemplatesService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/ITemplatesService.cs
@@ -9,7 +9,7 @@ public interface ITemplateService : IApplicationService
     {
         Task<EmailTemplate?> CreateAsync(EmailTempateDto templateDto);
         Task<EmailTemplate?> UpdateTemplate(Guid id, EmailTempateDto templateDto);
-        Task<List<EmailTemplate>> GetTemplatesByTenent();
+        Task<List<EmailTemplate>> GetTemplatesByTenant();
         Task<EmailTemplate?> GetTemplateById(Guid id);
         Task DeleteTemplate(Guid id);
         Task<EmailTemplate?> GetTemplateByName(string name);
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs
index ee51827d0f..2744d05d67 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Templates/TemplatesService.cs
@@ -40,7 +40,10 @@ ITemplateVariablesRepository templateVariablesRepository
             templateDto.Description,
             templateDto.Subject,
             templateDto.BodyText,
-            templateDto.BodyHTML, templateDto.SendFrom));
+            templateDto.BodyHTML,
+            templateDto.SendFrom,
+            templateDto.RecipientCategory,
+            templateDto.RecipientIdentifier));
     }
 
     public async Task<EmailTemplate?> UpdateTemplate(Guid id, EmailTempateDto templateDto)
@@ -54,13 +57,15 @@ ITemplateVariablesRepository templateVariablesRepository
         template.BodyHTML = templateDto.BodyHTML != null ? templateDto.BodyHTML : "";
         template.Name = templateDto.Name;
         template.SendFrom = templateDto.SendFrom;
+        template.RecipientCategory = templateDto.RecipientCategory;
+        template.RecipientIdentifier = templateDto.RecipientIdentifier;
 
         // When being called here the current tenant is in context - verified by looking at the tenant id
         EmailTemplate updatedTemplate = await _templatesRepository.UpdateAsync(template, autoSave: true);
         return updatedTemplate;
     }
 
-    public async Task<List<EmailTemplate>> GetTemplatesByTenent()
+    public async Task<List<EmailTemplate>> GetTemplatesByTenant()
     {
         var tenentId = _currentTenant.Id;
         return await _templatesRepository.GetByTenentIdAsync(tenentId);
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Unity.Notifications.Application.csproj b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Unity.Notifications.Application.csproj
index ae66935375..0e50decfcd 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Unity.Notifications.Application.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/Unity.Notifications.Application.csproj
@@ -25,6 +25,7 @@
     <!-- Explicit reference to fix vulnerable transitive dependency -->
     <PackageReference Include="AWSSDK.Core" Version="4.0.5" />
     <ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\..\src\Unity.GrantManager.Domain\Unity.GrantManager.Domain.csproj" />
     <ProjectReference Include="..\Unity.Notifications.Application.Contracts\Unity.Notifications.Application.Contracts.csproj" />
     <ProjectReference Include="..\Unity.Notifications.Domain\Unity.Notifications.Domain.csproj" />
   </ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/EmailAction.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/EmailAction.cs
index d6490385df..1e8c1e3caa 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/EmailAction.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/EmailAction.cs
@@ -11,6 +11,8 @@ public enum EmailAction
     SendApproval,
     SendDecline,
     SendCustom,
+    SendEventDriven,
+    SendDateDriven,
     SaveDraft,
     SendFsbNotification
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/EmailType.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/EmailType.cs
new file mode 100644
index 0000000000..be74382064
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/EmailType.cs
@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace Unity.Notifications.Emails;
+
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum EmailType
+{
+    Manual,
+    EventBased,
+    DateBased,
+    Delayed
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/RecipientType.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/RecipientType.cs
new file mode 100644
index 0000000000..7721d353ff
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Emails/RecipientType.cs
@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace Unity.Notifications.Emails;
+
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum RecipientType
+{
+    Internal,
+    External
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Localization/Notifications/en.json b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Localization/Notifications/en.json
index 394b584da3..2d5375f419 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Localization/Notifications/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Localization/Notifications/en.json
@@ -9,6 +9,44 @@
     "Setting:Notifications.Mailing.DefaultFromAddress.Description": "The default From sender address",
     "Permission:Notifications": "Notifications",
     "Permission:Notifications.Email": "Email",
-    "Permission:Notifications.Email.Send": "Send Email"
+    "Permission:Notifications.Email.Send": "Send Email for Individual Application",
+    "Permission:Notifications.Email.DeleteDraft": "Delete Draft Email for Individual Application",
+    "Permission:Notifications.Email.CancelScheduled": "Cancel Scheduled Email for Individual Application",
+    "Permission:Notifications.Email.Schedule": "Schedule Email for Individual Application",
+    "Permission:Notifications.Form.Tab": "Form Notifications Tab",
+    "Permission:Notifications.Form.Email.Schedule.Create": "Create Form Scheduled Email",
+    "Permission:Notifications.Form.Email.Schedule.Delete": "Delete Form Scheduled Email",
+    "Permission:Notifications.Form.Email.Schedule.Cancel": "Cancel Form Scheduled Email",
+    "Permission:Notifications.NotificationList": "Notification List",
+    "Permission:Notifications.NotificationList.View": "View Notification List",
+    "Menu:Notifications": "Notifications",
+    "Search": "Search",
+    "Filter": "Filter",
+    "Export": "Export",
+    "NotificationList:NotificationId": "Notification Id",
+    "NotificationList:SubmissionId": "Submission #",
+    "NotificationList:ApplicantName": "Applicant Name",
+    "NotificationList:SentDate": "Sent Date",
+    "NotificationList:Status": "Status",
+    "NotificationList:From": "From",
+    "NotificationList:To": "To",
+    "NotificationList:Subject": "Subject",
+    "NotificationList:Recipient": "Recipient",
+    "NotificationList:EmailType": "Email Type",
+    "NotificationList:EmailType:Manual": "Manual",
+    "NotificationList:EmailType:Scheduled": "Scheduled",
+    "NotificationList:EmailType:EventBased": "Event Based",
+    "NotificationList:EmailType:Delayed": "Delayed",
+    "NotificationList:QuickDateRange": "Quick Date Range",
+    "NotificationList:DateRange:Today": "Today",
+    "NotificationList:DateRange:Last7Days": "Last 7 days",
+    "NotificationList:DateRange:Last30Days": "Last 30 days",
+    "NotificationList:DateRange:Last3Months": "Last 3 months",
+    "NotificationList:DateRange:Last6Months": "Last 6 months",
+    "NotificationList:DateRange:AllTime": "All time",
+    "NotificationList:DateRange:Custom": "Custom Ranges",
+    "NotificationList:DateFrom": "Date From",
+    "NotificationList:DateTo": "Date To",
+    "NotificationList:DateCannotBeFuture": "The date cannot be in the future"
   }
-}
\ No newline at end of file
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Teams/MessageCard.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Teams/MessageCard.cs
index b605337fca..c50c59e8e7 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Teams/MessageCard.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Teams/MessageCard.cs
@@ -1,5 +1,5 @@
 using System.IO;
-namespace Unity.Notifications.TeamsNotifications;
+namespace Unity.Notifications.Teams;
 
 public static class MessageCard
 {
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLog.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLog.cs
index 98e3dce0d7..2015246d07 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLog.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLog.cs
@@ -14,6 +14,7 @@ public class EmailLog : AuditedAggregateRoot<Guid>, IMultiTenant
     public Guid AssessmentId { get; set; }
     public Guid ApplicationId { get; set; }
     public Guid ApplicantId { get; set; }
+    public Guid? ScheduledNotificationId { get; set; }
     public string FromAddress { get; set; } = string.Empty;
     public string ToAddress { get; set; } = string.Empty;
     public string CC { get; set; } = string.Empty;
@@ -29,6 +30,8 @@ public class EmailLog : AuditedAggregateRoot<Guid>, IMultiTenant
     public string ChesStatus { get; set; } = string.Empty;
     public string? ChesHttpStatusCode { get; set; }    
     public string Status { get; set; } = string.Empty;
+    public RecipientType? Recipient { get; set; }
+    public EmailType? EmailType { get; set; }
     public DateTime? SendOnDateTime { get; set; }
     public DateTime? SentDateTime { get; set; }
     public string TemplateName { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs
index 80db1b7ded..19afe129b1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailLogAttachment.cs
@@ -8,7 +8,11 @@ namespace Unity.Notifications.Emails;
 public class EmailLogAttachment : AuditedAggregateRoot<Guid>, IMultiTenant
 {
     // Foreign key to EmailLog
-    public Guid EmailLogId { get; set; }
+    public Guid? EmailLogId { get; set; }
+    public Guid? TemplateId { get; set; }
+    
+    // Original template ID when copying from template
+    public Guid? OriginTemplateId { get; set; }
 
     // S3 storage properties
     public string S3ObjectKey { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailStatus.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailStatus.cs
index f9ae83a736..a2b49f07d1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailStatus.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/EmailStatus.cs
@@ -7,4 +7,6 @@ public static class EmailStatus
     public const string Failed = "Failed";
     public const string Draft = "Draft";
     public const string Initialized = "Initialized";
+    public const string Cancelled = "Cancelled";
+    public const string Scheduled = "Scheduled";
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs
index c265eff986..b7b758ba99 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogAttachmentRepository.cs
@@ -8,4 +8,6 @@ namespace Unity.Notifications.Emails;
 public interface IEmailLogAttachmentRepository : IBasicRepository<EmailLogAttachment, Guid>
 {
     Task<List<EmailLogAttachment>> GetByEmailLogIdAsync(Guid emailLogId);
+    Task<List<EmailLogAttachment>> GetByTemplateIdAsync(Guid templateId);
+    Task<List<EmailLogAttachment>> GetOriginAttachmentsByEmailLogIdAsync(Guid emailLogId);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogsRepository.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogsRepository.cs
index 0a3720dc82..8ba3f48bc8 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogsRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Emails/IEmailLogsRepository.cs
@@ -5,9 +5,9 @@
 
 namespace Unity.Notifications.Emails
 {
-    public interface IEmailLogsRepository : IBasicRepository<EmailLog, Guid>
+    public interface IEmailLogsRepository : IRepository<EmailLog, Guid>
     {
-        Task<EmailLog?> GetByIdAsync(Guid id, bool includeDetails = false);
-        Task<List<EmailLog>> GetByApplicationIdAsync(Guid applicationId);
+        Task<EmailLog?> GetByIdAsync(Guid id, bool includeDetails = false);
+        Task<List<EmailLog>> GetByApplicationIdAsync(Guid applicationId);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettingDefinitionProvider.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettingDefinitionProvider.cs
index ca28101aec..a1353aadc3 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettingDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettingDefinitionProvider.cs
@@ -12,7 +12,8 @@ public override void Define(ISettingDefinitionContext context)
         var notificationsSettings = new Dictionary<string, string>
         {
             { NotificationsSettings.Mailing.DefaultFromAddress, "NoReply.Unity@gov.bc.ca"},
-            { NotificationsSettings.Mailing.EmailMaxRetryAttempts, "3"}
+            { NotificationsSettings.Mailing.EmailMaxRetryAttempts, "3"},
+            { NotificationsSettings.Mailing.EnableEmailDelay, "false"}
         };
 
         foreach (var notificationSetting in notificationsSettings)
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettings.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettings.cs
index 031488fb6f..9449238d62 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettings.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettings.cs
@@ -9,5 +9,6 @@ public static class Mailing
         public const string Default = "GrantManager.Notifications.Mailing";
         public const string DefaultFromAddress = "GrantManager.Notifications.Mailing.DefaultFromAddress";
         public const string EmailMaxRetryAttempts = "GrantManager.Notifications.Mailing.EmailMaxRetryAttempts";
+        public const string EnableEmailDelay = "GrantManager.Notifications.Mailing.EnableEmailDelay";
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettingsDto.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettingsDto.cs
index 27ec7d6c72..6978f72861 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettingsDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Settings/NotificationsSettingsDto.cs
@@ -3,4 +3,5 @@ public class NotificationsSettingsDto
 {
     public string DefaultFromAddress { get; set; } = string.Empty;
     public string MaximumRetryAttempts { get; set; } = string.Empty;
+    public bool EnableEmailDelay { get; set; }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Templates/EmailTemplate.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Templates/EmailTemplate.cs
index cff3e4c5c7..161293a1ef 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Templates/EmailTemplate.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/Templates/EmailTemplate.cs
@@ -17,7 +17,9 @@ public EmailTemplate(Guid id,
         string subject,
         string bodyText,
         string bodyHTML,
-        string sendFrom)
+        string sendFrom,
+        string? recipientCategory = null,
+        string? recipientIdentifier = null)
         : base(id)
     {
         Name = name;
@@ -26,6 +28,8 @@ public EmailTemplate(Guid id,
         BodyText = bodyText;
         BodyHTML = bodyHTML;
         SendFrom = sendFrom;
+        RecipientCategory = recipientCategory;
+        RecipientIdentifier = recipientIdentifier;
     }
 
     public Guid? TenantId { get; set; }
@@ -37,4 +41,6 @@ public EmailTemplate(Guid id,
     public string BodyText { get; set; } = string.Empty;
     public string BodyHTML { get; set; } = string.Empty;
     public string SendFrom { get; set; } = string.Empty;
+    public string? RecipientCategory { get; set; }
+    public string? RecipientIdentifier { get; set; }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationsDbContextModelCreatingExtensions.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationsDbContextModelCreatingExtensions.cs
index 177199a909..8898ae6a8a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationsDbContextModelCreatingExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationsDbContextModelCreatingExtensions.cs
@@ -20,6 +20,9 @@ public static void ConfigureNotifications(
                 NotificationsDbProperties.DbSchema);
 
             b.ConfigureByConvention();
+
+            b.Property(x => x.Recipient).HasConversion<string>().HasMaxLength(32);
+            b.Property(x => x.EmailType).HasConversion<string>().HasMaxLength(32);
         });
 
         modelBuilder.Entity<EmailLogAttachment>(b =>
@@ -32,10 +35,18 @@ public static void ConfigureNotifications(
             // Foreign key to EmailLog with CASCADE delete
             b.HasOne<EmailLog>()
                 .WithMany()
+                .IsRequired(false)
                 .HasForeignKey(x => x.EmailLogId)
                 .OnDelete(DeleteBehavior.Cascade);
 
+            b.HasOne<EmailTemplate>()
+                .WithMany()
+                .IsRequired(false)
+                .HasForeignKey(x => x.TemplateId)
+                .OnDelete(DeleteBehavior.Cascade);                
+
             // Indexes for performance
+            b.HasIndex(x => x.TemplateId);
             b.HasIndex(x => x.EmailLogId);
             b.HasIndex(x => x.S3ObjectKey);
         });
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs
index d8b1a13986..85c750eed1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.EntityFrameworkCore/Repositories/EmailLogAttachmentRepository.cs
@@ -10,18 +10,26 @@
 
 namespace Unity.Notifications.Repositories
 {
-    public class EmailLogAttachmentRepository : EfCoreRepository<NotificationsDbContext, EmailLogAttachment, Guid>,
+    public class EmailLogAttachmentRepository(IDbContextProvider<NotificationsDbContext> dbContextProvider) : 
+        EfCoreRepository<NotificationsDbContext, EmailLogAttachment, Guid>(dbContextProvider),
         IEmailLogAttachmentRepository
     {
-        public EmailLogAttachmentRepository(IDbContextProvider<NotificationsDbContext> dbContextProvider)
-            : base(dbContextProvider)
+        public async Task<List<EmailLogAttachment>> GetByEmailLogIdAsync(Guid emailLogId)
         {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet.Where(x => x.EmailLogId == emailLogId).ToListAsync();
         }
 
-        public async Task<List<EmailLogAttachment>> GetByEmailLogIdAsync(Guid emailLogId)
+        public async Task<List<EmailLogAttachment>> GetByTemplateIdAsync(Guid templateId)
         {
             var dbSet = await GetDbSetAsync();
-            return await dbSet.Where(x => x.EmailLogId == emailLogId).ToListAsync();
+            return await dbSet.Where(x => x.TemplateId == templateId).ToListAsync();
+        }
+
+        public async Task<List<EmailLogAttachment>> GetOriginAttachmentsByEmailLogIdAsync(Guid emailLogId)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet.Where(x => x.EmailLogId == emailLogId && x.OriginTemplateId != null).ToListAsync();
         }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Menus/NotificationsMenuContributor.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Menus/NotificationsMenuContributor.cs
index 9af0799b73..1f01740952 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Menus/NotificationsMenuContributor.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Menus/NotificationsMenuContributor.cs
@@ -1,4 +1,8 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Unity.Notifications.Localization;
+using Unity.Notifications.Permissions;
+using Volo.Abp.Features;
 using Volo.Abp.UI.Navigation;
 
 namespace Unity.Notifications.Web.Menus;
@@ -7,19 +11,27 @@ public class NotificationsMenuContributor : IMenuContributor
 {
     public async Task ConfigureMenuAsync(MenuConfigurationContext context)
     {
-        if (context.Menu.Name == StandardMenus.Main)
+        var featureChecker = context.ServiceProvider.GetRequiredService<IFeatureChecker>();
+
+        if (await featureChecker.IsEnabledAsync("Unity.Notifications") && context.Menu.Name == StandardMenus.Main)
         {
-            await ConfigureMainMenuAsync(context);
+            ConfigureMainMenu(context);
         }
     }
 
-#pragma warning disable S1172 // Unused method parameters should be removed
-#pragma warning disable IDE0060 // Remove unused parameter
-    private static Task ConfigureMainMenuAsync(MenuConfigurationContext context)
-#pragma warning restore IDE0060 // Remove unused parameter
-#pragma warning restore S1172 // Unused method parameters should be removed
+    private static void ConfigureMainMenu(MenuConfigurationContext context)
     {
-        // Add main menu items.
-        return Task.CompletedTask;
+        var l = context.GetLocalizer<NotificationsResource>();
+
+        context.Menu.AddItem(
+            new ApplicationMenuItem(
+                NotificationsMenus.NotificationList,
+                l["Menu:Notifications"],
+                "~/Notifications",
+                icon: "fl fl-mail",
+                order: 9,
+                requiredPermissionName: NotificationsPermissions.NotificationList.View
+            )
+        );
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Menus/NotificationsMenus.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Menus/NotificationsMenus.cs
index b503471bf1..116621fbd7 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Menus/NotificationsMenus.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Menus/NotificationsMenus.cs
@@ -1,8 +1,7 @@
-namespace Unity.Notifications.Web.Menus;
+namespace Unity.Notifications.Web.Menus;
 
 public static class NotificationsMenus
 {
     public const string Prefix = "Notifications";
-
-    //Add your menu items here...
+    public const string NotificationList = Prefix + ".NotificationList";
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml
index 9e35cd4f34..9d5c469bf2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml
@@ -1,11 +1,62 @@
-@page
+@page
 @using Microsoft.Extensions.Localization
 @using Unity.Notifications.Localization
-@using Unity.Notifications.Web.Pages.Notifications
 @model Unity.Notifications.Web.Pages.Notifications.IndexModel
 @inject IStringLocalizer<NotificationsResource> L
 
-@{
+@section styles {
+    <abp-style src="/Pages/Notifications/Index.css" />
 }
-<h1>Notifications</h1>
-<p>@L["SamplePageMessage"]</p>
+
+@section scripts {
+    <abp-script-bundle>
+        <abp-script src="/Pages/Notifications/Index.js" />
+    </abp-script-bundle>
+}
+
+<div class="container-fluid px-2 action-bar-date-controls">
+    <div class="action-bar p-2 search-action-bar">
+        <div class="search-action-bar_search-wrapper">
+            <label for="search" class="visually-hidden">@L["Search"]</label>
+            <input type="search" id="search" class="tbl-search" placeholder="@L["Search"]" aria-label="@L["Search"]" />
+            <div class="mb-3 date-input-filter-div">
+                <label class="form-label" for="quickDateRange">@L["NotificationList:QuickDateRange"]</label>
+                <select id="quickDateRange" class="form-control quick-date-input">
+                    <option value="today">@L["NotificationList:DateRange:Today"]</option>
+                    <option value="last7days">@L["NotificationList:DateRange:Last7Days"]</option>
+                    <option value="last30days">@L["NotificationList:DateRange:Last30Days"]</option>
+                    <option value="last3months">@L["NotificationList:DateRange:Last3Months"]</option>
+                    <option value="last6months" selected>@L["NotificationList:DateRange:Last6Months"]</option>
+                    <option value="alltime">@L["NotificationList:DateRange:AllTime"]</option>
+                    <option value="custom">@L["NotificationList:DateRange:Custom"]</option>
+                </select>
+            </div>
+            <div class="mb-3 custom-date-range-container-div" id="customDateInputs" style="display: none;">
+                <div class="mb-3 date-input-filter-div">
+                    <label class="form-label" for="submittedFromDate">@L["NotificationList:DateFrom"]</label>
+                    <input abp-data-datepicker="false"
+                           type="date"
+                           id="submittedFromDate"
+                           name="SubmittedFromDate"
+                           value=""
+                           class="form-control date-input-filter"
+                           min="1900-01-01"
+                           max="2100-01-01">
+                </div>
+                <div class="mb-3 date-input-filter-div">
+                    <label class="form-label" for="submittedToDate">@L["NotificationList:DateTo"]</label>
+                    <input abp-data-datepicker="false"
+                           type="date"
+                           id="submittedToDate"
+                           name="SubmittedToDate"
+                           value=""
+                           class="form-control date-input-filter"
+                           min="1900-01-01"
+                           max="2100-01-01">
+                </div>
+            </div>
+        </div>
+        <span id="dynamicButtonContainerId"></span>
+    </div>
+    <abp-table id="NotificationListTable"></abp-table>
+</div>
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml.cs
index 6fc9af2e05..0c50aabafc 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml.cs
@@ -1,5 +1,9 @@
+using Microsoft.AspNetCore.Authorization;
+using Unity.Notifications.Permissions;
+
 namespace Unity.Notifications.Web.Pages.Notifications;
 
+[Authorize(NotificationsPermissions.NotificationList.View)]
 public class IndexModel : NotificationsPageModel
 {
     public void OnGet()
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.css b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.css
new file mode 100644
index 0000000000..203b31391d
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.css
@@ -0,0 +1,65 @@
+/* Date-filter controls for the Notification list. Mirrors the shared ActionBar component
+   styling (Views/Shared/Components/ActionBar/Default.css) and the Applications date-control
+   label sizing, because this module page cannot reference those main-app page stylesheets. */
+
+.search-action-bar {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-end;
+    align-items: center;
+    row-gap: 6px;
+}
+
+.search-action-bar_search-wrapper {
+    flex: 1;
+    min-width: 220px;
+}
+
+.date-input-filter-div {
+    display: inline-block;
+    padding: 10px;
+    padding-top: 0px;
+    margin-top: -10px;
+    margin-bottom: -10px;
+    padding-bottom: 0px !important;
+}
+
+.date-input-filter-div label.form-label {
+    font-size: 13.6px;
+    margin-bottom: 0.3rem;
+}
+
+.custom-date-range-container-div {
+    display: inline-block;
+    padding: 0px;
+    margin: 0px;
+}
+
+.quick-date-input {
+    font-size: var(--bc-font-size);
+    color: var(--bc-colors-grey-text-500);
+    border-radius: var(--bc-layout-margin-small) !important;
+    border: 2px solid var(--bc-colors-blue-primary);
+    text-overflow: ellipsis;
+}
+
+#dynamicButtonContainerId {
+    flex-shrink: 0;
+    display: flex;
+    align-items: flex-end;
+}
+
+/* Match the Applications action-bar height: zero the row padding and reset the base
+   negative top-margin, letting the date controls' mb-3 provide the spacing. */
+.action-bar-date-controls .search-action-bar {
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+}
+
+.action-bar-date-controls .date-input-filter-div {
+    margin-top: 10px;
+}
+
+.action-bar-date-controls #dynamicButtonContainerId {
+    margin-top: 0;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js
new file mode 100644
index 0000000000..5f73dd9c54
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js
@@ -0,0 +1,318 @@
+$(function () {
+    const l = abp.localization.getResource('Notifications');
+    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 = $('#NotificationListTable');
+
+    const defaultQuickDateRange = 'last6months';
+    const STORAGE_KEYS = {
+        quickRange: 'Notifications_QuickRange',
+        fromDate: 'Notifications_FromDate',
+        toDate: 'Notifications_ToDate'
+    };
+    let notificationTableFilters = { dateFrom: null, dateTo: null };
+    // The Date From/To inputs are hidden by default and revealed by the Filter toggle
+    // (or when 'Custom Ranges' is selected). The Quick Range dropdown is always visible.
+    let dateInputsForcedByFilter = false;
+
+    const UIElements = {
+        quickDateRange: $('#quickDateRange'),
+        inputFilter: $('.date-input-filter'),
+        submittedFromInput: $('#submittedFromDate'),
+        submittedToInput: $('#submittedToDate')
+    };
+
+    const listColumns = getColumns();
+    const defaultVisibleColumns = [
+        'submissionReferenceNo',
+        'applicantName',
+        'sentDateTime',
+        'status',
+        'fromAddress',
+        'toAddress',
+        'subject',
+        'recipient',
+        'emailTypeText'
+    ];
+
+    // Seed the date filters BEFORE the table's first load so it defaults to the last 6 months.
+    initializeFilterDates();
+
+    let actionButtons = [
+        {
+            text: l('Filter'),
+            id: 'btn-toggle-filter',
+            className: 'custom-table-btn flex-none btn btn-secondary',
+            action: function (e, dt, node, config) { },
+            attr: { id: 'btn-toggle-filter' }
+        },
+        {
+            extend: 'csvNoPlaceholder',
+            text: l('Export'),
+            title: l('Menu:Notifications'),
+            className: 'custom-table-btn flex-none btn btn-secondary'
+        }
+    ];
+
+    const notificationsTable = initializeDataTable({
+        dt,
+        defaultVisibleColumns,
+        listColumns,
+        maxRowsPerPage: 15,
+        defaultSortColumn: { name: 'sentDateTime', dir: 'desc' },
+        dataEndpoint: unity.grantManager.notifications.notificationList.getList,
+        data: function () {
+            return {
+                dateFrom: notificationTableFilters.dateFrom,
+                dateTo: notificationTableFilters.dateTo
+            };
+        },
+        responseCallback,
+        actionButtons,
+        pagingEnabled: true,
+        reorderEnabled: true,
+        languageSetValues: {},
+        dataTableName: 'NotificationListTable',
+        dynamicButtonContainerId: 'dynamicButtonContainerId',
+        useNullPlaceholder: true,
+        fixedHeaders: true
+    });
+
+    UIElements.quickDateRange.on('change', handleQuickDateRangeChange);
+    UIElements.inputFilter.on('change', handleInputFilterChange);
+    // Reveal the Date From/To inputs together with the per-column filter row. filterRow.js emits
+    // "filterRow-visibility" when the user flips the "Show Filter Row" toggle in the Filter popover.
+    notificationsTable.on('filterRow-visibility', function (e, visible) {
+        dateInputsForcedByFilter = visible;
+        updateDateInputsVisibility();
+    });
+
+    // ============================ Date filter ============================
+
+    function initializeFilterDates() {
+        let savedQuickRange = localStorage.getItem(STORAGE_KEYS.quickRange) || defaultQuickDateRange;
+        let savedFromDate = localStorage.getItem(STORAGE_KEYS.fromDate);
+        let savedToDate = localStorage.getItem(STORAGE_KEYS.toDate);
+
+        let isCustomRange = savedQuickRange === 'custom';
+
+        let range = isCustomRange
+            ? { fromDate: savedFromDate || '', toDate: savedToDate || '' }
+            : getDateRange(savedQuickRange);
+
+        if (!isCustomRange && !range) {
+            savedQuickRange = defaultQuickDateRange;
+            range = getDateRange(savedQuickRange);
+        }
+
+        setDateRangeFilters(savedQuickRange, range);
+        setDateRangeLocalStorage(savedQuickRange, range);
+
+        const today = formatDate(new Date());
+        UIElements.submittedFromInput.attr({ 'max': today });
+        UIElements.submittedToInput.attr({ 'max': today });
+
+        updateDateInputsVisibility();
+    }
+
+    function updateDateInputsVisibility() {
+        const show = dateInputsForcedByFilter || UIElements.quickDateRange.val() === 'custom';
+        $('#customDateInputs').css('display', show ? '' : 'none');
+    }
+
+    function handleQuickDateRangeChange() {
+        const selectedRange = $(this).val();
+
+        if (selectedRange === 'custom') {
+            updateDateInputsVisibility();
+            return;
+        }
+
+        const range = getDateRange(selectedRange);
+        setDateRangeFilters(selectedRange, range);
+        setDateRangeLocalStorage(selectedRange, range);
+        updateDateInputsVisibility();
+        notificationsTable.ajax.reload(null, true);
+    }
+
+    function handleInputFilterChange() {
+        const $input = $(this);
+        if (!validateDate($input.val(), $input)) return;
+
+        syncFiltersFromInputs();
+
+        // Manual dates blank the quick-range preset.
+        UIElements.quickDateRange.val('custom');
+        localStorage.setItem(STORAGE_KEYS.quickRange, 'custom');
+        localStorage.setItem(STORAGE_KEYS.fromDate, notificationTableFilters.dateFrom || '');
+        localStorage.setItem(STORAGE_KEYS.toDate, notificationTableFilters.dateTo || '');
+
+        notificationsTable.ajax.reload(null, true);
+    }
+
+    function setDateRangeFilters(quickDateRange, range) {
+        UIElements.quickDateRange.val(quickDateRange);
+
+        if (range) {
+            UIElements.submittedFromInput.val(range.fromDate ?? '');
+            UIElements.submittedToInput.val(range.toDate ?? '');
+            syncFiltersFromInputs();
+        }
+    }
+
+    // Reads the From/To inputs into notificationTableFilters (the inputs are the source of truth).
+    function syncFiltersFromInputs() {
+        notificationTableFilters.dateFrom = UIElements.submittedFromInput.val() || null;
+        notificationTableFilters.dateTo = UIElements.submittedToInput.val() || null;
+    }
+
+    function setDateRangeLocalStorage(quickDateRange, fromToRange) {
+        localStorage.setItem(STORAGE_KEYS.quickRange, quickDateRange || defaultQuickDateRange);
+        if (fromToRange) {
+            if (fromToRange.fromDate) localStorage.setItem(STORAGE_KEYS.fromDate, fromToRange.fromDate);
+            else localStorage.removeItem(STORAGE_KEYS.fromDate);
+            if (fromToRange.toDate) localStorage.setItem(STORAGE_KEYS.toDate, fromToRange.toDate);
+            else localStorage.removeItem(STORAGE_KEYS.toDate);
+        }
+    }
+
+    function validateDate(dateValue, element) {
+        if (!dateValue) return true;
+
+        const selectedDate = new Date(dateValue);
+        const today = new Date();
+        today.setHours(0, 0, 0, 0);
+
+        if (selectedDate > today) {
+            element.addClass('input-validation-error');
+            abp.notify.error(l('NotificationList:DateCannotBeFuture'));
+            return false;
+        }
+
+        element.removeClass('input-validation-error');
+        return true;
+    }
+
+    // ============================ Columns ============================
+
+    function getColumns() {
+        let columnIndex = 0;
+        const columns = [
+            getNotificationIdColumn(columnIndex++),
+            getSubmissionIdColumn(columnIndex++),
+            getTextColumn(columnIndex++, l('NotificationList:ApplicantName'), 'applicantName'),
+            getSentDateColumn(columnIndex++),
+            getTextColumn(columnIndex++, l('NotificationList:Status'), 'status', { width: '7rem', className: 'data-table-header text-nowrap' }),
+            getTextColumn(columnIndex++, l('NotificationList:From'), 'fromAddress'),
+            getTextColumn(columnIndex++, l('NotificationList:To'), 'toAddress'),
+            getTextColumn(columnIndex++, l('NotificationList:Subject'), 'subject'),
+            getTextColumn(columnIndex++, l('NotificationList:Recipient'), 'recipient', { width: '8rem', className: 'data-table-header text-nowrap' }),
+            getTextColumn(columnIndex++, l('NotificationList:EmailType'), 'emailTypeText', { width: '9rem', className: 'data-table-header text-nowrap' })
+        ];
+        return columns.map((column) => ({ ...column, targets: [column.index], orderData: [column.index, 0] }));
+    }
+
+    function getNotificationIdColumn(columnIndex) {
+        return {
+            title: l('NotificationList:NotificationId'),
+            name: 'id',
+            data: 'id',
+            className: 'data-table-header',
+            index: columnIndex,
+            visible: false
+        };
+    }
+
+    function getSubmissionIdColumn(columnIndex) {
+        return {
+            title: l('NotificationList:SubmissionId'),
+            name: 'submissionReferenceNo',
+            data: 'submissionReferenceNo',
+            className: 'data-table-header text-nowrap',
+            width: '8rem',
+            index: columnIndex,
+            render: function (data, type, row) {
+                if (type !== 'display') {
+                    return data || '';
+                }
+                const safe = $.fn.dataTable.render.text().display(data || '');
+                const appId = row.applicationId;
+                if (data && appId && guidPattern.test(appId)) {
+                    return `<a href="/GrantApplications/Details?ApplicationId=${encodeURIComponent(appId)}">${safe}</a>`;
+                }
+                return safe || null;
+            }
+        };
+    }
+
+    function getSentDateColumn(columnIndex) {
+        return {
+            title: l('NotificationList:SentDate'),
+            name: 'sentDateTime',
+            data: 'sentDateTime',
+            className: 'data-table-header text-nowrap',
+            width: '8rem',
+            index: columnIndex,
+            render: function (data, type) {
+                return DateUtils.formatUtcDateToLocal(data, type);
+            }
+        };
+    }
+});
+
+function responseCallback(result) {
+    return {
+        recordsTotal: result.totalCount,
+        recordsFiltered: result.totalCount,
+        data: result.items
+    };
+}
+
+function getTextColumn(columnIndex, title, dataField, options = {}) {
+    return {
+        title: title,
+        name: dataField,
+        data: dataField,
+        className: options.className ?? 'data-table-header',
+        ...(options.width ? { width: options.width } : {}),
+        index: columnIndex
+    };
+}
+
+function formatDate(date) {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+}
+
+// Returns { fromDate, toDate } (yyyy-mm-dd) for a preset. 'alltime' -> both null; 'custom' -> null.
+function getDateRange(rangeType) {
+    let today = new Date();
+    const toDate = formatDate(new Date());
+    let fromDate;
+
+    switch (rangeType) {
+        case 'today':
+            fromDate = toDate;
+            break;
+        case 'last7days':
+            fromDate = formatDate(new Date(today.setDate(today.getDate() - 7)));
+            break;
+        case 'last30days':
+            fromDate = formatDate(new Date(today.setDate(today.getDate() - 30)));
+            break;
+        case 'last3months':
+            fromDate = formatDate(new Date(today.setMonth(today.getMonth() - 3)));
+            break;
+        case 'last6months':
+            fromDate = formatDate(new Date(today.setMonth(today.getMonth() - 6)));
+            break;
+        case 'alltime':
+            return { fromDate: null, toDate: null };
+        case 'custom':
+        default:
+            return null;
+    }
+
+    return { fromDate, toDate };
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.cshtml
index b246bb27c1..1fc31ed1c2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.cshtml
@@ -1,10 +1,6 @@
 @model Unity.Notifications.Web.Views.Settings.NotificationsSettingGroup.NotificationsSettingViewModel
 
 <div class="container-fluid px-0">
-    <div class="unity-page-titlebar">
-        <h4 class="m-0">Notifications</h4>
-    </div>
-
     <nav>
         <div class="nav nav-tabs" id="nav-tab" role="tablist">
             <button class="nav-link active" id="nav-mapping-tab" data-bs-toggle="tab" data-bs-target="#nav-config" type="button" role="tab">
@@ -38,6 +34,12 @@
                             </abp-column>
                         </abp-row>
 
+                        <abp-row>
+                            <abp-column size-md="_12" class="mx-2 fw-bold">
+                                <abp-input asp-for="EnableEmailDelay" />
+                            </abp-column>
+                        </abp-row>
+
                         <abp-row>
                             <hr class="my-4" />
                             <div class="d-flex p-2">
@@ -61,17 +63,13 @@
 
         <!-- Email Templates -->
         <div class="tab-pane fade" id="nav-template" role="tabpanel" aria-labelledby="nav-template-tab">
-            <div class="row">
-                <div class="container mt-3">
-                    <h3>Email Templates</h3>
+            <input type="hidden" id="Extensions" value="@Model.Extensions" />
+            <input type="hidden" id="MaxFileSize" value="@Model.MaxFileSize" />
+            <input type="hidden" id="EmailAttachmentMaxFileSize" value="@Model.EmailAttachmentMaxFileSize" />
+            <input type="hidden" id="TotalEmailAttachmentMaxFileSize" value="@Model.TotalEmailAttachmentMaxFileSize" />
 
-                    <abp-button id="CreateNewTemplate"
-                                text="+ Add Template"
-                                button-type="Primary"
-                                class="me-2 ms-auto" />
-
-                    <div id="cardContainer" class="v-scroll p-3"></div>
-                </div>
+            <div class="row">
+                @await Html.PartialAsync("/Views/Settings/NotificationsSettingGroup/_Templates.cshtml")      
             </div>
         </div>
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css
index e0b5931180..14ef7a32e3 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.css
@@ -12,10 +12,6 @@
     min-height:250px;
 }
 
-.note-text{
-    font-size:12px;
-}
-
 /* Group Users Table - Push remove button to far right */
 #groupUsersTable td:last-child,
 #createGroupUsersTable td:last-child {
@@ -74,3 +70,373 @@
 .modal-footer {
     margin-top: 10px;
 }
+
+
+/* ── Split-pane container ─────────────────────────────────────────────────── */
+.split-container {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    min-height: 400px;
+    gap: 0;
+    /* No fixed height — lets the DataTable footer and page footer remain visible */
+}
+
+/* ── Left pane ────────────────────────────────────────────────────────────── */
+.left-pane {
+    flex: 1 1 auto;
+    min-width: 0;
+    overflow: hidden;
+    transition: none;
+}
+
+/* ── Drag divider ─────────────────────────────────────────────────────────── */
+.split-divider {
+    display: none;
+    width: 7px;
+    flex-shrink: 0;
+    cursor: col-resize;
+    background: #dee2e6;
+    border-left: 1px solid #ced4da;
+    border-right: 1px solid #ced4da;
+    position: sticky;
+    top: 10px;
+    height: calc(100vh - 190px);
+    z-index: 10;
+    transition: background 0.15s;
+}
+
+.split-divider::after {
+    content: '⋮';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    color: #868e96;
+    font-size: 20px;
+    line-height: 1;
+    pointer-events: none;
+}
+
+.split-divider:hover,
+.split-divider.dragging {
+    background: #adb5bd;
+}
+
+.split-container.split-active .split-divider {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+/* ── Right pane ───────────────────────────────────────────────────────────── */
+.right-pane {
+    flex-shrink: 0;
+    width: 52%;
+    min-width: 300px;
+    max-width: 80%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    /* Sticky so the editor stays visible as the left-pane table grows */
+    position: sticky;
+    top: 10px;
+    /* Explicit height (not max-height) so h-100 on the inner card resolves correctly */
+    height: calc(100vh - 190px);
+}
+
+
+/* ── Editor header ────────────────────────────────────────────────── */
+.editor-header {
+    background: #f8f9fa;
+    position: absolute;
+    top: 0px;
+    width: 100%;    
+}
+
+/* ── Editor form body ─────────────────────────────────────────────── */
+.editor-body {
+    flex: 1 1 0;      /* 0 basis so flex shrinks below content natural size */
+    min-height: 0;    /* required for overflow-y:auto to work inside a flex column */
+    margin-top: 50px;
+    padding: 2px;
+}
+
+/* ── Resizable textareas ──────────────────────────────────────────────────── */
+.textarea {
+    resize: vertical;
+    min-height: 72px;
+    font-size: 0.82rem;
+    line-height: 1.5;
+}
+
+.template-field-div {
+  width: 100%;
+  max-width: none;
+  display: flex;
+}
+
+span.tooltip-wrapper {
+  flex: 1 1 auto;
+  width: 100%;
+  display: block;
+}
+
+.template-field {
+    flex: 0 0 135px !important;
+    min-width: 140px !important;
+    white-space: nowrap;
+    margin: 0.5rem;    
+}
+
+/* ── Drag ghost (prevent text selection while dragging) ───────────────────── */
+body.split-dragging {
+    cursor: col-resize !important;
+    user-select: none !important;
+}
+
+
+.tox-tinymce {
+    width: 100%;
+}
+
+.info-note {
+    background-color: #d1ecf1;
+    border: 1px solid #bee5eb;
+    color: #0c5460;
+    padding: 12px 16px;
+    margin: 16px;
+    border-radius: 4px;
+    font-size: 0.95rem;
+    line-height: 1.5;
+}
+
+/* ── Templates Table Layout Optimization ────────────────────────────────────── */
+
+/* Force the table to respect container bounds, but never shrink below the point
+   where the Name/Subject/Actions columns become unusable. Below this width the
+   scroll body (overflow-x: auto below) shows a horizontal scrollbar instead of
+   squishing the Actions column and overlapping its buttons. */
+#TemplatesTable {
+    table-layout: fixed !important;
+    width: 100% !important;
+    min-width: 480px !important; /* Name (~30%) + Subject (auto) + Actions (130px) */
+}
+
+/* Update Column Widths via colgroup/col (essential for DataTables-style tables) */
+#TemplatesTable col:nth-child(1) {
+    width: 30% !important; /* Name */
+}
+
+/* Subject (col:nth-child(2)) intentionally has no explicit width - under
+   table-layout: fixed it automatically fills whatever space remains after the
+   Name and Actions columns are allocated. */
+
+#TemplatesTable col:nth-child(3) {
+    width: 130px !important; /* Actions - fixed px so the buttons never get squeezed */
+}
+
+/* Handle text truncation for the content columns */
+#TemplatesTable td:nth-child(1),
+#TemplatesTable td:nth-child(2) {
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+    white-space: nowrap !important;
+}
+
+/* Ensure the Actions container does not wrap or expand */
+#TemplatesTable .d-inline-flex.gap-2 {
+    flex-wrap: nowrap !important;
+    width: auto !important;
+    white-space: nowrap !important;
+}
+
+/* Allow horizontal scrolling once the table hits its minimum width, instead of
+   squishing columns (and overlapping the action buttons) below usable sizes */
+#TemplatesTable_wrapper .dt-scroll-body {
+    overflow-x: auto !important;
+    scrollbar-gutter: stable; /* Reserves space for vertical scrollbar to prevent layout shift */
+}
+
+/* ── Form Validation Styling ─────────────────────────────────────────────────── */
+
+/* Hide validation symbol in invalid form controls */
+.form-control.is-invalid {
+    background-image: none !important;
+}
+
+/* ── Button Styling ──────────────────────────────────────────────────────────── */
+
+/* Gray outline buttons with secondary icon color */
+.btn-action-gray {
+    border-color: #6c757d !important;
+    color: #6c757d !important;
+}
+
+.btn-action-gray:hover {
+    border-color: #5a6268 !important;
+    color: #5a6268 !important;
+}
+
+/* Hidden button state */
+.btn-hidden {
+    display: none !important;
+}
+
+/* ── Form Control Styling ────────────────────────────────────────────────────── */
+
+input.form-control,
+textarea.form-control,
+.form-select {
+    font-size: var(--bc-font-size);
+    color: var(--bc-colors-grey-text-500);
+    border-radius: var(--bc-layout-margin-small) !important;
+    border: 2px solid var(--bc-colors-blue-primary);
+    text-overflow: ellipsis;
+}
+
+.form-select {
+    --bs-form-select-bg-img: url(data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e);
+    display: block;
+    width: 100%;
+    padding: 0.375rem 2.25rem 0.375rem 0.75rem;
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 1.5;
+    color: var(--bs-body-color);
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    background-color: var(--bs-body-bg);
+    background-image: var(--bs-form-select-bg-img), var(--bs-form-select-bg-icon, none);
+    background-repeat: no-repeat;
+    background-position: right 0.75rem center;
+    background-size: 16px 12px;
+    border: var(--bs-border-width) solid var(--bs-border-color);
+    border-radius: var(--bs-border-radius);
+    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+}
+
+.select2-container--default.select2-container--focus .select2-selection--multiple {
+  border-radius: 8px;
+  min-height: 40px;
+  border: 2px solid rgb(46, 93, 215);
+  display: flex;
+  align-items: center;
+}
+
+.select2-container--default .select2-search--inline .select2-search__field {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+select {
+    word-wrap: normal;
+}
+
+button,
+select {
+    text-transform: none;
+}
+
+input,
+button,
+select,
+optgroup,
+textarea {
+    margin: 0;
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
+}
+
+
+
+#templateRecipientSelect + .select2-container .select2-selection {
+    border: 2px solid #2e5dd7 !important;
+    border-radius: 8px !important;
+    min-height: 40px !important;
+    display: flex;
+    align-items: center;
+}
+
+/* Match native select elements to the Send From input style */
+#templateRecipientCategory {
+    border: 2px solid #2e5dd7 !important;
+    border-radius: 8px !important;
+    height: 40px !important;
+}
+
+/* Optional: Adjust Select2 search field margins for multi-selects */
+#templateRecipientSelect + .select2-container .select2-search__field {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+/* ── Select2 Selection Choice Refinement ────────────────────────────────────── */
+
+/* Reusable Remove Icon Button */
+.icon-remove,
+.select2-selection__choice__remove {
+    display: inline-flex !important;
+    align-items: center;
+    justify-content: center;
+    width: 16px !important;
+    height: 16px !important;
+    padding: 0 !important;
+    margin-right: 0.5rem;
+    margin-left: 0.25rem;
+    cursor: pointer;
+    background-color: transparent !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath stroke='%23676a6d' stroke-width='2' stroke-linecap='round' d='M2 2l12 12M14 2L2 14'/%3e%3c/svg%3e") !important;
+    background-repeat: no-repeat !important;
+    background-position: center !important;
+    background-size: contain !important;
+    border: none !important;
+    box-shadow: none !important;
+    outline: none !important;
+    appearance: none !important;
+    -webkit-appearance: none !important;
+}
+
+/* Selected Item Container */
+.select2-selection__choice {
+    display: inline-flex !important;
+    align-items: center;
+    padding: 0.3em 0.8em;
+    margin: 0.375rem;
+    font-family: "BCSans", sans-serif;
+    font-size: 1rem;
+    color: #212529;
+    background-color: transparent !important;
+    border: 1px solid var(--bs-border-color) !important;
+    border-radius: 0.25rem;
+    line-height: 1.5;
+    list-style-type: none;
+    white-space: nowrap;
+}
+
+/* Accessibility Fallback */
+.select2-selection__choice__remove span,
+.icon-remove span {
+    display: none !important;
+}
+
+/* ── DataTable Styling (only when right panel is displayed) ────────────────── */
+.split-container.split-active div.dt-scroll-body {
+    overflow-y: auto;
+    padding-right: 15px;
+}
+
+.split-container.split-active td {
+    min-width: 160px;
+    width: 200px;
+    position: relative;
+    margin-left: -20px;
+    transform: translateX(-10px);
+}
+
+button.btn.fullWidth:hover {
+  background-color: #ffffff !important;
+  color: #000000 !important;
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
index ca8c59cccd..651fe52ea2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js
@@ -1,5 +1,14 @@
-$(function () {
-    loadCardsFromService();
+
+$(function () {
+    const UiElements = {
+        saveButton: $("#saveTemplateBtn"),
+        discardButton: $("#discardTemaplateBtn"),
+        deleteButton: $("#deleteTeamplateBtn"),
+        closeButton: $("#closeTemplateBtn"),
+        addTemplateButton: $("#CreateNewTemplate"),
+        templatesTable: $('#TemplatesTable')
+    }
+
     const NotificationUiElements = {
         settingForm: $("#NotificationsSettingsForm"),
         saveButton: $("#NotificationsSaveButton"),
@@ -7,6 +16,19 @@
     }
 
     let initialFormState = NotificationUiElements.settingForm.serialize();
+    let dropdownItems = [];
+    let emailAttachmentsTable = null;
+    let templatesDataTable = null;
+    let originalFormValues = {};
+
+    function init() {
+        $('#email-attachments-section').hide();
+        initializeTemplateDataTables();
+        initializeDivider();
+        initializeTabPersistence();
+        initializeRecipientSelect();
+        checkFormChanges();
+    }      
 
     function checkFormChanges() {
         let currentFormState = NotificationUiElements.settingForm.serialize();
@@ -32,6 +54,11 @@
             $(document).trigger("AbpSettingSaved");
             initialFormState = NotificationUiElements.settingForm.serialize();
             checkFormChanges();
+        }).then(function () {
+            abp.notify.success('Settings saved successfully.');
+        }).$catch(function (e) {
+            console.warn('Failed to save settings:', e);
+            abp.notify.error('Failed to save settings.');
         });
 
     });
@@ -42,477 +69,1090 @@
         checkFormChanges();
     });
 
-    checkFormChanges();
-
-    let editorInstances = {};
+    init();
 
-    // Utility function for debouncing
-    function debounce(func, delay) {
-        let timeoutId;
-        return function (...args) {
-            clearTimeout(timeoutId);
-            timeoutId = setTimeout(() => func.apply(this, args), delay);
-        };
+    // ── Tab State Persistence ─────────────────────────────────────────────
+    function initializeTabPersistence() {
+        const tabContainer = $('#nav-tab');
+        
+        // Save tab selection when tab changes
+        tabContainer.on('shown.bs.tab', 'button[data-bs-toggle="tab"]', function () {
+            localStorage.setItem('notifications-active-tab', this.id);
+        });
+        
+        // Handle Templates tab visibility - redraw and reinitialize if needed
+        const templateTabButton = tabContainer.find('#nav-template-tab');
+        if (templateTabButton.length) {
+            templateTabButton.on('show.bs.tab', function () {
+                // Redraw the DataTable when tab is about to show
+                if (templatesDataTable) {
+                    setTimeout(() => {
+                        templatesDataTable.columns.adjust().draw();
+                    }, 0);
+                }
+            });
+        }
+        
+        // Restore saved tab on page load - but delay to ensure DOM is ready
+        const savedTabId = localStorage.getItem('notifications-active-tab');
+        if (savedTabId) {
+            setTimeout(() => {
+                const tabButton = tabContainer.find(`#${savedTabId}`);
+                if (tabButton.length) {
+                    const tab = new bootstrap.Tab(tabButton[0]);
+                    tab.show();
+                }
+            }, 100);
+        }
     }
 
-    // Utility functions for template operations
-    function extractFormData(formDataArray) {
-        return {
-            name: formDataArray[0].value,
-            sendFrom: formDataArray[1].value,
-            subject: formDataArray[2].value
-        };
+    // ── Select2 Initialization ─────────────────────────────────────────────
+    function initializeRecipientSelect() {
+        $('#templateRecipientSelect').select2({
+            theme: 'bootstrap-5',
+            placeholder: 'Select recipients...',
+            allowClear: false,
+            width: '100%'
+        });
     }
 
-    function buildTemplatePayload(data, editor) {
-        return JSON.stringify({
-            name: data.name,
-            description: "",
-            subject: data.subject,
-            bodyText: editor.getContent({ format: 'text' }),
-            bodyHTML: editor.getContent(),
-            sendFrom: data.sendFrom
+    // ── Field validation helpers ──────────────────────────────────────────
+    function checkTemplateNameUnique(name, currentId, callback) {
+        $.ajax({
+            url: `/api/app/template/template-by-name?name=${encodeURIComponent(name)}`,
+            type: 'GET',
+            success: function (response) {
+                const isUnique = !response?.id || response.id === currentId;
+                callback(isUnique);
+            },
+            error: function () {
+                // If check fails, allow save to proceed
+                callback(true);
+            }
         });
     }
 
-    function handleSuccess(message) {
-        abp.notify.success(message);
-        $("#cardContainer").empty();
-        loadCardsFromService();
-        return true;
+    function clearFieldError(fieldId) {
+        $(`#${fieldId}`).removeClass('is-invalid');
+        $(`#${fieldId}-error`).text('').hide();
     }
 
-    function handleError(message) {
-        abp.notify.error(message);
-        return false;
+    function markFieldError(fieldId, errorMessage) {
+        $(`#${fieldId}`).addClass('is-invalid');
+        $(`#${fieldId}-error`).text(errorMessage).show();
     }
 
-    function onSaveTemplateSuccess() {
-        handleSuccess('Template saved successfully.');
+    function clearAllErrors() {
+        $('#templateName, #sendFrom, #subject, #templateBody, #templateRecipientCategory, #templateRecipientSelect').removeClass('is-invalid');
+        $('#templateName-error, #sendFrom-error, #subject-error, #templateBody-error, #templateRecipientCategory-error, #templateRecipientSelect-error').text('').hide();
     }
 
-    function onSaveTemplateError() {
-        handleError('Failed to save template.');
-    }
+    // Listen for user input to clear error styling
+    $('#templateName, #sendFrom, #subject, #templateRecipientCategory').on('input change', function () {
+        clearFieldError(this.id);
+    });
 
-    function saveTemplate(payload) {
-        $.ajax({
-            url: `/api/app/template`,
-            method: 'POST',
-            contentType: 'application/json',
-            data: payload,
-            success: onSaveTemplateSuccess,
-            error: onSaveTemplateError
+    $('#templateBody, #templateRecipientSelect').on('input change', function () {
+        clearFieldError(this.id);
+    });
+
+    // ── Recipient helpers ──────────────────────────────────────────────────
+    function fetchRecipients(category) {
+        return $.ajax({
+            url: `/api/form-notifications/recipients?category=${encodeURIComponent(category)}`,
+            type: 'GET',
+            dataType: 'json'
         });
     }
 
-    function updateTemplate(id, payload) {
-        $.ajax({
-            url: `/api/app/template/${id}/template`,
-            method: 'PUT',
-            contentType: 'application/json',
-            data: payload,
-            success: onSaveTemplateSuccess,
-            error: onSaveTemplateError
-        });
+    function getSelectedTemplateRecipients() {
+        const val = $('#templateRecipientSelect').val();
+        if (Array.isArray(val)) return val.filter(v => v && v.trim() !== '');
+        return val ? [val] : [];
     }
 
-    function checkTemplateNameUnique(name, currentId, callback) {
-        $.ajax({
-            url: `/api/app/template/template-by-name?name=${encodeURIComponent(name)}`,
-            type: 'GET',
-            success: function (response) {
-                const wrapperId = `cardWrapper-${currentId}`;
-                const isSameAsCurrent = !currentId.includes('temp') && name === $(`#${wrapperId}`).data('original-name');
-                let isExist = false;
-                if (response?.id) {
-                    isExist = true;
-                }
-                callback(!isExist || isSameAsCurrent);
-            },
-            error: function () {
-                callback(false);
-            }
-        });
+    function setSelectedTemplateRecipients(values) {
+        let valueArr;
+        if (Array.isArray(values)) {
+            valueArr = values;
+        } else if (values) {
+            valueArr = [values];
+        } else {
+            valueArr = [];
+        }
+        $('#templateRecipientSelect').val(valueArr).trigger('change');
     }
 
-    function getTemplateVariables(dropdownItems) {
-        $.ajax({
-            url: `/api/app/template/template-variables`,
-            type: 'GET',
-            success: function (response) {
-                $.map(response, function (item) {
-                    dropdownItems.push({
-                        text: item.name,
-                        value: item.token
-                    });
-                });
-            },
-            error: function () {
-                // Handle error silently
-            }
+    function populateTemplateRecipients(list) {
+        const sel = $('#templateRecipientSelect');
+        sel.empty();
+        list.forEach(r => {
+            const opt = $('<option></option>').attr('value', r.id).text(r.displayName);
+            sel.append(opt);
         });
     }
 
-    function showDeleteConfirmation(id, wrapperId) {
-        const swalOptions = {
-            title: "Delete Template",
-            text: "Are you sure you want to delete this template?",
-            showCancelButton: true,
-            confirmButtonText: "Confirm",
-            customClass: {
-                confirmButton: 'btn btn-primary',
-                cancelButton: 'btn btn-secondary'
-            }
-        };
+    // Load recipients when category changes
+    $('#templateRecipientCategory').on('change', function () {
+        const category = $(this).val();
+        if (category) {
+            fetchRecipients(category)
+                .done(function (data) {
+                    populateTemplateRecipients(data);
+                })
+                .fail(function (err) {
+                    console.warn('Failed to load recipients:', err);
+                });
+        } else {
+            $('#templateRecipientSelect').empty();
+        }
+    });
 
-        Swal.fire(swalOptions).then(function(result) {
-            handleDeleteConfirmation(result, id, wrapperId);
-        });
+    // ── Open / close right panel ──────────────────────────────────────────
+    function openRightPanel() {           
+        // Activate split layout
+        $('#splitContainer').addClass('split-active');
+        $('#rightPane').show();
+        if (templatesDataTable) {
+            templatesDataTable.columns.adjust();
+        }
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.columns.adjust();
+        }
     }
 
-    function handleDeleteConfirmation(result, id, wrapperId) {
-        if (!result.isConfirmed) return;
-        deleteTemplate(id, wrapperId);
+    function closeRightPanel() {
+        // Deactivate split layout
+        $('#splitContainer').removeClass('split-active');
+        $('#rightPane').hide();
+        $('#leftPane').css('flex', '');
+        UiElements.deleteButton.hide();
+        if (templatesDataTable) {
+            templatesDataTable.columns.adjust();
+        }
     }
 
-    function handleDeleteSuccess(wrapperId) {
-        return function() {
-            $(`#${wrapperId}`).remove();
-            abp.notify.success('Template deleted successfully.');
+    function populateFields(data) {
+        // Store original values for discard functionality
+        originalFormValues = {
+            id: data.id,
+            name: data.name,
+            description: data.description || '',
+            sendFrom: data.sendFrom,
+            subject: data.subject,
+            bodyText: data.bodyText || '',
+            bodyHTML: data.bodyHTML,
+            recipientCategory: data.recipientCategory || '',
+            recipientIdentifier: data.recipientIdentifier || ''
         };
+        
+        $('#templateId').val(data.id);
+        $('#templateName').val(data.name);
+        $('#sendFrom').val(data.sendFrom);
+        $('#subject').val(data.subject);
+        $('#templateRecipientCategory').val(data.recipientCategory || '');
+        
+        // Load recipients if category is set
+        if (data.recipientCategory) {
+            fetchRecipients(data.recipientCategory)
+                .done(function (list) {
+                    populateTemplateRecipients(list);
+                    const values = data.recipientIdentifier ? data.recipientIdentifier.split(',').map(v => v.trim()) : [];
+                    setSelectedTemplateRecipients(values);
+                })
+                .fail(function (err) {
+                    console.warn('Failed to load recipients for edit:', err);
+                });
+        } else {
+            $('#templateRecipientSelect').empty();
+            setSelectedTemplateRecipients([]);
+        }
+        
+        UiElements.deleteButton.show();
+        $('#email-attachments-section').show();
+        initEmailAttachmentsTable(data.id);
+        
+        // Recalculate table columns after initialization
+        if (emailAttachmentsTable) {
+            setTimeout(() => {
+                emailAttachmentsTable.columns.adjust().draw();
+            }, 100);
+        }
     }
 
-    function handleDeleteError() {
-        abp.notify.error('Error deleting the template.');
+    function populateFieldsForNewTemplate() {
+        // Store original values as empty for new template
+        originalFormValues = {
+            id: '',
+            name: '',
+            description: '',
+            sendFrom: '',
+            subject: '',
+            bodyText: '',
+            bodyHTML: '',
+            recipientCategory: '',
+            recipientIdentifier: ''
+        };
+        
+        $('#templateId').val('');
+        $('#templateName').val('');
+        $('#sendFrom').val('');
+        $('#subject').val('');
+        $('#templateRecipientCategory').val('');
+        $('#templateRecipientSelect').empty().val([]).trigger('change');
+        UiElements.deleteButton.hide();
+        $('#email-attachments-section').hide();
+        // Don't load attachments for new templates - they have no ID yet
     }
 
-    function deleteTemplate(id, wrapperId) {
-        $.ajax({
-            url: `/api/app/template/${id}/template`,
-            type: 'DELETE',
-            success: handleDeleteSuccess(wrapperId),
-            error: handleDeleteError
+    UiElements.discardButton.on('click', function () {
+        if (Object.keys(originalFormValues).length > 0) {
+            $('#templateId').val(originalFormValues.id);
+            $('#templateName').val(originalFormValues.name);
+            $('#sendFrom').val(originalFormValues.sendFrom);
+            $('#subject').val(originalFormValues.subject);
+            $('#templateRecipientCategory').val(originalFormValues.recipientCategory || '');
+            
+            const editor = tinymce.get('templateBody');
+            if (editor) {
+                editor.setContent(originalFormValues.bodyHTML || '');
+            }
+            
+            // Restore recipients
+            if (originalFormValues.recipientCategory) {
+                fetchRecipients(originalFormValues.recipientCategory)
+                    .done(function (list) {
+                        populateTemplateRecipients(list);
+                        const values = originalFormValues.recipientIdentifier ? originalFormValues.recipientIdentifier.split(',').map(v => v.trim()) : [];
+                        setSelectedTemplateRecipients(values);
+                    })
+                    .fail(function (err) {
+                        console.warn('Failed to restore recipients:', err);
+                    });
+            } else {
+                $('#templateRecipientSelect').empty().val([]).trigger('change');
+            }
+        }
+    });
+
+    UiElements.closeButton.on('click', function () {
+        closeRightPanel();
+    });
+
+    UiElements.saveButton.on('click', function () {
+        const templateId = $('#templateId').val();
+        const templateName = $('#templateName').val();
+        const sendFrom = $('#sendFrom').val();
+        const subject = $('#subject').val();
+        const recipientCategory = $('#templateRecipientCategory').val();
+        const editor = tinymce.get('templateBody');
+        const bodyHTML = editor ? editor.getContent().trim() : '';
+
+        // Clear all previous error styles
+        clearAllErrors();
+
+        // Collect all validation errors
+        const validationErrors = [];
+
+        if (!templateName?.trim()) {
+            validationErrors.push('Template name is required.');
+            markFieldError('templateName', 'Template name is required.');
+        }
+        if (!sendFrom?.trim()) {
+            validationErrors.push('Send From is required.');
+            markFieldError('sendFrom', 'Send From is required.');
+        } else if (!validateEmail(sendFrom.trim())) {
+            validationErrors.push('Send From must be a valid email address.');
+            markFieldError('sendFrom', 'Send From must be a valid email address.');
+        }
+        if (!subject?.trim()) {
+            validationErrors.push('Subject is required.');
+            markFieldError('subject', 'Subject is required.');
+        }
+        if (!bodyHTML) {
+            validationErrors.push('Template body is required.');
+            markFieldError('templateBody', 'Template body is required.');
+        }
+
+        // Validate recipients: if category is selected, recipients must be selected
+        const selectedRecipients = getSelectedTemplateRecipients();
+        if (recipientCategory && selectedRecipients.length === 0) {
+            validationErrors.push('Recipients are required when Recipient Category is selected.');
+            markFieldError('templateRecipientSelect', 'Recipients are required when Recipient Category is selected.');
+        }
+
+        // Show single error popup if there are validation errors
+        if (validationErrors.length > 0) {
+            return abp.notify.error(validationErrors.join('<br>'));
+        }
+
+        const templateData = {
+            name: templateName,
+            description: '',
+            sendFrom: sendFrom,
+            subject: subject,
+            bodyText: '',
+            bodyHTML: bodyHTML,
+            recipientCategory: recipientCategory || null,
+            recipientIdentifier: selectedRecipients.length > 0 ? selectedRecipients.join(',') : null
+        };
+
+        const isNewTemplate = !templateId || templateId.trim() === '';
+
+        // Check template name uniqueness before saving
+        checkTemplateNameUnique(templateName.trim(), templateId, function (isUnique) {
+            if (!isUnique) {
+                markFieldError('templateName', 'Template name must be unique.');
+                return;
+            }
+            performSave(isNewTemplate, templateId, templateData, templateName, sendFrom, subject, bodyHTML);
         });
-    }
+    });
 
-    // Helper functions moved outside of createCard to reduce complexity
-    function getCardLastEditedDate(data) {
-        if (data?.lastModificationTime) {
-            return new Date(data.lastModificationTime).toLocaleDateString('en-CA');
-        } else if (data?.creationTime) {
-            return new Date(data.creationTime).toLocaleDateString('en-CA');
+    function performSave(isNewTemplate, templateId, templateData, templateName, sendFrom, subject, bodyHTML) {
+        if (isNewTemplate) {
+            // Create new template
+            unity.notifications.templates.template
+                .create(templateData)
+                .then(function (response) {
+                    abp.notify.success('Template created successfully.');
+                    // Populate templateId with returned ID
+                    $('#templateId').val(response.id);
+                    // Update original values with new template ID and data
+                    originalFormValues = {
+                        id: response.id,
+                        name: templateName,
+                        description: '',
+                        sendFrom: sendFrom,
+                        subject: subject,
+                        bodyText: '',
+                        bodyHTML: bodyHTML,
+                        recipientCategory: templateData.recipientCategory || '',
+                        recipientIdentifier: templateData.recipientIdentifier || ''
+                    };
+                    // Now show attachments section and initialize table
+                    $('#email-attachments-section').show();
+                    initEmailAttachmentsTable(response.id);
+                    UiElements.deleteButton.show();
+                    // Reload templates list
+                    PubSub.publish('reload_templates_table_no_close');
+                })
+                .catch(function (e) {
+                    console.warn('Failed to create template:', e);
+                    abp.notify.error('Failed to create template.');
+                });
         } else {
-            return new Date().toLocaleDateString('en-CA');
+            // Update existing template
+            unity.notifications.templates.template
+                .updateTemplate(templateId, templateData)
+                .then(function () {
+                    abp.notify.success('Template updated successfully.');
+                    // Update original values after successful save
+                    originalFormValues = {
+                        id: templateId,
+                        name: templateName,
+                        description: '',
+                        sendFrom: sendFrom,
+                        subject: subject,
+                        bodyText: '',
+                        bodyHTML: bodyHTML
+                    };
+                    PubSub.publish('reload_templates_table_no_close');
+                })
+                .catch(function (e) {
+                    console.warn('Failed to update template:', e);
+                    abp.notify.error('Failed to update template.');
+                });
         }
     }
 
-    function generateCardHtml(cardConfig) {
-        const { 
-            data, 
-            elementIds, 
-            displayInfo, 
-            isPopulated 
-        } = cardConfig;
+    UiElements.addTemplateButton.on('click', function () {
+        // Initialize template variables if needed
+        initializeTemplateVariables();
         
-        const disabled = isPopulated ? 'disabled' : '';
-        const cardDataId = data?.id?.toString() || elementIds.wrapperId;
+        // Initialize editor with empty data
+        initializeEditor({ bodyHTML: '' }, dropdownItems);
         
-        return `
-        <div class="card mb-3 shadow-sm" id="${elementIds.wrapperId}" data-id="${cardDataId}">
-            <div class="card-header d-flex justify-content-between align-items-center">
-                <strong class="template-title">${data?.name || 'Untitled Template'}</strong>
-                <div class="d-flex align-items-center gap-3">
-                    <div class="text-muted small text-end me-3">
-                        <div>Type<br /><span class="fw-normal">${displayInfo.type}</span></div>
-                    </div>
-                    <div class="text-muted small text-end me-3">
-                        <div>Last Edited<br /><span class="fw-normal">${displayInfo.lastEdited}</span></div>
-                    </div>
-                    <button class="btn btn-sm btn-link text-decoration-none" type="button"
-                        data-bs-toggle="collapse" data-bs-target="#${elementIds.cardId}" aria-expanded="false"
-                        aria-controls="${elementIds.cardId}">
-                        <i class="unt-icon-sm fa-solid fa-chevron-down"></i>
-                    </button>
-                </div>
-            </div>
-            <div class="collapse" id="${elementIds.cardId}">
-                <div class="card-body">
-                    <form id="${elementIds.formId}">
-                        <div class="mb-3">
-                            <label class="form-label">Template Name</label>
-                            <input type="text" class="form-control form-input" name="templateName" value="${data?.name || ''}" ${disabled} required>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Send From</label>
-                            <input type="text" class="form-control form-input" name="sendFrom" value="${data?.sendFrom || ''}" ${disabled} required>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Subject</label>
-                            <input type="text" class="form-control form-input" name="subject" value="${data?.subject || ''}" ${disabled} required>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Body</label>
-                            <textarea id="${elementIds.editorId}"></textarea>
-                        </div>
-                         <div class="mb-3">
-                         <p><b>NOTE</b>:<span class="note-text"> Selecting text will let you customize it: replace it with a variable, make it bold, italic, change the alignment, add a link, create a list, etc.</span></p>
-                         </div>
-                         <div class="mb-3">
-                         <hr>
-                         <button type="button" class="btn btn-outline-primary deleteCardBtn">X DELETE THIS TEMPLATE</button>
-                         <hr>
-                         </div>
-                        <div class="d-flex gap-2">
-                            ${isPopulated ? `<button type="submit" class="btn btn-primary  saveBtn" disabled>SAVE CHANGES</button>` : `<button type="submit" class="btn btn-primary saveBtn">SAVE CHANGES</button>`}
-                            <button type="button" class="btn btn-outline-secondary discardBtn d-none">DISCARD CHANGES</button>
-                            ${isPopulated ? `<button type="button" class="btn btn-secondary editBtn">EDIT THIS TEMPLATE</button>` : ''}
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    `;
-    }
-
-    function initializeEditor(editorId, id, data, isPopulated, dropdownItems) {        
-        if (tinymce.get(editorId)) {
-            tinymce.get(editorId).remove();
-        }
-
-        tinymce.init({
-            license_key: 'gpl',
-            selector: `#${editorId}`,
-            plugins: 'lists link image preview code',
-            toolbar: 'undo redo | styles | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image | code preview | variablesDropdownButton',
-            resize: true,
-            statusbar: true,
-            elementpath: false,
-            branding: false,
-            promotion: false,
-            content_css: false,
-            skin: false,
-            setup: function (editor) {                
-                setupEditor(editor, id, editorId, data, isPopulated, dropdownItems);
-            }
-        });
-    }
+        // Populate fields with empty values for new template
+        populateFieldsForNewTemplate();
+        
+        // Highlight nothing in the table
+        $('#TemplatesTable tbody tr').removeClass('template-selected');
+        
+        // Open right panel
+        openRightPanel();
+    });
 
-    function createMenuItems(dropdownItems, editor) {
-        return dropdownItems.map(item => ({
-            type: 'menuitem',
-            text: item.text,
-            onAction: () => {
-                editor.insertContent(`{{${item.value}}}`);
-            }
-        }));
+    function proceedWithDelete(templateId, onDelete) {
+        // Destroy attachments table before deleting
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.destroy();
+            emailAttachmentsTable = null;
+        }
+        unity.notifications.templates.template
+            .deleteTemplate(templateId)
+            .then(function () {
+                abp.notify.success('Template deleted successfully.');
+                onDelete();
+            })
+            .catch(function (e) {
+                console.warn('Failed to delete template:', e);
+                abp.notify.error('Failed to delete template.');
+            });
     }
 
-    function fetchVariablesMenuItems(dropdownItems, editor) {
-        return function (callback) {
-            const items = createMenuItems(dropdownItems, editor);
-            callback(items);
-        };
+    function handleDeleteCanCheckSuccess(response, templateId) {
+        if (response.canDelete) {
+            proceedWithDelete(templateId, function () {
+                PubSub.publish('reload_templates_table_with_close');
+            });
+        } else {
+            abp.notify.error(response.errorMessage || 'This template cannot be deleted because it is currently in use.');
+        }
     }
 
-    function setupEditor(editor, id, editorId, data, isPopulated, dropdownItems) {
-        editor.ui.registry.addMenuButton('variablesDropdownButton', {
-            text: 'VARIABLES',
-            fetch: fetchVariablesMenuItems(dropdownItems, editor)
+    function handleDeleteCanCheckError(templateId) {
+        // If check fails, proceed with deletion
+        proceedWithDelete(templateId, function () {
+            PubSub.publish('reload_templates_table_with_close');
         });
+    }
 
-        editor.on('init', function () {
-            editor.mode.set(isPopulated ? 'readonly' : 'design');
-            if (data?.bodyHTML) {
-                editor.setContent(data.bodyHTML);
+    function checkCanDeleteTemplate(templateId) {
+        $.ajax({
+            url: `/api/form-notifications/can-delete-template/${templateId}`,
+            type: 'GET',
+            success: function (response) {
+                handleDeleteCanCheckSuccess(response, templateId);
+            },
+            error: function () {
+                handleDeleteCanCheckError(templateId);
             }
-            editorInstances[id] = editor;            
         });
     }
 
-    function setupCardEventHandlers(cardData) {
-        const { id, formId, cardId, wrapperId, editorId, data, isPopulated, dropdownItems } = cardData;
-        
-        setupTemplateNameValidation(formId, wrapperId, id);
-        setupFormSubmission(formId, id);
-        setupCollapseHandlers(cardId, wrapperId);
-        setupEditDiscardHandlers(wrapperId, formId, editorId, id, data, dropdownItems);
-        setupDeleteHandler(wrapperId, id, isPopulated);
+    function initiateTemplateDelete(templateId) {
+        abp.message.confirm(
+            'Are you sure you want to delete this template?',
+            'Delete Template',
+            function (confirmed) {
+                if (confirmed) {
+                    checkCanDeleteTemplate(templateId);
+                }
+            }
+        );
     }
 
-    function setupTemplateNameValidation(formId, wrapperId, id) {
-        const debouncedValidation = debounce(function (templateInput, newTitle) {
-            checkTemplateNameUnique(newTitle, id, function (isUnique) {
-                toggleTemplateNameValidation(templateInput, formId, isUnique);
-            });
-        }, 250);
+    UiElements.deleteButton.on('click', function () {
+        const templateId = $('#templateId').val();
+        initiateTemplateDelete(templateId);
+    });
 
-        $(`#${formId} input[name="templateName"]`).on('input', function () {
-            const templateInput = $(this);
-            const newTitle = templateInput.val().trim() || 'Untitled Template';
-            $(`#${wrapperId} .template-title`).text(newTitle);
+    function initializeTemplateDataTables() {                
+        // ── Table columns ────────────────────────────────────────────────────────
+        const listColumns = [
+            {
+                title: 'Id',
+                name: 'id',
+                data: 'id',
+                visible: false,
+                index: 0
+            },        
+            {
+                title: 'Name',
+                name: 'name',
+                data: 'name',
+                index: 1,
+                width: '20%'
+            },
+            {
+                title: 'Subject',
+                name: 'subject',
+                data: 'subject',
+                index: 2,
+                width: '60%'
+            },
+            {
+                title: 'Actions',
+                name: 'actions',
+                data: 'id',
+                orderable: false,
+                searchable: false,
+                index: 3,
+                width: '130px',
+                render: function (data, type, row) {
+                    return `
+                        <div class="d-inline-flex gap-2">
+                            <button class="btn btn-sm btn-action-gray template-edit-btn" data-id="${data}" title="Edit">
+                                <i class="fl fl-edit"></i>
+                            </button>
+                            <button class="btn btn-sm btn-action-gray template-delete-btn" data-id="${data}" title="Delete">
+                                <i class="fl fl-cancel"></i>
+                            </button>
+                        </div>
+                    `;
+                }
+            }       
+        ];
+
+        const responseCallback = (result) => (        
+            {        
+                recordsTotal:    result.length,
+                recordsFiltered: result.length,
+                data:            result
+            }
+        );
 
-            debouncedValidation(templateInput, newTitle);
+        const actionButtons = [
+            {
+            }
+        ];
+
+        const defaultVisibleColumns = ['name', 'subject', 'actions'];
+        const dt = $('#TemplatesTable');
+
+        templatesDataTable = initializeDataTable({
+            dt,
+            defaultVisibleColumns,
+            listColumns,
+            maxRowsPerPage: 25,
+            defaultSortColumn: 0,
+            dataEndpoint: unity.notifications.templates.template.getTemplatesByTenant,
+            data: {},
+            responseCallback,
+            actionButtons,
+            pagingEnabled: true,
+            reorderEnabled: false,
+            languageSetValues: {},
+            dataTableName: 'TemplatesTable',
+            dynamicButtonContainerId: 'dynamicButtonContainerId',
+            useNullPlaceholder: true,
+            externalSearchId: 'search-prompts',
+            fixedHeaders: true
         });
-    }
 
-    function toggleTemplateNameValidation(templateInput, formId, isUnique) {
-        if (!isUnique) {
-            templateInput.addClass("is-invalid");
-            if (!$(`#${formId} .template-name-feedback`).length) {
-                templateInput.after(`<div class="invalid-feedback template-name-feedback">Template name must be unique.</div>`);
+        // ── Helper: Select and initialize template by ID ──
+        function selectTemplateById(templateId) {
+            const rows = templatesDataTable.rows().data();
+            for (let i = 0; i < rows.length; i++) {
+                if (rows[i].id === templateId) {
+                    const $row = $(templatesDataTable.row(i).node());
+                    const rowData = templatesDataTable.row(i).data();
+                    if (rowData) {
+                        initializeTemplateVariables();
+                        initializeEditor(rowData, dropdownItems);
+                        populateFields(rowData);
+                        
+                        // Highlight selected row
+                        $('#TemplatesTable tbody tr').removeClass('template-selected');
+                        $row.addClass('template-selected');
+                        openRightPanel();
+                        
+                        // Publish event for pub/sub listeners
+                        PubSub.publish('template_selected_from_email_editor', {
+                            templateId: templateId
+                        });
+                    }
+                    break;
+                }
             }
-            $(`#${formId} .saveBtn`).prop("disabled", true);
-        } else {
-            templateInput.removeClass("is-invalid");
-            $(`#${formId} .template-name-feedback`).remove();
-            $(`#${formId} .saveBtn`).prop("disabled", false);
         }
-    }
 
-    function setupFormSubmission(formId, id) {
-        $(`#${formId}`).on("submit", function (e) {
-            e.preventDefault();
+        // ── Auto-select template from localStorage if navigating from email editor ──
+        let hasCheckedAutoSelect = false;
+        $('#TemplatesTable').on('draw.dt', function () {
+            if (hasCheckedAutoSelect) return; // Only check once
             
-            const formDataArray = $(this).serializeArray();
-            const formData = extractFormData(formDataArray);
-            const editor = editorInstances[id];
-            const payload = buildTemplatePayload(formData, editor);
-
-            if (id.includes("temp")) {
-                saveTemplate(payload);
-            } else {
-                updateTemplate(id, payload);
+            const templateToSelectId = localStorage.getItem('notifications-template-to-select');
+            if (!templateToSelectId) return;
+            
+            hasCheckedAutoSelect = true;
+            localStorage.removeItem('notifications-template-to-select');
+            
+            // Ensure Templates tab is active
+            const templateTab = document.getElementById('nav-template-tab');
+            if (templateTab && !templateTab.classList.contains('active')) {
+                const tab = new bootstrap.Tab(templateTab);
+                tab.show();
             }
+            
+            // Wait for tab transition to complete, then find and select the template
+            setTimeout(() => {
+                selectTemplateById(templateToSelectId);
+            }, 150);
         });
-    }
 
-    function setupCollapseHandlers(cardId, wrapperId) {
-        $(`#${cardId}`).on('show.bs.collapse', function () {
-            $(`#${wrapperId} .btn[data-bs-target="#${cardId}"] i`)
-                .removeClass('fa-chevron-down')
-                .addClass('fa-chevron-up');
+        // ── Row click → open version panel ──────────────────────────────────────
+        $('#TemplatesTable').on('click', 'tbody tr', function (e) {
+            // Don't intercept action-column clicks
+            if ($(e.target).closest('.dropdown, .dropdown-menu, button, a').length) return;
+
+            const rowData = templatesDataTable.row(this).data();
+            if (!rowData) return;
+
+            // Initialize the tinymce editor with the selected template data
+            initializeTemplateVariables();
+            initializeEditor(rowData, dropdownItems);
+            populateFields(rowData);
+
+            // Highlight selected row
+            $('#TemplatesTable tbody tr').removeClass('template-selected');
+            $(this).addClass('template-selected');            
+            openRightPanel();
+        });
+
+        // ── Edit button click ──────────────────────────────────────────────────
+        $('#TemplatesTable').on('click', '.template-edit-btn', function (e) {
+            e.stopPropagation();
+            const rowData = templatesDataTable.row($(this).closest('tr')).data();
+            
+            if (!rowData) return;
+            
+            initializeTemplateVariables();
+            initializeEditor(rowData, dropdownItems);
+            populateFields(rowData);
+            
+            // Highlight selected row
+            $('#TemplatesTable tbody tr').removeClass('template-selected');
+            $(this).closest('tr').addClass('template-selected');
+            openRightPanel();
         });
 
-        $(`#${cardId}`).on('hide.bs.collapse', function () {
-            $(`#${wrapperId} .btn[data-bs-target="#${cardId}"] i`)
-                .removeClass('fa-chevron-up')
-                .addClass('fa-chevron-down');
+        // ── Delete button click ────────────────────────────────────────────────
+        $('#TemplatesTable').on('click', '.template-delete-btn', function (e) {
+            e.stopPropagation();
+            const templateId = $(this).data('id');
+            initiateTemplateDelete(templateId);
         });
+
+        // Removed nested functions - now defined at global scope above
     }
 
-    function setupEditDiscardHandlers(wrapperId, formId, editorId, id, data, dropdownItems) {
-        $(`#${wrapperId}`).on("click", ".editBtn", function () {
-            handleEditClick(wrapperId, editorId, id, data, dropdownItems);
-        });
 
-        $(`#${wrapperId}`).on("click", ".discardBtn", function () {
-            handleDiscardClick(wrapperId, formId, editorId, id, data, dropdownItems);
+    function initializeTemplateVariables() {
+        $.ajax({
+            url: `/api/app/template/template-variables`,
+            type: 'GET',
+            success: function (response) {
+                $.map(response, function (item) {
+                    dropdownItems.push({
+                        text: item.name,
+                        value: item.token
+                    });
+                });
+            },
+            error: function () {
+                // Handle error silently
+            }
         });
     }
 
-    function handleEditClick(wrapperId, editorId, id, data, dropdownItems) {
-        const currentEditor = editorInstances[id];
-        currentEditor.destroy();
+    function initEmailAttachmentsTable(templateId) {
+        // Destroy existing table if it exists
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.destroy();
+            emailAttachmentsTable = null;
+        }
 
-        initializeEditor(editorId, id, data, false, dropdownItems);
+        // Skip initialization if no template ID provided
+        if (!templateId) {
+            return;
+        }
 
-        const card = $(`#${wrapperId}`);
-        card.find(".form-input").prop('disabled', false);
-        card.find(".saveBtn").prop('disabled', false);
-        card.find(".discardBtn").removeClass("d-none");
-        card.find(".editBtn").addClass("d-none");
+        // Ensure table has 100% width
+        $('#EmailAttachmentsTable').css('width', '100%');
+
+        emailAttachmentsTable = $('#EmailAttachmentsTable').DataTable(
+            abp.libs.datatables.normalizeConfiguration({
+                serverSide: false,
+                order: [[2, 'asc']],
+                searching: false,
+                paging: false,
+                select: false,
+                info: false,
+                scrollX: true,
+                scrollY: '200px',
+                scrollCollapse: true,
+                ajax: abp.libs.datatables.createAjax(
+                    unity.notifications.emails.emailLogAttachment.getListByTemplateId,
+                    function () { return templateId; },
+                    function (result) { return { data: result }; }
+                ),
+                columnDefs: [
+                    {
+                        targets: 0,
+                        title: 'Document Name',
+                        data: 'fileName',
+                        className: 'data-table-header text-break text-start',
+                        width: '40%'
+                    },
+                    {
+                        targets: 1,
+                        title: 'Date',
+                        data: 'time',
+                        className: 'data-table-header text-start',
+                        width: '130px',
+                        render: function (data, type) {
+                            if (type === 'display' || type === 'filter') {
+                                return new Date(data).toDateString();
+                            }
+                            return data;
+                        }
+                    },
+                    {
+                        targets: 2,
+                        title: 'Attached by',
+                        data: 'attachedBy',
+                        className: 'data-table-header text-start',
+                        width: '25%'
+                    },
+                    {
+                        targets: 3,
+                        title: 'File Size',
+                        data: 'fileSize',
+                        className: 'data-table-header text-start',
+                        width: '90px',
+                        render: function (data) {
+                            if (!data) return '—';
+                            const mb = data * 0.000001;
+                            return mb >= 1 ? mb.toFixed(2) + ' MB' : (data / 1024).toFixed(0) + ' KB';
+                        }
+                    },
+                    {
+                        targets: 4,
+                        title: 'Actions',
+                        data: 'id',
+                        width: '80px',
+                        className: 'text-start',
+                        orderable: false,
+                        render: function (data) {
+                            return generateEmailAttachmentButtonContent(data);
+                        }
+                    }
+                ],
+                drawCallback: function () {
+                    if (emailAttachmentsTable) {
+                        emailAttachmentsTable.columns.adjust();
+                    }
+                }
+            })
+        );
     }
 
-    function handleDiscardClick(wrapperId, formId, editorId, id, data, dropdownItems) {
-        const form = $(`#${formId}`)[0];
-        form.reset();
-        const currentEditor = editorInstances[id];
-        currentEditor.destroy();
 
-        initializeEditor(editorId, id, data, true, dropdownItems);
+    $('#email_attachment_upload_btn').on('click', function () {
+        $('#email_attachment_upload').click();
+    });
+
+    $('#email_attachment_upload').on('change', function () {
+        uploadEmailFiles('email_attachment_upload');
+    });
 
-        $(`#${wrapperId} .form-input`).prop('disabled', true);
-        $(`#${wrapperId} .saveBtn`).prop('disabled', true);
-        $(`#${wrapperId} .discardBtn`).addClass("d-none");
-        $(`#${wrapperId} .editBtn`).removeClass("d-none");
-    }
+    function uploadEmailFiles(inputId) {
+        const templateId = $('#templateId').val();
+        const input = document.getElementById(inputId);
+        if (!input?.files?.length) return;
 
-    function setupDeleteHandler(wrapperId, id, isPopulated) {
-        $(`#${wrapperId}`).on("click", ".deleteCardBtn", function () {
-            if (isPopulated) {
-                showDeleteConfirmation(id, wrapperId);
-            } else {
-                $(`#${wrapperId}`).remove();
+        const disallowedTypes = JSON.parse(decodeURIComponent($('#Extensions').val()));
+        const maxFileSize = decodeURIComponent($('#EmailAttachmentMaxFileSize').val());
+
+        let isAllowedTypeError = false;
+        let isMaxFileSizeError = false;
+        const formData = new FormData();
+
+        for (let file of input.files) {
+            const ext = file.name.slice(file.name.lastIndexOf('.') + 1).toLowerCase();
+            if (disallowedTypes.includes(ext)) {
+                isAllowedTypeError = true;
+            }
+            if (file.size * 0.000001 > maxFileSize) {
+                isMaxFileSizeError = true;
+            }
+            formData.append('files', file);
+        }
+
+        if (isAllowedTypeError) {
+            input.value = '';
+            return abp.notify.error('Error', 'File type not supported');
+        }
+        if (isMaxFileSizeError) {
+            input.value = '';
+            return abp.notify.error(
+                'File Too Large',
+                'The selected file exceeds the maximum allowed size of ' + maxFileSize + ' MB for email attachments. Please select a smaller file.'
+            );
+        }
+
+        const totalMaxFileSize = Number.parseFloat(
+            decodeURIComponent($('#TotalEmailAttachmentMaxFileSize').val()) || '25'
+        );
+        let existingTotalBytes = 0;
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.rows().data().each(function (row) {
+                existingTotalBytes += (row.fileSize || 0);
+            });
+        }
+        let newFilesBytes = 0;
+        for (let file of input.files) {
+            newFilesBytes += file.size;
+        }
+        const combinedMB = (existingTotalBytes + newFilesBytes) * 0.000001;
+        if (combinedMB > totalMaxFileSize) {
+            input.value = '';
+            return abp.notify.error(
+                'Total Size Exceeded',
+                'The total size of all attachments would exceed the maximum allowed ' + totalMaxFileSize +
+                ' MB. Please remove existing attachments or select a smaller file.'
+            );
+        }
+
+        $.ajax({
+            url: `/api/app/attachment/template/${templateId}/upload`,
+            type: 'POST',
+            data: formData,
+            processData: false,
+            contentType: false,
+            xhr: function () {
+                const xhr = new globalThis.XMLHttpRequest();
+                xhr.upload.addEventListener('progress', function (e) {
+                    if (e.lengthComputable) {
+                        const pct = Math.round((e.loaded / e.total) * 100);
+                        $('#attachment-upload-progress-bar')
+                            .css('width', pct + '%')
+                            .attr('value', pct)
+                            .text(pct + '%');
+                    }
+                });
+                return xhr;
+            },
+            beforeSend: function () {
+                $('#email_attachment_upload_btn')
+                    .html('<span class="spinner-border spinner-border-sm me-1" role="status" aria-hidden="true"></span>Uploading...')
+                    .prop('disabled', true);
+                $('#attachment-upload-progress-bar').css('width', '0%').text('0%');
+                $('#attachment-upload-progress').show();
+            },
+            success: function () {
+                PubSub.publish('reload_email_attachments_table');
+            },
+            error: function (xhr) {
+                abp.notify.error(xhr.responseText || 'Failed to upload attachment.');
+            },
+            complete: function () {
+                input.value = '';
+                $('#email_attachment_upload_btn')
+                    .html('<i class="fl fl-plus me-1"></i>Add Attachments')
+                    .prop('disabled', false);
+                $('#attachment-upload-progress').hide();
             }
         });
     }
 
-    function createCard(data = null) {
-        const isPopulated = data !== null;
-        const id = data?.id?.toString() || generateTempId();
-        const cardId = `collapseDetails-${id}`;
-        const formId = `form-${id}`;
-        const wrapperId = `cardWrapper-${id}`;
-        const editorId = `editor-${id}`;
-        const type = data?.type || 'Automatic';
-        const lastEdited = getCardLastEditedDate(data);
-        const dropdownItems = [];
+    // ── Draggable divider ─────────────────────────────────────────────────────
+    function initializeDivider() {
         
-        getTemplateVariables(dropdownItems);
-
-        const cardConfig = {
-            data: data,
-            elementIds: {
-                cardId: cardId,
-                formId: formId,
-                wrapperId: wrapperId,
-                editorId: editorId
-            },
-            displayInfo: {
-                type: type,
-                lastEdited: lastEdited
-            },
-            isPopulated: isPopulated
-        };
+        const $divider   = $('#divider');
+        const $leftPane  = $('#leftPane');
+        const $rightPane = $('#rightPane');
+        const $container = $('#splitContainer');
+
+        let isDragging     = false;
+        let dragStartX     = 0;
+        let dragStartLeft  = 0;
+
+        $divider.on('mousedown', function (e) {
+            isDragging    = true;
+            dragStartX    = e.clientX;
+            dragStartLeft = $leftPane.width();
+            $divider.addClass('dragging');
+            $('body').addClass('split-dragging');
+            e.preventDefault();
+        });
 
-        const cardHtml = generateCardHtml(cardConfig);
+        $(document).on('mousemove.splitDrag', function (e) {
+            if (!isDragging) return;
 
-        $("#cardContainer").append(cardHtml);
-        $(`#${wrapperId}`).data('original-name', data?.name || '');
+            const totalWidth  = $container.width();
+            const dividerW    = $divider.outerWidth();
+            const delta       = e.clientX - dragStartX;
+            let   newLeft     = dragStartLeft + delta;
+            const minLeft     = totalWidth * 0.2;
+            const maxLeft     = totalWidth * 0.8 - dividerW;
 
-        initializeEditor(editorId, id, data, isPopulated, dropdownItems);
+            newLeft = Math.max(minLeft, Math.min(maxLeft, newLeft));
 
-        const cardData = {
-            id, formId, cardId, wrapperId, editorId, data, isPopulated, dropdownItems
-        };
-        setupCardEventHandlers(cardData);
-    }
+            const leftPct  = (newLeft / totalWidth * 100).toFixed(2);
+            const rightPct = ((totalWidth - newLeft - dividerW) / totalWidth * 100).toFixed(2);
 
-    function loadCardsFromService() {
-        $.ajax({
-            url: `/api/app/template/templates-by-tenent`,
-            type: 'GET',
-            success: handleLoadCardsSuccess,
-            error: handleLoadCardsError
+            $leftPane.css('flex', `0 0 ${leftPct}%`);
+            $rightPane.css({ 'flex': 'none', 'width': rightPct + '%' });
+            
+            // Recalculate table columns while dragging
+            if (emailAttachmentsTable) {
+                emailAttachmentsTable.columns.adjust();
+            }
+        });
+
+        $(document).on('mouseup.splitDrag', function () {
+            if (isDragging) {
+                isDragging = false;
+                $divider.removeClass('dragging');
+                $('body').removeClass('split-dragging');
+                
+                // Final recalculation after dragging completes
+                if (emailAttachmentsTable) {
+                    emailAttachmentsTable.columns.adjust().draw();
+                }
+            }
         });
     }
 
-    function handleLoadCardsSuccess(response) {
-        editorInstances = {};
-        response.forEach(item => createCard(item));
+    PubSub.subscribe('reload_email_attachments_table', () => {
+        reloadEmailAttachmentsTable();
+    });
+
+    function reloadEmailAttachmentsTable() {
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.ajax.reload();
+        }
     }
 
-    function handleLoadCardsError() {
-        abp.notify.error('Unable to load the templates.');
+    function reloadTemplatesTable() {
+        if (templatesDataTable) {
+            templatesDataTable.ajax.reload();
+        }
     }
-    function generateTempId() {
-        const array = new Uint32Array(1);
-        window.crypto.getRandomValues(array);
-        return `temp-${array[0].toString(36)}`;
+
+    function reloadTemplatesTableAndClose() {
+        if (templatesDataTable) {
+            templatesDataTable.ajax.reload();
+            closeRightPanel();
+        }
     }
 
-    $("#CreateNewTemplate").on("click", function () {
-        createCard();
+    PubSub.subscribe('reload_templates_table_no_close', () => {
+        reloadTemplatesTable();
+    });
+
+    PubSub.subscribe('reload_templates_table_with_close', () => {
+        reloadTemplatesTableAndClose();
     });
-});
\ No newline at end of file
+
+
+});
+
+function initializeEditor(data, dropdownItems) {     
+    const templateId = 'templateBody';
+    
+    // Remove existing editor instance if it exists
+    const existingEditor = tinymce.get(templateId);
+    if (existingEditor) {
+        tinymce.remove(`#${templateId}`);
+    }
+    
+    tinymce.init({
+        license_key: 'gpl',
+        selector: `#${templateId}`,
+        plugins: 'lists link image preview code',
+        menubar: 'file edit view insert format tools',
+        toolbar: 'variablesButton | undo redo | styles | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image | code preview',
+        resize: true,
+        statusbar: true,
+        elementpath: false,
+        branding: false,
+        promotion: false,
+        content_css: false,
+        skin: false,
+        setup: function (editor) {                
+            setupEditor(editor, templateId, templateId, data, dropdownItems);
+        }
+    });
+}
+
+function setupEditor(editor, id, editorId, data, dropdownItems) {
+    editor.ui.registry.addMenuButton('variablesButton', {
+        text: 'Variables',
+        fetch: (callback) => {
+            const items = dropdownItems.map(item => ({
+                type: 'menuitem',
+                text: item.text,
+                onAction: () => {
+                    editor.insertContent(`{{${item.value}}}`);
+                }
+            }));
+            callback(items);
+        }
+    });
+
+    editor.on('init', function () {
+        editor.mode.set('design');
+        if (data?.bodyHTML !== undefined) {
+            editor.setContent(data.bodyHTML);
+        }    
+    });
+}    
+
+function fetchVariablesMenuItems(dropdownItems, editor) {
+    return function (callback) {
+        const items = createMenuItems(dropdownItems, editor);
+        callback(items);
+    };
+}
+
+function createMenuItems(dropdownItems, editor) {
+    return dropdownItems.map(item => ({
+        type: 'menuitem',
+        text: item.text,
+        onAction: () => {
+            editor.insertContent(`{{${item.value}}}`);
+        }
+    }));
+}
+
+/**
+ * Generates HTML for email attachment button
+ * @param {string} attachmentId - Attachment ID
+ * @returns {string} HTML for attachment button
+ */
+function generateEmailAttachmentButtonContent(attachmentId) {
+    return `<button class="btn fullWidth btn  btn-action-gray" style="margin:10px" type="button" onclick="deleteEmailAttachment('${attachmentId}')">
+                <i class="fl fl-cancel"></i>
+            </button>`;
+}
+
+
+/**
+ * Deletes email attachment with confirmation
+ * @param {string} attachmentId - Attachment ID to delete
+ */
+function deleteEmailAttachment(attachmentId) {
+    abp.message.confirm(
+        'Are you sure you want to delete this attachment?',
+        'Delete Attachment',
+        function (confirmed) {
+            if (confirmed) {
+                unity.notifications.emails.emailLogAttachment
+                    .delete(attachmentId)
+                    .then(function () {
+                        abp.notify.success('Attachment deleted successfully.');
+                        PubSub.publish('reload_email_attachments_table');
+                    })
+                    .catch(function (e) {
+                        console.warn('Failed to delete attachment:', e);
+                        abp.notify.error('Failed to delete attachment.');
+                    });
+            }
+        }
+    );
+}
+
+/**
+  * Validates email format
+  * @param {string} email - Email address to validate
+  * @returns {boolean} True if valid email format
+  */
+function validateEmail(email) {
+    // Optimized regex to prevent ReDoS: use atomic-like patterns with specific character classes
+    const emailRegex = /^[a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+    return emailRegex.exec(String(email).toLowerCase()) !== null;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewComponent.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewComponent.cs
index ff9a8bda3e..1e3f2b7f71 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewComponent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewComponent.cs
@@ -5,7 +5,7 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 using Volo.Abp.Settings;
-
+using Microsoft.Extensions.Configuration;
 namespace Unity.Notifications.Web.Views.Settings.NotificationsSettingGroup;
 
 [Widget(
@@ -13,7 +13,8 @@ namespace Unity.Notifications.Web.Views.Settings.NotificationsSettingGroup;
     StyleTypes = [typeof(NotificationsSettingStyleBundleContributor)],
     AutoInitialize = true
 )]
-public class NotificationsSettingViewComponent(ISettingProvider settingProvider) : AbpViewComponent
+public class NotificationsSettingViewComponent(ISettingProvider settingProvider,  
+                                               IConfiguration configuration) : AbpViewComponent
 {
     public virtual async Task<IViewComponentResult> InvokeAsync()
     {
@@ -21,12 +22,22 @@ public virtual async Task<IViewComponentResult> InvokeAsync()
         var success = int.TryParse(retryMaxSetting, out int maximumRetryAttempts);
         if (!success) { maximumRetryAttempts = 3; }
 
+
+
         var model = new NotificationsSettingViewModel
         {
             DefaultFromAddress = await settingProvider.GetOrNullAsync(Notifications.Settings.NotificationsSettings.Mailing.DefaultFromAddress) ?? "",
-            MaximumRetryAttempts = maximumRetryAttempts
+            MaximumRetryAttempts = maximumRetryAttempts,
+            EnableEmailDelay = string.Equals(
+                await settingProvider.GetOrNullAsync(Notifications.Settings.NotificationsSettings.Mailing.EnableEmailDelay),
+                "true", System.StringComparison.OrdinalIgnoreCase),
+                Extensions = configuration["S3:DisallowedFileTypes"] ?? "",
+                MaxFileSize = configuration["S3:MaxFileSize"] ?? "",
+                EmailAttachmentMaxFileSize = configuration["S3:EmailAttachmentMaxFileSize"] ?? "",
+                TotalEmailAttachmentMaxFileSize = configuration["S3:EmailAttachmentsTotalMaxFileSize"] ?? "25"
         };
 
+
         return View("~/Views/Settings/NotificationsSettingGroup/Default.cshtml", model);
     }
 
@@ -40,6 +51,9 @@ public override void ConfigureBundle(BundleConfigurationContext context)
             context
                 .Files
                 .AddIfNotContains("/Views/Settings/NotificationsSettingGroup/InternalEmailGroups.js");
+            context
+                .Files
+                .AddIfNotContains("/libs/select2/dist/js/select2.full.min.js");
         }
     }
 
@@ -49,6 +63,10 @@ public override void ConfigureBundle(BundleConfigurationContext context)
         {
            context.Files
                 .AddIfNotContains("/Views/Settings/NotificationsSettingGroup/Default.css");
+            context.Files
+                .AddIfNotContains("/libs/select2/dist/css/select2.min.css");
+            context.Files
+                .AddIfNotContains("/libs/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css");
         }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewModel.cs b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewModel.cs
index 1e4d39d8d1..e9497f02ab 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewModel.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/NotificationsSettingViewModel.cs
@@ -14,4 +14,12 @@ public class NotificationsSettingViewModel
     [MaxValue(10)]
     [MaxLength(2)]
     public int MaximumRetryAttempts { get; set; } = 3;
+
+    [Display(Name = "Enable Schedule Email for Individual Application")]
+    public bool EnableEmailDelay { get; set; }
+
+    public string Extensions { get; set; } = string.Empty;
+    public string MaxFileSize { get; set; } = string.Empty;
+    public string EmailAttachmentMaxFileSize { get; set; } = string.Empty;
+    public string TotalEmailAttachmentMaxFileSize { get; set; } = string.Empty;      
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml
new file mode 100644
index 0000000000..e09b8ab96b
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml
@@ -0,0 +1,75 @@
+<div class="card-header editor-header py-2">
+    <div class="d-flex align-items-center gap-2 flex-wrap">                          
+        <button id="saveTemplateBtn" class="btn btn-sm btn-primary ms-auto">Save</button>                                         
+        <button id="discardTemaplateBtn" type="button" class="btn btn-outline-secondary btn-action-gray">Discard</button>
+        <button id="closeTemplateBtn" type="button" class="btn btn-sm btn-outline-secondary btn-action-gray">Close</button>
+        <button id="deleteTeamplateBtn" type="button" class="btn btn-sm btn-outline-secondary btn-action-gray btn-hidden"><i class="fl fl-cancel"></i></button>
+    </div>
+</div>
+
+<div class="card mb-3 shadow-sm">
+    <input type="hidden" id="templateId">
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="templateName" class="form-label template-field">Template Name</label>
+            <div class="flex-grow-1">
+                <input id="templateName" type="text" class="form-control form-input" name="templateName" required>
+                <div id="templateName-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="sendFrom" class="form-label template-field">Send From</label>
+            <div class="flex-grow-1">
+                <input id="sendFrom" type="text" class="form-control form-input" name="sendFrom" required>
+                <div id="sendFrom-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="templateRecipientCategory" class="form-label template-field">Recipient Category</label>
+            <div class="flex-grow-1">
+                <select id="templateRecipientCategory" class="form-control form-select" name="templateRecipientCategory">
+                    <option value=""></option>
+                    <option value="Internal">Internal</option>
+                    <option value="External">External</option>
+                </select>
+                <div id="templateRecipientCategory-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="templateRecipientSelect" class="form-label template-field">Recipients</label>
+            <div class="flex-grow-1">
+                <select id="templateRecipientSelect" class="form-control form-select" name="templateRecipientSelect" multiple>
+                </select>
+                <div id="templateRecipientSelect-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="d-flex template-field-div">
+            <label for="subject" class="form-label template-field">Subject</label>
+            <div class="flex-grow-1">
+                <input id="subject" type="text" class="form-control form-input" name="subject" required>
+                <div id="subject-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="d-flex">
+            <label for="templateBody" class="d-none">Body</label>
+            <div class="flex-grow-1">
+                <textarea id="templateBody" required></textarea>
+                <div id="templateBody-error" class="invalid-feedback d-block" style="display: none;"></div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3 info-note">
+        <b>NOTE</b>: <span class="note-text">Selecting text will let you customize it: replace it with a
+            variable, make it bold, italic, change the alignment, add a link, create a list, etc.</span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_Templates.cshtml b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_Templates.cshtml
new file mode 100644
index 0000000000..7a80cf2c56
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/_Templates.cshtml
@@ -0,0 +1,33 @@
+<div class="container mt-3">
+
+    <abp-button id="CreateNewTemplate"
+                text="+ Add Template"
+                button-type="Primary"
+                class="mb-2 me-2 ms-auto" />
+
+
+    <div id="splitContainer" class="split-container px-3 pb-3">
+
+        <!-- Left pane: prompts table -->
+        <div id="leftPane" class="left-pane">
+            <div class="card h-100">
+                <div class="card-body p-2">
+                    <abp-table id="TemplatesTable" striped-rows="false" class="nowrap"></abp-table>
+                </div>
+            </div>
+        </div>
+
+        <!-- Drag divider (shown when a row is selected) -->
+        <div id="divider" class="split-divider" title="Drag to resize"></div>
+
+        <!-- Right pane: editor (hidden until a row is selected) -->
+        <div id="rightPane" class="right-pane" style="display:none;">
+            <div class="card h-100 d-flex flex-column">
+                <div class="card-body editor-body overflow-auto">
+                    @await Html.PartialAsync("/Views/Settings/NotificationsSettingGroup/_TemplateDetails.cshtml")          
+                    @await Html.PartialAsync("/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml")
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/test/Unity.Notifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj b/applications/Unity.GrantManager/modules/Unity.Notifications/test/Unity.Notifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj
index 2e9f3f992b..1c140ce8e0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/test/Unity.Notifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/test/Unity.Notifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj
@@ -17,6 +17,8 @@
     <ProjectReference Include="..\..\src\Unity.Notifications.EntityFrameworkCore\Unity.Notifications.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\Unity.Notifications.TestBase\Unity.Notifications.TestBase.csproj" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="10.3.0" />
+    <!-- Explicit reference to fix vulnerable transitive dependency -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Enums/PaymentRequestStatus.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Enums/PaymentRequestStatus.cs
index 9d0bd15462..63d6e4e348 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Enums/PaymentRequestStatus.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Enums/PaymentRequestStatus.cs
@@ -19,5 +19,6 @@ public enum PaymentRequestStatus
         Failed = 11,        
         FSB = 12, // Financial Services Branch - Prevent CAS Payment
         HistoricalPayment = 13,
+        Cancelled = 14,
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/IPaymentRequestAppService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/IPaymentRequestAppService.cs
index bd604dbc3c..3040e3e8ba 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/IPaymentRequestAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/IPaymentRequestAppService.cs
@@ -10,7 +10,7 @@ public interface IPaymentRequestAppService : IApplicationService
     {
         Task<List<PaymentRequestDto>> CreateAsync(List<CreatePaymentRequestDto> paymentRequests);
         Task<List<PaymentRequestDto>> CreateHistoricalAsync(List<CreateHistoricalPaymentRequestDto> paymentRequests);
-        Task<PagedResultDto<PaymentRequestDto>> GetListAsync(PagedAndSortedResultRequestDto input);
+        Task<PagedResultDto<PaymentRequestDto>> GetListAsync(PaymentRequestListInputDto input);
         Task<decimal> GetTotalPaymentRequestAmountByCorrelationIdAsync(Guid correlationId);
         Task<List<PaymentDetailsDto>> GetListByApplicationIdAsync(Guid applicationId);
         Task<List<PaymentDetailsDto>> GetListByPaymentIdsAsync(List<Guid> paymentIds);
@@ -25,5 +25,6 @@ public interface IPaymentRequestAppService : IApplicationService
         Task<List<PaymentRequestDto>> GetPaymentPendingListByCorrelationIdsAsync(IEnumerable<Guid> correlationIds);
         Task<ApplicationPaymentRollupDto> GetApplicationPaymentRollupAsync(Guid applicationId);
         Task<Dictionary<Guid, ApplicationPaymentRollupDto>> GetApplicationPaymentRollupBatchAsync(List<Guid> applicationIds);
+        Task<PaymentRequestDto> CancelAsync(Guid paymentRequestId);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs
index b6ef9d46d7..ac0498a57f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs
@@ -47,8 +47,15 @@ public class PaymentRequestDto : AuditedEntityDto<Guid>, IMultiTenant
         public DateTime? FsbNotificationSentDate { get; set; }
         public string? FsbApNotified { get; set; }
 
+        public Guid? ApplicantId { get; set; }
+        public string? Category { get; set; }
         public Guid? TenantId { get; set; }
 
+        // Cancellation tracking
+        public DateTime? CancelledOn { get; set; }
+        public Guid? CancelledById { get; set; }
+        public string? CancelledBy { get; set; }
+
         public static explicit operator PaymentRequestDto(CreatePaymentRequestDto v)
         {
             throw new NotImplementedException();
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestListInputDto.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestListInputDto.cs
new file mode 100644
index 0000000000..ede13c1d91
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestListInputDto.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.Payments.PaymentRequests
+{
+    public class PaymentRequestListInputDto : PagedAndSortedResultRequestDto
+    {
+        public IReadOnlyList<string>? RequestedFields { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/PaymentRequests/PaymentRequest.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/PaymentRequests/PaymentRequest.cs
index 8a2f4d4314..4742e2178b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/PaymentRequests/PaymentRequest.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/PaymentRequests/PaymentRequest.cs
@@ -64,6 +64,11 @@ public class PaymentRequest : FullAuditedAggregateRoot<Guid>, IMultiTenant, ICor
         public virtual DateTime? FsbNotificationSentDate { get; private set; }
         public virtual string? FsbApNotified { get; private set; }
 
+        // Cancellation tracking
+        public virtual DateTime? CancelledOn { get; private set; }
+        public virtual Guid? CancelledById { get; private set; }
+        public virtual string? CancelledBy { get; private set; }
+
         protected PaymentRequest()
         {
             ExpenseApprovals = [];
@@ -222,6 +227,14 @@ public PaymentRequest ClearFsbNotificationEmailLog()
             return this;
         }
 
+        public PaymentRequest SetCancellation(DateTime cancelledOn, Guid cancelledById, string cancelledBy)
+        {
+            CancelledOn = cancelledOn;
+            CancelledById = cancelledById;
+            CancelledBy = cancelledBy;
+            return this;
+        }
+
         public PaymentRequest ValidatePaymentRequest()
         {
             if (Amount <= 0)
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentRequestQueryManager.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentRequestQueryManager.cs
index b2acd68f79..f9c74fb61c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentRequestQueryManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentRequestQueryManager.cs
@@ -13,7 +13,7 @@ public interface IPaymentRequestQueryManager
         Task<long> GetPaymentRequestCountAsync();
         Task<PaymentRequest?> GetPaymentRequestByIdAsync(Guid paymentRequestId);
         Task<List<PaymentRequest>> GetPaymentRequestsByIdsAsync(List<Guid> paymentRequestIds, bool includeDetails = false);
-        Task<List<PaymentRequest>> GetPagedPaymentRequestsWithIncludesAsync(int skipCount, int maxResultCount, string sorting);
+        Task<List<PaymentRequest>> GetPagedPaymentRequestsWithIncludesAsync(int skipCount, int maxResultCount, string sorting, IReadOnlyList<string>? requestedFields = null);
         Task<List<PaymentDetailsDto>> GetListByApplicationIdAsync(Guid applicationId);
         Task<List<PaymentDetailsDto>> GetListByApplicationIdsAsync(List<Guid> applicationIds);
         Task<List<PaymentDetailsDto>> GetListByPaymentIdsAsync(List<Guid> paymentIds);
@@ -24,7 +24,7 @@ public interface IPaymentRequestQueryManager
 
         // DTO Creation & Mapping
         Task<PaymentRequestDto> CreatePaymentRequestDtoAsync(Guid paymentRequestId);
-        Task<List<PaymentRequestDto>> MapToDtoAndLoadDetailsAsync(List<PaymentRequest> paymentsList);
+        Task<List<PaymentRequestDto>> MapToDtoAndLoadDetailsAsync(List<PaymentRequest> paymentsList, IReadOnlyList<string>? requestedFields = null);
         Task<string> GetAccountDistributionCodeAsync(AccountCodingDto? accountCoding);
 
         // Queue Operations
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentsManager.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentsManager.cs
index bccb0910c3..a69beb5b69 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentsManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/IPaymentsManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Unity.Payments.Domain.PaymentRequests;
 using Unity.Payments.Domain.Shared;
 
 namespace Unity.Payments.Domain.Services
@@ -7,7 +8,8 @@ namespace Unity.Payments.Domain.Services
     public interface IPaymentsManager
     {
         Task UpdatePaymentStatusAsync(Guid paymentRequestId, PaymentApprovalAction triggerAction);
+        Task<PaymentRequest> CancelPaymentAsync(Guid paymentRequestId);
         Task<bool> GetFormPreventPaymentStatusByPaymentRequestId(Guid paymentRequestId);
-        Task<bool> GetFormPreventPaymentStatusByApplicationId(Guid applicationId);        
+        Task<bool> GetFormPreventPaymentStatusByApplicationId(Guid applicationId);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentRequestQueryManager.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentRequestQueryManager.cs
index c9b7f6e813..0cc8b10f6c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentRequestQueryManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentRequestQueryManager.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
 using Unity.Payments.Domain.PaymentRequests;
 using Unity.Payments.Domain.Suppliers;
 using Unity.Payments.Enums;
@@ -19,8 +20,46 @@ public class PaymentRequestQueryManager(
         ISiteRepository siteRepository,
         IExternalUserLookupServiceProvider externalUserLookupServiceProvider,
         CasPaymentRequestCoordinator casPaymentRequestCoordinator,
-        IObjectMapper objectMapper) : DomainService, IPaymentRequestQueryManager
+        IObjectMapper objectMapper,
+        IApplicationRepository applicationRepository) : DomainService, IPaymentRequestQueryManager
     {
+        private static readonly HashSet<string> SiteFields = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "siteNumber",
+            "payGroup"
+        };
+
+        private static readonly HashSet<string> AccountCodingFields = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "accountCodingDisplay"
+        };
+
+        private static readonly HashSet<string> TagFields = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "paymentTags"
+        };
+
+        private static readonly HashSet<string> RequesterFields = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "paymentRequesterName"
+        };
+
+        private static readonly HashSet<string> ExpenseApprovalFields = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "l1ApproverName",
+            "l1ApprovalDate",
+            "l2ApproverName",
+            "l2ApprovalDate",
+            "l3ApproverName",
+            "l3ApprovalDate"
+        };
+
+        private static readonly HashSet<string> ApplicantFields = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "applicantName",
+            "category"
+        };
+
         public Task<int> GetPaymentRequestCountBySiteIdAsync(Guid siteId)
         {
             return paymentRequestRepository.GetPaymentRequestCountBySiteId(siteId);
@@ -41,17 +80,40 @@ public async Task<List<PaymentRequest>> GetPaymentRequestsByIdsAsync(List<Guid>
             return await paymentRequestRepository.GetListAsync(x => paymentRequestIds.Contains(x.Id), includeDetails: includeDetails);
         }
 
-        public async Task<List<PaymentRequest>> GetPagedPaymentRequestsWithIncludesAsync(int skipCount, int maxResultCount, string sorting)
+        public async Task<List<PaymentRequest>> GetPagedPaymentRequestsWithIncludesAsync(int skipCount, int maxResultCount, string sorting, IReadOnlyList<string>? requestedFields = null)
         {
-            await paymentRequestRepository.GetPagedListAsync(skipCount, maxResultCount, sorting, includeDetails: true);
-
             var paymentsQueryable = await paymentRequestRepository.GetQueryableAsync();
+            var includeSite = IncludesAny(requestedFields, SiteFields);
+            var includeAccountCoding = IncludesAny(requestedFields, AccountCodingFields);
+            var includeTags = IncludesAny(requestedFields, TagFields);
+            var includeExpenseApprovals = IncludesAny(requestedFields, ExpenseApprovalFields);
+
+            paymentsQueryable = paymentsQueryable.AsNoTracking();
+
+            if (includeSite)
+            {
+                paymentsQueryable = paymentsQueryable.Include(pr => pr.Site);
+            }
+
+            if (includeAccountCoding)
+            {
+                paymentsQueryable = paymentsQueryable.Include(pr => pr.AccountCoding);
+            }
+
+            if (includeTags)
+            {
+                paymentsQueryable = paymentsQueryable
+                    .Include(pr => pr.PaymentTags)
+                    .ThenInclude(pt => pt.Tag);
+            }
+
+            if (includeExpenseApprovals)
+            {
+                paymentsQueryable = paymentsQueryable.Include(pr => pr.ExpenseApprovals);
+            }
+
 #pragma warning disable CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
-            var paymentWithIncludes = await paymentsQueryable
-                .Include(pr => pr.AccountCoding)
-                .Include(pr => pr.PaymentTags)
-                    .ThenInclude(pt => pt.Tag)
-                .ToListAsync();
+            var paymentWithIncludes = await paymentsQueryable.ToListAsync();
 #pragma warning restore CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
 
             return paymentWithIncludes;
@@ -124,25 +186,79 @@ public async Task<decimal> GetTotalPaymentRequestAmountByCorrelationIdAsync(Guid
             return await paymentRequestRepository.GetTotalPaymentRequestAmountByCorrelationIdAsync(correlationId);
         }
 
-        public async Task<List<PaymentRequestDto>> MapToDtoAndLoadDetailsAsync(List<PaymentRequest> paymentsList)
+        public async Task<List<PaymentRequestDto>> MapToDtoAndLoadDetailsAsync(List<PaymentRequest> paymentsList, IReadOnlyList<string>? requestedFields = null)
         {
+            var includeApplicant = IncludesAny(requestedFields, ApplicantFields);
+            var includeRequester = IncludesAny(requestedFields, RequesterFields);
+            var includeExpenseApprovals = IncludesAny(requestedFields, ExpenseApprovalFields);
+            var includeAccountCoding = IncludesAny(requestedFields, AccountCodingFields);
+
             var paymentDtos = objectMapper.Map<List<PaymentRequest>, List<PaymentRequestDto>>(paymentsList);
 
-            // Flatten all DecisionUserIds from ExpenseApprovals across all PaymentRequestDtos
-            List<Guid> paymentRequesterIds = [.. paymentDtos
-                .Select(payment => payment.CreatorId)
-                .OfType<Guid>()
-                .Distinct()];
+            if (includeApplicant)
+            {
+                await LoadApplicantDetailsAsync(paymentDtos);
+            }
+
+            var userDictionary = await BuildUserDictionaryAsync(paymentDtos, includeRequester, includeExpenseApprovals);
+
+            await ApplyUserDetailsToPaymentsAsync(paymentDtos, userDictionary, includeRequester, includeAccountCoding, includeExpenseApprovals);
 
-            List<Guid> expenseApprovalCreatorIds = [.. paymentDtos
-                .SelectMany(payment => payment.ExpenseApprovals)
-                .Where(expenseApproval => expenseApproval.Status != ExpenseApprovalStatus.Requested)
-                .Select(expenseApproval => expenseApproval.DecisionUserId)
-                .OfType<Guid>()
-                .Distinct()];
+            return paymentDtos;
+        }
+
+        private async Task LoadApplicantDetailsAsync(List<PaymentRequestDto> paymentDtos)
+        {
+            var applicationIds = paymentDtos
+                .Select(p => p.CorrelationId)
+                .Distinct()
+                .ToArray();
 
-            // Call external lookup for each distinct User Id and store in a dictionary.
+            var applications = await applicationRepository.GetListByIdsAsync(applicationIds) ?? [];
+            var applicantIdByApplicationId = applications.ToDictionary(a => a.Id, a => a.ApplicantId);
+            var categoryByApplicationId = applications.ToDictionary(a => a.Id, a => a.ApplicationForm?.Category);
+
+            foreach (var paymentDto in paymentDtos)
+            {
+                if (applicantIdByApplicationId.TryGetValue(paymentDto.CorrelationId, out var applicantId))
+                {
+                    paymentDto.ApplicantId = applicantId;
+                }
+                if (categoryByApplicationId.TryGetValue(paymentDto.CorrelationId, out var category))
+                {
+                    paymentDto.Category = category;
+                }
+            }
+        }
+
+        private async Task<Dictionary<Guid, PaymentUserDto>> BuildUserDictionaryAsync(
+            List<PaymentRequestDto> paymentDtos,
+            bool includeRequester,
+            bool includeExpenseApprovals)
+        {
             var userDictionary = new Dictionary<Guid, PaymentUserDto>();
+
+            if (!includeRequester && !includeExpenseApprovals)
+            {
+                return userDictionary;
+            }
+
+            var paymentRequesterIds = includeRequester
+                ? paymentDtos
+                    .Select(payment => payment.CreatorId)
+                    .OfType<Guid>()
+                    .Distinct()
+                : [];
+
+            var expenseApprovalCreatorIds = includeExpenseApprovals
+                ? paymentDtos
+                    .SelectMany(payment => payment.ExpenseApprovals ?? [])
+                    .Where(expenseApproval => expenseApproval.Status != ExpenseApprovalStatus.Requested)
+                    .Select(expenseApproval => expenseApproval.DecisionUserId)
+                    .OfType<Guid>()
+                    .Distinct()
+                : [];
+
             var allUserIds = paymentRequesterIds.Concat(expenseApprovalCreatorIds).Distinct();
             foreach (var userId in allUserIds)
             {
@@ -153,34 +269,59 @@ public async Task<List<PaymentRequestDto>> MapToDtoAndLoadDetailsAsync(List<Paym
                 }
             }
 
-            // Map UserInfo details to each ExpenseApprovalDto
+            return userDictionary;
+        }
+
+        private async Task ApplyUserDetailsToPaymentsAsync(
+            List<PaymentRequestDto> paymentDtos,
+            Dictionary<Guid, PaymentUserDto> userDictionary,
+            bool includeRequester,
+            bool includeAccountCoding,
+            bool includeExpenseApprovals)
+        {
             foreach (var paymentRequestDto in paymentDtos)
             {
-                if (paymentRequestDto.CreatorId.HasValue
+                if (includeRequester
+                        && paymentRequestDto.CreatorId.HasValue
                         && userDictionary.TryGetValue(paymentRequestDto.CreatorId.Value, out var paymentRequestUserDto))
                 {
                     paymentRequestDto.CreatorUser = paymentRequestUserDto;
                 }
 
-                if (paymentRequestDto.AccountCoding != null)
+                if (includeAccountCoding && paymentRequestDto.AccountCoding != null)
                 {
                     paymentRequestDto.AccountCodingDisplay = await GetAccountDistributionCodeAsync(paymentRequestDto.AccountCoding);
                 }
 
-                if (paymentRequestDto.ExpenseApprovals != null)
+                if (includeExpenseApprovals && paymentRequestDto.ExpenseApprovals != null)
                 {
-                    foreach (var expenseApproval in paymentRequestDto.ExpenseApprovals)
-                    {
-                        if (expenseApproval.DecisionUserId.HasValue
-                            && userDictionary.TryGetValue(expenseApproval.DecisionUserId.Value, out var expenseApprovalUserDto))
-                        {
-                            expenseApproval.DecisionUser = expenseApprovalUserDto;
-                        }
-                    }
+                    ApplyExpenseApprovalUsers(paymentRequestDto.ExpenseApprovals, userDictionary);
                 }
             }
+        }
 
-            return paymentDtos;
+        private static void ApplyExpenseApprovalUsers(
+            IEnumerable<ExpenseApprovalDto> expenseApprovals,
+            Dictionary<Guid, PaymentUserDto> userDictionary)
+        {
+            foreach (var expenseApproval in expenseApprovals)
+            {
+                if (expenseApproval.DecisionUserId.HasValue
+                    && userDictionary.TryGetValue(expenseApproval.DecisionUserId.Value, out var expenseApprovalUserDto))
+                {
+                    expenseApproval.DecisionUser = expenseApprovalUserDto;
+                }
+            }
+        }
+
+        private static bool IncludesAny(IReadOnlyList<string>? requestedFields, IReadOnlySet<string> fieldsToCheck)
+        {
+            if (requestedFields == null || requestedFields.Count == 0)
+            {
+                return true;
+            }
+
+            return requestedFields.Any(fieldsToCheck.Contains);
         }
 
         public Task<string> GetAccountDistributionCodeAsync(AccountCodingDto? accountCoding)
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs
index b7413f3c9d..ddefff28db 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs
@@ -49,10 +49,20 @@ private void ConfigureWorkflow(StateMachine<PaymentRequestStatus, PaymentApprova
 
             paymentStateMachine.Configure(PaymentRequestStatus.L3Pending)
                 .PermitIf(PaymentApprovalAction.Submit, PaymentRequestStatus.Submitted, () => HasPermissionAsync(PaymentsPermissions.Payments.L3ApproveOrDecline).GetAwaiter().GetResult())
-                .PermitIf(PaymentApprovalAction.L3Decline, PaymentRequestStatus.L3Declined, () => HasPermissionAsync(PaymentsPermissions.Payments.L3ApproveOrDecline).GetAwaiter().GetResult());
+                .PermitIf(PaymentApprovalAction.L3Decline, PaymentRequestStatus.L3Declined, () => HasPermissionAsync(PaymentsPermissions.Payments.L3ApproveOrDecline).GetAwaiter().GetResult())
+                .PermitIf(PaymentApprovalAction.Cancel, PaymentRequestStatus.Cancelled, () => HasPermissionAsync(PaymentsPermissions.Payments.CancelPayment).GetAwaiter().GetResult());
 
             paymentStateMachine.Configure(PaymentRequestStatus.L2Declined)
                 .PermitIf(PaymentApprovalAction.Submit, PaymentRequestStatus.Submitted, () => HasPermissionAsync(PaymentsPermissions.Payments.L2ApproveOrDecline).GetAwaiter().GetResult());
+
+            paymentStateMachine.Configure(PaymentRequestStatus.L1Pending)
+                .PermitIf(PaymentApprovalAction.Cancel, PaymentRequestStatus.Cancelled, () => HasPermissionAsync(PaymentsPermissions.Payments.CancelPayment).GetAwaiter().GetResult());
+
+            paymentStateMachine.Configure(PaymentRequestStatus.L2Pending)
+                .PermitIf(PaymentApprovalAction.Cancel, PaymentRequestStatus.Cancelled, () => HasPermissionAsync(PaymentsPermissions.Payments.CancelPayment).GetAwaiter().GetResult());
+
+            paymentStateMachine.Configure(PaymentRequestStatus.HistoricalPayment)
+                .PermitIf(PaymentApprovalAction.Cancel, PaymentRequestStatus.Cancelled, () => HasPermissionAsync(PaymentsPermissions.Payments.CancelPayment).GetAwaiter().GetResult());
         }
 
         private async Task<bool> HasPermissionAsync(string permission)
@@ -194,5 +204,32 @@ public async Task UpdatePaymentStatusAsync(Guid paymentRequestId, PaymentApprova
 
             await uow.SaveChangesAsync();
         }
+
+        [Volo.Abp.Uow.UnitOfWork]
+        public virtual async Task<PaymentRequest> CancelPaymentAsync(Guid paymentRequestId)
+        {
+            var paymentRequest = await paymentRequestRepository.GetAsync(paymentRequestId, true);
+            var isHistoricalPayment = paymentRequest.Status == PaymentRequestStatus.HistoricalPayment;
+            var statusChange = paymentRequest.Status;
+
+            var workflow = new PaymentsWorkflow<PaymentRequestStatus, PaymentApprovalAction>(
+                () => statusChange, s => statusChange = s, ConfigureWorkflow);
+
+            await workflow.ExecuteActionAsync(PaymentApprovalAction.Cancel);
+
+            paymentRequest.SetPaymentRequestStatus(PaymentRequestStatus.Cancelled);
+            paymentRequest.SetCancellation(
+                Clock.Now,
+                currentUser.GetId(),
+                $"{currentUser.Name} {currentUser.SurName}".Trim());
+
+            if (isHistoricalPayment)
+            {
+                paymentRequest.SetInvoiceStatus(CasPaymentRequestStatus.Cancelled);
+                paymentRequest.SetPaymentStatus(CasPaymentRequestStatus.NotPaid);
+            }
+
+            return await paymentRequestRepository.UpdateAsync(paymentRequest);
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Shared/PaymentsAction.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Shared/PaymentsAction.cs
index c449f1402e..26ad4fc611 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Shared/PaymentsAction.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Shared/PaymentsAction.cs
@@ -24,5 +24,6 @@ public enum PaymentApprovalAction
     L2Decline,
     L3Approve,
     L3Decline,
-    Submit
+    Submit,
+    Cancel
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs
index f476876bd9..2594d6aef9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsDbContextModelCreatingExtensions.cs
@@ -42,12 +42,24 @@ public static void ConfigurePayments(
                 .OnDelete(DeleteBehavior.NoAction);
 
             b.HasIndex(e => e.ReferenceNumber).IsUnique();
+            b.HasIndex(e => e.CreationTime);
+            b.HasIndex(e => e.Status);
+            b.HasIndex(e => e.CorrelationId);
+            b.HasIndex(e => e.SiteId);
+            b.HasIndex(e => e.AccountCodingId);
+            b.HasIndex(e => new { e.TenantId, e.CreationTime })
+                .HasFilter("\"IsDeleted\" = false");
 
             // FSB Notification Tracking
             b.Property(x => x.FsbNotificationEmailLogId).IsRequired(false);
             b.Property(x => x.FsbNotificationSentDate).IsRequired(false);
             b.Property(x => x.FsbApNotified).IsRequired(false).HasMaxLength(10);
             b.HasIndex(x => x.FsbNotificationEmailLogId);
+
+            // Cancellation tracking
+            b.Property(x => x.CancelledOn).HasColumnName("CancelledOn").IsRequired(false);
+            b.Property(x => x.CancelledById).HasColumnName("CancelledById").IsRequired(false);
+            b.Property(x => x.CancelledBy).HasColumnName("CancelledBy").HasMaxLength(256).IsRequired(false);
         });
 
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsQueryableExtensions.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsQueryableExtensions.cs
index 5d5212de66..49292689f5 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsQueryableExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/PaymentsQueryableExtensions.cs
@@ -11,7 +11,7 @@ public static IQueryable<PaymentRequest> IncludeDetails(this IQueryable<PaymentR
         {
             return !include ? queryable : queryable
                 .Include(s => s.Site)
-                    .ThenInclude(site => site.Supplier)
+                    .ThenInclude(site => site!.Supplier)
                 .Include(p => p.AccountCoding)
                 .Include(y => y.ExpenseApprovals);
         }
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 c46f71e5a3..4910b5e003 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
@@ -58,6 +58,7 @@ public async Task<decimal> GetTotalPaymentRequestAmountByCorrelationIdAsync(Guid
               .Where(p => p.Status != PaymentRequestStatus.L1Declined
                         && p.Status != PaymentRequestStatus.L2Declined
                         && p.Status != PaymentRequestStatus.L3Declined
+                        && p.Status != PaymentRequestStatus.Cancelled
                         && p.InvoiceStatus != CasPaymentRequestStatus.Cancelled
                         && p.InvoiceStatus != CasPaymentRequestStatus.NotFound
                         && p.InvoiceStatus != CasPaymentRequestStatus.ErrorFromCas)
@@ -103,10 +104,10 @@ public async Task<List<PaymentRequest>> GetPaymentPendingListByCorrelationIdAsyn
 
         public async Task<List<PaymentRequest>> GetPaymentPendingListByCorrelationIdsAsync(IEnumerable<Guid> correlationIds)
         {
-            var idList = correlationIds?.ToList() ?? new List<Guid>();
+            var idList = correlationIds?.ToList() ?? [];
             if (idList.Count == 0)
             {
-                return new List<PaymentRequest>();
+                return [];
             }
 
             var dbSet = await GetDbSetAsync();
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
index fd46067031..df3bde3fee 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
@@ -143,7 +143,10 @@ private static PaymentRequestDto MapToPaymentRequestDto(PaymentRequest result)
                 CreationTime = result.CreationTime,
                 Status = result.Status,
                 ReferenceNumber = result.ReferenceNumber,
-                SubmissionConfirmationCode = result.SubmissionConfirmationCode
+                SubmissionConfirmationCode = result.SubmissionConfirmationCode,
+                CancelledOn = result.CancelledOn,
+                CancelledById = result.CancelledById,
+                CancelledBy = result.CancelledBy
             };
         }
 
@@ -325,18 +328,28 @@ public async Task<List<PaymentDetailsDto>> GetListByApplicationIdsAsync(List<Gui
             return await paymentRequestQueryManager.GetListByApplicationIdsAsync(applicationIds);
         }
 
-        public async Task<PagedResultDto<PaymentRequestDto>> GetListAsync(PagedAndSortedResultRequestDto input)
-        {
-            var totalCount = await paymentRequestQueryManager.GetPaymentRequestCountAsync();
+        public async Task<PagedResultDto<PaymentRequestDto>> GetListAsync(PaymentRequestListInputDto input)
+        {   
             using (dataFilter.Disable<ISoftDelete>())
             {
-                var paymentWithIncludes = await paymentRequestQueryManager.GetPagedPaymentRequestsWithIncludesAsync(input.SkipCount, input.MaxResultCount, input.Sorting ?? string.Empty);
+                var paymentWithIncludes = await paymentRequestQueryManager.GetPagedPaymentRequestsWithIncludesAsync(
+                    input.SkipCount,
+                    input.MaxResultCount,
+                    input.Sorting ?? string.Empty,
+                    input.RequestedFields);
 
-                var mappedPayments = await paymentRequestQueryManager.MapToDtoAndLoadDetailsAsync(paymentWithIncludes);
+                var mappedPayments = await paymentRequestQueryManager.MapToDtoAndLoadDetailsAsync(
+                    paymentWithIncludes,
+                    input.RequestedFields);
 
                 paymentRequestQueryManager.ApplyErrorSummary(mappedPayments);
 
-                return new PagedResultDto<PaymentRequestDto>(totalCount, mappedPayments);
+#pragma warning disable S125
+                //While the DataTable is client side, server side count query is not necessary.
+                //var totalCount = await paymentRequestQueryManager.GetPaymentRequestCountAsync();
+#pragma warning restore S125
+                return new PagedResultDto<PaymentRequestDto>(paymentWithIncludes.Count, mappedPayments);
+
             }
         }
 
@@ -415,5 +428,28 @@ public async Task<Dictionary<Guid, ApplicationPaymentRollupDto>> GetApplicationP
             var childApplicationIdsByParent = await applicationLinksService.Value.GetChildApplicationIdsByParentIdsAsync(applicationIds);
             return await paymentRequestQueryManager.GetApplicationPaymentRollupBatchAsync(applicationIds, childApplicationIdsByParent);
         }
+
+        [Authorize(PaymentsPermissions.Payments.CancelPayment)]
+        public virtual async Task<PaymentRequestDto> CancelAsync(Guid paymentRequestId)
+        {
+            var payment = await paymentRequestQueryManager.GetPaymentRequestByIdAsync(paymentRequestId)
+                ?? throw new BusinessException("Payments:PaymentRequestNotFound")
+                    .WithData("Id", paymentRequestId);
+
+            PaymentRequestStatus[] eligibleStatuses =
+            [
+                PaymentRequestStatus.HistoricalPayment,
+                PaymentRequestStatus.L1Pending,
+                PaymentRequestStatus.L2Pending,
+                PaymentRequestStatus.L3Pending
+            ];
+
+            if (!eligibleStatuses.Contains(payment.Status))
+                throw new BusinessException("Payments:CancellationNotAllowed")
+                    .WithData("Status", payment.Status.ToString());
+
+            var result = await paymentsManager.CancelPaymentAsync(paymentRequestId);
+            return MapToPaymentRequestDto(result);
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Permissions/PaymentsPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Permissions/PaymentsPermissionDefinitionProvider.cs
index e4186e3b76..9dd29990d0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Permissions/PaymentsPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Permissions/PaymentsPermissionDefinitionProvider.cs
@@ -20,6 +20,7 @@ public override void Define(IPermissionDefinitionContext context)
         paymentsPermissions.AddChild(PaymentsPermissions.Payments.RequestPayment, L("Permission:Payments.RequestPayment"));
         paymentsPermissions.AddChild(PaymentsPermissions.Payments.AccountCodingOverride, L("Permission:Payments.AccountCodingOverride"));
         paymentsPermissions.AddChild(PaymentsPermissions.Payments.AddHistoricalPayment, L("Permission:Payments.AddHistoricalPayment"));
+        paymentsPermissions.AddChild(PaymentsPermissions.Payments.CancelPayment, L("Permission:Payments.CancelPayment"));
 
         //-- PAYMENT INFO PERMISSIONS
         grantApplicationPermissionsGroup.Add_PaymentInfo_Permissions();
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
index bd8d494ef3..ff25b18a72 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
@@ -67,6 +67,7 @@
     "ApplicationPaymentListTable:PaymentStatus": "CAS Payment Status",
     "ApplicationPaymentListTable:Note": "Note",
     "ApplicationPaymentListTable:FsbApNotified": "FSB-AP Notified",
+    "ApplicationPaymentListTable:Category": "Category",
 
     "ApplicantInfoView:SupplierInfoTitle": "Supplier Info",
     "ApplicantInfoView:ApplicantInfo:SupplierNumber": "Supplier #",
@@ -104,6 +105,8 @@
     "PaymentInfoView:ApplicationPaymentListTable.UpdatedOn": "Updated On",
     "PaymentInfoView:ApplicationPaymentListTable.PaidOn": "Paid On",
     "PaymentInfoView:ApplicationPaymentListTable.CASResponse": "CAS Response",
+    "PaymentInfoView:ApplicationPaymentListTable.InvoiceStatus": "Invoice Status",
+    "PaymentInfoView:ApplicationPaymentListTable.Category": "Category",
 
     "ApplicationPaymentStatusRequest:ApproveTitle": "Approve Payments",
     "ApplicationPaymentStatusRequest:DeclineTitle": "Decline Payments",
@@ -127,6 +130,8 @@
     "Permission:Payments.AccountCodingOverride": "Override Account Coding",
     "Permission:Payments.EditFormPaymentConfiguration": "Edit Form Payment Configuration",
     "Permission:Payments.AddHistoricalPayment": "Add Historical Payment",
+    "Permission:Payments.CancelPayment": "Cancel Payment",
+    "Enum:PaymentRequestStatus.Cancelled": "Cancelled",
     "Enum:PaymentRequestStatus.L1Pending": "L1 Pending",
     "Enum:PaymentRequestStatus.L1Approved": "L1 Approved",
     "Enum:PaymentRequestStatus.L1Declined": "L1 Declined",
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Permissions/PaymentsPermissions.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Permissions/PaymentsPermissions.cs
index a0b470a799..efd2fb0af4 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Permissions/PaymentsPermissions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Permissions/PaymentsPermissions.cs
@@ -18,6 +18,7 @@ public static class Payments
         public const string EditSupplierInfo = Default + ".EditSupplierInfo";
         public const string EditFormPaymentConfiguration = Default + ".EditFormPaymentConfiguration";
         public const string AddHistoricalPayment = Default + ".AddHistoricalPayment";
+        public const string CancelPayment = Default + ".CancelPayment";
     }
 
     public static string[] GetAll()
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.css b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.css
index 267a66e061..814119e4a9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.css
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.css
@@ -51,3 +51,36 @@
     background-color: #FEEAEA;
     color: #FF0909 !important;
 }
+
+/* DataTables stateRestore - Save View */
+.container-fluid .dtsr-background {
+    background: rgba(0, 0, 0, 0.5) !important;
+}
+
+.cstm-save-view .dt-button-collection {
+    width: 230px;
+}
+
+.cstm-save-view .dt-button-split a {
+    line-height: 35px;
+}
+
+.container-fluid .dtsr-creation-title,
+.container-fluid .dtsr-confirmation-title {
+    font-weight: 700;
+    font-size: 1.25rem;
+}
+
+.container-fluid .dtsr-creation input,
+.container-fluid .dtsr-rename-modal input {
+    font-size: var(--bc-font-size);
+    color: var(--bc-colors-grey-text-500);
+    border-radius: 4px !important;
+    border: 2px solid var(--bc-colors-blue-primary);
+}
+
+.container-fluid div.dtsr-confirmation button,
+.container-fluid div.dtsr-creation button {
+    color: var(--bc-colors-white-primary-500);
+    background-color: var(--bc-colors-blue-primary);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
index f2deb13b7c..ab6f6489c7 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
@@ -1,6 +1,7 @@
 $(function () {
     const l = abp.localization.getResource('Payments');
     const nullPlaceholder = '—';
+    const requestedFieldsStorageKey = 'PaymentRequests_RequestedFields';
     const formatter = createNumberFormatter();
     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 = $('#PaymentRequestListTable');
@@ -9,11 +10,11 @@ $(function () {
 
     const listColumns = getColumns();
     const defaultVisibleColumns = [
+        'select',
         'referenceNumber',
         'batchName',
         'applicantName',
         'supplierNumber',
-        'creationTime',
         'siteNumber',
         'contactNumber',
         'invoiceNumber',
@@ -29,6 +30,30 @@ $(function () {
         'CASResponse',
         'accountCodingDisplay'
     ];
+    let initialLoad = true;
+    let isRestoringState = false;
+    let refreshDataTimeout = null;
+
+    let languageSetValues = {
+        buttons: {
+            stateRestore: 'View %d'
+        },
+        stateRestore: {
+            creationModal: {
+                title: 'Create View',
+                name: 'Name',
+                button: 'Save',
+            },
+            emptyStates: 'No saved views',
+            renameTitle: 'Rename View',
+            renameLabel: 'New name for "%s"',
+            removeTitle: 'Delete View',
+            removeConfirm: 'Are you sure you want to delete "%s"?',
+            removeSubmit: 'Delete',
+            duplicateError: 'A view with this name already exists.',
+            removeError: 'Failed to remove view.',
+        }
+    };
 
     let paymentRequestStatusModal = new abp.ModalManager({
         viewUrl: 'PaymentApprovals/UpdatePaymentRequestStatus',
@@ -65,6 +90,7 @@ $(function () {
                     payment_approve_buttons.disable();
                     payment_check_status_buttons.disable();
                     history_button.disable();
+                    if (cancel_button) cancel_button.disable();
                     selectedPaymentIds = [];
                     PubSub.publish("deselect_batchpayment_application", "reset_data");
                 })
@@ -74,6 +100,9 @@ $(function () {
         {
             text: 'Approve',
             className: 'custom-table-btn flex-none btn btn-secondary payment-status',
+            attr: {
+                'data-selector': 'batch-payment-table-actions'
+            },
             action: function (e, dt, node, config) {
                 // Store payment IDs in distributed cache to avoid URL length limits
                 unity.payments.paymentRequests.paymentBulkActions
@@ -94,6 +123,9 @@ $(function () {
         {
             text: 'Decline',
             className: 'custom-table-btn flex-none btn btn-secondary payment-status',
+            attr: {
+                'data-selector': 'batch-payment-table-actions'
+            },
             action: function (e, dt, node, config) {
                 // Store payment IDs in distributed cache to avoid URL length limits
                 unity.payments.paymentRequests.paymentBulkActions
@@ -111,9 +143,44 @@ $(function () {
                     });
             }
         },
+        ...(abp.auth.isGranted('PaymentsPermissions.Payments.CancelPayment') ? [{
+            text: 'Cancel',
+            className: 'custom-table-btn flex-none btn btn-secondary payment-cancel',
+            action: function (e, dt, node, config) {
+                if (selectedPaymentIds?.length !== 1) return;
+                const rowData = dt.rows({ selected: true }).data().toArray()[0];
+                abp.message.confirm(
+                    `Are you sure you want to cancel the payment: "${rowData.referenceNumber}"?`,
+                    'Cancel Payment',
+                    function (confirmed) {
+                        if (!confirmed) return;
+                        unity.payments.paymentRequests.paymentRequest
+                            .cancel(selectedPaymentIds[0])
+                            .then(function () {
+                                abp.notify.success('Payment has been cancelled successfully.');
+                                $(".select-all-payments").prop("checked", false);
+                                payment_approve_buttons.disable();
+                                payment_check_status_buttons.disable();
+                                history_button.disable();
+                                if (cancel_button) cancel_button.disable();
+                                selectedPaymentIds = [];
+                                PubSub.publish("deselect_batchpayment_application", "reset_data");
+                                dataTable.ajax.reload(null, false);
+                            })
+                            .catch(function (err) {
+                                abp.notify.error('Failed to cancel payment. Please try again.');
+                                console.warn('Cancel payment error:', err);
+                            });
+                    }
+                );
+            }
+        }] : []),
         {
             text: 'History',
             className: 'custom-table-btn flex-none btn btn-secondary history',
+            attr: {
+                'data-selector': 'batch-payment-table-actions'
+            },
             action: function (e, dt, node, config) {
                 location.href = '/PaymentHistory/Details?PaymentId=' + selectedPaymentIds[0];
             }
@@ -127,6 +194,66 @@ $(function () {
                 id: 'btn-toggle-filter'
             }
         },
+        {
+            extend: 'savedStates',
+            className: 'custom-table-btn flex-none btn btn-secondary grp-savedStates',
+            config: {
+                creationModal: true,
+                splitSecondaries: [
+                    { extend: 'updateState', text: '<i class="fa-regular fa-floppy-disk"></i> Update' },
+                    { extend: 'renameState', text: '<i class="fa-regular fa-pen-to-square"></i> Rename' },
+                    { extend: 'removeState', text: '<i class="fa-regular fa-trash-can"></i> Delete' }
+                ]
+            },
+            buttons: [
+                { extend: 'createState', text: 'Save As View' },
+                {
+                    text: 'Reset to Default View',
+                    action: function (e, dt, node, config) {
+                        let dtInit = dt.init();
+                        let initialSortOrder = dtInit?.order ?? [];
+
+                        dt.columns().visible(false);
+
+                        const allColumnNames = dt.settings()[0].aoColumns
+                            .map(col => col.name)
+                            .filter(colName => !defaultVisibleColumns.includes(colName));
+
+                        const orderedIndexes = [];
+                        defaultVisibleColumns.forEach((colName) => {
+                            const colIdx = dt.column(`${colName}:name`).index();
+                            if (colIdx !== undefined && colIdx !== -1) {
+                                dt.column(colIdx).visible(true);
+                                orderedIndexes.push(colIdx);
+                            }
+                        });
+
+                        allColumnNames.forEach((colName) => {
+                            const colIdx = dt.column(`${colName}:name`).index();
+                            if (colIdx !== undefined && colIdx !== -1) {
+                                orderedIndexes.push(colIdx);
+                            }
+                        });
+
+                        dt.colReorder.order(orderedIndexes);
+                        dt.columns.adjust();
+
+                        if (typeof dt.filterRow === 'function') {
+                            const filterRowApi = dt.filterRow();
+                            if (filterRowApi && typeof filterRowApi?.clearFilters === 'function') {
+                                filterRowApi.clearFilters();
+                            }
+                        }
+
+                        $('.dt-search input').val('');
+                        $('#search').val('');
+                        dt.search('').order(initialSortOrder).draw();
+                    }
+                },
+                { extend: 'removeAllStates', text: 'Delete All Views' },
+                { extend: 'spacer', style: 'bar' }
+            ]
+        },
         {
             extend: 'csv',
             text: 'Export',
@@ -172,16 +299,98 @@ $(function () {
             dir: 'desc'
         },
         dataEndpoint: unity.payments.paymentRequests.paymentRequest.getList,
-        data: {},
+        data: function () {
+            let requestedFields;
+            if (dataTable) {
+                try {
+                    const cols = dataTable.settings()[0].aoColumns;
+                    requestedFields = cols
+                        .filter(function (col, idx) { return dataTable.column(idx).visible(); })
+                        .map(function (col) { return col.sName; })
+                        .filter(function (name) { return !!name; });
+                    if (requestedFields.length > 0) {
+                        localStorage.setItem(requestedFieldsStorageKey, JSON.stringify(requestedFields));
+                    }
+                } catch {
+                    // DataTable may still be initializing.
+                }
+            }
+
+            if (!requestedFields || requestedFields.length === 0) {
+                try {
+                    const saved = localStorage.getItem(requestedFieldsStorageKey);
+                    if (saved) {
+                        requestedFields = JSON.parse(saved);
+                    }
+                } catch {
+                    // Ignore local storage parse errors and use defaults.
+                }
+            }
+
+            if (!requestedFields || requestedFields.length === 0) {
+                requestedFields = defaultVisibleColumns;
+            }
+
+            return {
+                requestedFields: requestedFields
+            };
+        },
         responseCallback,
         actionButtons,
+        deferRender: true,
         pagingEnabled: true,
         reorderEnabled: true,
-        languageSetValues: {},
+        languageSetValues,
         dataTableName: 'PaymentRequestListTable',
         dynamicButtonContainerId: 'dynamicButtonContainerId',
         useNullPlaceholder: true,
-        fixedHeaders: true
+        fixedHeaders: true,
+        onStateSaveParams: function (settings, data) {
+            data.customFilters = {
+                externalSearchValue: $('#search').val() || ''
+            };
+        },
+        onStateLoadParams: function (settings, data) {
+            if (!initialLoad) {
+                isRestoringState = true;
+                if (data?.customFilters) {
+                    $('#search').val(data.customFilters.externalSearchValue || '');
+                }
+            }
+        },
+        onStateLoaded: function (dtApi, data) {
+            if (!initialLoad) {
+                isRestoringState = false;
+                dtApi.ajax.reload(null, false);
+            }
+            initialLoad = false;
+        },
+        enableContextMenu: true,
+        contextMenuActionsSelector: '[data-selector="batch-payment-table-actions"]'
+    });
+
+    $('.grp-savedStates').text('Save View');
+    $('.grp-savedStates').closest('.btn-group').addClass('cstm-save-view');
+
+    dataTable.on('column-visibility.dt', function (e, settings, columnIdx) {
+        try {
+            const cols = dataTable.settings()[0].aoColumns;
+            const visibleFields = cols
+                .filter(function (col, idx) { return dataTable.column(idx).visible(); })
+                .map(function (col) { return col.sName; })
+                .filter(function (name) { return !!name; });
+            if (visibleFields.length > 0) {
+                localStorage.setItem(requestedFieldsStorageKey, JSON.stringify(visibleFields));
+            }
+            // During a saved-view restore, isRestoringState is true and onStateLoaded
+            // fires a single authoritative reload after all columns are applied.
+            if (!isRestoringState && cols[columnIdx]?.refreshData) {
+                clearTimeout(refreshDataTimeout);
+                refreshDataTimeout = setTimeout(function () {
+                    dataTable.ajax.reload(null, false);
+                }, 300);
+            }
+        } catch { }
     });
 
     // Attach the draw event to add custom row coloring logic
@@ -200,10 +409,14 @@ $(function () {
     let payment_approve_buttons = dataTable.buttons(['.payment-status']);
     let payment_check_status_buttons = dataTable.buttons(['.payment-check-status']);
     let history_button = dataTable.buttons(['.history']);
+    let cancel_button = abp.auth.isGranted('PaymentsPermissions.Payments.CancelPayment')
+        ? dataTable.buttons(['.payment-cancel'])
+        : null;
 
     payment_approve_buttons.disable();
     payment_check_status_buttons.disable();
     history_button.disable();
+    if (cancel_button) cancel_button.disable();
     dataTable.on('search.dt', () => handleSearch());
 
     function checkAllRowsHaveState(states) {
@@ -286,21 +499,32 @@ $(function () {
             payment_check_status_buttons.disable();
         }
         let hasHistoricalPayment = dataTable.rows('.selected').data().toArray().some(row => row.status === 'HistoricalPayment');
-        if (dataTable.rows({ selected: true }).indexes().length > 0 && !isInSentState && !hasHistoricalPayment) {
-            if (abp.auth.isGranted('PaymentsPermissions.Payments.L1ApproveOrDecline')
+        let hasCancelledPayment = dataTable.rows('.selected').data().toArray().some(row => row.status === 'Cancelled');
+        const hasSelection = dataTable.rows({ selected: true }).indexes().length > 0;
+        const canApprove = hasSelection && !isInSentState && !hasHistoricalPayment && !hasCancelledPayment
+            && (abp.auth.isGranted('PaymentsPermissions.Payments.L1ApproveOrDecline')
                 || abp.auth.isGranted('PaymentsPermissions.Payments.L2ApproveOrDecline')
-                || abp.auth.isGranted('PaymentsPermissions.Payments.L3ApproveOrDecline')) {
-                payment_approve_buttons.enable();
-
+                || abp.auth.isGranted('PaymentsPermissions.Payments.L3ApproveOrDecline'));
+        if (canApprove) {
+            payment_approve_buttons.enable();
+        } else {
+            payment_approve_buttons.disable();
+        }
+        checkEnableHistoryButton(dataTable, history_button);
+
+        if (cancel_button) {
+            const eligibleCancelStatuses = ['HistoricalPayment', 'L1Pending', 'L2Pending', 'L3Pending'];
+            const selectedCount = dataTable.rows({ selected: true }).indexes().length;
+            if (selectedCount === 1) {
+                const rowData = dataTable.rows({ selected: true }).data().toArray()[0];
+                if (eligibleCancelStatuses.includes(rowData.status)) {
+                    cancel_button.enable();
+                } else {
+                    cancel_button.disable();
+                }
             } else {
-                payment_approve_buttons.disable();
+                cancel_button.disable();
             }
-
-            checkEnableHistoryButton(dataTable, history_button);
-        }
-        else {
-            payment_approve_buttons.disable();
-            checkEnableHistoryButton(dataTable, history_button);
         }
     }
 
@@ -324,6 +548,7 @@ $(function () {
             getBatchNameColumn(columnIndex++),
             getSubmissionConfirmationCodeColumn(columnIndex++),
             getApplicantNameColumn(columnIndex++),
+            getCategoryColumn(columnIndex++),
             getSupplierNumberColumn(columnIndex++),
             getSupplierNameColumn(columnIndex++),
             getSiteNumberColumn(columnIndex++),
@@ -350,6 +575,9 @@ $(function () {
             getNoteColumn(columnIndex++),
             getAccountDistributionColumn(columnIndex++),
             getFsbNotifiedColumn(columnIndex++),
+            getCancelledColumn(columnIndex++),
+            getCancelledByColumn(columnIndex++),
+            getCancelledOnColumn(columnIndex++),
         ]
 
         return columns.map((column) => ({ ...column, targets: [column.index], orderData: [column.index, 0] }));
@@ -378,6 +606,7 @@ $(function () {
             name: 'applicantName',
             data: 'payeeName',
             className: 'data-table-header',
+            refreshData: true,
             index: columnIndex,
             render: function (data, type, row) {
                 let applicantName = (typeof data !== 'string' || data.trim() === '') ? 'Applicant Name' : data;
@@ -389,7 +618,7 @@ $(function () {
                 const safeApplicantName = $.fn.dataTable.render.text().display(applicantName);
 
                 if (type === 'display' && abp.auth.isGranted('GrantApplicationManagement.Applicants.ViewList')) {
-                    const applicantId = row?.id;
+                    const applicantId = row?.applicantId;
                     const isGuid = applicantId && guidPattern.test(applicantId);
 
                     if (isGuid) {
@@ -420,12 +649,12 @@ $(function () {
 
                 const safeCode = $.fn.dataTable.render.text().display(code);
 
-                if (type === 'display' && abp.auth.isGranted('GrantApplicationManagement.Applicants.ViewList')) {
-                    const applicantId = row?.id;
-                    const isGuid = applicantId && guidPattern.test(applicantId);
+                if (type === 'display' && abp.auth.isGranted('GrantApplicationManagement.Applications')) {
+                    const applicationId = row?.correlationId;
+                    const isGuid = applicationId && guidPattern.test(applicationId);
 
                     if (isGuid) {
-                        return `<a href="/GrantApplicants/Details?ApplicantId=${encodeURIComponent(applicantId)}">${safeCode}</a>`;
+                        return `<a href="/GrantApplications/Details?ApplicationId=${encodeURIComponent(applicationId)}">${safeCode}</a>`;
                     }
 
                     return safeCode;
@@ -464,6 +693,7 @@ $(function () {
             name: 'siteNumber',
             data: 'site',
             className: 'data-table-header',
+            refreshData: true,
             index: columnIndex,
             render: function (data) {
                 return data?.number;
@@ -497,6 +727,7 @@ $(function () {
             name: 'payGroup',
             data: 'site',
             className: 'data-table-header',
+            refreshData: true,
             index: columnIndex,
             render: function (data) {
                 if (!data) return '';
@@ -619,6 +850,7 @@ $(function () {
             name: 'paymentRequesterName',
             data: 'creatorUser',
             className: 'data-table-header',
+            refreshData: true,
             index: columnIndex,
             render: function (data) {
                 return formatName(data);
@@ -632,6 +864,7 @@ $(function () {
             name: `l${level}ApproverName`,
             data: 'expenseApprovals',
             className: 'data-table-header',
+            refreshData: true,
             index: columnIndex,
             render: function (data) {
                 const approval = getExpenseApprovalsDetails(data, level);
@@ -650,6 +883,7 @@ $(function () {
             name: `l${level}ApprovalDate`,
             data: 'expenseApprovals',
             className: 'data-table-header text-nowrap',
+            refreshData: true,
             index: columnIndex,
             render: function (data, type) {
                 let approval = getExpenseApprovalsDetails(data, level);
@@ -727,9 +961,10 @@ $(function () {
             name: 'paymentTags',
             data: 'paymentTags',
             className: '',
+            refreshData: true,
             index: columnIndex,
             render: function (data) {
-                let tagNames = data
+                let tagNames = (data ?? [])
                     .filter(x => x?.tag?.name)
                     .map(x => x.tag.name);
                 return tagNames.join(', ') ?? '';
@@ -754,6 +989,7 @@ $(function () {
             name: 'accountCodingDisplay',
             data: 'accountCodingDisplay',
             className: 'data-table-header',
+            refreshData: true,
             index: columnIndex,
             render: function (data) {
                 if (data + "" !== "undefined" && data?.length > 0) {
@@ -782,11 +1018,28 @@ $(function () {
         };
     }
 
+    function getCategoryColumn(columnIndex) {
+        return {
+            title: l('ApplicationPaymentListTable:Category'),
+            name: 'category',
+            data: 'category',
+            refreshData: true,
+            className: 'data-table-header',
+            index: columnIndex,
+            render: function (data) {
+                return data ?? nullPlaceholder;
+            }
+        };
+    }
+
     function getExpenseApprovalsDetails(expenseApprovals, type) {
-        return expenseApprovals.find(x => x.type == type);
+        return (expenseApprovals ?? []).find(x => x.type == type);
     }
 
     $('#search').on('input', function () {
+        if (isRestoringState) {
+            return;
+        }
         let table = $('#PaymentRequestListTable').DataTable();
         table.search($(this).val()).draw();
     });
@@ -802,6 +1055,7 @@ $(function () {
         payment_approve_buttons.disable();
         payment_check_status_buttons.disable();
         history_button.disable();
+        if (cancel_button) cancel_button.disable();
         selectedPaymentIds = [];
         PubSub.publish("deselect_batchpayment_application", "reset_data");
     });
@@ -836,6 +1090,9 @@ $(function () {
             case "Failed":
                 return "#CE3E39";
 
+            case "Cancelled":
+                return "#6c757d";
+
             default:
                 return "#053662";
         }
@@ -858,6 +1115,7 @@ $(function () {
             payment_approve_buttons.disable();
             payment_check_status_buttons.disable();
             history_button.disable();
+            if (cancel_button) cancel_button.disable();
             selectedPaymentIds = [];
             PubSub.publish("deselect_batchpayment_application", "reset_data");
             PubSub.publish('clear_selected_payment');
@@ -866,6 +1124,45 @@ $(function () {
 
 });
 
+function getCancelledColumn(columnIndex) {
+    return {
+        title: 'Cancelled',
+        name: 'cancelled',
+        data: null,
+        className: 'data-table-header',
+        index: columnIndex,
+        render: function (data, type, row) {
+            return row.status === 'Cancelled' ? 'Cancelled' : '';
+        }
+    };
+}
+
+function getCancelledByColumn(columnIndex) {
+    return {
+        title: 'Cancelled By',
+        name: 'cancelledBy',
+        data: 'cancelledBy',
+        className: 'data-table-header',
+        index: columnIndex,
+        render: function (data) {
+            return data ?? '';
+        }
+    };
+}
+
+function getCancelledOnColumn(columnIndex) {
+    return {
+        title: 'Cancelled On',
+        name: 'cancelledOn',
+        data: 'cancelledOn',
+        className: 'data-table-header',
+        index: columnIndex,
+        render: function (data, type) {
+            return DateUtils.formatUtcDateToLocal(data, type);
+        }
+    };
+}
+
 let casPaymentResponseModal = new abp.ModalManager({
     viewUrl: '../PaymentRequests/CasPaymentRequestResponse'
 });
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.cshtml
index e85e4c364c..04992a2ceb 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.cshtml
@@ -19,6 +19,7 @@
 
 <input type="hidden" id="PaymentInfoViewApplicationId" value="@Model.ApplicationId" />
 <input type="hidden" id="PaymentInfo_ApplicantId" value="@Model.ApplicantId" />
+<input type="hidden" id="PaymentInfoApplicationCategory" value="@Model.Category" />
 
 <abp-row class="px-1 pb-2 mb-4 payment-info-container">
     <div class="save-button-container">
@@ -39,28 +40,30 @@
                     <h6 class="ps-1 fw-bold">@L["PaymentInfoView:PaymentInfoTitle"].Value</h6>
                 </div>
             </abp-column>
-            <abp-column size="_6" class="px-1">
+            <abp-column size="_4" class="px-1">
                 <div class="unity-input-group">
                     <span class="unity-input-prepend">$</span>
                     <abp-input class="unity-currency-input" asp-for="@Model.RequestedAmount" disabled />
                 </div>
                 <div class="unity-input-group">
                     <span class="unity-input-prepend">$</span>
-                    <abp-input class="unity-currency-input" asp-for="@Model.ApprovedAmount" disabled />
+                    <abp-input class="unity-currency-input" asp-for="@Model.RecommendedAmount" disabled />
                 </div>
+            </abp-column>
+            <abp-column size="_4" class="px-1">
                 <div class="unity-input-group">
                     <span class="unity-input-prepend">$</span>
-                    <abp-input class="unity-currency-input" asp-for="@Model.TotalPendingAmounts" disabled />
+                    <abp-input class="unity-currency-input" asp-for="@Model.ApprovedAmount" disabled />
                 </div>
-            </abp-column>
-            <abp-column size="_6" class="px-1">
                 <div class="unity-input-group">
                     <span class="unity-input-prepend">$</span>
-                    <abp-input class="unity-currency-input" asp-for="@Model.RecommendedAmount" disabled />
+                    <abp-input class="unity-currency-input" asp-for="@Model.TotalPaid" disabled />
                 </div>
+            </abp-column>
+            <abp-column size="_4" class="px-1">
                 <div class="unity-input-group">
                     <span class="unity-input-prepend">$</span>
-                    <abp-input class="unity-currency-input" asp-for="@Model.TotalPaid" disabled />
+                    <abp-input class="unity-currency-input" asp-for="@Model.TotalPendingAmounts" disabled />
                 </div>
                 <div class="unity-input-group">
                     <span class="unity-input-prepend">$</span>
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.css b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.css
index e52eccef88..e62abbbe9c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.css
@@ -14,4 +14,15 @@
 
 .payment-info-summary {
     border-bottom: 0.25rem solid var(--bc-colors-white-background);
+}
+
+#ApplicationPaymentRequestListTable .error-row td {
+    background-color: #FEEAEA;
+    color: #CC0000 !important;
+}
+
+.info-btn {
+    font-size: 13pt;
+    font-family: BCSans, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    font-weight: 100;
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js
index e36b24ac28..cd3cbfe767 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js
@@ -8,7 +8,7 @@
     let dt = $('#ApplicationPaymentRequestListTable');
     let dataTable;
     const listColumns = getColumns();
-    const defaultVisibleColumns = ['id', 'amount', 'status', 'supplierName'];
+    const defaultVisibleColumns = ['id', 'amount', 'status', 'supplierName', 'invoiceStatus', 'cASResponse', 'category'];
 
     $('body').on('click', '#savePaymentInfoBtn', function () {
         let applicationId = document.getElementById(
@@ -221,6 +221,52 @@
 
     dataTable.on('search.dt', () => handleSearch());
 
+    dataTable.on('draw', function () {
+        dataTable.rows().every(function () {
+            let data = this.data();
+            let $row = $(this.node());
+            $row.removeClass('error-row');
+            if (data.casResponse && data.casResponse !== '' &&
+                data.casResponse.toUpperCase() !== 'SUCCEEDED') {
+                $row.addClass('error-row');
+            }
+        });
+    });
+
+    // Reposition the COLUMNS dropdown to open upward when there is not enough space below. Opens downward if there is no ample space in either direction.
+    $('#dynamicButtonContainerId').on('click', '.dt-button', function () {
+        if ($(this).closest('.dt-button-collection').length) return;
+        const $btn = $(this);
+        setTimeout(function () {
+            const $collection = $('#dynamicButtonContainerId .dt-button-collection').filter(':visible').first();
+            if (!$collection.length) return;
+            const btnRect = $btn[0].getBoundingClientRect();
+            const collHeight = $collection.outerHeight();
+            const rightOffset = window.innerWidth - btnRect.right;
+            if (btnRect.bottom + collHeight > window.innerHeight) {
+                $collection[0].style.setProperty('position', 'fixed', 'important');
+                $collection[0].style.setProperty('bottom', (window.innerHeight - btnRect.top) + 'px', 'important');
+                $collection[0].style.setProperty('top', '', 'important');
+            } else {
+                $collection[0].style.setProperty('position', 'fixed', 'important');
+                $collection[0].style.setProperty('top', btnRect.bottom + 'px', 'important');
+                $collection[0].style.setProperty('bottom', '', 'important');
+            }
+            $collection[0].style.setProperty('left', 'auto', 'important');
+            $collection[0].style.setProperty('right', rightOffset + 'px', 'important');
+        }, 0);
+    });
+
+    $('#ApplicationPaymentRequestListTable').on('click', 'tr td', function (e) {
+        let column = dataTable.column(this);
+        let columnName = dataTable.context[0].aoColumns[column.index()].sName;
+        if (columnName === 'cASResponse') {
+            e.preventDefault();
+            e.stopImmediatePropagation();
+            return false;
+        }
+    });
+
     dataTable.on('select', function (e, dt, type, indexes) {
         if (indexes?.length) {
             indexes.forEach((index) => {
@@ -282,6 +328,8 @@
             getApplicationPaymentPaidOnColumn(),
             getApplicationPaymentDescriptionColumn(),
             getApplicationPaymentCASResponseColumn(),
+            getApplicationPaymentInvoiceStatusColumn(),
+            getApplicationPaymentCategoryColumn(),
             getMailingAddressColumn(),
             getMaskedBankAccountColumn(),
             getSiteNumberColumn(),
@@ -385,21 +433,41 @@
             title: l('PaymentInfoView:ApplicationPaymentListTable.CASResponse'),
             name: 'cASResponse',
             data: 'casResponse',
-            className: 'data-table-header',
+            className: 'data-table-header notexport',
             index: 8,
             render: function (data) {
                 if (data + '' !== 'undefined' && data?.length > 0) {
-                    return (
-                        '<button id="cas-response-btn" class="btn btn-light info-btn cas-response-btn" type="button" onclick="openCasResponseModal(\'' +
-                        data +
-                        '\');">View Response<i class="fl fl-mapinfo"></i></button>'
-                    );
+                    return '<button class="btn btn-light info-btn" type="button" onclick="openCasResponseModal(\'' + data + '\');">View Response<i class="fl fl-mapinfo"></i></button>';
                 }
-                return '{Not Available}';
+                return null;
             },
         };
     }
 
+    function getApplicationPaymentInvoiceStatusColumn() {
+        return {
+            title: l('PaymentInfoView:ApplicationPaymentListTable.InvoiceStatus'),
+            name: 'invoiceStatus',
+            data: 'invoiceStatus',
+            className: 'data-table-header',
+            index: 9,
+            defaultContent: '',
+        };
+    }
+
+    function getApplicationPaymentCategoryColumn() {
+        const category = document.getElementById('PaymentInfoApplicationCategory')?.value || '';
+        return {
+            title: l('PaymentInfoView:ApplicationPaymentListTable.Category'),
+            name: 'category',
+            data: null,
+            className: 'data-table-header',
+            index: 10,
+            defaultContent: category,
+            render: function () { return category; },
+        };
+    }
+
     function getMailingAddressColumn() {
         return {
             title: l(
@@ -424,7 +492,7 @@
                     nullToEmpty(full.site.postalCode)
                 );
             },
-            index: 9,
+            index: 11,
         };
     }
 
@@ -436,7 +504,7 @@
             name: 'bankAccount',
             data: 'site.bankAccount',
             className: 'data-table-header',
-            index: 10,
+            index: 12,
         };
     }
 
@@ -446,7 +514,7 @@
             name: 'number',
             data: 'site.number',
             className: 'data-table-header',
-            index: 11,
+            index: 13,
         };
     }
 
@@ -458,7 +526,7 @@
             name: 'supplierNumber',
             data: 'supplierNumber',
             className: 'data-table-header',
-            index: 12,
+            index: 14,
         };
     }
     function getSupplierNameColumn() {
@@ -469,7 +537,7 @@
             name: 'supplierName',
             data: 'supplierName',
             className: 'data-table-header',
-            index: 13,
+            index: 15,
         };
     }
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/PaymentInfoViewComponent.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/PaymentInfoViewComponent.cs
index 32ddf14fee..474e499afd 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/PaymentInfoViewComponent.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/PaymentInfoViewComponent.cs
@@ -46,6 +46,8 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicationId, Guid app
                     ApplicantId = application.Applicant.Id
                 };
 
+                model.Category = application.ApplicationForm?.Category ?? string.Empty;
+
                 var rollup = await _paymentRequestService.GetApplicationPaymentRollupAsync(applicationId);
                 model.TotalPaid = rollup.TotalPaid;
                 model.TotalPendingAmounts = rollup.TotalPending;
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/PaymentInfoViewModel.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/PaymentInfoViewModel.cs
index a2940570f9..ae376c30a0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/PaymentInfoViewModel.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/PaymentInfoViewModel.cs
@@ -27,5 +27,6 @@ public class PaymentInfoViewModel : PageModel
         public Guid ApplicationId { get; set; }
         public Guid ApplicationFormVersionId { get; set; }
         public Guid ApplicantId { get; set; }
+        public string Category { get; set; } = string.Empty;
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/BatchPaymentRequests/PaymentRequestAppService_Tests.cs b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/BatchPaymentRequests/PaymentRequestAppService_Tests.cs
index 35c286753a..91e0cc56c0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/BatchPaymentRequests/PaymentRequestAppService_Tests.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/BatchPaymentRequests/PaymentRequestAppService_Tests.cs
@@ -121,7 +121,7 @@ public async Task GetListAsync_ReturnsPaymentsList()
         _ = await _paymentRequestRepository.InsertAsync(new PaymentRequest(Guid.NewGuid(), paymentRequestDto), true);
 
         // Act
-        var paymentRequests = await _paymentRequestAppService.GetListAsync(new Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto()
+        var paymentRequests = await _paymentRequestAppService.GetListAsync(new PaymentRequestListInputDto()
         {
             MaxResultCount = 100
         });
@@ -158,7 +158,7 @@ public async Task GetListAsync_ReturnsPagedPaymentsList()
         _ = await _paymentRequestRepository.InsertAsync(new PaymentRequest(Guid.NewGuid(), paymentRequestDto), true);
 
         // Act
-        var paymentRequests = await _paymentRequestAppService.GetListAsync(new Volo.Abp.Application.Dtos.PagedAndSortedResultRequestDto
+        var paymentRequests = await _paymentRequestAppService.GetListAsync(new PaymentRequestListInputDto
         {
             MaxResultCount = 10,
             SkipCount = 0,
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Domain/PaymentRequests/PaymentRequestQueryManager_PaymentRollup_Tests.cs b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Domain/PaymentRequests/PaymentRequestQueryManager_PaymentRollup_Tests.cs
index 49c2c4bd1d..f4e2af138f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Domain/PaymentRequests/PaymentRequestQueryManager_PaymentRollup_Tests.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Domain/PaymentRequests/PaymentRequestQueryManager_PaymentRollup_Tests.cs
@@ -404,7 +404,8 @@ private static PaymentRequestQueryManager CreateManager(IPaymentRequestRepositor
             Substitute.For<ISiteRepository>(),
             Substitute.For<IExternalUserLookupServiceProvider>(),
             null!, // CasPaymentRequestCoordinator - not used by Rollup methods
-            null!  // IObjectMapper - not used by Rollup methods
+            null!, // IObjectMapper - not used by Rollup methods
+            null!  // IApplicationRepository - not used by Rollup methods
         );
     }
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj
index e0871d7f80..b935efb804 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj
@@ -21,6 +21,8 @@
     <ProjectReference Include="..\..\..\Unity.SharedKernel\Unity.SharedKernel.csproj" />
     <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="10.3.0" />
+    <!-- Explicit reference to fix vulnerable transitive dependency -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
index a81086a22f..72bad667f8 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedFormVersionFieldsProvider.cs
@@ -29,9 +29,9 @@ public class ConsolidatedFormVersionFieldsProvider(
         /// Fields with the same (Label, Path) but different Type produce per-version conflict entries.
         /// Fields unique to one version are included with a VersionLabel marker.
         /// </summary>
-        public async Task<FieldPathMetaMapDto> GetFieldsMetadataAsync(Guid formId)
+        public async Task<FieldPathMetaMapDto> GetFieldsMetadataAsync(Guid correlationId)
         {
-            var versions = await applicationFormAppService.GetVersionsAsync(formId);
+            var versions = await applicationFormAppService.GetVersionsAsync(correlationId);
             var versionsWithFields = new List<(Guid VersionId, string VersionLabel, FieldPathTypeDto[] Fields)>();
             var metadataInfo = new Dictionary<string, string>();
 
@@ -138,7 +138,7 @@ private static List<FieldPathTypeDto> MergeFields(
             var result = new List<FieldPathTypeDto>();
             var processedExactKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-            foreach (var (_, versionLabel, fields) in versionsWithFields)
+            foreach (var (_, _, fields) in versionsWithFields)
             {
                 foreach (var field in fields)
                 {
@@ -167,8 +167,8 @@ private static List<FieldPathTypeDto> MergeFields(
                             Id = field.Id,
                             Key = field.Key,
                             Label = field.Label,
-                            Path = field.Path,
-                            Type = field.Type,
+                            Path = field.Path ?? string.Empty,
+                            Type = field.Type ?? string.Empty,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
                             VersionLabel = string.Join(", ", exactGroup.Select(e => e.VersionLabel))
@@ -182,8 +182,8 @@ private static List<FieldPathTypeDto> MergeFields(
                             Id = field.Id,
                             Key = field.Key,
                             Label = field.Label,
-                            Path = field.Path,
-                            Type = field.Type,
+                            Path = field.Path ?? string.Empty,
+                            Type = field.Type ?? string.Empty,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
                             VersionLabel = null
@@ -197,8 +197,8 @@ private static List<FieldPathTypeDto> MergeFields(
                             Id = field.Id,
                             Key = field.Key,
                             Label = field.Label,
-                            Path = field.Path,
-                            Type = field.Type,
+                            Path = field.Path ?? string.Empty,
+                            Type = field.Type ?? string.Empty,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
                             VersionLabel = string.Join(", ", exactGroup.Select(e => e.VersionLabel))
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
index 1ad032d941..bb8d055188 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/FieldsProviders/ConsolidatedWorksheetFieldsProvider.cs
@@ -31,9 +31,9 @@ public class ConsolidatedWorksheetFieldsProvider(
         /// Fields with the same (Label, Path) but different Type produce per-version conflict entries.
         /// Fields unique to one version are included with a VersionLabel marker.
         /// </summary>
-        public async Task<FieldPathMetaMapDto> GetFieldsMetadataAsync(Guid formId)
+        public async Task<FieldPathMetaMapDto> GetFieldsMetadataAsync(Guid correlationId)
         {
-            var versions = await applicationFormAppService.GetVersionsAsync(formId);
+            var versions = await applicationFormAppService.GetVersionsAsync(correlationId);
             var versionsWithFields = new List<(Guid VersionId, string VersionLabel, FieldPathTypeDto[] Fields)>();
             var metadataInfo = new Dictionary<string, string>();
 
@@ -164,7 +164,7 @@ private static List<FieldPathTypeDto> MergeFields(
             var result = new List<FieldPathTypeDto>();
             var processedExactKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-            foreach (var (_, versionLabel, fields) in versionsWithFields)
+            foreach (var (_, _, fields) in versionsWithFields)
             {
                 foreach (var field in fields)
                 {
@@ -193,8 +193,8 @@ private static List<FieldPathTypeDto> MergeFields(
                             Id = field.Id,
                             Key = field.Key,
                             Label = field.Label,
-                            Path = field.Path,
-                            Type = field.Type,
+                            Path = field.Path ?? string.Empty,
+                            Type = field.Type ?? string.Empty,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
                             VersionLabel = string.Join(", ", exactGroup.Select(e => e.VersionLabel))
@@ -208,8 +208,8 @@ private static List<FieldPathTypeDto> MergeFields(
                             Id = field.Id,
                             Key = field.Key,
                             Label = field.Label,
-                            Path = field.Path,
-                            Type = field.Type,
+                            Path = field.Path ?? string.Empty,
+                            Type = field.Type ?? string.Empty,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
                             VersionLabel = null
@@ -223,8 +223,8 @@ private static List<FieldPathTypeDto> MergeFields(
                             Id = field.Id,
                             Key = field.Key,
                             Label = field.Label,
-                            Path = field.Path,
-                            Type = field.Type,
+                            Path = field.Path ?? string.Empty,
+                            Type = field.Type ?? string.Empty,
                             TypePath = field.TypePath,
                             DataPath = field.DataPath,
                             VersionLabel = string.Join(", ", exactGroup.Select(e => e.VersionLabel))
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Menus/ReportingMenuContributor.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Menus/ReportingMenuContributor.cs
index d6e91808e7..0819c74972 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Menus/ReportingMenuContributor.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Menus/ReportingMenuContributor.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Unity.Modules.Shared.Navigation;
 using Unity.Modules.Shared.Permissions;
 using Volo.Abp.UI.Navigation;
 
@@ -31,16 +32,15 @@ public async Task ConfigureMenuAsync(MenuConfigurationContext context)
     /// </summary>
     /// <param name="context">The menu configuration context for adding reporting menu items.</param>
     /// <returns>A completed task representing the synchronous menu item addition operations.</returns>
-    private static Task ConfigureReportingMenuAsync(MenuConfigurationContext context)
+    private static async Task ConfigureReportingMenuAsync(MenuConfigurationContext context)
     {
         // Add Reporting Configuration menu item for IT Admin users
-        context.Menu.AddItem(
+        await context.AddItemAsync(
            new ApplicationMenuItem(
                    ReportingMenus.Prefix,
                    displayName: "Reporting",
-                   "~/ReportingAdmin/Configuration",
-                   requiredPermissionName: IdentityConsts.ITAdminPermissionName
-       ));
-        return Task.CompletedTask;
+                   "~/ReportingAdmin/Configuration")
+               .OnlyWhenInRole(IdentityConsts.ITAdminRoleName)
+       );
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Pages/ReportingAdmin/Configuration/Index.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Pages/ReportingAdmin/Configuration/Index.js
index 432d3339c3..d4511e78f5 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Pages/ReportingAdmin/Configuration/Index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Pages/ReportingAdmin/Configuration/Index.js
@@ -10,7 +10,7 @@ $(function () {
     }
 
     // Initialize DataTable for tenant view role management
-    $('#TenantViewRoleTable').DataTable({
+    let tenantViewRoleTable = $('#TenantViewRoleTable').DataTable({
         order: [[0, 'asc']], // Sort by tenant name
         processing: false,
         serverSide: false,
@@ -18,6 +18,8 @@ $(function () {
         searching: true,
         pageLength: 25,
         autoWidth: false,
+        scrollY: 'calc(100vh - 325px)',
+        scrollCollapse: true,
         columnDefs: [
             {
                 targets: [2], // Actions column
@@ -37,6 +39,14 @@ $(function () {
         }
     });
 
+    // Keep the scroll body sized so the header/pagination stay within the viewport
+    // instead of the table overflowing past the bottom of the screen (same plugin
+    // used by initializeDataTable's fixedHeaders option elsewhere in the app).
+    // Stashed on the settings object, matching table-utils.js's own usage of the plugin.
+    if ($.fn.dataTable.ScrollResize) {
+        tenantViewRoleTable.settings()[0]._scrollResize = new $.fn.dataTable.ScrollResize(tenantViewRoleTable);
+    }
+
     // Initialize tooltips on page load
     initializeTooltips();
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
index f419f5b7a5..f238989357 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
@@ -7,7 +7,7 @@
 @inject IFeatureChecker FeatureChecker
 @model ReportingConfigurationViewModel
 
-<div class="report-config-component">
+<div class="report-config-component container-fluid">
     <input type="hidden" id="reportingFormId" value="@Model.FormId" />
     <input type="hidden" id="reportingVersionId" value="@Model.SelectedVersionId" />
     <input type="hidden" id="reportingCorrelationId" value="@Model.CorrelationId" />
@@ -73,7 +73,7 @@
                             data-bs-toggle="tooltip"
                             data-bs-placement="top"
                             data-bs-original-title="Generate view"
-                            class="btn unt-btn-primary btn-primary @(Model.HasSavedConfiguration ? "" : "generate-view-btn-hidden")"></abp-button>
+                            class="btn unt-btn-primary btn-primary btn-compact @(Model.HasSavedConfiguration ? "" : "generate-view-btn-hidden")"></abp-button>
 
             }
 
@@ -86,7 +86,7 @@
                             data-bs-toggle="tooltip"
                             data-bs-placement="top"
                             data-bs-original-title="Delete this configuration and associated view"
-                            class="btn unt-btn-danger btn-danger report-config-btn-height-fix @(Model.HasSavedConfiguration ? "" : "delete-config-btn-hidden")"></abp-button>
+                            class="btn unt-btn-danger btn-danger btn-compact @(Model.HasSavedConfiguration ? "" : "delete-config-btn-hidden")"></abp-button>
             }
 
             @if (await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Update))
@@ -98,7 +98,7 @@
                             data-bs-toggle="tooltip"
                             data-bs-placement="top"
                             data-bs-original-title="Save changes"
-                            class="btn unt-btn-primary btn-primary"></abp-button>
+                            class="btn unt-btn-primary btn-primary btn-compact"></abp-button>
             }
 
             <abp-button id="btn-undo-report-configuration"
@@ -108,14 +108,14 @@
                         data-bs-toggle="tooltip"
                         data-bs-placement="top"
                         data-bs-original-title="Cancel changes"
-                        class="btn unt-btn-outline-primary btn-outline-primary mx-1"
+                        class="btn unt-btn-outline-primary btn-outline-primary btn-compact mx-1"
                         style="display: none;"></abp-button>
 
             @if (await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Update))
             {
                 <fieldset class="btn-group">
                     <button type="button"
-                            class="btn unt-btn-outline-primary btn-outline-primary dropdown-toggle"
+                                class="btn unt-btn-outline-primary btn-outline-primary dropdown-toggle btn-compact"
                             data-bs-toggle="dropdown"
                             aria-expanded="false">
                         <i class="fl fl-code me-1"></i> JSON
@@ -151,7 +151,7 @@
                         data-bs-toggle="tooltip"
                         data-bs-placement="top"
                         data-bs-original-title="Navigate back to the Forms"
-                        class="btn unt-btn-outline-primary btn-outline-primary mx-1 report-config-btn-height-fix"></abp-button>
+                            class="btn unt-btn-outline-primary btn-outline-primary btn-compact mx-1"></abp-button>
             </div>
         </div>
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
index 11439605b3..aab7f7d7f2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
@@ -8,6 +8,10 @@
     margin-bottom: 0.5rem;
 }
 
+    .provider-toggle-section .btn-compact {
+        height: 1.28rem !important;
+    }
+
 
     .provider-toggle-group {
         display: flex;
@@ -111,7 +115,7 @@
     }
 
     .column-name-input.is-invalid:focus {
-        border-color: #dc3545;
+        border-color: var(--bs-danger);
         box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
     }
 
@@ -120,8 +124,7 @@
     width: 100%;
     margin-top: 0.25rem;
     font-size: 0.875rem;
-    color: #dc3545;
-    display: block;
+    color: var(--bs-danger);
 }
 
 .valid-feedback {
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
index 7985f2ed8d..4d9505829f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js
@@ -1,6 +1,7 @@
 $(function () {
     let hasUnsavedChanges = false;
     let dataTable = null;
+    let _suppressColvisSave = false;
 
     // Initialize provider from the hidden input
     let currentProvider = $('#reportingProvider').val() || 'formversion';
@@ -247,12 +248,45 @@ $(function () {
         }
     }
 
-    function refreshConfigurationState(correlationId) {
-        checkConfigurationExists(correlationId, function (exists) {
-            updateGenerateViewButtonVisibility(exists);
-            updateDeleteButtonVisibility(exists);
-        });
-        refreshViewStatusWidget(correlationId, getCorrelationProvider());
+    // Persist column visibility state per provider in localStorage
+    function saveColvisState(provider) {
+        if (!dataTable) return;
+        try {
+            const state = {};
+            dataTable.columns().every(function (colIdx) {
+                const colName = dataTable.settings()[0].aoColumns[colIdx].name;
+                if (colName) state[colName] = this.visible();
+            });
+            localStorage.setItem('reportingColvis_' + provider, JSON.stringify(state));
+        } catch (e) { 
+            /* storage unavailable */ 
+            console.error(e);
+        }
+    }
+
+    function restoreColvisState(provider) {
+        if (!dataTable) return;
+        try {
+            const stored = localStorage.getItem('reportingColvis_' + provider);
+            if (!stored) return;
+            const state = JSON.parse(stored);
+            dataTable.columns().every(function (colIdx) {
+                const colName = dataTable.settings()[0].aoColumns[colIdx].name;
+                if (colName && colName in state) this.visible(state[colName]);
+            });
+        } catch (e) { 
+            /* ignore invalid stored state */ 
+            console.error(e);
+        }
+    }
+
+    // Destroy and reinitialize the DataTable for the current provider
+    function reinitTable() {
+        if (dataTable) {
+            dataTable.destroy();
+            dataTable = null;
+        }
+        initializeReportConfigTable();
     }
 
     // Function to handle provider change
@@ -269,48 +303,7 @@ $(function () {
         updateVersionSelectorVisibility();
         resetChangesState();
         $('#reportingViewStatus').val('');
-        updateDataTableColumnHeaders();
-
-        const correlationId = getCurrentCorrelationId();
-        if (correlationId) {
-            refreshConfigurationState(correlationId);
-        } else {
-            updateGenerateViewButtonVisibility(false);
-            updateDeleteButtonVisibility(false);
-        }
-
-        if (dataTable) {
-            dataTable.ajax.reload();
-        }
-    }
-
-    // Function to update DataTable column headers
-    function updateDataTableColumnHeaders() {
-        if (!dataTable) return;
-
-        const providerConfig = getCurrentProviderConfig();
-        const columns = providerConfig.columns;
-
-        // Update column headers
-        const columnIndices = [
-            { index: 0, title: columns.label },
-            { index: 1, title: columns.key },
-            { index: 2, title: columns.type },
-            { index: 3, title: columns.path },
-            { index: 4, title: columns.columnName },
-            { index: 5, title: columns.typePath }
-        ];
-
-        columnIndices.forEach(col => {
-            const header = $(dataTable.column(col.index).header());
-            header.text(col.title);
-        });
-
-        // Show the Version(s) column only for consolidated providers
-        dataTable.column('versionLabel:name').visible(currentProvider === 'worksheet_consolidated' || currentProvider === 'formversion_consolidated');
-
-        // Force redraw to update headers
-        dataTable.draw(false);
+        reinitTable();
     }
 
     // Handle provider toggle change event
@@ -818,6 +811,16 @@ $(function () {
             fixedHeaders: true
         });
 
+        // Persist column visibility per provider
+        dataTable.on('column-visibility.dt', function () {
+            if (!_suppressColvisSave) saveColvisState(currentProvider);
+        });
+
+        // Restore saved visibility for the initial provider
+        _suppressColvisSave = true;
+        restoreColvisState(currentProvider);
+        _suppressColvisSave = false;
+
         // Add event handler for when DataTable completes drawing
         dataTable.on('draw.dt', function () {
             // Ensure inputs are always enabled (edit mode is always on)
@@ -832,31 +835,6 @@ $(function () {
             updateDynamicColumnsWarning(hasDynamicColumns);
         });
 
-        // Track changes on column name inputs with validation
-        $('#ReportConfigurationTable').on('input', '.column-name-input', function () {
-            const $input = $(this);
-            const value = $input.val();
-            const path = $input.data('path');
-
-            // Validate and provide feedback
-            validateColumnNameInput($input, value, path);
-            markAsChanged();
-        });
-
-        // Handle blur event to sanitize input
-        $('#ReportConfigurationTable').on('blur', '.column-name-input', function () {
-            const $input = $(this);
-            const value = $input.val().trim();
-
-            if (value) {
-                const sanitized = sanitizeColumnName(value);
-                if (sanitized !== value) {
-                    $input.val(sanitized);
-                    validateColumnNameInput($input, sanitized, $input.data('path'));
-                }
-            }
-        });
-
         // Initial check for button visibility on page load
         const initialCorrelationId = getCurrentCorrelationId();
         if (initialCorrelationId) {
@@ -2154,6 +2132,25 @@ $(function () {
     // Initialize on page load
     initializeReportConfigTable();
 
+    // Delegated handlers registered once — survive DataTable destroy/reinit
+    $('#ReportConfigurationTable').on('input', '.column-name-input', function () {
+        const $input = $(this);
+        validateColumnNameInput($input, $input.val(), $input.data('path'));
+        markAsChanged();
+    });
+
+    $('#ReportConfigurationTable').on('blur', '.column-name-input', function () {
+        const $input = $(this);
+        const value = $input.val().trim();
+        if (value) {
+            const sanitized = sanitizeColumnName(value);
+            if (sanitized !== value) {
+                $input.val(sanitized);
+                validateColumnNameInput($input, sanitized, $input.data('path'));
+            }
+        }
+    });
+
     // Set initial undo button state
     updateUndoButtonVisibility();
 
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.Override.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.Override.cs
index 913fe23187..b61eba84f8 100644
--- a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.Override.cs
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.Override.cs
@@ -49,4 +49,15 @@ public static partial class Update
             }
         }
     }
+
+    public static partial class Application
+    {
+        public static partial class Status
+        {
+            public const string Default = "Unity.GrantManager.ApplicationManagement.Application.Status";
+            public const string Publish = "Unity.GrantManager.ApplicationManagement.Application.Status.Publish";
+            public const string Unpublish = "Unity.GrantManager.ApplicationManagement.Application.Status.Unpublish";
+            public const string BulkPublish = "Unity.GrantManager.ApplicationManagement.Application.Status.BulkPublish";
+        }
+    }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Features/FeatureConsts.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Features/FeatureConsts.cs
index f4e48b303d..cafbfba345 100644
--- a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Features/FeatureConsts.cs
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Features/FeatureConsts.cs
@@ -3,5 +3,6 @@
     public static class FeatureConsts
     {
         public const string Reporting = "Unity.Reporting";
+        public const string Onboarding = "Unity.Onboarding";
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Navigation/MenuItemExtensions.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Navigation/MenuItemExtensions.cs
new file mode 100644
index 0000000000..ebf06de147
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Navigation/MenuItemExtensions.cs
@@ -0,0 +1,201 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Unity.Modules.Shared.Specializations;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Features;
+using Volo.Abp.UI.Navigation;
+using Volo.Abp.Users;
+
+namespace Unity.Modules.Shared.Navigation;
+
+public static class MenuItemExtensions
+{
+    private const string ExcludeWhenFeaturesKey = "_ExcludeWhenFeatures";
+    private const string OnlyWhenFeaturesKey = "_OnlyWhenFeatures";
+    private const string ExcludeWhenSpecializationsKey = "_ExcludeWhenSpecializations";
+    private const string OnlyWhenSpecializationsKey = "_OnlyWhenSpecializations";
+    private const string OnlyWhenInRoleKey = "_OnlyWhenInRole";
+    private const string RequiredPermissionOrRolePermissionKey = "_RequiredPermissionOrRolePermission";
+    private const string RequiredPermissionOrRoleRolesKey = "_RequiredPermissionOrRoleRoles";
+
+    /// <summary>
+    /// Hides this menu item when any of the given features are enabled.
+    /// </summary>
+    public static ApplicationMenuItem ExcludeWhenFeatures(
+        this ApplicationMenuItem item,
+        params string[] featureNames)
+    {
+        item.CustomData[ExcludeWhenFeaturesKey] = featureNames;
+        return item;
+    }
+
+    /// <summary>
+    /// Shows this menu item only when all of the given features are enabled.
+    /// </summary>
+    public static ApplicationMenuItem OnlyWhenFeatures(
+        this ApplicationMenuItem item,
+        params string[] featureNames)
+    {
+        item.CustomData[OnlyWhenFeaturesKey] = featureNames;
+        return item;
+    }
+
+    /// <summary>
+    /// Hides this menu item when any of the given specializations are enabled.
+    /// </summary>
+    public static ApplicationMenuItem ExcludeWhenSpecializations(
+        this ApplicationMenuItem item,
+        params string[] specializationNames)
+    {
+        item.CustomData[ExcludeWhenSpecializationsKey] = specializationNames;
+        return item;
+    }
+
+    /// <summary>
+    /// Shows this menu item only when all of the given specializations are enabled.
+    /// </summary>
+    public static ApplicationMenuItem OnlyWhenSpecializations(
+        this ApplicationMenuItem item,
+        params string[] specializationNames)
+    {
+        item.CustomData[OnlyWhenSpecializationsKey] = specializationNames;
+        return item;
+    }
+
+    /// <summary>
+    /// Shows this menu item only when the current user is in any of the given roles
+    /// (checked via ICurrentUser.IsInRole, e.g. Keycloak-issued client roles).
+    /// </summary>
+    public static ApplicationMenuItem OnlyWhenInRole(
+        this ApplicationMenuItem item,
+        params string[] roleNames)
+    {
+        item.CustomData[OnlyWhenInRoleKey] = roleNames;
+        return item;
+    }
+
+    /// <summary>
+    /// Shows this menu item when the current user either has the given permission granted
+    /// (checked via IPermissionChecker, e.g. permissions granted through the DB/UI) or is in
+    /// any of the given roles (checked via ICurrentUser.IsInRole, e.g. Keycloak-issued client
+    /// roles).
+    /// </summary>
+    /// <remarks>
+    /// Use this instead of the <c>ApplicationMenuItem(..., requiredPermissionName: ...)</c>
+    /// constructor argument when a role (typically ITAdministrator/ITOperations) should also be
+    /// able to see the item even without the permission explicitly granted. The constructor arg
+    /// is checked entirely inside ABP's own menu-rendering pipeline via IPermissionChecker and
+    /// has no awareness of roles or of authorization policies - it will NOT be satisfied by a
+    /// role-based RoleOrPermissionRequirement authorization policy registered for the same
+    /// permission name, even if that policy protects the page itself.
+    /// (This is exactly what caused the TestingPermissions menu item to stay hidden for
+    /// ITOperations/ITAdministrator users despite the page being reachable via a
+    /// RoleOrPermissionRequirement policy of the same name - the menu check and the page's
+    /// [Authorize] check are two unrelated code paths.)
+    /// Use <see cref="OnlyWhenInRole"/> instead when the item should be role-gated ONLY, with no
+    /// permission fallback.
+    /// </remarks>
+    public static ApplicationMenuItem RequirePermissionOrRole(
+        this ApplicationMenuItem item,
+        string permissionName,
+        params string[] roleNames)
+    {
+        item.CustomData[RequiredPermissionOrRolePermissionKey] = permissionName;
+        item.CustomData[RequiredPermissionOrRoleRolesKey] = roleNames;
+        return item;
+    }
+
+    /// <summary>
+    /// Adds the item to the menu, respecting any feature, specialization or role visibility declarations.
+    /// </summary>
+    public static async Task AddItemAsync(
+        this MenuConfigurationContext context,
+        ApplicationMenuItem item)
+    {
+        if (await IsVisibleAsync(item, context.ServiceProvider))
+        {
+            context.Menu.AddItem(item);
+        }
+    }
+
+    /// <summary>
+    /// Adds the item as a child of the given parent menu item, respecting any feature,
+    /// specialization or role visibility declarations.
+    /// </summary>
+    public static async Task AddItemAsync(
+        this ApplicationMenuItem parent,
+        IServiceProvider serviceProvider,
+        ApplicationMenuItem item)
+    {
+        if (await IsVisibleAsync(item, serviceProvider))
+        {
+            parent.AddItem(item);
+        }
+    }
+
+    private static async Task<bool> IsVisibleAsync(ApplicationMenuItem item, IServiceProvider serviceProvider)
+    {
+        var featureChecker = serviceProvider.GetRequiredService<IFeatureChecker>();
+        var specializationChecker = serviceProvider.GetRequiredService<ISpecializationChecker>();
+
+        if (item.CustomData.TryGetValue(ExcludeWhenFeaturesKey, out var excludeFeatObj)
+            && excludeFeatObj is string[] excludeFeatures)
+        {
+            foreach (var feature in excludeFeatures)
+                if (await featureChecker.IsEnabledAsync(feature))
+                    return false;
+        }
+
+        if (item.CustomData.TryGetValue(OnlyWhenFeaturesKey, out var onlyFeatObj)
+            && onlyFeatObj is string[] onlyFeatures)
+        {
+            foreach (var feature in onlyFeatures)
+                if (!await featureChecker.IsEnabledAsync(feature))
+                    return false;
+        }
+
+        if (item.CustomData.TryGetValue(ExcludeWhenSpecializationsKey, out var excludeSpecObj)
+            && excludeSpecObj is string[] excludeSpecs)
+        {
+            foreach (var spec in excludeSpecs)
+                if (await specializationChecker.IsEnabledAsync(spec))
+                    return false;
+        }
+
+        if (item.CustomData.TryGetValue(OnlyWhenSpecializationsKey, out var onlySpecObj)
+            && onlySpecObj is string[] onlySpecs)
+        {
+            foreach (var spec in onlySpecs)
+                if (!await specializationChecker.IsEnabledAsync(spec))
+                    return false;
+        }
+
+        if (item.CustomData.TryGetValue(OnlyWhenInRoleKey, out var onlyRoleObj)
+            && onlyRoleObj is string[] onlyRoles)
+        {
+            var currentUser = serviceProvider.GetRequiredService<ICurrentUser>();
+            if (!Array.Exists(onlyRoles, currentUser.IsInRole))
+                return false;
+        }
+
+        if (item.CustomData.TryGetValue(RequiredPermissionOrRolePermissionKey, out var permObj)
+            && permObj is string permissionName)
+        {
+            var roles = item.CustomData.TryGetValue(RequiredPermissionOrRoleRolesKey, out var rolesObj)
+                && rolesObj is string[] requiredRoles
+                    ? requiredRoles
+                    : [];
+
+            var currentUser = serviceProvider.GetRequiredService<ICurrentUser>();
+            if (!Array.Exists(roles, currentUser.IsInRole))
+            {
+                var permissionChecker = serviceProvider.GetRequiredService<IPermissionChecker>();
+                if (!await permissionChecker.IsGrantedAsync(permissionName))
+                    return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Permissions/IdentityConsts.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Permissions/IdentityConsts.cs
index 1a4b1583e9..a9fc9c2537 100644
--- a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Permissions/IdentityConsts.cs
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Permissions/IdentityConsts.cs
@@ -10,5 +10,9 @@ public static class IdentityConsts
         public const string ITOperationsRoleName = "ITOperations";
         public const string ITOperationsPermissionName = "ITOperations";
 
+        // ITAdministrator is a superset of ITOperations - anywhere ITOperations alone is
+        // required, ITAdministrator should also be allowed. Use this policy (RequireRole is an
+        // OR check across the given roles) instead of ITOperationsPolicyName when that's needed.
+        public const string ITAdminOrITOperationsPolicyName = "ITAdminOrITOperations";
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Specializations/ISpecializationChecker.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Specializations/ISpecializationChecker.cs
new file mode 100644
index 0000000000..57e0acb434
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Specializations/ISpecializationChecker.cs
@@ -0,0 +1,8 @@
+using System.Threading.Tasks;
+
+namespace Unity.Modules.Shared.Specializations;
+
+public interface ISpecializationChecker
+{
+    Task<bool> IsEnabledAsync(string name);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Specializations/SpecializationChecker.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Specializations/SpecializationChecker.cs
new file mode 100644
index 0000000000..0f29fa7b1c
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Specializations/SpecializationChecker.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Features;
+
+namespace Unity.Modules.Shared.Specializations;
+
+public class SpecializationChecker(IFeatureChecker featureChecker) : ISpecializationChecker, ITransientDependency
+{
+    public Task<bool> IsEnabledAsync(string name) => featureChecker.IsEnabledAsync(name);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Specializations/SpecializationConsts.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Specializations/SpecializationConsts.cs
new file mode 100644
index 0000000000..eb95bab581
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Specializations/SpecializationConsts.cs
@@ -0,0 +1,8 @@
+namespace Unity.Modules.Shared.Specializations;
+
+public static class SpecializationConsts
+{
+    public const string GroupName = "Specializations";
+
+    public const string Onboarding = "Unity.Onboarding";
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/DateTimeExtensions.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/DateTimeExtensions.cs
index 3eb2e66341..86466a1d01 100644
--- a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/DateTimeExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/DateTimeExtensions.cs
@@ -5,20 +5,17 @@
 namespace Unity.Modules.Shared.Utils;
 public static class DateTimeExtensions
 {
-    private const string WindowsPacificId = "Pacific Standard Time";
-    private const string IanaPacificId = "America/Los_Angeles";
+    // BC Pacific timezone: PST does NOT observe DST in 2026 — fixed UTC-8 year-round.
+    private static readonly TimeSpan BcPstOffset = TimeSpan.FromHours(-8);
 
-    // Lazy-initialized cached timezone to avoid repeated OS lookups.
-    private static readonly Lazy<TimeZoneInfo> PacificTimeZone = new(GetPacificTimeZone, isThreadSafe: true);
+    // BC Mountain timezone: Peace River / NE BC region — MST/MDT, DST still applies.
+    private const string WindowsMountainId = "Mountain Standard Time";
+    private const string IanaMountainId = "America/Edmonton";
+    private static readonly Lazy<TimeZoneInfo> MountainTimeZone = new(GetMountainTimeZone, isThreadSafe: true);
 
     /// <summary>
     /// Formats a nullable <see cref="DateTime"/> value as an ISO 8601-compliant UTC timestamp.
     /// </summary>
-    /// <remarks>If the provided <paramref name="utcTime"/> is not already in UTC, it will be treated as a
-    /// local time and converted to UTC before formatting.</remarks>
-    /// <param name="utcTime">The nullable <see cref="DateTime"/> to format. If the value is not in UTC, it will be converted to UTC.</param>
-    /// <returns>A string representation of the <paramref name="utcTime"/> in ISO 8601 format, or an empty string if <paramref
-    /// name="utcTime"/> is <see langword="null"/>.</returns>
     public static string FormatTimestamp(DateTime? utcTime)
     {
         if (!utcTime.HasValue)
@@ -32,16 +29,13 @@ public static string FormatTimestamp(DateTime? utcTime)
     }
 
     /// <summary>
-    /// Converts a given UTC time to Pacific Time and formats it as a string with the appropriate time zone
-    /// abbreviation.
+    /// Converts a given UTC time to BC Pacific Standard Time and formats it as a string.
+    /// BC's Pacific timezone does NOT observe Daylight Saving Time in 2026; PST (UTC-8)
+    /// is applied year-round. For the Peace River / NE BC region (Mountain Time), use
+    /// <see cref="FormatMountainTime"/> instead.
     /// </summary>
-    /// <remarks>The method ensures that the input <paramref name="utcTime"/> is treated as UTC. If the input
-    /// time is not explicitly marked as UTC, it is converted to UTC before performing the time zone
-    /// conversion.</remarks>
     /// <param name="utcTime">The UTC time to convert. If <see langword="null"/>, an empty string is returned.</param>
-    /// <returns>A string representing the Pacific Time equivalent of the provided UTC time, formatted as "yyyy-MM-dd h:mm tt"
-    /// followed by the time zone abbreviation "(PDT)" for daylight saving time or "(PST)" for standard time. Returns an
-    /// empty string if <paramref name="utcTime"/> is <see langword="null"/>.</returns>
+    /// <returns>A string formatted as "yyyy-MM-dd h:mm tt (PST)".</returns>
     public static string FormatPacificTime(DateTime? utcTime)
     {
         if (!utcTime.HasValue)
@@ -51,30 +45,52 @@ public static string FormatPacificTime(DateTime? utcTime)
             ? utcTime.Value
             : DateTime.SpecifyKind(utcTime.Value, DateTimeKind.Utc);
 
-        var pacificTimeZone = PacificTimeZone.Value;
-        var pacificDateTime = TimeZoneInfo.ConvertTimeFromUtc(utcTimeValue, pacificTimeZone);
+        // BC PST is a fixed UTC-8 offset — no DST adjustment in 2026.
+        var bcPstDateTime = new DateTimeOffset(utcTimeValue, TimeSpan.Zero).ToOffset(BcPstOffset);
 
-        string timeZoneAbbreviation = pacificTimeZone.IsDaylightSavingTime(pacificDateTime) ? "(PDT)" : "(PST)";
-        return $"{pacificDateTime.ToString("yyyy-MM-dd h:mm tt", CultureInfo.InvariantCulture)} {timeZoneAbbreviation}";
+        return $"{bcPstDateTime.ToString("yyyy-MM-dd h:mm tt", CultureInfo.InvariantCulture)} (PST)";
     }
 
-    private static TimeZoneInfo GetPacificTimeZone()
+    /// <summary>
+    /// Converts a given UTC time to BC Mountain Time (Peace River / NE BC region) and formats it.
+    /// Unlike BC's Pacific zone, the Mountain timezone in BC DOES observe Daylight Saving Time in 2026:
+    /// MST (UTC-7) in winter, MDT (UTC-6) in summer.
+    /// </summary>
+    /// <param name="utcTime">The UTC time to convert. If <see langword="null"/>, an empty string is returned.</param>
+    /// <returns>A string formatted as "yyyy-MM-dd h:mm tt (MST)" or "yyyy-MM-dd h:mm tt (MDT)".</returns>
+    public static string FormatMountainTime(DateTime? utcTime)
+    {
+        if (!utcTime.HasValue)
+            return string.Empty;
+
+        var utcTimeValue = utcTime.Value.Kind == DateTimeKind.Utc
+            ? utcTime.Value
+            : DateTime.SpecifyKind(utcTime.Value, DateTimeKind.Utc);
+
+        var mountainTz = MountainTimeZone.Value;
+        var mtDateTime = TimeZoneInfo.ConvertTimeFromUtc(utcTimeValue, mountainTz);
+        string abbr = mountainTz.IsDaylightSavingTime(mtDateTime) ? "(MDT)" : "(MST)";
+
+        return $"{mtDateTime.ToString("yyyy-MM-dd h:mm tt", CultureInfo.InvariantCulture)} {abbr}";
+    }
+
+    private static TimeZoneInfo GetMountainTimeZone()
     {
-        // If running on Windows, attempt Windows ID first; otherwise attempt IANA first.
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            if (TryFindTimeZone(WindowsPacificId, out var tz)) return tz;
-            if (TryFindTimeZone(IanaPacificId, out tz)) return tz;
+            if (TryFindTimeZone(WindowsMountainId, out var tz)) return tz;
+            if (TryFindTimeZone(IanaMountainId, out tz)) return tz;
         }
         else
         {
-            if (TryFindTimeZone(IanaPacificId, out var tz)) return tz;
-            if (TryFindTimeZone(WindowsPacificId, out tz)) return tz;
+            if (TryFindTimeZone(IanaMountainId, out var tz)) return tz;
+            if (TryFindTimeZone(WindowsMountainId, out tz)) return tz;
         }
 
         throw new TimeZoneNotFoundException(
-            $"Neither '{WindowsPacificId}' nor '{IanaPacificId}' time zone IDs were found on this system.");
+            $"Neither '{WindowsMountainId}' nor '{IanaMountainId}' time zone IDs were found on this system.");
     }
+
     private static bool TryFindTimeZone(string id, out TimeZoneInfo tz)
     {
         try
diff --git a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/StringExtensions.cs b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/StringExtensions.cs
index d28d8f5080..494ca8d46e 100644
--- a/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/StringExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.SharedKernel/Utils/StringExtensions.cs
@@ -61,5 +61,18 @@ public static double CompareStrings(this string str1, string str2)
 
             return emailAddressList.Count > 0 ? emailAddressList : null;
         }
+
+        /// <summary>
+        /// Capitalizes the first character and lowercases the remaining characters.
+        /// </summary>
+        /// <param name="inputString">The string to capitalize</param>
+        /// <returns>String with first character uppercase and rest lowercase, or empty if input is null/empty</returns>
+        public static string Capitalize(this string? inputString)
+        {
+            if (string.IsNullOrEmpty(inputString))
+                return string.Empty;
+
+            return char.ToUpper(inputString[0]) + inputString.Substring(1).ToLower();
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ColumnFilterDto.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ColumnFilterDto.cs
new file mode 100644
index 0000000000..95cd6b7bfa
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ColumnFilterDto.cs
@@ -0,0 +1,7 @@
+namespace Unity.TenantManagement;
+
+public class ColumnFilterDto
+{
+    public string Name { get; set; } = string.Empty;
+    public string Value { get; set; } = string.Empty;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingApplicationProvider.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingApplicationProvider.cs
new file mode 100644
index 0000000000..75fd8f7eb2
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingApplicationProvider.cs
@@ -0,0 +1,26 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.TenantManagement;
+
+public interface IOnboardingApplicationProvider
+{
+    Task<PagedResultDto<OnboardingApplicationRecord>> GetPagedListAsync(
+        int skipCount,
+        int maxResultCount,
+        string? sorting,
+        string category,
+        string? filter = null,
+        IReadOnlyList<Guid>? globalDynamicMatchIds = null,
+        IReadOnlyList<ColumnFilterDto>? staticColumnFilters = null,
+        IReadOnlyList<Guid>? dynamicColumnMatchIds = null);
+    Task<OnboardingApplicationRecord?> GetByIdAsync(Guid id);
+    Task<List<Guid>> GetAllIdsAsync(string category);
+    Task<List<Guid>> GetFormVersionIdsAsync(string category);
+    Task<List<OnboardingColumnDto>> GetMappedCoreFieldColumnsAsync(string category);
+    Task<List<string>> GetAvailableCategoriesAsync();
+    Task CloseApplicationAsync(Guid applicationId);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingRequestAppService.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingRequestAppService.cs
new file mode 100644
index 0000000000..10cfd4acc0
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingRequestAppService.cs
@@ -0,0 +1,18 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace Unity.TenantManagement;
+
+public interface IOnboardingRequestAppService : IApplicationService
+{
+    Task<PagedResultDto<OnboardingRequestDto>> GetListAsync(OnboardingListRequestDto input);
+    Task<OnboardingRequestDto?> GetAsync(Guid id);
+    Task<OnboardingValidationResultDto> ValidateAsync(Guid id, string? tenantNameFieldKey, string? superUsersFieldKey, string? branchFieldKey = null, string? featuresFieldKey = null, string? ministryFieldKey = null, string? programAreaFieldKey = null);
+    Task CreateTenantAsync(Guid id, CreateTenantInputDto? input);
+    Task<OnboardingColumnSchemaDto> GetColumnSchemaAsync(string? category = null);
+    Task<List<string>> GetAvailableCategoriesAsync();
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingUserLookup.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingUserLookup.cs
new file mode 100644
index 0000000000..155c75194d
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingUserLookup.cs
@@ -0,0 +1,11 @@
+#nullable enable
+using System.Threading.Tasks;
+
+namespace Unity.TenantManagement;
+
+/// <summary>Thin seam over the CSS directory API for onboarding use cases.</summary>
+public interface IOnboardingUserLookup
+{
+    /// <summary>Returns the IDIR user GUID if the email resolves in the directory, null otherwise.</summary>
+    Task<string?> FindUserGuidByEmailAsync(string email);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingValidationStep.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingValidationStep.cs
new file mode 100644
index 0000000000..d5097e4798
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/IOnboardingValidationStep.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace Unity.TenantManagement;
+
+public interface IOnboardingValidationStep
+{
+    int Order { get; }
+    string StepName { get; }
+    Task<OnboardingValidationStepResult> ValidateAsync(OnboardingRequestDto request);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ITenantAppService.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ITenantAppService.cs
index ae68094937..bea5f47225 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ITenantAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ITenantAppService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
@@ -6,8 +7,8 @@ namespace Unity.TenantManagement;
 
 public interface ITenantAppService : ICrudAppService<TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
 {
-    Task<string> GetDefaultConnectionStringAsync(Guid id);
-    Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString);
-    Task DeleteDefaultConnectionStringAsync(Guid id);
     Task AssignManagerAsync(TenantAssignManagerDto managerAssignment);
+    Task<TenantConnectionStringsDto> GetConnectionStringsAsync(Guid id);
+    Task UpdateConnectionStringsAsync(Guid id, TenantConnectionStringsDto input);
+    Task<List<TenantManagerDto>> GetManagersAsync(Guid id);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ITenantConnectionStringBuilder.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ITenantConnectionStringBuilder.cs
index 10d36e8ec5..c5b82716f8 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ITenantConnectionStringBuilder.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/ITenantConnectionStringBuilder.cs
@@ -1,9 +1,14 @@
-using Volo.Abp.Application.Services;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
 
 namespace Unity.TenantManagement.Application.Contracts
 {
     public interface ITenantConnectionStringBuilder : IApplicationService
     {
-        string Build(string tenantName);
+        Task<TenantDbCredentials> GenerateCredentialsAsync();
+
+        TenantDbCredentials GenerateReadOnlyCredentials(TenantDbCredentials credentials);
+
+        string Build(string tenantName, TenantDbCredentials credentials);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingApplicationRecord.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingApplicationRecord.cs
new file mode 100644
index 0000000000..6310942477
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingApplicationRecord.cs
@@ -0,0 +1,15 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+
+namespace Unity.TenantManagement;
+
+public class OnboardingApplicationRecord
+{
+    public Guid Id { get; set; }
+    public string ReferenceNo { get; set; } = string.Empty;
+    public DateTime SubmissionDate { get; set; }
+    public string Status { get; set; } = string.Empty;
+    public string Category { get; set; } = string.Empty;
+    public Dictionary<string, object?> CoreFieldValues { get; set; } = [];
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingColumnConfigDto.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingColumnConfigDto.cs
new file mode 100644
index 0000000000..2a95c6a0af
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingColumnConfigDto.cs
@@ -0,0 +1,33 @@
+#nullable enable
+using System.Collections.Generic;
+
+namespace Unity.TenantManagement;
+
+public class OnboardingColumnDto
+{
+    public string Key { get; set; } = string.Empty;
+    public string Label { get; set; } = string.Empty;
+    public string Type { get; set; } = string.Empty;
+    public bool Selected { get; set; }
+}
+
+public class OnboardingColumnSchemaDto
+{
+    public List<OnboardingColumnDto> Columns { get; set; } = [];
+    public string? TenantNameFieldKey { get; set; }
+    public string? SuperUsersFieldKey { get; set; }
+    public string? BranchFieldKey { get; set; }
+    public string? FeaturesFieldKey { get; set; }
+    public string? MinistryFieldKey { get; set; }
+    public string? ProgramAreaFieldKey { get; set; }
+}
+
+public class CreateTenantInputDto
+{
+    public string? TenantNameFieldKey { get; set; }
+    public string? SuperUsersFieldKey { get; set; }
+    public string? BranchFieldKey { get; set; }
+    public string? FeaturesFieldKey { get; set; }
+    public string? MinistryFieldKey { get; set; }
+    public string? ProgramAreaFieldKey { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingListRequestDto.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingListRequestDto.cs
new file mode 100644
index 0000000000..8abeaea7d9
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingListRequestDto.cs
@@ -0,0 +1,12 @@
+#nullable enable
+using System.Collections.Generic;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.TenantManagement;
+
+public class OnboardingListRequestDto : PagedAndSortedResultRequestDto
+{
+    public string? Category { get; set; } = "Onboarding";
+    public string? Filter { get; set; }
+    public List<ColumnFilterDto>? ColumnFilters { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingRequestDto.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingRequestDto.cs
new file mode 100644
index 0000000000..c251999c11
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingRequestDto.cs
@@ -0,0 +1,25 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+
+namespace Unity.TenantManagement;
+
+public class OnboardingRequestDto
+{
+    public Guid Id { get; set; }
+    public string SubmissionNumber { get; set; } = string.Empty;
+    public string TenantName { get; set; } = string.Empty;
+    public string TenantDescription { get; set; } = string.Empty;
+    public string ProgramAreaName { get; set; } = string.Empty;
+    public string ProgramAreaDescription { get; set; } = string.Empty;
+    public string Contacts { get; set; } = string.Empty;
+    public string Features { get; set; } = string.Empty;
+    public string SuperUsers { get; set; } = string.Empty;
+    public string ExecutiveDirector { get; set; } = string.Empty;
+    public string Branch { get; set; } = string.Empty;
+    public string Ministry { get; set; } = string.Empty;
+    public string Status { get; set; } = string.Empty;
+    public string Category { get; set; } = string.Empty;
+    public DateTime? SubmissionDate { get; set; }
+    public Dictionary<string, object?> Fields { get; set; } = [];
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingValidationResultDto.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingValidationResultDto.cs
new file mode 100644
index 0000000000..aeed66c0c6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingValidationResultDto.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Unity.TenantManagement;
+
+public class OnboardingValidationResultDto
+{
+    public bool IsValid { get; set; }
+    public List<string> Issues { get; set; } = [];
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingValidationStepResult.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingValidationStepResult.cs
new file mode 100644
index 0000000000..eb28626bbb
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/OnboardingValidationStepResult.cs
@@ -0,0 +1,11 @@
+#nullable enable
+namespace Unity.TenantManagement;
+
+public class OnboardingValidationStepResult
+{
+    public bool IsValid { get; set; }
+    public string? Issue { get; set; }
+
+    public static OnboardingValidationStepResult Success() => new() { IsValid = true };
+    public static OnboardingValidationStepResult Failure(string issue) => new() { IsValid = false, Issue = issue };
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantConnectionStringsDto.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantConnectionStringsDto.cs
new file mode 100644
index 0000000000..60464c9de7
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantConnectionStringsDto.cs
@@ -0,0 +1,8 @@
+#nullable enable
+namespace Unity.TenantManagement;
+
+public class TenantConnectionStringsDto
+{
+    public string? TenantConnectionString { get; set; }
+    public string? ReadOnlyConnectionString { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantCreateDto.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantCreateDto.cs
index e76eedd858..d9b7998e85 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantCreateDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantCreateDto.cs
@@ -1,6 +1,9 @@
-namespace Unity.TenantManagement;
+#nullable enable
+namespace Unity.TenantManagement;
 
 public class TenantCreateDto : TenantCreateOrUpdateDtoBase
 {
-    public string UserIdentifier { get; set; }
+    public string UserIdentifier { get; set; } = string.Empty;
+    /// <summary>Comma-separated ABP feature keys to enable on the new tenant (e.g. "Unity.Payments,Unity.Reporting").</summary>
+    public string? FeatureKeys { get; set; }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantDbCredentials.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantDbCredentials.cs
new file mode 100644
index 0000000000..3c2fa35c8e
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantDbCredentials.cs
@@ -0,0 +1,16 @@
+namespace Unity.TenantManagement.Application.Contracts
+{
+    public class TenantDbCredentials
+    {
+        public TenantDbCredentials(string dbName, string username, string password)
+        {
+            DbName = dbName;
+            Username = username;
+            Password = password;
+        }
+
+        public string DbName { get; }
+        public string Username { get; }
+        public string Password { get; }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantDto.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantDto.cs
index b1aaf19b9e..5dc338b00c 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantDto.cs
@@ -11,5 +11,6 @@ public class TenantDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
     public string Branch { get; set; } = string.Empty;
     public string Description { get; set; } = string.Empty;
     public string CasClientCode { get; set; } = string.Empty;
+    public string LicencePlate { get; set; } = string.Empty;
     public string ConcurrencyStamp { get; set; }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantManagementPermissions.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantManagementPermissions.cs
index 4b10adc481..12b1decc2f 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantManagementPermissions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantManagementPermissions.cs
@@ -18,6 +18,13 @@ public static class Tenants
         public const string ManageEndpoints = AbpGroupName + ".Tenants" + ".ManageEndpoints";
     }
 
+    public static class Policies
+    {
+        public const string TenantsOrITOps = "TenantManagement.TenantsOrITOps";
+        public const string TenantsUpdateOrITOps = "TenantManagement.TenantsUpdateOrITOps";
+        public const string TenantsCreateOrITOps = "TenantManagement.TenantsCreateOrITOps";
+    }
+
     public static string[] GetAll()
     {
         return ReflectionHelper.GetPublicConstantsRecursively(typeof(TenantManagementPermissions));
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantManagerDto.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantManagerDto.cs
new file mode 100644
index 0000000000..3dd083f1e1
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application.Contracts/TenantManagerDto.cs
@@ -0,0 +1,7 @@
+namespace Unity.TenantManagement;
+
+public class TenantManagerDto
+{
+    public string DisplayName { get; set; } = string.Empty;
+    public string Email { get; set; } = string.Empty;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/EncryptedTenantConnectionStringResolver.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/EncryptedTenantConnectionStringResolver.cs
new file mode 100644
index 0000000000..65257f69b3
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/EncryptedTenantConnectionStringResolver.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Options;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Security.Encryption;
+
+namespace Unity.TenantManagement.Application;
+
+[Dependency(ReplaceServices = true)]
+[ExposeServices(typeof(IConnectionStringResolver))]
+public class EncryptedTenantConnectionStringResolver : MultiTenantConnectionStringResolver
+{
+    private readonly IStringEncryptionService _encryptionService;
+
+    public EncryptedTenantConnectionStringResolver(
+        IOptionsMonitor<AbpDbConnectionOptions> options,
+        ICurrentTenant currentTenant,
+        IServiceProvider serviceProvider,
+        IStringEncryptionService encryptionService)
+        : base(options, currentTenant, serviceProvider)
+    {
+        _encryptionService = encryptionService;
+    }
+
+    public override async Task<string> ResolveAsync(string connectionStringName = null)
+    {
+        var value = await base.ResolveAsync(connectionStringName);
+        if (string.IsNullOrEmpty(value)) return value;
+        if (PlainConnectionStringDetector.LooksLikePlainConnectionString(value)) return value;
+
+        try
+        {
+            return _encryptionService.Decrypt(value);
+        }
+        catch (FormatException)
+        {
+            // Not valid base64, so it can't be ciphertext - it's plain text.
+            return value;
+        }
+        catch (CryptographicException)
+        {
+            // Valid base64 but failed to decrypt (wrong passphrase/corrupted ciphertext) -
+            // fall back to the raw value rather than breaking connection resolution.
+            return value;
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Onboarding/OnboardingColumnConfigSettingDefinitionProvider.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Onboarding/OnboardingColumnConfigSettingDefinitionProvider.cs
new file mode 100644
index 0000000000..c0000d45fc
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Onboarding/OnboardingColumnConfigSettingDefinitionProvider.cs
@@ -0,0 +1,23 @@
+using Volo.Abp.Settings;
+using Volo.Abp.SettingManagement;
+
+namespace Unity.TenantManagement.Onboarding;
+
+public class OnboardingColumnConfigSettingDefinitionProvider : SettingDefinitionProvider
+{
+    private static SettingDefinition OnboardingDef(string name) =>
+        new SettingDefinition(name, defaultValue: null, isVisibleToClients: false, isInherited: false, isEncrypted: false)
+            .WithProviders(GlobalSettingValueProvider.ProviderName, UserSettingValueProvider.ProviderName);
+
+    public override void Define(ISettingDefinitionContext context)
+    {
+        context.Add(
+            OnboardingDef(OnboardingColumnConfigSettings.TenantNameFieldKey),
+            OnboardingDef(OnboardingColumnConfigSettings.SuperUsersFieldKey),
+            OnboardingDef(OnboardingColumnConfigSettings.BranchFieldKey),
+            OnboardingDef(OnboardingColumnConfigSettings.FeaturesFieldKey),
+            OnboardingDef(OnboardingColumnConfigSettings.MinistryFieldKey),
+            OnboardingDef(OnboardingColumnConfigSettings.ProgramAreaFieldKey)
+        );
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Onboarding/OnboardingColumnConfigSettings.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Onboarding/OnboardingColumnConfigSettings.cs
new file mode 100644
index 0000000000..a2041e1c22
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Onboarding/OnboardingColumnConfigSettings.cs
@@ -0,0 +1,11 @@
+namespace Unity.TenantManagement.Onboarding;
+
+public static class OnboardingColumnConfigSettings
+{
+    public const string TenantNameFieldKey = "Onboarding.ColumnConfig.TenantNameFieldKey";
+    public const string SuperUsersFieldKey = "Onboarding.ColumnConfig.SuperUsersFieldKey";
+    public const string BranchFieldKey = "Onboarding.ColumnConfig.BranchFieldKey";
+    public const string FeaturesFieldKey = "Onboarding.ColumnConfig.FeaturesFieldKey";
+    public const string MinistryFieldKey = "Onboarding.ColumnConfig.MinistryFieldKey";
+    public const string ProgramAreaFieldKey = "Onboarding.ColumnConfig.ProgramAreaFieldKey";
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Onboarding/OnboardingFeatureMap.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Onboarding/OnboardingFeatureMap.cs
new file mode 100644
index 0000000000..0bf2720292
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Onboarding/OnboardingFeatureMap.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Unity.TenantManagement.Onboarding;
+
+internal static class OnboardingFeatureMap
+{
+    private static readonly Dictionary<string, string> _map = new(StringComparer.OrdinalIgnoreCase)
+    {
+        // Display name / delimited-string variants
+        ["Payments"]                  = "Unity.Payments",
+        ["Notifications"]             = "Unity.Notifications",
+        ["Flex"]                      = "Unity.Flex",
+        ["Reporting"]                 = "Unity.Reporting",
+        ["AI Reporting"]              = "Unity.AIReporting",
+        ["AI Attachment Summaries"]   = "Unity.AI.AttachmentSummaries",
+        ["AI Application Analysis"]   = "Unity.AI.ApplicationAnalysis",
+        ["AI Scoring"]                = "Unity.AI.Scoring",
+        ["Analytics"]                 = "Unity.Analytics",
+        // camelCase key aliases used by the checkbox-group JSON format
+        ["aiReporting"]               = "Unity.AIReporting",
+        ["aiAttachmentSummaries"]     = "Unity.AI.AttachmentSummaries",
+        ["aiApplicationAnalysis"]     = "Unity.AI.ApplicationAnalysis",
+        ["aiScoring"]                 = "Unity.AI.Scoring",
+    };
+
+    private static readonly char[] _delimiters = [',', ';', '|'];
+
+    private sealed class CheckboxItem
+    {
+        [JsonPropertyName("key")]   public string Key   { get; set; } = string.Empty;
+        [JsonPropertyName("value")] public bool   Value { get; set; }
+    }
+
+    /// <summary>
+    /// Accepts either a JSON checkbox-group array or a delimited string (comma / semicolon / pipe)
+    /// and returns the ABP feature keys for all enabled/listed recognised names.
+    /// </summary>
+    public static IReadOnlyList<string> ResolveFeatureKeys(string features)
+    {
+        if (string.IsNullOrWhiteSpace(features))
+            return [];
+
+        IEnumerable<string> tokens;
+        var trimmed = features.Trim();
+
+        if (trimmed.StartsWith('['))
+        {
+            try
+            {
+                var items = JsonSerializer.Deserialize<List<CheckboxItem>>(trimmed);
+                tokens = items?.Where(i => i.Value).Select(i => i.Key) ?? [];
+            }
+            catch
+            {
+                tokens = [];
+            }
+        }
+        else
+        {
+            tokens = trimmed.Split(_delimiters, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+        }
+
+        return [.. tokens
+            .Select(token => _map.TryGetValue(token, out var key) ? key : null)
+            .Where(key => key is not null)
+            .Cast<string>()
+            .Distinct()];
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/OnboardingRequestAppService.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/OnboardingRequestAppService.cs
new file mode 100644
index 0000000000..7b60631ad3
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/OnboardingRequestAppService.cs
@@ -0,0 +1,561 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Unity.Flex.Worksheets;
+using Unity.Flex.Worksheets.Values;
+using Unity.Flex.WorksheetInstances;
+using Unity.Modules.Shared.Correlation;
+using Unity.Modules.Shared.Permissions;
+using Unity.TenantManagement.Onboarding;
+using Unity.TenantManagement.Validation;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.SettingManagement;
+
+namespace Unity.TenantManagement;
+
+[Authorize(IdentityConsts.ITOperationsPolicyName)]
+public class OnboardingRequestAppService(
+    IEnumerable<IOnboardingValidationStep> validationSteps,
+    ISettingManager settingManager
+) : ApplicationService, IOnboardingRequestAppService
+{
+    private readonly IEnumerable<IOnboardingValidationStep> _validationSteps = validationSteps;
+    private readonly ISettingManager _settingManager = settingManager;
+
+    private const string DefaultCategory = "Onboarding";
+    private const string ApplicationCorrelationProvider = "Application";
+    private const string UserProvider = "U";
+
+    private ITenantAppService TenantAppService =>
+        LazyServiceProvider.LazyGetRequiredService<ITenantAppService>();
+
+    private IOnboardingUserLookup? UserLookup =>
+        LazyServiceProvider.LazyGetService<IOnboardingUserLookup>();
+
+    private IOnboardingApplicationProvider? ApplicationProvider =>
+        LazyServiceProvider.LazyGetService<IOnboardingApplicationProvider>();
+
+    private IWorksheetAppService WorksheetAppService =>
+        LazyServiceProvider.LazyGetRequiredService<IWorksheetAppService>();
+
+    private IWorksheetInstanceAppService WorksheetInstanceAppService =>
+        LazyServiceProvider.LazyGetRequiredService<IWorksheetInstanceAppService>();
+
+    public virtual async Task<PagedResultDto<OnboardingRequestDto>> GetListAsync(OnboardingListRequestDto input)
+    {
+        if (ApplicationProvider == null)
+            return new PagedResultDto<OnboardingRequestDto>(0, []);
+
+        var category = string.IsNullOrWhiteSpace(input.Category) ? DefaultCategory : input.Category;
+
+        // Core fields are real Application/Applicant columns — the provider can filter/sort
+        // them directly in SQL, same as the always-static columns. Only worksheet fields (JSONB)
+        // need the in-memory scan below.
+        var coreFieldKeys = (await ApplicationProvider.GetMappedCoreFieldColumnsAsync(category))
+            .Select(c => c.Key)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+        bool IsProviderColumn(string name) => IsStaticColumn(name) || coreFieldKeys.Contains(name);
+
+        bool hasGlobalFilter = !string.IsNullOrWhiteSpace(input.Filter);
+        var staticColumnFilters = GetStaticColumnFilters(input.ColumnFilters, IsProviderColumn);
+        var dynamicColumnFilters = GetDynamicColumnFilters(input.ColumnFilters, IsProviderColumn);
+        var (sortField, sortDescending) = ParseSorting(input.Sorting);
+        bool isDynamicSort = sortField != null && !IsProviderColumn(sortField);
+
+        IReadOnlyList<Guid>? globalDynamicMatchIds = null;
+        IReadOnlyList<Guid>? dynamicColumnMatchIds = null;
+        Dictionary<Guid, IReadOnlyList<WorksheetInstanceDataDto>>? allInstancesByApp = null;
+
+        // PERF: global filter, dynamic worksheet-field filters, and dynamic sort all require
+        // loading every application id + worksheet instance for the category into memory, since
+        // worksheet field values live in JSONB and can't be filtered/sorted in SQL. Fine at current
+        // onboarding-request volumes; revisit (e.g. bounded fetch, indexed projection) if this
+        // screen is reused/refactored for a larger dataset.
+        if (hasGlobalFilter || dynamicColumnFilters.Count > 0 || isDynamicSort)
+        {
+            var allIds = await ApplicationProvider.GetAllIdsAsync(category);
+
+            if (allIds.Count > 0)
+            {
+                var allInstances = await WorksheetInstanceAppService
+                    .GetListByCorrelationIdsAsync(allIds, ApplicationCorrelationProvider);
+
+                allInstancesByApp = allInstances
+                    .GroupBy(wi => wi.CorrelationId)
+                    .ToDictionary(g => g.Key, g => (IReadOnlyList<WorksheetInstanceDataDto>)g.ToList());
+
+                if (hasGlobalFilter)
+                {
+                    globalDynamicMatchIds = allIds
+                        .Where(id => MatchesGlobalInWorksheet(
+                            allInstancesByApp.GetValueOrDefault(id, []), input.Filter!))
+                        .ToList();
+                }
+
+                if (dynamicColumnFilters.Count > 0)
+                {
+                    dynamicColumnMatchIds = allIds
+                        .Where(id => dynamicColumnFilters.All(cf =>
+                            MatchesColumnInWorksheet(
+                                allInstancesByApp.GetValueOrDefault(id, []), cf.Name, cf.Value)))
+                        .ToList();
+                }
+            }
+            else if (dynamicColumnFilters.Count > 0)
+            {
+                dynamicColumnMatchIds = []; // No apps → nothing matches dynamic filters
+            }
+        }
+
+        PagedResultDto<OnboardingApplicationRecord> appPage;
+
+        if (isDynamicSort)
+        {
+            // Worksheet field values live in JSONB, not a queryable column, so the DB can't
+            // sort by them — fetch every filtered match and sort/page in memory instead.
+            // PERF: int.MaxValue means no upper bound on this fetch — acceptable while onboarding
+            // request volume stays small; cap this if that changes.
+            var filtered = await ApplicationProvider.GetPagedListAsync(
+                0, int.MaxValue, null, category,
+                hasGlobalFilter ? input.Filter : null,
+                globalDynamicMatchIds,
+                staticColumnFilters.Count > 0 ? staticColumnFilters : null,
+                dynamicColumnMatchIds);
+
+            IOrderedEnumerable<OnboardingApplicationRecord> ordered = sortDescending
+                ? filtered.Items.OrderByDescending(
+                    a => GetWorksheetFieldValue(allInstancesByApp?.GetValueOrDefault(a.Id, []) ?? [], sortField!),
+                    StringComparer.OrdinalIgnoreCase)
+                : filtered.Items.OrderBy(
+                    a => GetWorksheetFieldValue(allInstancesByApp?.GetValueOrDefault(a.Id, []) ?? [], sortField!),
+                    StringComparer.OrdinalIgnoreCase);
+
+            var pagedItems = ordered.Skip(input.SkipCount).Take(input.MaxResultCount).ToList();
+            appPage = new PagedResultDto<OnboardingApplicationRecord>(filtered.TotalCount, pagedItems);
+        }
+        else
+        {
+            // Reconstruct from the already-parsed (prefix-stripped) field rather than passing
+            // input.Sorting raw — core-field columns are sent by the client as "fields.<key>",
+            // same as worksheet columns, and the provider only knows the bare field name.
+            var providerSorting = sortField != null ? $"{sortField} {(sortDescending ? "DESC" : "ASC")}" : null;
+
+            appPage = await ApplicationProvider.GetPagedListAsync(
+                input.SkipCount, input.MaxResultCount, providerSorting, category,
+                hasGlobalFilter ? input.Filter : null,
+                globalDynamicMatchIds,
+                staticColumnFilters.Count > 0 ? staticColumnFilters : null,
+                dynamicColumnMatchIds);
+        }
+
+        if (appPage.TotalCount == 0)
+            return new PagedResultDto<OnboardingRequestDto>(0, []);
+
+        var applicationIds = appPage.Items.Select(a => a.Id).ToList();
+        var worksheetInstances = await WorksheetInstanceAppService
+            .GetListByCorrelationIdsAsync(applicationIds, ApplicationCorrelationProvider);
+
+        var instancesByApp = worksheetInstances
+            .GroupBy(wi => wi.CorrelationId)
+            .ToDictionary(g => g.Key, g => g.ToList());
+
+        var mapping = await ReadTenantMappingAsync();
+        var items = appPage.Items
+            .Select(app => MapToDto(
+                app,
+                instancesByApp.GetValueOrDefault(app.Id, []),
+                mapping))
+            .ToList();
+
+        return new PagedResultDto<OnboardingRequestDto>(appPage.TotalCount, items);
+    }
+
+    public virtual async Task<OnboardingRequestDto?> GetAsync(Guid id)
+    {
+        if (ApplicationProvider == null) return null;
+
+        var app = await ApplicationProvider.GetByIdAsync(id);
+        if (app == null) return null;
+
+        var worksheetInstances = await WorksheetInstanceAppService
+            .GetListByCorrelationIdsAsync([id], ApplicationCorrelationProvider);
+
+        var mapping = await ReadTenantMappingAsync();
+        return MapToDto(app, worksheetInstances, mapping);
+    }
+
+    public virtual async Task<OnboardingColumnSchemaDto> GetColumnSchemaAsync(string? category = null)
+    {
+        if (ApplicationProvider == null)
+            return new OnboardingColumnSchemaDto { Columns = [] };
+
+        var resolvedCategory = string.IsNullOrWhiteSpace(category) ? DefaultCategory : category;
+        var formVersionIds = await ApplicationProvider.GetFormVersionIdsAsync(resolvedCategory);
+
+        if (formVersionIds.Count == 0)
+            return new OnboardingColumnSchemaDto { Columns = [] };
+
+        var seenWorksheetIds = new HashSet<Guid>();
+        // Columns are combined across form versions by key alone — two versions mapping the
+        // same key are treated as the same column even if the label/worksheet differs between
+        // them. Whichever version is encountered first wins the displayed label/type.
+        var seenKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var columns = new List<OnboardingColumnDto>();
+
+        foreach (var formVersionId in formVersionIds)
+        {
+            List<WorksheetDto> worksheets;
+            try { worksheets = await WorksheetAppService.GetListByCorrelationAsync(formVersionId, CorrelationConsts.FormVersion); }
+            catch { continue; }
+
+            foreach (var worksheet in worksheets)
+            {
+                if (!seenWorksheetIds.Add(worksheet.Id)) continue;
+
+                foreach (var field in worksheet.Sections
+                    .OrderBy(s => s.Order)
+                    .SelectMany(s => s.Fields.OrderBy(f => f.Order))
+                    .Where(f => f.Enabled))
+                {
+                    if (!seenKeys.Add(field.Key)) continue;
+                    columns.Add(new OnboardingColumnDto
+                    {
+                        Key = field.Key,
+                        Label = field.Label,
+                        Type = field.Type.ToString(),
+                        Selected = true
+                    });
+                }
+            }
+        }
+
+        foreach (var coreColumn in await ApplicationProvider.GetMappedCoreFieldColumnsAsync(resolvedCategory))
+        {
+            if (!seenKeys.Add(coreColumn.Key)) continue;
+            columns.Add(coreColumn);
+        }
+
+        var saved = await ReadTenantMappingAsync();
+        saved.Columns = columns;
+        return saved;
+    }
+
+    public virtual async Task<List<string>> GetAvailableCategoriesAsync()
+    {
+        if (ApplicationProvider == null) return [DefaultCategory];
+        var categories = await ApplicationProvider.GetAvailableCategoriesAsync();
+        // Always ensure "Onboarding" is present even if no forms carry it yet
+        if (!categories.Contains(DefaultCategory))
+            categories.Insert(0, DefaultCategory);
+        return categories;
+    }
+
+    public virtual async Task<OnboardingValidationResultDto> ValidateAsync(Guid id, string? tenantNameFieldKey, string? superUsersFieldKey, string? branchFieldKey = null, string? featuresFieldKey = null, string? ministryFieldKey = null, string? programAreaFieldKey = null)
+    {
+        var request = await GetAsync(id);
+        if (request == null)
+            return new OnboardingValidationResultDto { IsValid = false, Issues = ["Onboarding request not found."] };
+
+        await ResolveFieldMappings(request, tenantNameFieldKey, superUsersFieldKey, branchFieldKey, featuresFieldKey, ministryFieldKey, programAreaFieldKey);
+
+        var issues = await RunValidationStepsAsync(request);
+
+        return new OnboardingValidationResultDto { IsValid = issues.Count == 0, Issues = issues };
+    }
+
+    public virtual async Task CreateTenantAsync(Guid id, CreateTenantInputDto? input)
+    {
+        var request = await GetAsync(id)
+            ?? throw new UserFriendlyException("Onboarding request not found.");
+
+        await ResolveFieldMappings(request, input?.TenantNameFieldKey, input?.SuperUsersFieldKey, input?.BranchFieldKey, input?.FeaturesFieldKey, input?.MinistryFieldKey, input?.ProgramAreaFieldKey);
+
+        if (input != null)
+            await SaveFieldMappingAsync(input.TenantNameFieldKey, input.SuperUsersFieldKey, input.BranchFieldKey, input.FeaturesFieldKey, input.MinistryFieldKey, input.ProgramAreaFieldKey);
+
+        // Re-validate server-side even if the client already called ValidateAsync — the client
+        // cannot be trusted to have done so, and skipping this would let a duplicate tenant name
+        // or other validation-step failure slip through directly via this endpoint.
+        var validationIssues = await RunValidationStepsAsync(request);
+        if (validationIssues.Count > 0)
+            throw new UserFriendlyException(string.Join(" ", validationIssues));
+
+        var emails = SuperUsersValidationStep.ParseEmails(request.SuperUsers);
+
+        var userGuids = new List<string>();
+        if (UserLookup is not null)
+        {
+            foreach (var email in emails)
+            {
+                var guid = await UserLookup.FindUserGuidByEmailAsync(email);
+                if (!string.IsNullOrWhiteSpace(guid))
+                    userGuids.Add(guid);
+            }
+        }
+
+        if (userGuids.Count == 0)
+            throw new UserFriendlyException("No valid super users could be resolved. Cannot create tenant without at least one valid program manager.");
+
+        var featureKeys = OnboardingFeatureMap.ResolveFeatureKeys(request.Features);
+
+        var tenantDto = await TenantAppService.CreateAsync(new TenantCreateDto
+        {
+            Name = request.TenantName,
+            Branch = request.Branch,
+            Description = request.TenantDescription,
+            UserIdentifier = userGuids[0],
+            FeatureKeys = featureKeys.Count > 0 ? string.Join(',', featureKeys) : null
+        });
+
+        foreach (var userGuid in userGuids.Skip(1))
+        {
+            await TenantAppService.AssignManagerAsync(new TenantAssignManagerDto
+            {
+                TenantId = tenantDto.Id,
+                UserIdentifier = userGuid
+            });
+        }
+
+        if (ApplicationProvider != null)
+            await ApplicationProvider.CloseApplicationAsync(id);
+    }
+
+    private async Task<List<string>> RunValidationStepsAsync(OnboardingRequestDto request)
+    {
+        var issues = new List<string>();
+        foreach (var step in _validationSteps.OrderBy(s => s.Order))
+        {
+            var stepResult = await step.ValidateAsync(request);
+            if (!stepResult.IsValid && stepResult.Issue is not null)
+                issues.Add($"[{step.StepName}] {stepResult.Issue}");
+        }
+        return issues;
+    }
+
+    private async Task ResolveFieldMappings(OnboardingRequestDto request,
+        string? tenantNameKey = null, string? superUsersKey = null,
+        string? branchKey = null, string? featuresKey = null,
+        string? ministryKey = null, string? programAreaKey = null)
+    {
+        var saved = await ReadTenantMappingAsync();
+        tenantNameKey ??= saved.TenantNameFieldKey;
+        superUsersKey ??= saved.SuperUsersFieldKey;
+        branchKey ??= saved.BranchFieldKey;
+        featuresKey ??= saved.FeaturesFieldKey;
+        ministryKey ??= saved.MinistryFieldKey;
+        programAreaKey ??= saved.ProgramAreaFieldKey;
+
+        if (!string.IsNullOrEmpty(tenantNameKey) && request.Fields.TryGetValue(tenantNameKey, out var tenantNameVal) && tenantNameVal is not null)
+            request.TenantName = tenantNameVal.ToString()!;
+        if (!string.IsNullOrEmpty(superUsersKey) && request.Fields.TryGetValue(superUsersKey, out var superUsersVal) && superUsersVal is not null)
+            request.SuperUsers = superUsersVal.ToString()!;
+        if (!string.IsNullOrEmpty(branchKey) && request.Fields.TryGetValue(branchKey, out var branchVal) && branchVal is not null)
+            request.Branch = branchVal.ToString()!;
+        if (!string.IsNullOrEmpty(featuresKey) && request.Fields.TryGetValue(featuresKey, out var featuresVal) && featuresVal is not null)
+            request.Features = featuresVal.ToString()!;
+        if (!string.IsNullOrEmpty(ministryKey) && request.Fields.TryGetValue(ministryKey, out var ministryVal) && ministryVal is not null)
+            request.Ministry = ministryVal.ToString()!;
+        if (!string.IsNullOrEmpty(programAreaKey) && request.Fields.TryGetValue(programAreaKey, out var programAreaVal) && programAreaVal is not null)
+            request.ProgramAreaName = programAreaVal.ToString()!;
+    }
+
+    private async Task SaveFieldMappingAsync(string? tenantNameKey, string? superUsersKey, string? branchKey, string? featuresKey, string? ministryKey, string? programAreaKey)
+    {
+        var userId = CurrentUser.Id?.ToString();
+        if (string.IsNullOrEmpty(userId)) return;
+        await _settingManager.SetAsync(OnboardingColumnConfigSettings.TenantNameFieldKey, tenantNameKey, UserProvider, userId);
+        await _settingManager.SetAsync(OnboardingColumnConfigSettings.SuperUsersFieldKey, superUsersKey, UserProvider, userId);
+        await _settingManager.SetAsync(OnboardingColumnConfigSettings.BranchFieldKey, branchKey, UserProvider, userId);
+        await _settingManager.SetAsync(OnboardingColumnConfigSettings.FeaturesFieldKey, featuresKey, UserProvider, userId);
+        await _settingManager.SetAsync(OnboardingColumnConfigSettings.MinistryFieldKey, ministryKey, UserProvider, userId);
+        await _settingManager.SetAsync(OnboardingColumnConfigSettings.ProgramAreaFieldKey, programAreaKey, UserProvider, userId);
+    }
+
+    private async Task<OnboardingColumnSchemaDto> ReadTenantMappingAsync()
+    {
+        var userId = CurrentUser.Id?.ToString();
+        string? tenantNameKey = null, superUsersKey = null, branchKey = null, featuresKey = null, ministryKey = null, programAreaKey = null;
+
+        if (!string.IsNullOrEmpty(userId))
+        {
+            tenantNameKey  = await _settingManager.GetOrNullAsync(OnboardingColumnConfigSettings.TenantNameFieldKey,  UserProvider, userId);
+            superUsersKey  = await _settingManager.GetOrNullAsync(OnboardingColumnConfigSettings.SuperUsersFieldKey,  UserProvider, userId);
+            branchKey      = await _settingManager.GetOrNullAsync(OnboardingColumnConfigSettings.BranchFieldKey,      UserProvider, userId);
+            featuresKey    = await _settingManager.GetOrNullAsync(OnboardingColumnConfigSettings.FeaturesFieldKey,    UserProvider, userId);
+            ministryKey    = await _settingManager.GetOrNullAsync(OnboardingColumnConfigSettings.MinistryFieldKey,    UserProvider, userId);
+            programAreaKey = await _settingManager.GetOrNullAsync(OnboardingColumnConfigSettings.ProgramAreaFieldKey, UserProvider, userId);
+        }
+
+        tenantNameKey  ??= await _settingManager.GetOrNullGlobalAsync(OnboardingColumnConfigSettings.TenantNameFieldKey);
+        superUsersKey  ??= await _settingManager.GetOrNullGlobalAsync(OnboardingColumnConfigSettings.SuperUsersFieldKey);
+        branchKey      ??= await _settingManager.GetOrNullGlobalAsync(OnboardingColumnConfigSettings.BranchFieldKey);
+        featuresKey    ??= await _settingManager.GetOrNullGlobalAsync(OnboardingColumnConfigSettings.FeaturesFieldKey);
+        ministryKey    ??= await _settingManager.GetOrNullGlobalAsync(OnboardingColumnConfigSettings.MinistryFieldKey);
+        programAreaKey ??= await _settingManager.GetOrNullGlobalAsync(OnboardingColumnConfigSettings.ProgramAreaFieldKey);
+
+        return new OnboardingColumnSchemaDto
+        {
+            TenantNameFieldKey  = tenantNameKey,
+            SuperUsersFieldKey  = superUsersKey,
+            BranchFieldKey      = branchKey,
+            FeaturesFieldKey    = featuresKey,
+            MinistryFieldKey    = ministryKey,
+            ProgramAreaFieldKey = programAreaKey
+        };
+    }
+
+    private static List<ColumnFilterDto> GetStaticColumnFilters(List<ColumnFilterDto>? filters, Func<string, bool> isProviderColumn) =>
+        (filters ?? [])
+            .Where(cf => !string.IsNullOrWhiteSpace(cf.Value) && isProviderColumn(cf.Name))
+            .ToList();
+
+    private static List<ColumnFilterDto> GetDynamicColumnFilters(List<ColumnFilterDto>? filters, Func<string, bool> isProviderColumn) =>
+        (filters ?? [])
+            .Where(cf => !string.IsNullOrWhiteSpace(cf.Value) && !isProviderColumn(cf.Name))
+            .ToList();
+
+    private static bool IsStaticColumn(string name) =>
+        name is "submissionNumber" or "status" or "category" or "submissionDate";
+
+    private static (string? Field, bool Descending) ParseSorting(string? sorting)
+    {
+        if (string.IsNullOrWhiteSpace(sorting)) return (null, false);
+        var parts = sorting.Trim().Split(' ', 2, StringSplitOptions.RemoveEmptyEntries);
+        var descending = parts.Length > 1 && parts[1].Equals("DESC", StringComparison.OrdinalIgnoreCase);
+
+        // Dynamic columns use a "fields.<key>" dot-path on the client so DataTables can
+        // resolve the cell value; strip that prefix to get back the raw worksheet field key.
+        var field = parts[0];
+        if (field.StartsWith("fields.", StringComparison.OrdinalIgnoreCase))
+            field = field["fields.".Length..];
+
+        return (field, descending);
+    }
+
+    private static string? GetWorksheetFieldValue(
+        IReadOnlyList<WorksheetInstanceDataDto> instances, string fieldKey)
+    {
+        foreach (var wi in instances)
+        {
+            if (string.IsNullOrWhiteSpace(wi.CurrentValue) || wi.CurrentValue == "{}") continue;
+            try
+            {
+                var parsed = JsonSerializer.Deserialize<WorksheetInstanceValue>(wi.CurrentValue);
+                var match = parsed?.Values?.FirstOrDefault(fv =>
+                    fv.Key.Equals(fieldKey, StringComparison.OrdinalIgnoreCase));
+                if (match != null) return match.Value;
+            }
+            catch
+            {
+                // Malformed JSONB — skip silently
+            }
+        }
+        return null;
+    }
+
+    private static bool MatchesGlobalInWorksheet(
+        IReadOnlyList<WorksheetInstanceDataDto> instances, string filter)
+    {
+        var lowerFilter = filter.ToLowerInvariant();
+        return instances.Any(wi =>
+        {
+            if (string.IsNullOrWhiteSpace(wi.CurrentValue) || wi.CurrentValue == "{}") return false;
+            try
+            {
+                var parsed = JsonSerializer.Deserialize<WorksheetInstanceValue>(wi.CurrentValue);
+                return parsed?.Values?.Any(fv =>
+                    fv.Value?.ToLowerInvariant().Contains(lowerFilter) ?? false) ?? false;
+            }
+            catch { return false; }
+        });
+    }
+
+    private static bool MatchesColumnInWorksheet(
+        IReadOnlyList<WorksheetInstanceDataDto> instances, string fieldKey, string value)
+    {
+        var lowerValue = value.ToLowerInvariant();
+        return instances.Any(wi =>
+        {
+            if (string.IsNullOrWhiteSpace(wi.CurrentValue) || wi.CurrentValue == "{}") return false;
+            try
+            {
+                var parsed = JsonSerializer.Deserialize<WorksheetInstanceValue>(wi.CurrentValue);
+                return parsed?.Values?.Any(fv =>
+                    fv.Key.Equals(fieldKey, StringComparison.OrdinalIgnoreCase) &&
+                    (fv.Value?.ToLowerInvariant().Contains(lowerValue) ?? false)) ?? false;
+            }
+            catch { return false; }
+        });
+    }
+
+    private static OnboardingRequestDto MapToDto(
+        OnboardingApplicationRecord app,
+        IEnumerable<WorksheetInstanceDataDto> worksheetInstances,
+        OnboardingColumnSchemaDto mapping)
+    {
+        var dto = new OnboardingRequestDto
+        {
+            Id = app.Id,
+            SubmissionNumber = app.ReferenceNo,
+            SubmissionDate = app.SubmissionDate,
+            Status = app.Status,
+            Category = app.Category
+        };
+
+        foreach (var (key, value) in app.CoreFieldValues)
+            dto.Fields[key] = value;
+
+        foreach (var instance in worksheetInstances)
+        {
+            if (string.IsNullOrWhiteSpace(instance.CurrentValue) || instance.CurrentValue == "{}") continue;
+
+            try
+            {
+                var parsed = JsonSerializer.Deserialize<WorksheetInstanceValue>(instance.CurrentValue);
+                if (parsed?.Values == null) continue;
+
+                foreach (var fv in parsed.Values)
+                {
+                    dto.Fields[fv.Key] = fv.Value;
+
+                    switch (fv.Key.ToLowerInvariant().Replace("-", "").Replace("_", "").Replace(" ", ""))
+                    {
+                        case "tenantdescription": case "description": dto.TenantDescription = fv.Value; break;
+                        case "programareaname": case "programarea": dto.ProgramAreaName = fv.Value; break;
+                        case "programareadescription": dto.ProgramAreaDescription = fv.Value; break;
+                        case "contacts": dto.Contacts = fv.Value; break;
+                        case "features": dto.Features = fv.Value; break;
+                        case "executivedirector": dto.ExecutiveDirector = fv.Value; break;
+                        case "branch": dto.Branch = fv.Value; break;
+                        case "ministry": dto.Ministry = fv.Value; break;
+                    }
+                }
+            }
+            catch
+            {
+                // Malformed JSONB — skip silently
+            }
+        }
+
+        if (!string.IsNullOrEmpty(mapping.TenantNameFieldKey) && dto.Fields.TryGetValue(mapping.TenantNameFieldKey, out var tn) && tn != null)
+            dto.TenantName = tn.ToString()!;
+        if (!string.IsNullOrEmpty(mapping.SuperUsersFieldKey) && dto.Fields.TryGetValue(mapping.SuperUsersFieldKey, out var su) && su != null)
+            dto.SuperUsers = su.ToString()!;
+        if (!string.IsNullOrEmpty(mapping.BranchFieldKey) && dto.Fields.TryGetValue(mapping.BranchFieldKey, out var br) && br != null)
+            dto.Branch = br.ToString()!;
+        if (!string.IsNullOrEmpty(mapping.FeaturesFieldKey) && dto.Fields.TryGetValue(mapping.FeaturesFieldKey, out var ft) && ft != null)
+            dto.Features = ft.ToString()!;
+        if (!string.IsNullOrEmpty(mapping.MinistryFieldKey) && dto.Fields.TryGetValue(mapping.MinistryFieldKey, out var mn) && mn != null)
+            dto.Ministry = mn.ToString()!;
+        if (!string.IsNullOrEmpty(mapping.ProgramAreaFieldKey) && dto.Fields.TryGetValue(mapping.ProgramAreaFieldKey, out var pa) && pa != null)
+            dto.ProgramAreaName = pa.ToString()!;
+
+        return dto;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/PlainConnectionStringDetector.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/PlainConnectionStringDetector.cs
new file mode 100644
index 0000000000..63a42d0375
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/PlainConnectionStringDetector.cs
@@ -0,0 +1,19 @@
+using System.Text.RegularExpressions;
+
+namespace Unity.TenantManagement.Application
+{
+    internal static partial class PlainConnectionStringDetector
+    {
+        // Require at least 2 keyword hits - a single hit (e.g. "Pwd=" or "Uid=") could
+        // coincidentally occur at the tail of valid base64 ciphertext, right before the
+        // padding '='. Real connection strings always carry several key=value pairs.
+        private const int MinKeywordMatches = 2;
+
+        public static bool LooksLikePlainConnectionString(string value)
+            => ConnectionStringKeywordPattern().Matches(value).Count >= MinKeywordMatches;
+
+        [GeneratedRegex(@"(Host|Server|Port|Database|Initial Catalog|Username|User Id|Uid|Pwd|Password|Data Source)\s*=",
+            RegexOptions.IgnoreCase)]
+        private static partial Regex ConnectionStringKeywordPattern();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Properties/AssemblyInfo.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..145fb8527b
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Properties/AssemblyInfo.cs
@@ -0,0 +1,2 @@
+using System.Runtime.CompilerServices;
+[assembly:InternalsVisibleToAttribute("Unity.TenantManagement.Application.Tests")]
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/TenantAppService.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/TenantAppService.cs
index 4d1e1b01b2..3e5bed3287 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/TenantAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/TenantAppService.cs
@@ -1,6 +1,8 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Unity.TenantManagement.Abstractions;
@@ -11,13 +13,15 @@
 using Volo.Abp.Data;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.Security.Encryption;
 using Volo.Abp.TenantManagement;
 using Volo.Abp.Uow;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Identity;
 
 namespace Unity.TenantManagement;
 
-[Authorize(TenantManagementPermissions.Tenants.Default)]
+[Authorize(TenantManagementPermissions.Policies.TenantsOrITOps)]
 [ExposeServices(typeof(ITenantAppService), typeof(TenantAppService))]
 public class TenantAppService(
      ICurrentTenant currentTenant,
@@ -25,8 +29,11 @@ public class TenantAppService(
     ITenantManager tenantManager,
     ILocalEventBus localEventBus,
     IUnitOfWorkManager unitOfWorkManager,
-    ITenantConnectionStringBuilder tenantConnectionStringBuilder) : TenantManagementAppServiceBase, ITenantAppService
+    ITenantConnectionStringBuilder tenantConnectionStringBuilder,
+    IStringEncryptionService stringEncryptionService) : TenantManagementAppServiceBase, ITenantAppService
 {
+    private IIdentityUserRepository IdentityUserRepository => LazyServiceProvider.LazyGetRequiredService<IIdentityUserRepository>();
+
     private const string ExtraPropDivision = "Division";
     private const string ExtraPropBranch = "Branch";
     private const string ExtraPropDescription = "Description";
@@ -84,10 +91,11 @@ public virtual async Task<PagedResultDto<TenantDto>> GetListAsync(GetTenantsInpu
         }
 
         // In-memory path: needed when filtering on ExtraProperties or sorting on ExtraProperties
+        // Keep native name filtering in SQL and only layer ExtraProperties matching on top.
         var dbSorting = dbSortFields.Contains(sortField) ? input.Sorting : nameof(Tenant.Name);
-        var allTenants = await tenantRepository.GetListAsync(dbSorting, int.MaxValue, 0, null);
+        var filteredTenants = await tenantRepository.GetListAsync(dbSorting, int.MaxValue, 0, input.Filter);
 
-        IEnumerable<Tenant> result = allTenants;
+        IEnumerable<Tenant> result = filteredTenants;
 
         // Apply ExtraProperties filter
         if (hasFilter)
@@ -131,21 +139,36 @@ private static string GetExtraPropertyValue(Tenant tenant, string key)
         return entry.Value?.ToString() ?? string.Empty;
     }
 
-    [Authorize(TenantManagementPermissions.Tenants.Create)]
+    [Authorize(TenantManagementPermissions.Policies.TenantsCreateOrITOps)]
     public virtual async Task<TenantDto> CreateAsync(TenantCreateDto input)
     {
-        Tenant tenant = null;
+        Tenant? tenant = null;
 
         using (var uow = unitOfWorkManager.Begin(true, false))
-        {            
+        {
             tenant = await tenantManager.CreateAsync(input.Name);
 
+            var credentials = await tenantConnectionStringBuilder.GenerateCredentialsAsync();
+
+            var plainConnectionString = tenantConnectionStringBuilder.Build(tenant.Name, credentials);
+            var encryptedConnectionString = stringEncryptionService.Encrypt(plainConnectionString);
+
             tenant.ConnectionStrings
                 .Add(new TenantConnectionString(tenant.Id,
                     UnityTenantManagementConsts.TenantConnectionStringName,
-                    tenantConnectionStringBuilder.Build(tenant.Name)));
+                    encryptedConnectionString));
+
+            var readOnlyCredentials = tenantConnectionStringBuilder.GenerateReadOnlyCredentials(credentials);
+            var plainReadOnlyConnectionString = tenantConnectionStringBuilder.Build(tenant.Name, readOnlyCredentials);
+            var encryptedReadOnlyConnectionString = stringEncryptionService.Encrypt(plainReadOnlyConnectionString);
+
+            tenant.ConnectionStrings
+                .Add(new TenantConnectionString(tenant.Id,
+                    UnityTenantManagementConsts.TenantReadOnlyConnectionStringName,
+                    encryptedReadOnlyConnectionString));
 
             // Set ExtraProperties from input
+            tenant.ExtraProperties[UnityTenantManagementConsts.TenantLicencePlateExtraPropertyKey] = credentials.DbName;
             tenant.ExtraProperties[ExtraPropDivision] = input.Division ?? string.Empty;
             tenant.ExtraProperties[ExtraPropBranch] = input.Branch ?? string.Empty;
             tenant.ExtraProperties[ExtraPropDescription] = input.Description ?? string.Empty;
@@ -164,7 +187,8 @@ await localEventBus.PublishAsync(
                     Name = tenant.Name,
                     Properties =
                     {
-                        { "UserIdentifier",  input.UserIdentifier }
+                        { "UserIdentifier", input.UserIdentifier },
+                        { "FeatureKeys", input.FeatureKeys ?? string.Empty }
                     }
                 }
             );
@@ -172,7 +196,7 @@ await localEventBus.PublishAsync(
         return ObjectMapper.Map<Tenant, TenantDto>(tenant);
     }
 
-    [Authorize(TenantManagementPermissions.Tenants.Update)]
+    [Authorize(TenantManagementPermissions.Policies.TenantsUpdateOrITOps)]
     public virtual async Task<TenantDto> UpdateAsync(Guid id, TenantUpdateDto input)
     {
         var tenant = await tenantRepository.GetAsync(id);
@@ -204,35 +228,12 @@ public virtual async Task DeleteAsync(Guid id)
         await tenantRepository.DeleteAsync(tenant);
     }
 
-    [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)]
-    public virtual async Task<string> GetDefaultConnectionStringAsync(Guid id)
-    {
-        var tenant = await tenantRepository.GetAsync(id);
-        return tenant?.FindDefaultConnectionString();
-    }
-
-    [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)]
-    public virtual async Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString)
-    {
-        var tenant = await tenantRepository.GetAsync(id);
-        tenant.SetDefaultConnectionString(defaultConnectionString);
-        await tenantRepository.UpdateAsync(tenant);
-    }
-
-    [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)]
-    public virtual async Task DeleteDefaultConnectionStringAsync(Guid id)
-    {
-        var tenant = await tenantRepository.GetAsync(id);
-        tenant.RemoveDefaultConnectionString();
-        await tenantRepository.UpdateAsync(tenant);
-    }
-
-    [RemoteService(false)]    
+    [RemoteService(false)]
     [AllowAnonymous]
     public async Task<string> GetCurrentTenantCasClientCodeAsync(Guid tenantId)
     {
         var tenant = tenantId != Guid.Empty ? await tenantRepository.GetAsync(tenantId) : null;
-        return tenant?.ExtraProperties.TryGetValue("CasClientCode", out var value) == true ? value?.ToString() : null;
+        return (tenant?.ExtraProperties.TryGetValue("CasClientCode", out var value) == true ? value?.ToString() : null)!;
     }
 
     public async Task<string> GetCurrentTenantName()
@@ -242,6 +243,7 @@ public async Task<string> GetCurrentTenantName()
         return tenant?.Name ?? string.Empty;
     }
 
+    [Authorize(TenantManagementPermissions.Policies.TenantsUpdateOrITOps)]
     public async Task AssignManagerAsync(TenantAssignManagerDto managerAssignment)
     {
         await localEventBus.PublishAsync(
@@ -252,4 +254,77 @@ await localEventBus.PublishAsync(
              }
          );
     }
+
+    [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)]
+    public async Task<TenantConnectionStringsDto> GetConnectionStringsAsync(Guid id)
+    {
+        var tenant = await tenantRepository.GetAsync(id, includeDetails: true);
+        return new TenantConnectionStringsDto
+        {
+            TenantConnectionString = TryDecryptConnectionString(
+                tenant.FindConnectionString(UnityTenantManagementConsts.TenantConnectionStringName)),
+            ReadOnlyConnectionString = TryDecryptConnectionString(
+                tenant.FindConnectionString(UnityTenantManagementConsts.TenantReadOnlyConnectionStringName))
+        };
+    }
+
+    [Authorize(TenantManagementPermissions.Tenants.ManageConnectionStrings)]
+    public async Task UpdateConnectionStringsAsync(Guid id, TenantConnectionStringsDto input)
+    {
+        var tenant = await tenantRepository.GetAsync(id, includeDetails: true);
+
+        if (!string.IsNullOrWhiteSpace(input.TenantConnectionString))
+        {
+            tenant.SetConnectionString(UnityTenantManagementConsts.TenantConnectionStringName,
+                stringEncryptionService.Encrypt(input.TenantConnectionString));
+        }
+
+        if (!string.IsNullOrWhiteSpace(input.ReadOnlyConnectionString))
+        {
+            tenant.SetConnectionString(UnityTenantManagementConsts.TenantReadOnlyConnectionStringName,
+                stringEncryptionService.Encrypt(input.ReadOnlyConnectionString));
+        }
+
+        await tenantRepository.UpdateAsync(tenant);
+    }
+
+    [Authorize(TenantManagementPermissions.Policies.TenantsUpdateOrITOps)]
+    public async Task<List<TenantManagerDto>> GetManagersAsync(Guid id)
+    {
+        using (currentTenant.Change(id))
+        {
+            var users = await IdentityUserRepository.GetListByNormalizedRoleNameAsync("PROGRAM_MANAGER");
+            return users.Select(u =>
+            {
+                var displayName = $"{u.Name} {u.Surname}".Trim();
+                return new TenantManagerDto
+                {
+                    DisplayName = string.IsNullOrEmpty(displayName) ? u.UserName : displayName,
+                    Email = u.Email ?? string.Empty
+                };
+            }).ToList();
+        }
+    }
+
+    private string? TryDecryptConnectionString(string? rawValue)
+    {
+        if (rawValue == null) return null;
+        if (PlainConnectionStringDetector.LooksLikePlainConnectionString(rawValue)) return rawValue;
+
+        try
+        {
+            return stringEncryptionService.Decrypt(rawValue);
+        }
+        catch (FormatException)
+        {
+            // Not valid base64, so it can't be ciphertext - it's plain text.
+            return rawValue;
+        }
+        catch (CryptographicException)
+        {
+            // Valid base64 but failed to decrypt (wrong passphrase/corrupted ciphertext) -
+            // fall back to the raw value rather than breaking the admin UI.
+            return rawValue;
+        }
+    }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/TenantConnectionStringBuilder.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/TenantConnectionStringBuilder.cs
index 1e83ae5238..7a0058bccf 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/TenantConnectionStringBuilder.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/TenantConnectionStringBuilder.cs
@@ -1,33 +1,120 @@
-using Microsoft.Extensions.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using Unity.TenantManagement.Application.Contracts;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
+using Volo.Abp.TenantManagement;
 
 namespace Unity.TenantManagement.Application
 {
     [RemoteService(false)]
     public class TenantConnectionStringBuilder : ApplicationService, ITenantConnectionStringBuilder
     {
+        private static readonly char[] Letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".ToCharArray();
+        private static readonly char[] Digits = "0123456789".ToCharArray();
+
+        // Deliberately excludes quote/backslash characters — the password is interpolated into
+        // a single-quoted SQL literal by EntityFrameworkCoreGrantManagerDbSchemaMigrator, so
+        // restricting the charset here removes that injection surface at the source rather than
+        // relying solely on escaping at the consuming end.
+        private static readonly char[] PasswordAlphabet =
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789".ToCharArray();
+
         private readonly IConfiguration _configuration;
+        private readonly ITenantRepository _tenantRepository;
 
-        public TenantConnectionStringBuilder(IConfiguration configuration)
+        public TenantConnectionStringBuilder(IConfiguration configuration, ITenantRepository tenantRepository)
         {
             _configuration = configuration;
+            _tenantRepository = tenantRepository;
+        }
+
+        public string Build(string tenantName, TenantDbCredentials credentials)
+        {
+            var baseConnectionString = _configuration.GetConnectionString(UnityTenantManagementConsts.TenantConnectionStringName)
+                ?? throw new UserFriendlyException("Connection string configuration error");
+
+            return ReplaceKeyValues(baseConnectionString, new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                ["Database"] = credentials.DbName,
+                ["Username"] = credentials.Username,
+                ["Password"] = credentials.Password
+            });
+        }
+
+        // Replaces connection string values by key (case-insensitive) while preserving
+        // the original key casing from the template (e.g. "Host" stays "Host", not "host").
+        private static string ReplaceKeyValues(string connectionString, Dictionary<string, string> replacements)
+        {
+            var parts = connectionString.Split(';');
+            for (int i = 0; i < parts.Length; i++)
+            {
+                var eq = parts[i].IndexOf('=');
+                if (eq > 0 && replacements.TryGetValue(parts[i][..eq].Trim(), out var newValue))
+                {
+                    parts[i] = $"{parts[i][..eq]}={newValue}";
+                }
+            }
+            return string.Join(";", parts);
         }
 
-        public string Build(string tenantName)
+        public async Task<TenantDbCredentials> GenerateCredentialsAsync()
         {
-            var connectionString = _configuration.GetConnectionString(UnityTenantManagementConsts.TenantConnectionStringName);
+            var allTenants = await _tenantRepository.GetListAsync(nameof(Tenant.Name), int.MaxValue, 0, null, includeDetails: true);
 
-            return connectionString == null
-                ? throw new UserFriendlyException("Connection string configuration error")
-                : connectionString
-                .Replace(UnityTenantManagementConsts.TenantConnectionStringTenantDb, PrepTenantName(tenantName));
+            var existingDbNames = allTenants
+                .Where(t => t.ExtraProperties.ContainsKey(UnityTenantManagementConsts.TenantLicencePlateExtraPropertyKey))
+                .Select(t => t.ExtraProperties[UnityTenantManagementConsts.TenantLicencePlateExtraPropertyKey]?.ToString() ?? "")
+                .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+            string dbName;
+            do
+            {
+                dbName = GenerateDbName();
+            }
+            while (existingDbNames.Contains(dbName));
+
+            return new TenantDbCredentials(dbName, dbName, GeneratePassword());
+        }
+
+        public TenantDbCredentials GenerateReadOnlyCredentials(TenantDbCredentials credentials)
+        {
+            return new TenantDbCredentials(credentials.DbName, $"{credentials.Username}_readonly", GeneratePassword());
+        }
+
+        private static string GenerateDbName()
+        {
+            // Format: T_XXX999 where X is A-Z and 9 is 0-9, e.g. T_ABC123
+            Span<char> chars =
+            [
+                'T',
+                '_',
+                Letters[RandomNumberGenerator.GetInt32(Letters.Length)],
+                Letters[RandomNumberGenerator.GetInt32(Letters.Length)],
+                Letters[RandomNumberGenerator.GetInt32(Letters.Length)],
+                Digits[RandomNumberGenerator.GetInt32(Digits.Length)],
+                Digits[RandomNumberGenerator.GetInt32(Digits.Length)],
+                Digits[RandomNumberGenerator.GetInt32(Digits.Length)]
+            ];
+            return new string(chars);
         }
 
-        private static string PrepTenantName(string tenantName)
+        private static string GeneratePassword()
         {
-            return tenantName.Trim().Replace(" ", "");
+            // 24 cryptographically random characters (mixed-case letters + digits) — generated
+            // via RandomNumberGenerator (CSPRNG), not the non-cryptographic Random.Shared, since
+            // this protects a live PostgreSQL login role's credentials.
+            const int length = 24;
+            Span<char> chars = new char[length];
+            for (var i = 0; i < length; i++)
+            {
+                chars[i] = PasswordAlphabet[RandomNumberGenerator.GetInt32(PasswordAlphabet.Length)];
+            }
+            return new string(chars);
         }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Unity.TenantManagement.Application.csproj b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Unity.TenantManagement.Application.csproj
index ece4db4b9b..37aa38e406 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Unity.TenantManagement.Application.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Unity.TenantManagement.Application.csproj
@@ -15,12 +15,16 @@
     <PackageReference Include="Volo.Abp.Mapperly" Version="10.3.0" />
     <PackageReference Include="Riok.Mapperly" Version="4.3.1" />
     <PackageReference Include="Volo.Abp.Ddd.Application" Version="10.3.0" />
+    <PackageReference Include="Volo.Abp.Identity.Domain" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="10.3.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="10.3.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Unity.TenantManagement.Application.Contracts\Unity.TenantManagement.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\Unity.SharedKernel\Unity.SharedKernel.csproj" />
+    <ProjectReference Include="..\..\..\Unity.Flex\src\Unity.Flex.Application.Contracts\Unity.Flex.Application.Contracts.csproj" />
   </ItemGroup>
 </Project>
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementApplicationModule.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementApplicationModule.cs
index 98cc1dbb0c..5c4344e95a 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementApplicationModule.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementApplicationModule.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Unity.Flex;
 using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
 using Volo.Abp.TenantManagement;
@@ -9,7 +10,8 @@ namespace Unity.TenantManagement
         typeof(AbpTenantManagementDomainModule),
         typeof(UnityTenantManagementApplicationContractsModule),
         typeof(AbpTenantManagementApplicationModule),
-        typeof(AbpMapperlyModule)
+        typeof(AbpMapperlyModule),
+        typeof(FlexApplicationContractsModule)
     )]
     public class UnityTenantManagementApplicationModule : AbpModule
     {
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementConsts.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementConsts.cs
index 0c6d6833fe..0e2275ea37 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementConsts.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementConsts.cs
@@ -4,6 +4,8 @@ public static class UnityTenantManagementConsts
     {
         public const string TenantConnectionStringName = "Tenant";
 
-        public const string TenantConnectionStringTenantDb = "UnityGrantTenant";
+        public const string TenantReadOnlyConnectionStringName = "Tenant_Readonly";
+
+        public const string TenantLicencePlateExtraPropertyKey = "LicencePlate";
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementMapperlyProfile.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementMapperlyProfile.cs
index 2d806371cf..c0af541474 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementMapperlyProfile.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/UnityTenantManagementMapperlyProfile.cs
@@ -20,6 +20,7 @@ public override void Map(Tenant source, TenantDto destination)
         destination.Name = source.Name;
         destination.ConcurrencyStamp = source.ConcurrencyStamp;
         destination.CasClientCode = GetExtraProperty(source, "CasClientCode") ?? string.Empty;
+        destination.LicencePlate = GetExtraProperty(source, "LicencePlate") ?? string.Empty;
         destination.Division = GetExtraProperty(source, "Division") ?? string.Empty;
         destination.Branch = GetExtraProperty(source, "Branch") ?? string.Empty;
         destination.Description = GetExtraProperty(source, "Description") ?? string.Empty;
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Validation/SuperUsersValidationStep.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Validation/SuperUsersValidationStep.cs
new file mode 100644
index 0000000000..7db1572c3c
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Validation/SuperUsersValidationStep.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.Flex.Worksheets.Values;
+using Volo.Abp;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.TenantManagement.Validation;
+
+[RemoteService(false)]
+[ExposeServices(typeof(IOnboardingValidationStep))]
+public class SuperUsersValidationStep(IOnboardingUserLookup userLookup)
+    : IOnboardingValidationStep, ITransientDependency
+{
+    public int Order => 20;
+    public string StepName => "Super Users";
+
+    public async Task<OnboardingValidationStepResult> ValidateAsync(OnboardingRequestDto request)
+    {
+        var emails = ParseEmails(request.SuperUsers);
+        if (emails.Length == 0)
+            return OnboardingValidationStepResult.Failure("No super user email addresses specified.");
+
+        foreach (var email in emails)
+        {
+            var guid = await userLookup.FindUserGuidByEmailAsync(email);
+            if (!string.IsNullOrWhiteSpace(guid))
+                return OnboardingValidationStepResult.Success();
+        }
+
+        return OnboardingValidationStepResult.Failure(
+            "None of the specified super user email addresses could be found in the directory.");
+    }
+
+    internal static string[] ParseEmails(string superUsers)
+    {
+        var dataGridEmails = ParseDataGridEmails(superUsers);
+        if (dataGridEmails.Length > 0)
+            return dataGridEmails;
+
+        return [.. superUsers.Split([',', ';', '|'], StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).Where(e => e.Contains('@'))];
+    }
+
+    // Formio/CHEFS "Super Users" fields are submitted as a DataGrid: one row per super user, with
+    // columns such as name/email/title. The email column's key varies per worksheet (e.g.
+    // "s03_SuperUserEmail"), so it's matched by name rather than a fixed key.
+    private static string[] ParseDataGridEmails(string superUsers)
+    {
+        DataGridRowsValue grid;
+        try
+        {
+            grid = JsonSerializer.Deserialize<DataGridRowsValue>(superUsers);
+        }
+        catch (JsonException)
+        {
+            return [];
+        }
+
+        if (grid?.Rows is not { Count: > 0 }) return [];
+
+        return [.. grid.Rows
+            .Select(r => r.Cells.FirstOrDefault(c => c.Key.Contains("email", StringComparison.OrdinalIgnoreCase))?.Value)
+            .Where(v => !string.IsNullOrWhiteSpace(v) && v.Contains('@'))
+            .Select(v => v!.Trim())];
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Validation/TenantNameUniquenessStep.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Validation/TenantNameUniquenessStep.cs
new file mode 100644
index 0000000000..3717b1a57b
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Application/Validation/TenantNameUniquenessStep.cs
@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.TenantManagement;
+
+namespace Unity.TenantManagement.Validation;
+
+[RemoteService(false)]
+[ExposeServices(typeof(IOnboardingValidationStep))]
+public class TenantNameUniquenessStep(ITenantRepository tenantRepository)
+    : IOnboardingValidationStep, ITransientDependency
+{
+    public int Order => 10;
+    public string StepName => "Tenant Name";
+
+    public async Task<OnboardingValidationStepResult> ValidateAsync(OnboardingRequestDto request)
+    {
+        if (string.IsNullOrWhiteSpace(request.TenantName))
+            return OnboardingValidationStepResult.Failure("Tenant name is required.");
+
+        // FindByNameAsync matches against NormalizedName (stored as ToUpper())
+        var existing = await tenantRepository.FindByNameAsync(request.TenantName.ToUpper());
+        return existing is not null
+            ? OnboardingValidationStepResult.Failure($"A tenant named '{request.TenantName}' already exists.")
+            : OnboardingValidationStepResult.Success();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/TenantClientProxy.Generated.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/TenantClientProxy.Generated.cs
index 8afbfed3f6..187ad02c74 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/TenantClientProxy.Generated.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/TenantClientProxy.Generated.cs
@@ -53,28 +53,4 @@ public virtual async Task DeleteAsync(Guid id)
         });
     }
 
-    public virtual async Task<string> GetDefaultConnectionStringAsync(Guid id)
-    {
-        return await RequestAsync<string>(nameof(GetDefaultConnectionStringAsync), new ClientProxyRequestTypeValue
-        {
-            { typeof(Guid), id }
-        });
-    }
-
-    public virtual async Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString)
-    {
-        await RequestAsync(nameof(UpdateDefaultConnectionStringAsync), new ClientProxyRequestTypeValue
-        {
-            { typeof(Guid), id },
-            { typeof(string), defaultConnectionString }
-        });
-    }
-
-    public virtual async Task DeleteDefaultConnectionStringAsync(Guid id)
-    {
-        await RequestAsync(nameof(DeleteDefaultConnectionStringAsync), new ClientProxyRequestTypeValue
-        {
-            { typeof(Guid), id }
-        });
-    }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/TenantClientProxy.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/TenantClientProxy.cs
index c834e39e03..bdd9379c6d 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/TenantClientProxy.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/TenantClientProxy.cs
@@ -1,5 +1,7 @@
 // This file is part of TenantClientProxy, you can customize it here
 // ReSharper disable once CheckNamespace
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Http.Client.ClientProxying;
 
@@ -7,6 +9,14 @@ namespace Unity.TenantManagement;
 
 public partial class TenantClientProxy
 {
+    public virtual async Task<List<TenantManagerDto>> GetManagersAsync(Guid id)
+    {
+        return await RequestAsync<List<TenantManagerDto>>(nameof(GetManagersAsync), new ClientProxyRequestTypeValue
+        {
+            { typeof(Guid), id }
+        });
+    }
+
     public virtual async Task AssignManagerAsync(TenantAssignManagerDto managerAssignment)
     {
         await RequestAsync(nameof(AssignManagerAsync), new ClientProxyRequestTypeValue
@@ -14,4 +24,21 @@ public virtual async Task AssignManagerAsync(TenantAssignManagerDto managerAssig
             { typeof(TenantAssignManagerDto), managerAssignment }
         });
     }
+
+    public virtual async Task<TenantConnectionStringsDto> GetConnectionStringsAsync(Guid id)
+    {
+        return await RequestAsync<TenantConnectionStringsDto>(nameof(GetConnectionStringsAsync), new ClientProxyRequestTypeValue
+        {
+            { typeof(Guid), id }
+        });
+    }
+
+    public virtual async Task UpdateConnectionStringsAsync(Guid id, TenantConnectionStringsDto input)
+    {
+        await RequestAsync(nameof(UpdateConnectionStringsAsync), new ClientProxyRequestTypeValue
+        {
+            { typeof(Guid), id },
+            { typeof(TenantConnectionStringsDto), input }
+        });
+    }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/multi-tenancy-generate-proxy.json b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/multi-tenancy-generate-proxy.json
index 44e4a7eeb5..97c9abf536 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/multi-tenancy-generate-proxy.json
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi.Client/ClientProxies/multi-tenancy-generate-proxy.json
@@ -16,65 +16,6 @@
               "type": "Unity.TenantManagement.ITenantAppService",
               "name": "ITenantAppService",
               "methods": [
-                {
-                  "name": "GetDefaultConnectionStringAsync",
-                  "parametersOnMethod": [
-                    {
-                      "name": "id",
-                      "typeAsString": "System.Guid, System.Private.CoreLib",
-                      "type": "System.Guid",
-                      "typeSimple": "string",
-                      "isOptional": false,
-                      "defaultValue": null
-                    }
-                  ],
-                  "returnValue": {
-                    "type": "System.String",
-                    "typeSimple": "string"
-                  }
-                },
-                {
-                  "name": "UpdateDefaultConnectionStringAsync",
-                  "parametersOnMethod": [
-                    {
-                      "name": "id",
-                      "typeAsString": "System.Guid, System.Private.CoreLib",
-                      "type": "System.Guid",
-                      "typeSimple": "string",
-                      "isOptional": false,
-                      "defaultValue": null
-                    },
-                    {
-                      "name": "defaultConnectionString",
-                      "typeAsString": "System.String, System.Private.CoreLib",
-                      "type": "System.String",
-                      "typeSimple": "string",
-                      "isOptional": false,
-                      "defaultValue": null
-                    }
-                  ],
-                  "returnValue": {
-                    "type": "System.Void",
-                    "typeSimple": "System.Void"
-                  }
-                },
-                {
-                  "name": "DeleteDefaultConnectionStringAsync",
-                  "parametersOnMethod": [
-                    {
-                      "name": "id",
-                      "typeAsString": "System.Guid, System.Private.CoreLib",
-                      "type": "System.Guid",
-                      "typeSimple": "string",
-                      "isOptional": false,
-                      "defaultValue": null
-                    }
-                  ],
-                  "returnValue": {
-                    "type": "System.Void",
-                    "typeSimple": "System.Void"
-                  }
-                },
                 {
                   "name": "GetAsync",
                   "parametersOnMethod": [
@@ -412,137 +353,6 @@
               },
               "allowAnonymous": null,
               "implementFrom": "Unity.Application.Services.IDeleteAppService<System.Guid>"
-            },
-            "GetDefaultConnectionStringAsyncById": {
-              "uniqueName": "GetDefaultConnectionStringAsyncById",
-              "name": "GetDefaultConnectionStringAsync",
-              "httpMethod": "GET",
-              "url": "api/multi-tenancy/tenants/{id}/default-connection-string",
-              "supportedVersions": [],
-              "parametersOnMethod": [
-                {
-                  "name": "id",
-                  "typeAsString": "System.Guid, System.Private.CoreLib",
-                  "type": "System.Guid",
-                  "typeSimple": "string",
-                  "isOptional": false,
-                  "defaultValue": null
-                }
-              ],
-              "parameters": [
-                {
-                  "nameOnMethod": "id",
-                  "name": "id",
-                  "jsonName": null,
-                  "type": "System.Guid",
-                  "typeSimple": "string",
-                  "isOptional": false,
-                  "defaultValue": null,
-                  "constraintTypes": [],
-                  "bindingSourceId": "Path",
-                  "descriptorName": ""
-                }
-              ],
-              "returnValue": {
-                "type": "System.String",
-                "typeSimple": "string"
-              },
-              "allowAnonymous": null,
-              "implementFrom": "Unity.TenantManagement.ITenantAppService"
-            },
-            "UpdateDefaultConnectionStringAsyncByIdAndDefaultConnectionString": {
-              "uniqueName": "UpdateDefaultConnectionStringAsyncByIdAndDefaultConnectionString",
-              "name": "UpdateDefaultConnectionStringAsync",
-              "httpMethod": "PUT",
-              "url": "api/multi-tenancy/tenants/{id}/default-connection-string",
-              "supportedVersions": [],
-              "parametersOnMethod": [
-                {
-                  "name": "id",
-                  "typeAsString": "System.Guid, System.Private.CoreLib",
-                  "type": "System.Guid",
-                  "typeSimple": "string",
-                  "isOptional": false,
-                  "defaultValue": null
-                },
-                {
-                  "name": "defaultConnectionString",
-                  "typeAsString": "System.String, System.Private.CoreLib",
-                  "type": "System.String",
-                  "typeSimple": "string",
-                  "isOptional": false,
-                  "defaultValue": null
-                }
-              ],
-              "parameters": [
-                {
-                  "nameOnMethod": "id",
-                  "name": "id",
-                  "jsonName": null,
-                  "type": "System.Guid",
-                  "typeSimple": "string",
-                  "isOptional": false,
-                  "defaultValue": null,
-                  "constraintTypes": [],
-                  "bindingSourceId": "Path",
-                  "descriptorName": ""
-                },
-                {
-                  "nameOnMethod": "defaultConnectionString",
-                  "name": "defaultConnectionString",
-                  "jsonName": null,
-                  "type": "System.String",
-                  "typeSimple": "string",
-                  "isOptional": false,
-                  "defaultValue": null,
-                  "constraintTypes": null,
-                  "bindingSourceId": "ModelBinding",
-                  "descriptorName": ""
-                }
-              ],
-              "returnValue": {
-                "type": "System.Void",
-                "typeSimple": "System.Void"
-              },
-              "allowAnonymous": null,
-              "implementFrom": "Unity.TenantManagement.ITenantAppService"
-            },
-            "DeleteDefaultConnectionStringAsyncById": {
-              "uniqueName": "DeleteDefaultConnectionStringAsyncById",
-              "name": "DeleteDefaultConnectionStringAsync",
-              "httpMethod": "DELETE",
-              "url": "api/multi-tenancy/tenants/{id}/default-connection-string",
-              "supportedVersions": [],
-              "parametersOnMethod": [
-                {
-                  "name": "id",
-                  "typeAsString": "System.Guid, System.Private.CoreLib",
-                  "type": "System.Guid",
-                  "typeSimple": "string",
-                  "isOptional": false,
-                  "defaultValue": null
-                }
-              ],
-              "parameters": [
-                {
-                  "nameOnMethod": "id",
-                  "name": "id",
-                  "jsonName": null,
-                  "type": "System.Guid",
-                  "typeSimple": "string",
-                  "isOptional": false,
-                  "defaultValue": null,
-                  "constraintTypes": [],
-                  "bindingSourceId": "Path",
-                  "descriptorName": ""
-                }
-              ],
-              "returnValue": {
-                "type": "System.Void",
-                "typeSimple": "System.Void"
-              },
-              "allowAnonymous": null,
-              "implementFrom": "Unity.TenantManagement.ITenantAppService"
             }
           }
         }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi/OnboardingRequestController.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi/OnboardingRequestController.cs
new file mode 100644
index 0000000000..e00ada72a8
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi/OnboardingRequestController.cs
@@ -0,0 +1,69 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace Unity.TenantManagement;
+
+[Controller]
+[RemoteService(Name = TenantManagementRemoteServiceConsts.RemoteServiceName)]
+[Area(TenantManagementRemoteServiceConsts.ModuleName)]
+[Route("api/onboarding-requests")]
+public class OnboardingRequestController(IOnboardingRequestAppService onboardingRequestAppService)
+    : AbpControllerBase, IOnboardingRequestAppService
+{
+    protected IOnboardingRequestAppService OnboardingRequestAppService { get; } = onboardingRequestAppService;
+
+    [HttpGet]
+    public virtual Task<PagedResultDto<OnboardingRequestDto>> GetListAsync([FromQuery] OnboardingListRequestDto input)
+    {
+        if (!ModelState.IsValid) throw new UserFriendlyException("OnboardingRequestController->GetListAsync: ModelState Invalid");
+        return OnboardingRequestAppService.GetListAsync(input);
+    }
+
+    [HttpGet("{id}")]
+    public virtual Task<OnboardingRequestDto?> GetAsync(Guid id)
+    {
+        if (!ModelState.IsValid) throw new UserFriendlyException("OnboardingRequestController->GetAsync: ModelState Invalid");
+        return OnboardingRequestAppService.GetAsync(id);
+    }
+
+    [HttpGet("{id}/validate")]
+    public virtual Task<OnboardingValidationResultDto> ValidateAsync(
+        Guid id,
+        [FromQuery] string? tenantNameFieldKey = null,
+        [FromQuery] string? superUsersFieldKey = null,
+        [FromQuery] string? branchFieldKey = null,
+        [FromQuery] string? featuresFieldKey = null,
+        [FromQuery] string? ministryFieldKey = null,
+        [FromQuery] string? programAreaFieldKey = null)
+    {
+        if (!ModelState.IsValid) throw new UserFriendlyException("OnboardingRequestController->ValidateAsync: ModelState Invalid");
+        return OnboardingRequestAppService.ValidateAsync(id, tenantNameFieldKey, superUsersFieldKey, branchFieldKey, featuresFieldKey, ministryFieldKey, programAreaFieldKey);
+    }
+
+    [HttpPost("{id}/create-tenant")]
+    public virtual Task CreateTenantAsync(Guid id, [FromBody] CreateTenantInputDto? input = null)
+    {
+        if (!ModelState.IsValid) throw new UserFriendlyException("OnboardingRequestController->CreateTenantAsync: ModelState Invalid");
+        return OnboardingRequestAppService.CreateTenantAsync(id, input);
+    }
+
+    [HttpGet("column-schema")]
+    public virtual Task<OnboardingColumnSchemaDto> GetColumnSchemaAsync([FromQuery] string? category = null)
+    {
+        if (!ModelState.IsValid) throw new UserFriendlyException("OnboardingRequestController->GetColumnSchemaAsync: ModelState Invalid");
+        return OnboardingRequestAppService.GetColumnSchemaAsync(category);
+    }
+
+    [HttpGet("categories")]
+    public virtual Task<List<string>> GetAvailableCategoriesAsync()
+    {
+        if (!ModelState.IsValid) throw new UserFriendlyException("OnboardingRequestController->GetAvailableCategoriesAsync: ModelState Invalid");
+        return OnboardingRequestAppService.GetAvailableCategoriesAsync();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi/TenantController.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi/TenantController.cs
index f87e1706bf..e036ba383c 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi/TenantController.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.HttpApi/TenantController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
@@ -69,46 +70,46 @@ public virtual Task DeleteAsync(Guid id)
     }
 
     [HttpGet]
-    [Route("{id}/default-connection-string")]
-    public virtual Task<string> GetDefaultConnectionStringAsync(Guid id)
+    [Route("{id}/managers")]
+    public virtual Task<List<TenantManagerDto>> GetManagersAsync(Guid id)
     {
         if (!ModelState.IsValid)
         {
-            throw new UserFriendlyException("TenantController->GetDefaultConnectionStringAsync: ModelState Invalid");
+            throw new UserFriendlyException("TenantController->GetManagersAsync: ModelState Invalid");
         }
-        return TenantAppService.GetDefaultConnectionStringAsync(id);
+        return TenantAppService.GetManagersAsync(id);
     }
 
     [HttpPut]
-    [Route("{id}/default-connection-string")]
-    public virtual Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString)
+    [Route("assign-manager")]
+    public virtual Task AssignManagerAsync(TenantAssignManagerDto managerAssignment)
     {
         if (!ModelState.IsValid)
         {
-            throw new UserFriendlyException("TenantController->UpdateDefaultConnectionStringAsync: ModelState Invalid");
+            throw new UserFriendlyException("TenantController->AssignManagerAsync: ModelState Invalid");
         }
-        return TenantAppService.UpdateDefaultConnectionStringAsync(id, defaultConnectionString);
+        return TenantAppService.AssignManagerAsync(managerAssignment);
     }
 
-    [HttpDelete]
-    [Route("{id}/default-connection-string")]
-    public virtual Task DeleteDefaultConnectionStringAsync(Guid id)
+    [HttpGet]
+    [Route("{id}/connection-strings")]
+    public virtual Task<TenantConnectionStringsDto> GetConnectionStringsAsync(Guid id)
     {
         if (!ModelState.IsValid)
         {
-            throw new UserFriendlyException("TenantController->DeleteDefaultConnectionStringAsync: ModelState Invalid");
+            throw new UserFriendlyException("TenantController->GetConnectionStringsAsync: ModelState Invalid");
         }
-        return TenantAppService.DeleteDefaultConnectionStringAsync(id);
+        return TenantAppService.GetConnectionStringsAsync(id);
     }
 
     [HttpPut]
-    [Route("assign-manager")]
-    public virtual Task AssignManagerAsync(TenantAssignManagerDto managerAssignment)
+    [Route("{id}/connection-strings")]
+    public virtual Task UpdateConnectionStringsAsync(Guid id, [FromBody] TenantConnectionStringsDto input)
     {
         if (!ModelState.IsValid)
         {
-            throw new UserFriendlyException("TenantController->AssignManagerAsync: ModelState Invalid");
+            throw new UserFriendlyException("TenantController->UpdateConnectionStringsAsync: ModelState Invalid");
         }
-        return TenantAppService.AssignManagerAsync(managerAssignment);
+        return TenantAppService.UpdateConnectionStringsAsync(id, input);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs
index 007c2d6ab7..9c44cbbddd 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Navigation/TenantManagementMenuNames.cs
@@ -7,4 +7,5 @@ public static class TenantManagementMenuNames
     public const string Tenants = GroupName + ".Tenants";
     public const string Endpoints = GroupName + ".Endpoints";
     public const string Reconciliation = GroupName + ".Reconciliation";
+    public const string Onboarding = GroupName + ".Onboarding";
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Navigation/UnityTenantManagementWebMainMenuContributor.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Navigation/UnityTenantManagementWebMainMenuContributor.cs
index 519a5fbeee..9915343860 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Navigation/UnityTenantManagementWebMainMenuContributor.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Navigation/UnityTenantManagementWebMainMenuContributor.cs
@@ -1,17 +1,18 @@
 using System.Threading.Tasks;
+using Unity.Modules.Shared.Navigation;
+using Unity.Modules.Shared.Permissions;
 using Volo.Abp.TenantManagement.Localization;
 using Volo.Abp.UI.Navigation;
-using Volo.Abp.Authorization.Permissions;
 
 namespace Unity.TenantManagement.Web.Navigation;
 
 public class AbpTenantManagementWebMainMenuContributor : IMenuContributor
 {
-    public virtual Task ConfigureMenuAsync(MenuConfigurationContext context)
+    public virtual async Task ConfigureMenuAsync(MenuConfigurationContext context)
     {
         if (context.Menu.Name != StandardMenus.Main)
         {
-            return Task.CompletedTask;
+            return;
         }
 
         var administrationMenu = context.Menu.GetAdministration();
@@ -21,8 +22,10 @@ public virtual Task ConfigureMenuAsync(MenuConfigurationContext context)
         var tenantManagementMenuItem = new ApplicationMenuItem(TenantManagementMenuNames.GroupName, l["Menu:TenantManagement"], icon: "fa fa-users");
         administrationMenu.AddItem(tenantManagementMenuItem);
 
-        tenantManagementMenuItem.AddItem(new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "~/TenantManagement/Tenants").RequirePermissions(TenantManagementPermissions.Tenants.Default));
-
-        return Task.CompletedTask;
+        await tenantManagementMenuItem.AddItemAsync(
+            context.ServiceProvider,
+            new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "~/TenantManagement/Tenants")
+                .OnlyWhenInRole(IdentityConsts.ITAdminRoleName, IdentityConsts.ITOperationsRoleName)
+        );
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/CreateTenantModal.cshtml b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/CreateTenantModal.cshtml
new file mode 100644
index 0000000000..f396127cdf
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/CreateTenantModal.cshtml
@@ -0,0 +1,103 @@
+@page
+@using Microsoft.AspNetCore.Mvc.Localization
+@using Unity.GrantManager.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@using Unity.TenantManagement
+@using Unity.TenantManagement.Web.Pages.TenantManagement.Onboarding
+@model CreateTenantModalModel
+@inject IHtmlLocalizer<GrantManagerResource> L
+@{
+    Layout = null;
+}
+<abp-modal size="Large">
+    <abp-modal-header title="@L["CreateTenantModal:Title"].Value"></abp-modal-header>
+    <abp-modal-body>
+
+        <script id="create-tenant-fields-json" type="application/json">@Html.Raw(System.Text.Json.JsonSerializer.Serialize(Model.OnboardingRequest!.Fields))</script>
+
+        <div id="create-tenant-field-mapping" style="display:none;">
+            <div class="row g-2 mb-3">
+                <div class="col-12">
+                    <label for="create-tenant-ministry-field" class="form-label small mb-1">@L["CreateTenantModal:Ministry"]</label>
+                    <div class="input-group input-group-sm">
+                        <select id="create-tenant-ministry-field" class="form-select form-select-sm" style="flex:0 0 50%;">
+                            <option value="">@L["CreateTenantModal:MappingPlaceholder"]</option>
+                        </select>
+                        <span id="create-tenant-ministry-value" class="input-group-text text-muted fst-italic" style="flex:0 0 50%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;"></span>
+                    </div>
+                </div>
+                <div class="col-12">
+                    <label for="create-tenant-branch-field" class="form-label small mb-1">@L["CreateTenantModal:Branch"]</label>
+                    <div class="input-group input-group-sm">
+                        <select id="create-tenant-branch-field" class="form-select form-select-sm" style="flex:0 0 50%;">
+                            <option value="">@L["CreateTenantModal:MappingPlaceholder"]</option>
+                        </select>
+                        <span id="create-tenant-branch-value" class="input-group-text text-muted fst-italic" style="flex:0 0 50%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;"></span>
+                    </div>
+                </div>
+                <div class="col-12">
+                    <label for="create-tenant-program-area-field" class="form-label small mb-1">@L["CreateTenantModal:ProgramArea"]</label>
+                    <div class="input-group input-group-sm">
+                        <select id="create-tenant-program-area-field" class="form-select form-select-sm" style="flex:0 0 50%;">
+                            <option value="">@L["CreateTenantModal:MappingPlaceholder"]</option>
+                        </select>
+                        <span id="create-tenant-program-area-value" class="input-group-text text-muted fst-italic" style="flex:0 0 50%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;"></span>
+                    </div>
+                </div>
+                <div class="col-12">
+                    <label for="create-tenant-features-field" class="form-label small mb-1">@L["CreateTenantModal:Features"]</label>
+                    <div class="input-group input-group-sm" style="align-items:flex-start;">
+                        <select id="create-tenant-features-field" class="form-select form-select-sm" style="flex:0 0 50%;">
+                            <option value="">@L["CreateTenantModal:MappingPlaceholder"]</option>
+                        </select>
+                        <span id="create-tenant-features-value" class="input-group-text" style="flex:0 0 50%; height:auto; flex-wrap:wrap; row-gap:4px;"></span>
+                    </div>
+                </div>
+                <div class="col-12">
+                    <label for="create-tenant-tenant-name-field" class="form-label small mb-1">@L["CreateTenantModal:TenantNameFieldLabel"]</label>
+                    <div class="input-group input-group-sm">
+                        <select id="create-tenant-tenant-name-field" class="form-select form-select-sm" style="flex:0 0 50%;">
+                            <option value="">@L["CreateTenantModal:MappingPlaceholder"]</option>
+                        </select>
+                        <span id="create-tenant-tenant-name-value" class="input-group-text text-muted fst-italic" style="flex:0 0 50%; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;"></span>
+                    </div>
+                </div>
+                <div class="col-12">
+                    <label for="create-tenant-super-users-field" class="form-label small mb-1">@L["CreateTenantModal:SuperUsersFieldLabel"]</label>
+                    <div class="input-group input-group-sm" style="align-items:flex-start;">
+                        <select id="create-tenant-super-users-field" class="form-select form-select-sm" style="flex:0 0 50%;">
+                            <option value="">@L["CreateTenantModal:MappingPlaceholder"]</option>
+                        </select>
+                        <span id="create-tenant-super-users-value" class="input-group-text text-muted fst-italic" style="flex:0 0 50%; display:block; height:auto; white-space:normal; overflow-wrap:break-word;"></span>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div id="onboarding-validation-loading" class="text-muted">
+            <span class="spinner-border spinner-border-sm me-2"></span>
+            @L["CreateTenantModal:Validating"]
+        </div>
+        <div id="onboarding-validation-result" class="d-none"></div>
+
+        <div id="onboarding-creating" class="d-none mt-3">
+            <div class="d-flex align-items-center text-muted mb-2">
+                <span class="spinner-border spinner-border-sm me-2"></span>
+                @L["CreateTenantModal:CreatingSpinner"]
+            </div>
+            <div class="alert alert-info mb-0 small">
+                <strong>@L["CreateTenantModal:CreatingWarningTitle"]</strong>
+                @L["CreateTenantModal:CreatingWarningBody"]
+            </div>
+        </div>
+
+    </abp-modal-body>
+    <abp-modal-footer>
+        <button type="button" id="btn-confirm-create-tenant" class="btn btn-primary" disabled>
+            @L["CreateTenantModal:ConfirmButton"]
+        </button>
+        <button type="button" id="btn-cancel-create-tenant" class="btn btn-secondary" data-bs-dismiss="modal">
+            @L["Common:Command:Cancel"]
+        </button>
+    </abp-modal-footer>
+</abp-modal>
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/CreateTenantModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/CreateTenantModal.cshtml.cs
new file mode 100644
index 0000000000..bf3d068f36
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/CreateTenantModal.cshtml.cs
@@ -0,0 +1,25 @@
+#nullable enable
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Unity.Modules.Shared.Permissions;
+
+namespace Unity.TenantManagement.Web.Pages.TenantManagement.Onboarding;
+
+[Authorize(IdentityConsts.ITOperationsPolicyName)]
+public class CreateTenantModalModel(IOnboardingRequestAppService onboardingRequestAppService)
+    : OnboardingPageModel
+{
+    [BindProperty(SupportsGet = true)]
+    public Guid Id { get; set; }
+
+    public OnboardingRequestDto? OnboardingRequest { get; set; }
+
+    public virtual async Task<IActionResult> OnGetAsync()
+    {
+        OnboardingRequest = await onboardingRequestAppService.GetAsync(Id);
+        if (OnboardingRequest == null) return NotFound();
+        return Page();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.cshtml
new file mode 100644
index 0000000000..f134a44543
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.cshtml
@@ -0,0 +1,48 @@
+@page
+@using Microsoft.AspNetCore.Mvc.Localization
+@using Unity.GrantManager.Localization
+@using Unity.TenantManagement.Web.Navigation
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@using Unity.TenantManagement.Web.Pages.TenantManagement.Onboarding
+@model IndexModel
+@inject IHtmlLocalizer<GrantManagerResource> L
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.BreadCrumb.Add(L["Menu:Onboarding"].Value);
+    PageLayout.Content.MenuItemName = TenantManagementMenuNames.Onboarding;
+    ViewBag.PageTitle = L["Menu:Onboarding"].Value;
+}
+@section styles {
+    <abp-style src="/Views/Shared/Components/ActionBar/Default.css" />
+    <style>
+        #OnboardingRequestsTable tbody tr { cursor: pointer; }
+    </style>
+}
+@section scripts {
+    <abp-script-bundle name="@typeof(IndexModel).FullName">
+        <abp-script src="/client-proxies/multi-tenancy-proxy.js" />
+        <abp-script src="/Pages/TenantManagement/Onboarding/Index.js" />
+    </abp-script-bundle>
+}
+<div class="container-fluid px-2">
+    <div class="action-bar p-2 search-action-bar">
+        <div class="search-action-bar_search-wrapper">
+            <input type="search" id="search" placeholder="@L["Common:Command:Search"]" aria-label="@L["Common:Command:Search"]" class="tbl-search">
+        </div>
+        <div class="d-flex align-items-center gap-2 ms-2">
+            <label for="onboarding-category-filter" class="form-label mb-0 text-nowrap small">@L["OnboardingList:CategoryLabel"]</label>
+            <select id="onboarding-category-filter" class="form-select form-select-sm" style="min-width:140px"></select>
+        </div>
+        <div class="btn-group">
+            <button id="btn-open-onboarding"
+                    data-selector="onboarding-table-actions"
+                    class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable">@L["OnboardingList:OpenButton"]</button>
+            <button id="btn-create-tenant"
+                    data-selector="onboarding-table-actions"
+                    class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable">@L["OnboardingList:CreateTenantButton"]</button>
+            <button id="btn-toggle-filter" class="custom-table-btn flex-none btn btn-secondary">@L["OnboardingList:FilterButton"]</button>
+        </div>
+        <div id="dynamicButtonContainerId"></div>
+    </div>
+    <abp-table id="OnboardingRequestsTable" striped-rows="false" class="nowrap"></abp-table>
+</div>
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.cshtml.cs
new file mode 100644
index 0000000000..ce8af35a00
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.cshtml.cs
@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Authorization;
+using Unity.Modules.Shared.Permissions;
+
+namespace Unity.TenantManagement.Web.Pages.TenantManagement.Onboarding;
+
+[Authorize(IdentityConsts.ITOperationsPolicyName)]
+public class IndexModel : OnboardingPageModel
+{
+    public void OnGet() { }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.js b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.js
new file mode 100644
index 0000000000..eb7317d294
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.js
@@ -0,0 +1,622 @@
+(function () {
+    let l = abp.localization.getResource('GrantManager');
+    let _onboardingRequestAppService = unity.tenantManagement.onboardingRequest;
+    let _dataTable = null;
+    let _selectedRow = null;
+    let _selectedCategory = 'Onboarding';
+
+    const CATEGORY_STORAGE_KEY = 'Onboarding_SelectedCategory';
+
+    // ─── Fixed columns (always present) ──────────────────────────────────────
+
+    const FIXED_COLUMNS = [
+        {
+            title: l('Onboarding:ColumnSubmissionNumber'),
+            data: 'submissionNumber',
+            name: 'submissionNumber',
+            index: 0,
+            render: function (data, type, row) {
+                if (type !== 'display') return data ?? '';
+                return '<a href="/GrantApplications/Details?ApplicationId=' + row.id + '">' + _escapeHtml(data) + '</a>';
+            }
+        },
+        { title: l('Onboarding:ColumnStatus'),           data: 'status',           name: 'status',           index: 1 },
+        {
+            title: l('Onboarding:ColumnSubmissionDate'),
+            data: 'submissionDate',
+            name: 'submissionDate',
+            index: 2,
+            render: function (data, type) {
+                return DateUtils.formatUtcDateToLocal(data, type);
+            }
+        },
+        { title: l('Onboarding:ColumnCategory'), data: 'category', name: 'category', index: 3 }
+    ];
+
+    // ─── Field value renderers ────────────────────────────────────────────────
+
+    function _escapeHtml(str) {
+        return String(str)
+            .replaceAll('&', '&amp;')
+            .replaceAll('<', '&lt;')
+            .replaceAll('>', '&gt;')
+            .replaceAll('"', '&quot;');
+    }
+
+    function _formatCheckboxKey(key) {
+        return String(key)
+            .replaceAll(/([a-z])([A-Z])/g, '$1 $2')
+            .replaceAll(/\b\w/g, function (c) { return c.toUpperCase(); });
+    }
+
+    // Worksheet CheckboxGroup values are always serialized as [{key, value}, ...].
+    function _extractCheckboxLabels(data) {
+        if (data === null || data === undefined || data === '') return [];
+        try {
+            const items = JSON.parse(data);
+            if (Array.isArray(items)) {
+                return items.filter(function (i) { return i?.value === true; }).map(function (i) { return i.key; });
+            }
+        } catch {
+            // not a CheckboxGroup value
+        }
+        return [];
+    }
+
+    function _renderCheckboxGroup(data, type) {
+        // No value submitted at all for this field — leave the cell blank, as opposed to
+        // data being present but resolving to zero checked labels (handled below).
+        if (data === null || data === undefined || data === '') return '';
+
+        const labels = _extractCheckboxLabels(data);
+
+        if (type === 'sort' || type === 'filter' || type === 'type') {
+            return labels.join(', ');
+        }
+
+        if (labels.length === 0) return '<span class="text-muted">—</span>';
+
+        return labels.map(function (label) {
+            return '<span class="badge rounded-pill bg-light text-dark border me-1 onboarding-checkbox-badge">'
+                + _escapeHtml(_formatCheckboxKey(label))
+                + '</span>';
+        }).join('');
+    }
+
+    // ─── Super Users DataGrid email extraction ───────────────────────────────
+
+    // Formio/CHEFS "Super Users" fields are submitted as a DataGrid: one row per super
+    // user, with columns such as name/email/title. The email column's key varies per
+    // worksheet (e.g. "s03_SuperUserEmail"), so it's matched by name rather than a fixed
+    // key — mirrors SuperUsersValidationStep.ParseEmails on the server.
+    // Returns null when `raw` isn't a DataGrid value at all (legacy plain-text field).
+    function _extractDataGridEmails(raw) {
+        if (!raw) return null;
+        let parsed;
+        try { parsed = typeof raw === 'string' ? JSON.parse(raw) : raw; } catch { return null; }
+        if (!parsed || !Array.isArray(parsed.rows)) return null;
+
+        return parsed.rows
+            .map(function (row) {
+                const cell = (row.cells || []).find(function (c) { return /email/i.test(c.key || ''); });
+                return cell ? String(cell.value || '').trim() : '';
+            })
+            .filter(function (v) { return v.includes('@'); });
+    }
+
+    // ─── DOM-based preview builders ──────────────────────────────────────────
+    // Used by _updateFieldPreview below, which injects these via DOM append rather than
+    // .html() — these build real elements with jQuery's .text() for any dynamic content
+    // (the worksheet field value), so there's no HTML-string sink for CodeQL/XSS scanners
+    // to flag, unlike the string-concatenation renderers above (which still serve the
+    // DataTables column-render path, where a string return is required).
+
+    function _buildMutedPlaceholder() {
+        return $('<span>').addClass('text-muted').text('—');
+    }
+
+    function _buildCheckboxBadgesPreview(data) {
+        const labels = _extractCheckboxLabels(data);
+        if (labels.length === 0) return _buildMutedPlaceholder();
+
+        return $(labels.map(function (label) {
+            return $('<span>')
+                .addClass('badge rounded-pill bg-light text-dark border me-1 onboarding-checkbox-badge')
+                .text(_formatCheckboxKey(label))
+                .get(0);
+        }));
+    }
+
+    function _buildSuperUsersPreview(data) {
+        const emails = _extractDataGridEmails(data);
+        if (emails === null) {
+            return data ? $('<span>').text(data) : _buildMutedPlaceholder();
+        }
+        return emails.length ? $('<span>').text(emails.join(', ')) : _buildMutedPlaceholder();
+    }
+
+    // ─── DataGrid cell renderer ───────────────────────────────────────────────
+
+    let _dataGridCache = {};
+    let _dataGridCacheId = 0;
+
+    function _renderDataGridIcon(data, columnTitle) {
+        if (!data) return '';
+
+        let parsed;
+        try {
+            parsed = typeof data === 'string' ? JSON.parse(data) : data;
+        } catch {
+            return '';
+        }
+        if (!parsed || !Array.isArray(parsed.rows) || parsed.rows.length === 0) return '';
+
+        const cacheKey = 'dg-' + (_dataGridCacheId++);
+        _dataGridCache[cacheKey] = { grid: parsed, title: columnTitle };
+        return '<button type="button" class="btn btn-icon btn-sm onboarding-datagrid-btn" data-datagrid-key="' + cacheKey + '" title="' + l('Onboarding:ViewDataGrid') + '"><i class="fl fl-datagrid"></i></button>';
+    }
+
+    function _openDataGridModal(grid, title) {
+        const keys = [];
+        grid.rows.forEach(function (row) {
+            (row.cells || []).forEach(function (cell) {
+                if (!keys.includes(cell.key)) keys.push(cell.key);
+            });
+        });
+
+        const headerHtml = keys.map(function (k) { return '<th>' + _escapeHtml(_formatCheckboxKey(k)) + '</th>'; }).join('');
+        const rowsHtml = grid.rows.map(function (row) {
+            const cellsByKey = {};
+            (row.cells || []).forEach(function (c) { cellsByKey[c.key] = c.value; });
+            const tds = keys.map(function (k) { return '<td>' + _escapeHtml(cellsByKey[k] ?? '') + '</td>'; }).join('');
+            return '<tr>' + tds + '</tr>';
+        }).join('');
+
+        const modalHtml = '<div class="modal fade" id="onboardingDataGridModal" tabindex="-1">' +
+            '<div class="modal-dialog modal-lg modal-dialog-scrollable">' +
+            '<div class="modal-content">' +
+            '<div class="modal-header">' +
+            '<h5 class="modal-title">' + _escapeHtml(title || l('Onboarding:DataGridModalTitle')) + '</h5>' +
+            '<button type="button" class="btn-close" data-bs-dismiss="modal"></button>' +
+            '</div>' +
+            '<div class="modal-body">' +
+            '<table class="table table-bordered table-striped table-sm mb-3"><thead><tr>' + headerHtml + '</tr></thead><tbody>' + rowsHtml + '</tbody></table>' +
+            '</div>' +
+            '</div></div></div>';
+
+        $('#onboardingDataGridModal').remove();
+        $('body').append(modalHtml);
+        const modalEl = document.getElementById('onboardingDataGridModal');
+        const modal = new bootstrap.Modal(modalEl);
+        modalEl.addEventListener('hidden.bs.modal', function () { $(modalEl).remove(); });
+        modal.show();
+    }
+
+    $(document).on('click', '.onboarding-datagrid-btn', function (e) {
+        e.stopPropagation();
+        const cached = _dataGridCache[$(this).data('datagrid-key')];
+        if (cached) _openDataGridModal(cached.grid, cached.title);
+    });
+
+    // ─── Column builder ───────────────────────────────────────────────────────
+
+    function buildColumns(schema) {
+        let cols = FIXED_COLUMNS.map(function (c, i) { return { ...c, index: i }; });
+
+        if (schema?.columns) {
+            let offset = cols.length;
+            schema.columns.forEach(function (c, i) {
+                let col = {
+                    title: c.label,
+                    // Use a dot-path string (not a function) so DataTables/ABP can resolve
+                    // the column's name for server-side sorting — a function data accessor
+                    // breaks that resolution.
+                    data: 'fields.' + c.key,
+                    name: c.key,
+                    defaultContent: '',
+                    index: offset + i
+                };
+                if (c.type === 'Date') {
+                    col.render = function (data, type) { return DateUtils.formatUtcDateToLocal(data, type); };
+                } else if (c.type === 'CheckboxGroup') {
+                    col.render = _renderCheckboxGroup;
+                } else if (c.type === 'DataGrid') {
+                    col.render = function (data, type) { return type === 'display' ? _renderDataGridIcon(data, c.label) : ''; };
+                }
+                cols.push(col);
+            });
+        }
+
+        return cols;
+    }
+
+    // ─── DataTable init ───────────────────────────────────────────────────────
+
+    function initTable(schema) {
+        if (_dataTable) {
+            _dataTable.off('select deselect');
+            _dataTable.destroy();
+            $('#OnboardingRequestsTable').empty();
+            _dataTable = null;
+            _selectedRow = null;
+            manageActionButtons();
+        }
+
+        let listColumns = buildColumns(schema);
+
+        _dataTable = initializeDataTable({
+            dt: $('#OnboardingRequestsTable'),
+            listColumns: listColumns,
+            defaultSortColumn: 0,
+            dataEndpoint: _onboardingRequestAppService.getList,
+            data: function (requestData) {
+                const extras = { category: _selectedCategory };
+
+                const globalSearch = requestData?.search?.value;
+                if (globalSearch) extras.filter = globalSearch;
+
+                // Column-level filters from FilterRow; category dropdown is always included
+                const columnFilters = (requestData?.columns || [])
+                    .filter(function (col) { return col?.name && col?.search?.value; })
+                    .map(function (col) { return { name: col.name, value: col.search.value }; });
+
+                columnFilters.push({ name: 'category', value: _selectedCategory });
+                extras.columnFilters = columnFilters;
+
+                return extras;
+            },
+            responseCallback: function (result) {
+                return { recordsTotal: result.totalCount, recordsFiltered: result.totalCount, data: result.items };
+            },
+            actionButtons: commonTableActionButtons(l('Menu:Onboarding')).filter(b => b.id !== 'btn-toggle-filter'),
+            serverSideEnabled: true,
+            pagingEnabled: true,
+            reorderEnabled: true,
+            languageSetValues: {},
+            dynamicButtonContainerId: 'dynamicButtonContainerId',
+            externalSearchId: 'search',
+            lengthMenu: [10, 25, 50]
+        });
+
+        _dataTable.select.style('single');
+
+        _dataTable.on('select', function (e, dt, type, indexes) {
+            if (type === 'row' && indexes.length) {
+                _selectedRow = dt.row(indexes[0]).data();
+                manageActionButtons();
+            }
+        });
+
+        _dataTable.on('deselect', function (e, dt, type) {
+            if (type === 'row' && dt.rows({ selected: true }).count() === 0) {
+                _selectedRow = null;
+                manageActionButtons();
+            }
+        });
+    }
+
+    // ─── Action button state ──────────────────────────────────────────────────
+
+    function manageActionButtons() {
+        const hasSelection = _selectedRow !== null;
+        $('#btn-open-onboarding').toggleClass('action-bar-btn-unavailable', !hasSelection);
+        $('#btn-create-tenant').toggleClass('action-bar-btn-unavailable',
+            !hasSelection || _selectedRow.status !== 'Approved');
+    }
+
+    // ─── Field value preview ─────────────────────────────────────────────────
+
+    let _fieldValues = {};
+
+    function _updateFieldPreview(selectId, previewId, domBuilder) {
+        const key = $('#' + selectId).val();
+        const raw = key ? (_fieldValues[key] ?? '') : '';
+        const text = raw ? String(raw) : '';
+        const $preview = $('#' + previewId);
+        if (domBuilder) {
+            // domBuilder() returns real jQuery/DOM elements built with .text(), not an HTML
+            // string — appended directly so there's no .html()-of-untrusted-string sink.
+            $preview.empty().append(domBuilder(text));
+        } else {
+            $preview.text(text || '—').toggleClass('text-muted', !text);
+        }
+    }
+
+    // ─── Create Tenant modal ──────────────────────────────────────────────────
+
+    let _createTenantModal = new abp.ModalManager({
+        viewUrl: abp.appPath + 'TenantManagement/Onboarding/CreateTenantModal',
+        modalClass: 'createTenantModal'
+    });
+
+    function _renderValidationResult(result) {
+        $('#onboarding-validation-loading').addClass('d-none');
+        if (result.isValid) {
+            $('#onboarding-validation-result')
+                .html('<div class="alert alert-success mb-0"><i class="fl fl-check me-1"></i> ' + l('OnboardingModal:ValidationPassed') + '</div>')
+                .removeClass('d-none');
+            $('#btn-confirm-create-tenant').prop('disabled', false);
+        } else {
+            let issuesHtml = (result.issues || [])
+                .map(function (i) { return '<li>' + $('<span>').text(i).html() + '</li>'; })
+                .join('');
+            $('#onboarding-validation-result')
+                .html('<div class="alert alert-danger mb-0"><strong>' + l('OnboardingModal:ValidationFailed') + '</strong><ul class="mb-0 mt-1">' + issuesHtml + '</ul></div>')
+                .removeClass('d-none');
+        }
+    }
+
+    function _renderValidationFail() {
+        $('#onboarding-validation-loading').addClass('d-none');
+        $('#onboarding-validation-result')
+            .html('<div class="alert alert-danger mb-0">' + l('OnboardingModal:ValidateFailed') + '</div>')
+            .removeClass('d-none');
+    }
+
+    function _triggerValidation(applicationId) {
+        $('#onboarding-validation-loading').removeClass('d-none');
+        $('#onboarding-validation-result').addClass('d-none');
+        $('#btn-confirm-create-tenant').prop('disabled', true);
+
+        const tenantNameFieldKey  = $('#create-tenant-tenant-name-field').val() || null;
+        const superUsersFieldKey  = $('#create-tenant-super-users-field').val() || null;
+        const branchFieldKey      = $('#create-tenant-branch-field').val() || null;
+        const featuresFieldKey    = $('#create-tenant-features-field').val() || null;
+        const ministryFieldKey    = $('#create-tenant-ministry-field').val() || null;
+        const programAreaFieldKey = $('#create-tenant-program-area-field').val() || null;
+
+        const params = new URLSearchParams();
+        if (tenantNameFieldKey)  params.append('tenantNameFieldKey',  tenantNameFieldKey);
+        if (superUsersFieldKey)  params.append('superUsersFieldKey',  superUsersFieldKey);
+        if (branchFieldKey)      params.append('branchFieldKey',      branchFieldKey);
+        if (featuresFieldKey)    params.append('featuresFieldKey',    featuresFieldKey);
+        if (ministryFieldKey)    params.append('ministryFieldKey',    ministryFieldKey);
+        if (programAreaFieldKey) params.append('programAreaFieldKey', programAreaFieldKey);
+        const query = params.size ? '?' + params.toString() : '';
+
+        abp.ajax({
+            url: abp.appPath + 'api/onboarding-requests/' + applicationId + '/validate' + query,
+            type: 'GET'
+        }).done(_renderValidationResult).fail(_renderValidationFail);
+    }
+
+    function _onCreateTenantConfirm(applicationId) {
+        return function () {
+            const $btn = $(this);
+            $btn.prop('disabled', true);
+            $('#btn-cancel-create-tenant').prop('disabled', true);
+            $('#onboarding-validation-result').addClass('d-none');
+            $('#onboarding-creating').removeClass('d-none');
+
+            const tenantNameFieldKey  = $('#create-tenant-tenant-name-field').val() || null;
+            const superUsersFieldKey  = $('#create-tenant-super-users-field').val() || null;
+            const branchFieldKey      = $('#create-tenant-branch-field').val() || null;
+            const featuresFieldKey    = $('#create-tenant-features-field').val() || null;
+            const ministryFieldKey    = $('#create-tenant-ministry-field').val() || null;
+            const programAreaFieldKey = $('#create-tenant-program-area-field').val() || null;
+
+            abp.ajax({
+                url: abp.appPath + 'api/onboarding-requests/' + applicationId + '/create-tenant',
+                type: 'POST',
+                data: JSON.stringify({ tenantNameFieldKey, superUsersFieldKey, branchFieldKey, featuresFieldKey, ministryFieldKey, programAreaFieldKey }),
+                contentType: 'application/json'
+            }).done(function () {
+                abp.notify.success(l('OnboardingModal:CreateSuccess'));
+                _createTenantModal.close();
+                _dataTable.ajax.reload();
+            }).fail(function () {
+                $('#onboarding-creating').addClass('d-none');
+                $btn.prop('disabled', false);
+                $('#btn-cancel-create-tenant').prop('disabled', false);
+                abp.notify.error(l('OnboardingModal:CreateFailed'));
+            });
+        };
+    }
+
+    function _wireCreateTenantMappingHandlers(applicationId) {
+        $('#create-tenant-ministry-field').on('change', function () {
+            _updateFieldPreview('create-tenant-ministry-field', 'create-tenant-ministry-value');
+        });
+        $('#create-tenant-branch-field').on('change', function () {
+            _updateFieldPreview('create-tenant-branch-field', 'create-tenant-branch-value');
+        });
+        $('#create-tenant-program-area-field').on('change', function () {
+            _updateFieldPreview('create-tenant-program-area-field', 'create-tenant-program-area-value');
+        });
+        $('#create-tenant-features-field').on('change', function () {
+            _updateFieldPreview('create-tenant-features-field', 'create-tenant-features-value', _buildCheckboxBadgesPreview);
+        });
+        $('#create-tenant-tenant-name-field').on('change', function () {
+            _updateFieldPreview('create-tenant-tenant-name-field', 'create-tenant-tenant-name-value');
+            _triggerValidation(applicationId);
+        });
+        $('#create-tenant-super-users-field').on('change', function () {
+            _updateFieldPreview('create-tenant-super-users-field', 'create-tenant-super-users-value', _buildSuperUsersPreview);
+            _triggerValidation(applicationId);
+        });
+    }
+
+    function _renderNoFieldsWarning() {
+        $('#onboarding-validation-loading').addClass('d-none');
+        $('#onboarding-validation-result')
+            .html('<div class="alert alert-warning mb-0">' + l('CreateTenantModal:NoFieldsWarning') + '</div>')
+            .removeClass('d-none');
+        $('#btn-confirm-create-tenant').prop('disabled', true);
+    }
+
+    function _loadCreateTenantFields(applicationId) {
+        abp.ajax({
+            url: abp.appPath + 'api/onboarding-requests/column-schema',
+            type: 'GET',
+            data: { category: _selectedCategory }
+        }).done(function (schema) {
+            if (!schema?.columns?.length) {
+                _renderNoFieldsWarning();
+                return;
+            }
+            _renderMappingDropdown('create-tenant-ministry-field',    schema.columns, MINISTRY_CANONICALS,     schema.ministryFieldKey);
+            _renderMappingDropdown('create-tenant-branch-field',      schema.columns, BRANCH_CANONICALS,        schema.branchFieldKey);
+            _renderMappingDropdown('create-tenant-program-area-field', schema.columns, PROGRAM_AREA_CANONICALS, schema.programAreaFieldKey);
+            _renderMappingDropdown('create-tenant-features-field',    schema.columns, FEATURES_CANONICALS,      schema.featuresFieldKey);
+            _renderMappingDropdown('create-tenant-tenant-name-field', schema.columns, TENANT_NAME_CANONICALS,   schema.tenantNameFieldKey);
+            _renderMappingDropdown('create-tenant-super-users-field', schema.columns, SUPER_USERS_CANONICALS,   schema.superUsersFieldKey);
+            _updateFieldPreview('create-tenant-ministry-field',    'create-tenant-ministry-value');
+            _updateFieldPreview('create-tenant-branch-field',      'create-tenant-branch-value');
+            _updateFieldPreview('create-tenant-program-area-field', 'create-tenant-program-area-value');
+            _updateFieldPreview('create-tenant-features-field',    'create-tenant-features-value', _buildCheckboxBadgesPreview);
+            _updateFieldPreview('create-tenant-tenant-name-field', 'create-tenant-tenant-name-value');
+            _updateFieldPreview('create-tenant-super-users-field', 'create-tenant-super-users-value', _buildSuperUsersPreview);
+            $('#create-tenant-field-mapping').show();
+            _wireCreateTenantMappingHandlers(applicationId);
+            _triggerValidation(applicationId);
+        }).fail(function () {
+            _renderValidationFail();
+        });
+    }
+
+    abp.modals.createTenantModal = function () {
+        return {
+            initModal: function (publicApi, args) {
+                const applicationId = args.id;
+
+                try {
+                    const raw = document.getElementById('create-tenant-fields-json');
+                    _fieldValues = raw ? JSON.parse(raw.textContent) : {};
+                } catch { _fieldValues = {}; }
+
+                _loadCreateTenantFields(applicationId);
+                $('#btn-confirm-create-tenant').on('click', _onCreateTenantConfirm(applicationId));
+            }
+        };
+    };
+
+    // ─── Jaro-Winkler field auto-detection ───────────────────────────────────
+
+    function _normalizeLabel(s) {
+        return s
+            .replaceAll(/([a-z])([A-Z])/g, '$1 $2')
+            .replaceAll(/[_-]+/g, ' ')
+            .toLowerCase()
+            .trim();
+    }
+
+    function _computeJaroMatchings(s1, s2, matchDist) {
+        const l1 = s1.length, l2 = s2.length;
+        const s1m = new Array(l1).fill(false), s2m = new Array(l2).fill(false);
+        let matches = 0;
+        for (let i = 0; i < l1; i++) {
+            const lo = Math.max(0, i - matchDist), hi = Math.min(i + matchDist + 1, l2);
+            for (let j = lo; j < hi; j++) {
+                if (s2m[j] || s1[i] !== s2[j]) continue;
+                s1m[i] = s2m[j] = true; matches++; break;
+            }
+        }
+        return { s1m, s2m, matches };
+    }
+
+    function _computeJaroTranspositions(s1, s2, s1m, s2m) {
+        let k = 0, transpositions = 0;
+        for (let i = 0; i < s1.length; i++) {
+            if (!s1m[i]) continue;
+            while (!s2m[k]) k++;
+            if (s1[i] !== s2[k]) transpositions++;
+            k++;
+        }
+        return transpositions;
+    }
+
+    function _jaroWinkler(s1, s2) {
+        if (s1 === s2) return 1;
+        const l1 = s1.length, l2 = s2.length;
+        if (!l1 || !l2) return 0;
+        const matchDist = Math.max(Math.floor(Math.max(l1, l2) / 2) - 1, 0);
+        const { s1m, s2m, matches } = _computeJaroMatchings(s1, s2, matchDist);
+        if (!matches) return 0;
+        const transpositions = _computeJaroTranspositions(s1, s2, s1m, s2m);
+        const jaro = (matches / l1 + matches / l2 + (matches - transpositions / 2) / matches) / 3;
+        let prefix = 0;
+        for (let p = 0; p < Math.min(4, l1, l2); p++) {
+            if (s1[p] === s2[p]) prefix++; else break;
+        }
+        return jaro + prefix * 0.1 * (1 - jaro);
+    }
+
+    const TENANT_NAME_CANONICALS  = ['tenant name', 'organization name', 'company name', 'program name', 'applicant name', 'tenant abbreviation'];
+    const SUPER_USERS_CANONICALS  = ['super user', 'super users', 'admin email', 'program manager', 'manager email', 'administrator', 'user email'];
+    const MINISTRY_CANONICALS     = ['ministry', 'ministry name', 'government ministry', 'responsible ministry'];
+    const BRANCH_CANONICALS       = ['branch', 'division branch', 'ministry branch', 'business branch'];
+    const PROGRAM_AREA_CANONICALS = ['program area', 'program area name', 'program name', 'program'];
+    const FEATURES_CANONICALS     = ['features', 'feature flags', 'program features', 'modules', 'enabled features', 'features to be enabled'];
+    const MATCH_THRESHOLD = 0.85;
+
+    function _bestMatch(fields, canonicals) {
+        let best = null, bestScore = 0;
+        fields.forEach(function (f) {
+            const norm = _normalizeLabel(f.label || f.key);
+            const score = Math.max(...canonicals.map(function (c) { return _jaroWinkler(norm, c); }));
+            if (score > bestScore) { bestScore = score; best = f.key; }
+        });
+        return bestScore >= MATCH_THRESHOLD ? best : null;
+    }
+
+    function _renderMappingDropdown(selectId, fields, canonicals, savedKey) {
+        const $sel = $('#' + selectId);
+        $sel.find('option:not(:first)').remove();
+        fields.forEach(function (f) {
+            $sel.append('<option value="' + $('<span>').text(f.key).html() + '">' + $('<span>').text(f.label).html() + '</option>');
+        });
+        const savedKeyValid = savedKey && fields.some(function (f) { return f.key === savedKey; });
+        const pick = (savedKeyValid ? savedKey : null) || _bestMatch(fields, canonicals);
+        if (pick) $sel.val(pick);
+    }
+
+    // ─── Document ready ───────────────────────────────────────────────────────
+
+    function _loadSchemaAndInitTable() {
+        abp.ajax({
+            url: abp.appPath + 'api/onboarding-requests/column-schema',
+            type: 'GET',
+            data: { category: _selectedCategory }
+        }).done(function (schema) {
+            initTable(schema);
+        }).fail(function () {
+            initTable(null);
+        });
+    }
+
+    $(function () {
+        abp.ajax({
+            url: abp.appPath + 'api/onboarding-requests/categories',
+            type: 'GET'
+        }).done(function (categories) {
+            const categoryList = categories || ['Onboarding'];
+            const $sel = $('#onboarding-category-filter');
+            $sel.empty();
+            categoryList.forEach(function (cat) {
+                $sel.append('<option value="' + _escapeHtml(cat) + '">' + _escapeHtml(cat) + '</option>');
+            });
+
+            const savedCategory = localStorage.getItem(CATEGORY_STORAGE_KEY);
+            _selectedCategory = (savedCategory && categoryList.includes(savedCategory)) ? savedCategory : 'Onboarding';
+            $sel.val(_selectedCategory);
+        }).always(function () {
+            _loadSchemaAndInitTable();
+        });
+
+        $('#onboarding-category-filter').on('change', function () {
+            _selectedCategory = $(this).val() || 'Onboarding';
+            localStorage.setItem(CATEGORY_STORAGE_KEY, _selectedCategory);
+            _loadSchemaAndInitTable();
+        });
+
+        $('#btn-open-onboarding').on('click', function () {
+            if (!_selectedRow) return;
+            globalThis.location.href = '/GrantApplications/Details?ApplicationId=' + _selectedRow.id;
+        });
+
+        $('#btn-create-tenant').on('click', function () {
+            if (!_selectedRow) return;
+            _createTenantModal.open({ id: _selectedRow.id });
+        });
+    });
+})();
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/OnboardingPageModel.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/OnboardingPageModel.cs
new file mode 100644
index 0000000000..06692db6a7
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/OnboardingPageModel.cs
@@ -0,0 +1,12 @@
+using Unity.TenantManagement.Web;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.TenantManagement.Web.Pages.TenantManagement.Onboarding;
+
+public abstract class OnboardingPageModel : AbpPageModel
+{
+    protected OnboardingPageModel()
+    {
+        ObjectMapperContext = typeof(UnityTenantManagementWebModule);
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/_ViewImports.cshtml b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/_ViewImports.cshtml
new file mode 100644
index 0000000000..231948b339
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+@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.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/ConfigurationModal.cshtml b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/ConfigurationModal.cshtml
new file mode 100644
index 0000000000..8cea4764ca
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/ConfigurationModal.cshtml
@@ -0,0 +1,194 @@
+@page
+@using Microsoft.AspNetCore.Mvc.Localization
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@using Volo.Abp.Data
+@using Volo.Abp.Localization
+@using Volo.Abp.ObjectExtending
+@using Volo.Abp.TenantManagement.Localization
+@using Unity.TenantManagement
+@using Unity.TenantManagement.Web.Pages.TenantManagement.Tenants
+@model ConfigurationModalModel
+@inject IHtmlLocalizer<AbpTenantManagementResource> L
+@inject IStringLocalizerFactory StringLocalizerFactory
+@{
+    Layout = null;
+}
+<form method="post" asp-page="/TenantManagement/Tenants/ConfigurationModal" autocomplete="off">
+    <abp-modal size="Large">
+        <abp-modal-header title="@($"Configuration - {Model.Tenant.Name}")"></abp-modal-header>
+        <abp-modal-body>
+            <input type="hidden" asp-for="Tenant.Id" />
+            <input type="hidden" asp-for="Tenant.ConcurrencyStamp" />
+
+            <ul class="nav nav-tabs mb-3" id="configurationTabs">
+                <li class="nav-item">
+                    <button class="nav-link active" id="tab-details" data-bs-toggle="tab"
+                            data-bs-target="#pane-details" type="button"
+                            aria-controls="pane-details">
+                        Details
+                    </button>
+                </li>
+                @if (Model.CanManageManagers)
+                {
+                    <li class="nav-item">
+                        <button class="nav-link" id="tab-managers" data-bs-toggle="tab"
+                                data-bs-target="#pane-managers" type="button"
+                                aria-controls="pane-managers">
+                            Program Managers
+                        </button>
+                    </li>
+                }
+                @if (Model.CanManageConnectionStrings)
+                {
+                    <li class="nav-item">
+                        <button class="nav-link" id="tab-connections" data-bs-toggle="tab"
+                                data-bs-target="#pane-connections" type="button"
+                                aria-controls="pane-connections">
+                            Connection Strings
+                        </button>
+                    </li>
+                }
+                @if (Model.CanManageFeatures)
+                {
+                    <li class="nav-item">
+                        <button class="nav-link" id="tab-features" data-bs-toggle="tab"
+                                data-bs-target="#pane-features" type="button"
+                                aria-controls="pane-features">
+                            Features
+                        </button>
+                    </li>
+                }
+            </ul>
+
+            <div class="tab-content" id="configurationTabContent">
+
+                <div class="tab-pane fade show active" id="pane-details" aria-labelledby="tab-details">
+                    <abp-input asp-for="Tenant.Name" label="@L["TenantName"].Value" />
+                    <abp-input asp-for="Tenant.Division" label="Division" />
+                    <abp-input asp-for="Tenant.Branch" label="Branch" />
+                    <abp-input asp-for="Tenant.Description" label="Description" />
+
+                    <div class="form-group">
+                        <label for="Tenant_CasClientCode">CAS Client Code</label>
+                        <select asp-for="Tenant.CasClientCode" id="Tenant_CasClientCode" class="form-control cas-client-select"
+                                data-ministry-target="#selected-ministry">
+                            <option value="">Select a Client Code</option>
+                            @foreach (var option in Model.CasClientOptions)
+                            {
+                                <option value="@option.Code" data-ministry="@option.Ministry">@option.DisplayName</option>
+                            }
+                        </select>
+                    </div>
+
+                    @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<ConfigurationModalModel.TenantInfoModel>().Where(p => !p.Name.EndsWith("_Text")))
+                    {
+                        if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                        {
+                            if (propertyInfo.Type.IsEnum)
+                            {
+                                Model.Tenant.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type);
+                            }
+                            <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                                        label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                        autocomplete-api-url="@propertyInfo.Lookup.Url"
+                                        autocomplete-selected-item-name="@Model.Tenant.GetProperty(propertyInfo.Name+"_Text")"
+                                        autocomplete-selected-item-value="@Model.Tenant.GetProperty(propertyInfo.Name)"
+                                        autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                        autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                        autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                        autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                        }
+                        else
+                        {
+                            <abp-input type="@propertyInfo.GetInputType()"
+                                       asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                                       label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                       asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                       value="@propertyInfo.GetInputValueOrNull(Model.Tenant.GetProperty(propertyInfo.Name))" />
+                        }
+                    }
+                </div>
+
+                @if (Model.CanManageManagers)
+                {
+                <div class="tab-pane fade" id="pane-managers" aria-labelledby="tab-managers">
+
+                    <div class="mb-3">
+                        <h6 class="text-secondary mb-2">
+                            Current Program Managers
+                            <span id="config-managers-count" class="badge bg-secondary ms-1"></span>
+                        </h6>
+                        <div id="config-managers-loading" class="text-muted small">
+                            <span class="spinner-border spinner-border-sm me-1"></span>Loading...
+                        </div>
+                        <div id="config-managers-content" style="max-height: 200px; overflow-y: auto;"></div>
+                    </div>
+
+                    <hr class="my-3" />
+
+                    <h6 class="text-secondary mb-2">Assign Program Manager</h6>
+                    <div class="input-group mb-2">
+                        <select id="config-search-field" class="form-select" style="max-width: 170px;" aria-label="Manager search field">
+                            <option value="firstName">First Name</option>
+                            <option value="lastName">Last Name</option>
+                            <option value="firstAndLast">First &amp; Last Name</option>
+                            <option value="email">Email</option>
+                        </select>
+                        <input type="text" id="config-search-value" class="form-control" placeholder="At least 2 characters..." aria-label="Manager search value" />
+                    </div>
+                    <input type="hidden" asp-for="SelectedManagerUserIdentifier" id="config-selected-user-identifier" />
+
+                    <abp-button id="ConfigTenantAdminSearchButton"
+                                text="@L["Search"].Value"
+                                icon-type="Other"
+                                icon="fl fl-search"
+                                button-type="Light"
+                                class="mb-2" />
+                    <abp-table id="ConfigUserSearchTable"></abp-table>
+
+                    <div id="config-selected-user-display" class="text-muted small mt-2" style="display:none">
+                        Selected: <span id="config-selected-user-name" class="fw-semibold text-body"></span>
+                    </div>
+                </div>
+                }
+
+                @if (Model.CanManageConnectionStrings)
+                {
+                    <div class="tab-pane fade" id="pane-connections" aria-labelledby="tab-connections">
+                        <div class="form-group mb-3">
+                            <label asp-for="ConnectionStrings.TenantConnectionString">Tenant Connection String</label>
+                            <textarea asp-for="ConnectionStrings.TenantConnectionString"
+                                      class="form-control font-monospace"
+                                      rows="3"></textarea>
+                            <small class="form-text text-muted">Displayed decrypted. Saved encrypted automatically.</small>
+                        </div>
+                        <div class="form-group mb-3">
+                            <label asp-for="ConnectionStrings.ReadOnlyConnectionString">Read-Only Connection String</label>
+                            <textarea asp-for="ConnectionStrings.ReadOnlyConnectionString"
+                                      class="form-control font-monospace"
+                                      rows="3"></textarea>
+                            <small class="form-text text-muted">Displayed decrypted. Saved encrypted automatically.</small>
+                        </div>
+                    </div>
+                }
+
+                @if (Model.CanManageFeatures)
+                {
+                    <div class="tab-pane fade" id="pane-features" aria-labelledby="tab-features">
+                        <div id="config-features-loading" class="text-center py-3 text-muted" style="display:none">
+                            <span class="spinner-border spinner-border-sm me-2"></span>Loading features...
+                        </div>
+                        <div id="config-features-content"></div>
+                        <input type="hidden" id="config-features-json" asp-for="FeaturesJson" />
+                    </div>
+                }
+
+            </div>
+        </abp-modal-body>
+        <abp-modal-footer>
+            <button class="btn btn-primary" data-busy-text="Saving..." type="submit">Save</button>
+            <button class="btn btn-secondary" data-bs-dismiss="modal" type="button">Cancel</button>
+        </abp-modal-footer>
+    </abp-modal>
+</form>
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/ConfigurationModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/ConfigurationModal.cshtml.cs
new file mode 100644
index 0000000000..6966884120
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/ConfigurationModal.cshtml.cs
@@ -0,0 +1,155 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Unity.GrantManager.Integrations;
+using Unity.Modules.Shared.Permissions;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.FeatureManagement;
+using Volo.Abp.Features;
+using Volo.Abp.ObjectExtending;
+using Volo.Abp.TenantManagement;
+using Volo.Abp.Validation;
+
+namespace Unity.TenantManagement.Web.Pages.TenantManagement.Tenants;
+
+public class ConfigurationModalModel(
+    ITenantAppService tenantAppService,
+    ICasClientCodeLookupService lookupService,
+    IFeatureAppService featureAppService) : TenantManagementPageModel
+{
+    [BindProperty]
+    public TenantInfoModel Tenant { get; set; } = null!;
+
+    [BindProperty]
+    public TenantConnectionStringsDto ConnectionStrings { get; set; } = new();
+
+    [BindProperty]
+    public string? SelectedManagerUserIdentifier { get; set; }
+
+    [BindProperty]
+    public string? FeaturesJson { get; set; }
+
+    public ManagerInfoModel Manager { get; set; } = null!;
+
+    public List<CasClientCodeOptionDto> CasClientOptions { get; set; } = [];
+
+    public bool CanManageConnectionStrings { get; set; }
+
+    public bool CanManageFeatures { get; set; }
+
+    public bool CanManageManagers { get; set; }
+
+    public virtual async Task<IActionResult> OnGetAsync(Guid id)
+    {
+        var tenantDto = await tenantAppService.GetAsync(id);
+
+        Tenant = ObjectMapper.Map<TenantDto, TenantInfoModel>(tenantDto);
+        Manager = ObjectMapper.Map<TenantDto, ManagerInfoModel>(tenantDto);
+        CasClientOptions = await lookupService.GetActiveOptionsAsync();
+
+        CanManageConnectionStrings = (await AuthorizationService
+            .AuthorizeAsync(User, TenantManagementPermissions.Tenants.ManageConnectionStrings)).Succeeded;
+
+        CanManageFeatures = (await AuthorizationService
+            .AuthorizeAsync(User, IdentityConsts.ITAdminOrITOperationsPolicyName)).Succeeded;
+
+        CanManageManagers = CanManageFeatures;
+
+        if (CanManageConnectionStrings)
+        {
+            ConnectionStrings = await tenantAppService.GetConnectionStringsAsync(id);
+        }
+
+        return Page();
+    }
+
+    public virtual async Task<IActionResult> OnPostAsync()
+    {
+        ValidateModel();
+
+        var input = ObjectMapper.Map<TenantInfoModel, TenantUpdateDto>(Tenant);
+        await tenantAppService.UpdateAsync(Tenant.Id, input);
+
+        if (!string.IsNullOrWhiteSpace(SelectedManagerUserIdentifier))
+        {
+            await tenantAppService.AssignManagerAsync(new TenantAssignManagerDto
+            {
+                TenantId = Tenant.Id,
+                UserIdentifier = SelectedManagerUserIdentifier
+            });
+        }
+
+        if ((await AuthorizationService.AuthorizeAsync(User, TenantManagementPermissions.Tenants.ManageConnectionStrings)).Succeeded)
+        {
+            await tenantAppService.UpdateConnectionStringsAsync(Tenant.Id, ConnectionStrings);
+        }
+
+        if (!string.IsNullOrEmpty(FeaturesJson) &&
+            (await AuthorizationService.AuthorizeAsync(User, IdentityConsts.ITAdminOrITOperationsPolicyName)).Succeeded)
+        {
+            var featureUpdates = new List<UpdateFeatureDto>();
+            foreach (var feature in JsonDocument.Parse(FeaturesJson).RootElement.EnumerateArray())
+            {
+                featureUpdates.Add(new UpdateFeatureDto
+                {
+                    Name = feature.GetProperty("name").GetString()!,
+                    Value = feature.GetProperty("value").GetString()!
+                });
+            }
+            await featureAppService.UpdateAsync(
+                TenantFeatureValueProvider.ProviderName,
+                Tenant.Id.ToString(),
+                new UpdateFeaturesDto { Features = featureUpdates });
+        }
+
+        return NoContent();
+    }
+
+    public class TenantInfoModel : ExtensibleObject, IHasConcurrencyStamp
+    {
+        [HiddenInput]
+        public Guid Id { get; set; }
+
+        [Required]
+        [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.MaxNameLength))]
+        [Display(Name = "DisplayName:TenantName")]
+        public string Name { get; set; } = string.Empty;
+
+        public string Division { get; set; } = string.Empty;
+        public string Branch { get; set; } = string.Empty;
+        public string Description { get; set; } = string.Empty;
+
+        [Display(Name = "CAS Client Code")]
+        public string? CasClientCode { get; set; }
+
+        [HiddenInput]
+        public string ConcurrencyStamp { get; set; } = string.Empty;
+    }
+
+    public class ManagerInfoModel : ExtensibleObject
+    {
+        [HiddenInput]
+        public Guid Id { get; set; }
+
+        [Display(Name = "DisplayName:TenantName")]
+        public string Name { get; set; } = string.Empty;
+
+        [DisplayName("First Name")]
+        public string? FirstName { get; set; }
+
+        [DisplayName("Last Name")]
+        public string? LastName { get; set; }
+
+        [Required]
+        public string Directory { get; set; } = "IDIR";
+
+        [Required]
+        public string UserIdentifier { get; set; } = string.Empty;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
index 4d492e9bd1..f410abec4f 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml
@@ -19,8 +19,9 @@
     ViewBag.PageTitle = L["Tenants"].Value;
 }
 @section styles {
-    <abp-style-bundle name="@typeof(IndexModel).FullName">        
+    <abp-style-bundle name="@typeof(IndexModel).FullName">
         <abp-style src="/Pages/TenantManagement/Tenants/Index.css" />
+        <abp-style src="/Views/Shared/Components/ActionBar/Default.css" />
     </abp-style-bundle>
 }
 @section scripts {
@@ -33,9 +34,17 @@
 @section content_toolbar {
     @await Component.InvokeAsync(typeof(AbpPageToolbarViewComponent), new { pageName = typeof(IndexModel).FullName })
 }
-<abp-card id="TenantsWrapper">
-    <abp-card-body>
-        <input type="hidden" id="casClientCodeHashData" data-hash='@Json.Serialize(Model.CasClientCodeHash)' />
-        <abp-table id="TenantsTable" striped-rows="false" class="nowrap"></abp-table>
-    </abp-card-body>
-</abp-card>
+<div class="container-fluid px-2">
+    <div class="action-bar p-2 search-action-bar">
+        <div class="search-action-bar_search-wrapper">
+            <input type="search" id="search" placeholder="Search" aria-label="Search" class="tbl-search">
+        </div>
+        <div class="btn-group" id="tenantCreateButtonContainer"></div>
+        <div class="btn-group">
+            <button id="btn-toggle-filter" class="custom-table-btn flex-none btn btn-secondary">Filter</button>
+        </div>
+        <div id="dynamicButtonContainerId"></div>
+    </div>
+    <input type="hidden" id="casClientCodeHashData" data-hash='@Json.Serialize(Model.CasClientCodeHash)' />
+    <abp-table id="TenantsTable" striped-rows="false" class="nowrap"></abp-table>
+</div>
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
index cc16f58fd0..3b7b834ed4 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
@@ -1,157 +1,90 @@
 (function () {
     let l = abp.localization.getResource('AbpTenantManagement');
+    let lGm = abp.localization.getResource('GrantManager');
     let _tenantAppService = unity.tenantManagement.tenant;
     let _userImportService = unity.grantManager.identity.userImport;
     let _casClientCodeHash = {};
 
-    let _editModal = new abp.ModalManager(
-        abp.appPath + 'TenantManagement/Tenants/EditModal'
-    );
     let _createModal = new abp.ModalManager({
             viewUrl: abp.appPath + 'TenantManagement/Tenants/CreateModal',
             modalClass: 'createTenant'
         }
     );
-    let _featuresModal = new abp.ModalManager(
-        abp.appPath + 'FeatureManagement/FeatureManagementModal'
-    );
-    let _assignManagerModal = new abp.ModalManager({
-            viewUrl: abp.appPath + 'TenantManagement/Tenants/AssignManagerModal',
-            modalClass: 'assignManager'
+
+    let _configurationModal = new abp.ModalManager({
+            viewUrl: abp.appPath + 'TenantManagement/Tenants/ConfigurationModal',
+            modalClass: 'configurationModal'
         }
     );
 
     let _dataTable = null;
 
-    abp.ui.extensions.entityActions.get('tenantManagement.tenant').addContributor(
-        function(actionList) {
-            return actionList.addManyTail(
-                [
-                    {
-                        text: l('Edit'),
-                        visible: abp.auth.isGranted(
-                            'UnityTenantManagement.Tenants.Update'
-                        ),
-                        action: function (data) {
-                            _editModal.open({
-                                id: data.record.id,
-                            });
-                        },
-                    },
-                    {
-                        text: l('Assign Manager'),
-                        visible: abp.auth.isGranted(
-                            'UnityTenantManagement.Tenants.Create'
-                        ),
-                        action: function (data) {
-                            _assignManagerModal.open({                                
-                                id: data.record.id,
-                            });
-                        },
-                    },
-                    {
-                        text: l('Features'),
-                        visible: abp.auth.isGranted(
-                            'AbpTenantManagement.Tenants.ManageFeatures'
-                        ),
-                        action: function (data) {
-                            _featuresModal.open({
-                                providerName: 'T',
-                                providerKey: data.record.id,
-                            });
-                        },
-                    },
-                    {
-                        text: l('Delete'),
-                        visible: abp.auth.isGranted(
-                            'UnityTenantManagement.Tenants.Delete'
-                        ),
-                        confirmMessage: function (data) {
-                            return l(
-                                'TenantDeletionConfirmationMessage',
-                                data.record.name
-                            );
-                        },
-                        action: function (data) {
-                            _tenantAppService
-                                .delete(data.record.id)
-                                .then(function () {
-                                    _dataTable.ajax.reloadEx();
-                                    abp.notify.success(l('SuccessfullyDeleted'));
-                                });
-                        },
-                    }
-                ]
-            );
+    // ─── Actions column renderer ──────────────────────────────────────────────
+
+    function _buildActionsCell(id, name) {
+        let items = [];
+        if (abp.auth.isGranted('UnityTenantManagement.Tenants.Update') || abp.auth.isGranted('ITOperations')) {
+            items.push('<a href="javascript:;" class="dropdown-item tenant-action-config" data-id="' + id + '">' + lGm('TenantList:ConfigurationAction') + '</a>');
         }
-    );
+        if (abp.auth.isGranted('UnityTenantManagement.Tenants.Delete')) {
+            items.push('<a href="javascript:;" class="dropdown-item tenant-action-delete" data-id="' + id + '" data-name="' + $('<span>').text(name || '').html() + '">' + l('Delete') + '</a>');
+        }
+        if (!items.length) return '';
+        return '<div class="text-center"><div class="dropdown d-inline-block">' +
+            '<a href="javascript:;" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">' +
+            '<i class="fa fa-cog"></i> ' + lGm('TenantList:ActionsButton') + '</a>' +
+            '<div class="dropdown-menu">' + items.join('') + '</div>' +
+            '</div></div>';
+    }
 
-    abp.ui.extensions.tableColumns.get('tenantManagement.tenant').addContributor(
-        function (columnList) {
-            columnList.addManyTail(
-                [
-                    {
-                        title: l("Actions"),
-                        orderable: false,
-                        rowAction: {
-                            items: abp.ui.extensions.entityActions.get('tenantManagement.tenant').actions.toArray()
-                        }
-                    },
-                    {
-                        title: l("TenantName"),
-                        data: 'name',
-                    },
-                    {
-                        title: l("Division"),
-                        data: 'division',
-                    },
-                    {
-                        title: l("Branch"),
-                        data: 'branch',
-                    },
-                    {
-                        title: l("Description"),
-                        data: 'description',
-                    },
-                    {
-                        title: "CAS Client Code",
-                        data: 'casClientCode',
-                        render: function (data, type, row) {
-                            if (type === 'display') {
-                                const code = row.casClientCode || '';
-                                const displayValue = _casClientCodeHash[code] || '';
-                                return displayValue;
-                            }
-                            return data;
-                        }
-                    },
-                    {
-                        title: l("Id"),
-                        data: 'id',
-                    }
-                ]
-            );
+    // ─── Column definitions ───────────────────────────────────────────────────
+
+    let listColumns = [
+        {
+            title: l('Actions'),
+            name: 'actions',
+            data: 'id',
+            orderable: false,
+            className: 'notexport text-center',
+            index: 0,
+            render: function (data, type, row) {
+                return type === 'display' ? _buildActionsCell(data, row.name) : '';
+            }
         },
-        0 //adds as the first contributor
-    );
+        { title: l('TenantName'),  data: 'name',         name: 'name',         index: 1 },
+        { title: lGm('TenantList:LicencePlate'),  data: 'licencePlate', name: 'licencePlate', index: 2 },
+        { title: l('Division'),    data: 'division',     name: 'division',     index: 3 },
+        { title: l('Branch'),      data: 'branch',       name: 'branch',       index: 4 },
+        { title: l('Description'), data: 'description',  name: 'description',  index: 5 },
+        {
+            title: lGm('TenantList:CasClientCode'),
+            data: 'casClientCode',
+            name: 'casClientCode',
+            index: 6,
+            render: function (data, type, row) {
+                if (type === 'display') {
+                    return _casClientCodeHash[row.casClientCode || ''] || '';
+                }
+                return data;
+            }
+        },
+        { title: l('Id'), data: 'id', name: 'id', index: 7 }
+    ];
 
-    let inputAction = function (requestData, dataTableSettings) {
-        return {
-            directory: 'IDIR',
-            firstName: $('#create-tenant-firstName').val(),
-            lastName: $('#create-tenant-lastName').val()
-        };
-    };
+    let defaultVisibleColumns = ['actions', 'name', 'licencePlate', 'division', 'branch', 'description', 'casClientCode'];
 
     let responseCallback = function (result) {
         return {
-            recordsTotal: result.length,
-            recordsFiltered: result.length,
-            data: result
+            recordsTotal: result.totalCount,
+            recordsFiltered: result.totalCount,
+            data: result.items
         };
     };
 
+    // ─── Modal setup: Create tenant ───────────────────────────────────────────
+
     let _filterDataTable = null;
+    let _configFilterDataTable = null;
 
     let setupCreateTenantModal = function () {
         let _$filterTable = $('#UserSearchTable');
@@ -166,8 +99,20 @@
                     searching: false,
                     ajax: abp.libs.datatables.createAjax(
                         _userImportService.search,
-                        inputAction,
-                        responseCallback
+                        function () {
+                            return {
+                                directory: 'IDIR',
+                                firstName: $('#create-tenant-firstName').val(),
+                                lastName: $('#create-tenant-lastName').val()
+                            };
+                        },
+                        function (result) {
+                            return {
+                                recordsTotal: result.length,
+                                recordsFiltered: result.length,
+                                data: result
+                            };
+                        }
                     ),
                     select: {
                         style: 'single',
@@ -191,17 +136,16 @@
                         className: 'data-table-header'
                     }],
                 })
-        )
+        );
 
         $('#TenantAdminSearchButton').click(function (e) {
             e.preventDefault();
-            _filterDataTable.ajax.reloadEx();
+            _filterDataTable.ajax.reload();
             $('#create-tenant-btn').attr('disabled', true);
         });
 
         $('#cancel-tenant-btn').click(function (e) {
             _createModal.close();
-            _assignManagerModal.close();
         });
 
         _filterDataTable.on('select', function (e, dt, type, indexes) {
@@ -216,15 +160,7 @@
             $('#create-tenant-admin-id').val();
             $('#create-tenant-btn').attr('disabled', true);
         });
-
-        _createModal.onResult(function () {
-            _dataTable.ajax.reloadEx();
-        });
-
-        _assignManagerModal.onResult(function () {
-            _dataTable.ajax.reloadEx();
-        });
-    }
+    };
 
     _createModal.onOpen(function () {
         setTimeout(() => {
@@ -232,29 +168,252 @@
         });
     });
 
-    _assignManagerModal.onOpen(function () {
+    _configurationModal.onOpen(function () {
         setTimeout(() => {
-            _filterDataTable.columns.adjust().draw();
+            if (_configFilterDataTable) {
+                _configFilterDataTable.columns.adjust().draw();
+            }
         });
     });
 
+    function _createTenantInitModal(publicApi, args) {
+        setupCreateTenantModal();
+    }
+
     abp.modals.createTenant = function () {
-        let initModal = function (publicApi, args) {
-            setupCreateTenantModal();
+        return { initModal: _createTenantInitModal };
+    };
+
+    // ─── Modal setup: Configuration ───────────────────────────────────────────
+
+    let _configTenantId = null;
+    let _featuresLoaded = false;
+
+    function _renderFeatureItem(feature) {
+        let id = 'ft-' + feature.name.replaceAll('.', '-');
+        let checked = feature.value === 'true' ? ' checked' : '';
+        return '<div class="form-check form-switch mb-2">' +
+            '<input class="form-check-input" type="checkbox" id="' + id + '"' +
+            ' data-feature-name="' + feature.name + '"' + checked + '>' +
+            '<label class="form-check-label" for="' + id + '">' +
+            (feature.displayName || feature.name) + '</label>' +
+            '</div>';
+    }
+
+    function _renderFeatureGroups(groups) {
+        if (!groups?.length) {
+            return '<p class="text-muted">No features available.</p>';
+        }
+        let html = '';
+        groups.forEach(function (group) {
+            html += '<div class="mb-4" data-feature-group="' + group.name + '">';
+            html += '<h6 class="mb-2 text-secondary">' + (group.displayName || group.name) + '</h6>';
+            group.features?.forEach(function (feature) {
+                html += _renderFeatureItem(feature);
+            });
+            html += '</div>';
+        });
+        return html;
+    }
+
+    function _loadManagersTab(tenantId) {
+        $('#config-managers-loading').show();
+        $('#config-managers-content').html('');
+
+        abp.ajax({
+            url: abp.appPath + 'api/multi-tenancy/tenants/' + tenantId + '/managers',
+            type: 'GET'
+        }).done(function (result) {
+            $('#config-managers-loading').hide();
+            $('#config-managers-count').text(result?.length ?? 0);
+            if (result?.length) {
+                let html = '<ul class="list-unstyled mb-0">';
+                result.forEach(function (m) {
+                    html += '<li class="d-flex align-items-center py-1">' +
+                        '<i class="fl fl-user me-2 text-muted"></i>' +
+                        '<span>' + $('<span>').text(m.displayName).html() + '</span>' +
+                        (m.email ? '<span class="text-muted small ms-2">(' + $('<span>').text(m.email).html() + ')</span>' : '') +
+                        '</li>';
+                });
+                html += '</ul>';
+                $('#config-managers-content').html(html);
+            } else {
+                $('#config-managers-content').html('<p class="text-muted small mb-0">No program managers assigned.</p>');
+            }
+        }).fail(function () {
+            $('#config-managers-loading').hide();
+            $('#config-managers-content').html('<p class="text-danger small mb-0">Failed to load program managers.</p>');
+        });
+    }
+
+    function _loadFeaturesTab(tenantId) {
+        $('#config-features-loading').show();
+        $('#config-features-content').html('');
+        $('#config-features-actions').hide();
+
+        abp.ajax({
+            url: abp.appPath + 'api/feature-management/features',
+            type: 'GET',
+            data: { providerName: 'T', providerKey: tenantId }
+        }).done(function (result) {
+            $('#config-features-loading').hide();
+            $('#config-features-content').html(_renderFeatureGroups(result.groups));
+            $('#config-features-actions').show();
+            _captureFeaturesToForm();
+        }).fail(function () {
+            $('#config-features-loading').hide();
+            $('#config-features-content').html('<div class="alert alert-danger">Failed to load features. Please try again.</div>');
+        });
+    }
+
+    function _captureFeaturesToForm() {
+        if (!_featuresLoaded) return;
+        let features = [];
+        $('#config-features-content input[type="checkbox"]').each(function () {
+            features.push({ name: $(this).data('feature-name'), value: $(this).prop('checked').toString() });
+        });
+        $('#config-features-json').val(JSON.stringify(features));
+    }
+
+    function _specializationCheckboxChange() {
+        if ($(this).prop('checked')) {
+            let $allSpecs = $('[data-feature-group="Specializations"] input[type="checkbox"]');
+            $allSpecs.not(this).prop('checked', false);
+        }
+    }
+
+    function _configSearchInputAction() {
+        let field = $('#config-search-field').val();
+        let value = $('#config-search-value').val();
+        if (field === 'firstAndLast') {
+            let parts = value.trim().replaceAll(/\s+/g, ' ').split(' ');
+            return {
+                directory: 'IDIR',
+                firstName: parts[0] || '',
+                lastName: parts[1] || '',
+                email: ''
+            };
+        }
+        return {
+            directory: 'IDIR',
+            firstName: field === 'firstName' ? value : '',
+            lastName: field === 'lastName' ? value : '',
+            email: field === 'email' ? value : ''
         };
-        return { initModal: initModal };
     }
 
-    abp.modals.assignManager = function () {
-        let initModal = function (publicApi, args) {
-            setupCreateTenantModal();
+    function _configSearchResponseCallback(result) {
+        return { recordsTotal: result.length, recordsFiltered: result.length, data: result };
+    }
+
+    function _configurationModalInitModal(publicApi, args) {
+        _configTenantId = args.id;
+
+        _loadManagersTab(_configTenantId);
+
+        _configFilterDataTable = $('#ConfigUserSearchTable').DataTable(
+            abp.libs.datatables.normalizeConfiguration({
+                order: [[0, 'asc']],
+                processing: true,
+                serverSide: false,
+                scrollX: true,
+                paging: true,
+                searching: false,
+                ajax: abp.libs.datatables.createAjax(
+                    _userImportService.search,
+                    _configSearchInputAction,
+                    _configSearchResponseCallback
+                ),
+                select: { style: 'single' },
+                columnDefs: [
+                    { title: 'First Name', name: 'firstName', data: 'firstName', className: 'data-table-header' },
+                    { title: 'Last Name', name: 'lastName', data: 'lastName', className: 'data-table-header' },
+                    { title: 'Display Name', name: 'displayName', data: 'displayName', className: 'data-table-header' },
+                    { title: 'Email', name: 'email', data: 'email', className: 'data-table-header' }
+                ]
+            })
+        );
+
+        $('#config-search-field').on('change', function () {
+            let placeholders = {
+                firstName: 'At least 2 characters...',
+                lastName: 'At least 2 characters...',
+                firstAndLast: 'e.g. John Smith',
+                email: 'At least 2 characters...'
+            };
+            $('#config-search-value').val('').attr('placeholder', placeholders[$(this).val()] || 'At least 2 characters...');
+        });
+
+        $('#ConfigTenantAdminSearchButton').click(function (e) {
+            e.preventDefault();
+            if ($('#config-search-value').val().trim().length < 2) {
+                abp.notify.warn(lGm('TenantList:SearchMinChars'));
+                return;
+            }
+            _configFilterDataTable.ajax.reload();
+            $('#config-selected-user-identifier').val('');
+            $('#config-selected-user-display').hide();
+        });
+
+        _configFilterDataTable.on('select', function (e, dt, type, indexes) {
+            if (type === 'row') {
+                let selectedData = _configFilterDataTable.row(indexes).data();
+                $('#config-selected-user-identifier').val(selectedData.userGuid);
+                let displayName = selectedData.displayName || (selectedData.firstName + ' ' + selectedData.lastName).trim();
+                $('#config-selected-user-name').text(displayName);
+                $('#config-selected-user-display').show();
+            }
+        });
+
+        _configFilterDataTable.on('deselect', function () {
+            $('#config-selected-user-identifier').val('');
+            $('#config-selected-user-display').hide();
+        });
+
+        _featuresLoaded = false;
+        $('#tab-features').on('shown.bs.tab', function () {
+            if (!_featuresLoaded) {
+                _featuresLoaded = true;
+                _loadFeaturesTab(_configTenantId);
+            }
+        });
+        $('#config-features-content').on('change', '[data-feature-group="Specializations"] input[type="checkbox"]', _specializationCheckboxChange);
+        $('#config-features-content').on('change', 'input[type="checkbox"]', _captureFeaturesToForm);
+
+        $('#pane-features').closest('form').on('invalid-form.validate', function (e, validator) {
+            if (validator.errorList.length > 0) {
+                let $firstErrorPane = $(validator.errorList[0].element).closest('.tab-pane');
+                if ($firstErrorPane.length) {
+                    $('[data-bs-target="#' + $firstErrorPane.attr('id') + '"]').tab('show');
+                }
+            }
+        });
+    }
+
+    abp.modals.configurationModal = function () {
+        return { initModal: _configurationModalInitModal };
+    };
+
+    // ─── Delete confirmation ──────────────────────────────────────────────────
+
+    function _onDeleteConfirmed(id) {
+        return function (confirmed) {
+            if (confirmed) {
+                _tenantAppService.delete(id).then(function () {
+                    _dataTable.ajax.reload();
+                    abp.notify.success(l('SuccessfullyDeleted'));
+                });
+            }
         };
-        return { initModal: initModal };
     }
 
+    function _confirmDeleteTenant(id, name) {
+        abp.message.confirm(l('TenantDeletionConfirmationMessage', name), _onDeleteConfirmed(id));
+    }
+
+    // ─── Document ready ───────────────────────────────────────────────────────
+
     $(function () {
-        let _$wrapper = $('#TenantsWrapper');
-        
         // Parse CAS client code hash from hidden field data attribute
         let casClientCodeHashEl = document.getElementById('casClientCodeHashData');
         try {
@@ -263,38 +422,62 @@
             console.warn('Failed to parse CAS client code hash', e);
         }
 
-        _dataTable = _$wrapper.find('table').DataTable(
-            abp.libs.datatables.normalizeConfiguration({
-                order: [[1, 'asc']],
-                processing: true,
-                paging: true,
-                scrollX: true,
-                serverSide: true,
-                ajax: abp.libs.datatables.createAjax(_tenantAppService.getList),
-                columnDefs: abp.ui.extensions.tableColumns.get('tenantManagement.tenant').columns.toArray(),
-            })
-        );
+        _dataTable = initializeDataTable({
+            dt: $('#TenantsTable'),
+            listColumns: listColumns,
+            defaultVisibleColumns: defaultVisibleColumns,
+            defaultSortColumn: 1,
+            dataEndpoint: _tenantAppService.getList,
+            responseCallback: responseCallback,
+            actionButtons: commonTableActionButtons('Tenants').filter(function (b) { return b.id !== 'btn-toggle-filter'; }),
+            serverSideEnabled: false,
+            pagingEnabled: true,
+            reorderEnabled: true,
+            languageSetValues: {},
+            dynamicButtonContainerId: 'dynamicButtonContainerId',
+            externalSearchId: 'search',
+            fixedHeaders: true
+        });
+
+        // Disable interactive row selection (selection is only ever driven via the API),
+        // without needing a "selectable" option on the shared initializeDataTable helper.
+        _dataTable.select.style('api');
 
         _createModal.onResult(function () {
-            _dataTable.ajax.reloadEx();
+            _dataTable.ajax.reload();
         });
 
-        _editModal.onResult(function () {
-            _dataTable.ajax.reloadEx();
+        _configurationModal.onResult(function () {
+            _dataTable.ajax.reload();
         });
 
-        $('#AbpContentToolbar button[name=CreateTenant]').click(function (e) {
+        // Relocate the page-toolbar "New Tenant" button into the action bar, to the
+        // left of the Filter button, matching the Endpoints list layout.
+        $('#tenantCreateButtonContainer').append($('#AbpContentToolbar button[name=CreateTenant]'));
+
+        $('#tenantCreateButtonContainer button[name=CreateTenant]').click(function (e) {
             e.preventDefault();
             _createModal.open();
         });
+
+        // Action column event delegation
+        $(document).on('click', '.tenant-action-config', function (e) {
+            e.preventDefault();
+            _configurationModal.open({ id: $(this).data('id') });
+        });
+
+        $(document).on('click', '.tenant-action-delete', function (e) {
+            e.preventDefault();
+            _confirmDeleteTenant($(this).data('id'), $(this).data('name'));
+        });
     });
-    
-    // Use event delegation to handle dynamically loaded elements
+
+    // ─── CAS client select handler (event delegation for dynamic elements) ────
+
     $(document).on('change', '.cas-client-select', function() {
         const $select = $(this);
         const selectedOption = $select.find('option:selected');
-        
-        // Handle ministry field update
+
         const ministryValue = selectedOption.data('ministry') || '';
         const ministryTarget = $select.data('ministry-target');
         if (ministryTarget) {
@@ -303,8 +486,7 @@
                 $targetInput.val(ministryValue);
             }
         }
-        
-        // Handle CAS client code update
+
         const casClientCode = selectedOption.data('cas-client-code');
         if (casClientCode) {
             const $container = $select.closest('form, .modal-body');
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/UnityTenantManagementWebMapperlyProfile.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/UnityTenantManagementWebMapperlyProfile.cs
index 2ff26b3542..07827e6ab9 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/UnityTenantManagementWebMapperlyProfile.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/UnityTenantManagementWebMapperlyProfile.cs
@@ -1,6 +1,7 @@
 using Unity.TenantManagement.Web.Pages.TenantManagement.Tenants;
 using Volo.Abp.Mapperly;
 using static Unity.TenantManagement.Web.Pages.TenantManagement.Tenants.AssignManagerModalModel;
+using static Unity.TenantManagement.Web.Pages.TenantManagement.Tenants.ConfigurationModalModel;
 
 namespace Unity.TenantManagement.Web;
 
@@ -79,6 +80,66 @@ public override void Map(EditModalModel.TenantInfoModel source, TenantUpdateDto
     }
 }
 
+public class TenantDtoToConfigurationTenantInfoMapper : MapperBase<TenantDto, TenantInfoModel>
+{
+    public override TenantInfoModel Map(TenantDto source)
+    {
+        var destination = new TenantInfoModel();
+        Map(source, destination);
+        return destination;
+    }
+
+    public override void Map(TenantDto source, TenantInfoModel destination)
+    {
+        destination.Id = source.Id;
+        destination.Name = source.Name;
+        destination.Division = source.Division;
+        destination.Branch = source.Branch;
+        destination.Description = source.Description;
+        destination.CasClientCode = source.CasClientCode;
+        destination.ConcurrencyStamp = source.ConcurrencyStamp;
+        TenantExtraPropertiesCopier.Copy(source, destination);
+    }
+}
+
+public class ConfigurationTenantInfoToTenantUpdateDtoMapper : MapperBase<TenantInfoModel, TenantUpdateDto>
+{
+    public override TenantUpdateDto Map(TenantInfoModel source)
+    {
+        var destination = new TenantUpdateDto();
+        Map(source, destination);
+        return destination;
+    }
+
+    public override void Map(TenantInfoModel source, TenantUpdateDto destination)
+    {
+        destination.Name = source.Name;
+        destination.Division = source.Division;
+        destination.Branch = source.Branch;
+        destination.Description = source.Description;
+        destination.CasClientCode = source.CasClientCode ?? string.Empty;
+        destination.ConcurrencyStamp = source.ConcurrencyStamp;
+        TenantExtraPropertiesCopier.Copy(source, destination);
+    }
+}
+
+public class TenantDtoToConfigurationManagerInfoMapper : MapperBase<TenantDto, ManagerInfoModel>
+{
+    public override ManagerInfoModel Map(TenantDto source)
+    {
+        var destination = new ManagerInfoModel();
+        Map(source, destination);
+        return destination;
+    }
+
+    public override void Map(TenantDto source, ManagerInfoModel destination)
+    {
+        destination.Id = source.Id;
+        destination.Name = source.Name;
+        TenantExtraPropertiesCopier.Copy(source, destination);
+    }
+}
+
 public class TenantDtoToAssignManagerInfoMapper : MapperBase<TenantDto, AssignManagerInfoModel>
 {
     public override AssignManagerInfoModel Map(TenantDto source)
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/UnityTenantManagementWebModule.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/UnityTenantManagementWebModule.cs
index 08f08f4142..f7bffd53c2 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/UnityTenantManagementWebModule.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/UnityTenantManagementWebModule.cs
@@ -14,6 +14,7 @@
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
 using Volo.Abp.Threading;
+using Unity.Modules.Shared.Permissions;
 using Unity.TenantManagement.Web.Navigation;
 
 namespace Unity.TenantManagement.Web;
@@ -55,10 +56,12 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
         Configure<RazorPagesOptions>(options =>
         {
-            options.Conventions.AuthorizePage("/TenantManagement/Tenants/Index", TenantManagementPermissions.Tenants.Default);
+            options.Conventions.AuthorizePage("/TenantManagement/Tenants/Index", TenantManagementPermissions.Policies.TenantsOrITOps);
             options.Conventions.AuthorizePage("/TenantManagement/Tenants/CreateModal", TenantManagementPermissions.Tenants.Create);
             options.Conventions.AuthorizePage("/TenantManagement/Tenants/EditModal", TenantManagementPermissions.Tenants.Update);
             options.Conventions.AuthorizePage("/TenantManagement/Tenants/AssignManagerModal", TenantManagementPermissions.Tenants.Create);
+            options.Conventions.AuthorizePage("/TenantManagement/Tenants/ConfigurationModal", TenantManagementPermissions.Policies.TenantsOrITOps);
+            options.Conventions.AuthorizePage("/TenantManagement/Onboarding/Index", IdentityConsts.ITOperationsPermissionName);
         });
 
         Configure<AbpPageToolbarOptions>(options =>
@@ -95,7 +98,8 @@ public override void PostConfigureServices(ServiceConfigurationContext context)
                     editFormTypes: new[]
                     {
                         typeof(Pages.TenantManagement.Tenants.EditModalModel.TenantInfoModel),
-                        typeof(Pages.TenantManagement.Tenants.AssignManagerModalModel.AssignManagerInfoModel)
+                        typeof(Pages.TenantManagement.Tenants.AssignManagerModalModel.AssignManagerInfoModel),
+                        typeof(Pages.TenantManagement.Tenants.ConfigurationModalModel.TenantInfoModel)
                     }
                 );
         });
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/wwwroot/client-proxies/multi-tenancy-proxy.js b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/wwwroot/client-proxies/multi-tenancy-proxy.js
index 7ffac83e74..c5014d6c15 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/wwwroot/client-proxies/multi-tenancy-proxy.js
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/wwwroot/client-proxies/multi-tenancy-proxy.js
@@ -44,24 +44,86 @@
         dataType: null
       }, ajaxParams));
     };
-    unity.tenantManagement.tenant.getDefaultConnectionString = function(id, ajaxParams) {
+    unity.tenantManagement.tenant.getConnectionStrings = function(id, ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/multi-tenancy/tenants/' + id + '/default-connection-string',
+        url: abp.appPath + 'api/multi-tenancy/tenants/' + id + '/connection-strings',
         type: 'GET'
-      }, { dataType: 'text' }, ajaxParams));
+      }, ajaxParams));
     };
-    unity.tenantManagement.tenant.updateDefaultConnectionString = function(id, defaultConnectionString, ajaxParams) {
+    unity.tenantManagement.tenant.updateConnectionStrings = function(id, input, ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/multi-tenancy/tenants/' + id + '/default-connection-string' + abp.utils.buildQueryString([{ name: 'defaultConnectionString', value: defaultConnectionString }]) + '',
+        url: abp.appPath + 'api/multi-tenancy/tenants/' + id + '/connection-strings',
         type: 'PUT',
-        dataType: null
+        data: JSON.stringify(input)
+      }, ajaxParams));
+    };
+
+  })();
+
+  // controller unity.tenantManagement.onboardingRequest
+
+  (function(){
+
+    abp.utils.createNamespace(globalThis, 'unity.tenantManagement.onboardingRequest');
+
+    unity.tenantManagement.onboardingRequest.getList = function(input, ajaxParams) {
+      const qsParams = [
+        { name: 'sorting', value: input.sorting },
+        { name: 'skipCount', value: input.skipCount },
+        { name: 'maxResultCount', value: input.maxResultCount },
+        { name: 'category', value: input.category },
+        { name: 'filter', value: input.filter }
+      ];
+      (input.columnFilters || []).forEach(function(cf, i) {
+        qsParams.push(
+          { name: 'columnFilters[' + i + '].name', value: cf.name },
+          { name: 'columnFilters[' + i + '].value', value: cf.value }
+        );
+      });
+      return abp.ajax($.extend(true, {
+        url: abp.appPath + 'api/onboarding-requests' + abp.utils.buildQueryString(qsParams) + '',
+        type: 'GET'
       }, ajaxParams));
     };
-    unity.tenantManagement.tenant.deleteDefaultConnectionString = function(id, ajaxParams) {
+
+    unity.tenantManagement.onboardingRequest.get = function(id, ajaxParams) {
       return abp.ajax($.extend(true, {
-        url: abp.appPath + 'api/multi-tenancy/tenants/' + id + '/default-connection-string',
-        type: 'DELETE',
-        dataType: null
+        url: abp.appPath + 'api/onboarding-requests/' + id + '',
+        type: 'GET'
+      }, ajaxParams));
+    };
+
+    unity.tenantManagement.onboardingRequest.validate = function(id, input, ajaxParams) {
+      return abp.ajax($.extend(true, {
+        url: abp.appPath + 'api/onboarding-requests/' + id + '/validate' + abp.utils.buildQueryString([
+          { name: 'tenantNameFieldKey', value: input?.tenantNameFieldKey },
+          { name: 'superUsersFieldKey', value: input?.superUsersFieldKey }
+        ]) + '',
+        type: 'GET'
+      }, ajaxParams));
+    };
+
+    unity.tenantManagement.onboardingRequest.createTenant = function(id, input, ajaxParams) {
+      return abp.ajax($.extend(true, {
+        url: abp.appPath + 'api/onboarding-requests/' + id + '/create-tenant',
+        type: 'POST',
+        data: JSON.stringify(input)
+      }, ajaxParams));
+    };
+
+    unity.tenantManagement.onboardingRequest.getColumnSchema = function(input, ajaxParams) {
+      return abp.ajax($.extend(true, {
+        url: abp.appPath + 'api/onboarding-requests/column-schema' + abp.utils.buildQueryString([
+          { name: 'category', value: input?.category }
+        ]) + '',
+        type: 'GET'
+      }, ajaxParams));
+    };
+
+    unity.tenantManagement.onboardingRequest.getAvailableCategories = function(ajaxParams) {
+      return abp.ajax($.extend(true, {
+        url: abp.appPath + 'api/onboarding-requests/categories',
+        type: 'GET'
       }, ajaxParams));
     };
 
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/Onboarding/OnboardingFeatureMapTests.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/Onboarding/OnboardingFeatureMapTests.cs
new file mode 100644
index 0000000000..e5e7e990a6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/Onboarding/OnboardingFeatureMapTests.cs
@@ -0,0 +1,73 @@
+using Shouldly;
+using Xunit;
+
+namespace Unity.TenantManagement.Onboarding;
+
+public class OnboardingFeatureMapTests
+{
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("   ")]
+    public void ResolveFeatureKeys_BlankInput_ReturnsEmpty(string input)
+    {
+        var result = OnboardingFeatureMap.ResolveFeatureKeys(input);
+
+        result.ShouldBeEmpty();
+    }
+
+    [Fact]
+    public void ResolveFeatureKeys_UnrecognizedTokens_AreDroppedNotPassedThrough()
+    {
+        // The "Features" worksheet field is filled out by the applicant submitting the onboarding
+        // request, so unrecognized/arbitrary tokens must never reach the real ABP feature name list.
+        var result = OnboardingFeatureMap.ResolveFeatureKeys("Payments,SomeArbitraryFeatureKey,DROP TABLE Tenants");
+
+        result.ShouldBe(["Unity.Payments"]);
+    }
+
+    [Theory]
+    [InlineData("Payments,Reporting")]
+    [InlineData("Payments;Reporting")]
+    [InlineData("Payments|Reporting")]
+    public void ResolveFeatureKeys_AllDelimiterVariants_AreSupported(string input)
+    {
+        var result = OnboardingFeatureMap.ResolveFeatureKeys(input);
+
+        result.ShouldBe(["Unity.Payments", "Unity.Reporting"]);
+    }
+
+    [Fact]
+    public void ResolveFeatureKeys_KeyMatchingIsCaseInsensitive()
+    {
+        var result = OnboardingFeatureMap.ResolveFeatureKeys("payments,AIREPORTING");
+
+        result.ShouldBe(["Unity.Payments", "Unity.AIReporting"]);
+    }
+
+    [Fact]
+    public void ResolveFeatureKeys_DuplicateTokens_CollapseToASingleKey()
+    {
+        var result = OnboardingFeatureMap.ResolveFeatureKeys("Payments,Payments,Flex");
+
+        result.ShouldBe(["Unity.Payments", "Unity.Flex"]);
+    }
+
+    [Fact]
+    public void ResolveFeatureKeys_CheckboxGroupJsonFormat_OnlyEnabledKeysAreResolved()
+    {
+        var json = """[{"key":"aiReporting","value":true},{"key":"aiScoring","value":false}]""";
+
+        var result = OnboardingFeatureMap.ResolveFeatureKeys(json);
+
+        result.ShouldBe(["Unity.AIReporting"]);
+    }
+
+    [Fact]
+    public void ResolveFeatureKeys_MalformedJsonArray_DoesNotThrowAndReturnsEmpty()
+    {
+        var result = OnboardingFeatureMap.ResolveFeatureKeys("[ this is not valid json");
+
+        result.ShouldBeEmpty();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/OnboardingRequestAppServiceTests.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/OnboardingRequestAppServiceTests.cs
new file mode 100644
index 0000000000..7667f51dfa
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/OnboardingRequestAppServiceTests.cs
@@ -0,0 +1,472 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using NSubstitute;
+using Shouldly;
+using Unity.Flex.Worksheets;
+using Unity.Flex.Worksheets.Values;
+using Unity.Flex.WorksheetInstances;
+using Unity.TenantManagement.Onboarding;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.SettingManagement;
+using Xunit;
+
+namespace Unity.TenantManagement;
+
+public class OnboardingRequestAppServiceTests : AbpTenantManagementApplicationTestBase
+{
+    private const string ApplicationCorrelationProvider = "Application";
+
+    private IOnboardingApplicationProvider _applicationProvider = null!;
+    private IWorksheetInstanceAppService _worksheetInstanceAppService = null!;
+    private IWorksheetAppService _worksheetAppService = null!;
+    private IOnboardingUserLookup _userLookup = null!;
+    private ITenantAppService _tenantAppService = null!;
+    private ISettingManager _settingManager = null!;
+
+    private readonly IOnboardingRequestAppService _appService;
+
+    protected override void AfterAddApplication(IServiceCollection services)
+    {
+        _applicationProvider = Substitute.For<IOnboardingApplicationProvider>();
+        _applicationProvider.GetAllIdsAsync(Arg.Any<string>()).Returns(new List<Guid>());
+        _applicationProvider.GetFormVersionIdsAsync(Arg.Any<string>()).Returns(new List<Guid>());
+        _applicationProvider.GetMappedCoreFieldColumnsAsync(Arg.Any<string>()).Returns(new List<OnboardingColumnDto>());
+        _applicationProvider.GetPagedListAsync(
+                Arg.Any<int>(), Arg.Any<int>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(),
+                Arg.Any<IReadOnlyList<Guid>>(), Arg.Any<IReadOnlyList<ColumnFilterDto>>(), Arg.Any<IReadOnlyList<Guid>>())
+            .Returns(new PagedResultDto<OnboardingApplicationRecord>(0, []));
+
+        _worksheetInstanceAppService = Substitute.For<IWorksheetInstanceAppService>();
+        _worksheetInstanceAppService.GetListByCorrelationIdsAsync(Arg.Any<List<Guid>>(), Arg.Any<string>())
+            .Returns(new List<WorksheetInstanceDataDto>());
+
+        _worksheetAppService = Substitute.For<IWorksheetAppService>();
+        _userLookup = Substitute.For<IOnboardingUserLookup>();
+        _tenantAppService = Substitute.For<ITenantAppService>();
+
+        _settingManager = Substitute.For<ISettingManager>();
+        _settingManager.GetOrNullAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>())
+            .Returns((string)null);
+
+        services.AddSingleton(_applicationProvider);
+        services.AddSingleton(_worksheetInstanceAppService);
+        services.AddSingleton(_worksheetAppService);
+        services.AddSingleton(_userLookup);
+        services.AddSingleton(_tenantAppService);
+        services.AddSingleton(_settingManager);
+    }
+
+    public OnboardingRequestAppServiceTests()
+    {
+        _appService = GetRequiredService<IOnboardingRequestAppService>();
+    }
+
+    private static WorksheetInstanceDataDto WorksheetInstanceFor(Guid correlationId, params (string Key, string Value)[] fields) =>
+        new()
+        {
+            Id = Guid.NewGuid(),
+            CorrelationId = correlationId,
+            WorksheetId = Guid.NewGuid(),
+            CurrentValue = System.Text.Json.JsonSerializer.Serialize(new WorksheetInstanceValue
+            {
+                Values = fields.Select(f => new FieldInstanceValue(f.Key, f.Value)).ToList()
+            })
+        };
+
+    [Fact]
+    public async Task GetListAsync_DynamicColumnFilters_AreCaseInsensitiveAndAndCombined()
+    {
+        var matching = Guid.NewGuid();
+        var wrongMinistry = Guid.NewGuid();
+        var wrongBranch = Guid.NewGuid();
+        var allIds = new List<Guid> { matching, wrongMinistry, wrongBranch };
+
+        _applicationProvider.GetAllIdsAsync("Onboarding").Returns(allIds);
+        _worksheetInstanceAppService.GetListByCorrelationIdsAsync(Arg.Any<List<Guid>>(), ApplicationCorrelationProvider).Returns(new List<WorksheetInstanceDataDto>
+        {
+            WorksheetInstanceFor(matching, ("ministry", "Health"), ("branch", "North")),
+            WorksheetInstanceFor(wrongMinistry, ("ministry", "Finance"), ("branch", "North")),
+            WorksheetInstanceFor(wrongBranch, ("ministry", "Health"), ("branch", "South"))
+        });
+
+        IReadOnlyList<Guid> capturedMatchIds = null;
+        _applicationProvider
+            .When(p => p.GetPagedListAsync(
+                Arg.Any<int>(), Arg.Any<int>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(),
+                Arg.Any<IReadOnlyList<Guid>>(), Arg.Any<IReadOnlyList<ColumnFilterDto>>(), Arg.Any<IReadOnlyList<Guid>>()))
+            .Do(call => capturedMatchIds = call.ArgAt<IReadOnlyList<Guid>>(7));
+
+        await _appService.GetListAsync(new OnboardingListRequestDto
+        {
+            ColumnFilters = [
+                new ColumnFilterDto { Name = "ministry", Value = "HEALTH" },
+                new ColumnFilterDto { Name = "branch", Value = "nor" }
+            ]
+        });
+
+        capturedMatchIds.ShouldNotBeNull();
+        capturedMatchIds.ShouldBe([matching]);
+    }
+
+    [Fact]
+    public async Task GetListAsync_DynamicColumnSort_StripsFieldsPrefixAndSortsInMemoryWithPaging()
+    {
+        var idA = Guid.NewGuid();
+        var idB = Guid.NewGuid();
+        var idC = Guid.NewGuid();
+        var allIds = new List<Guid> { idA, idB, idC };
+
+        _applicationProvider.GetAllIdsAsync("Onboarding").Returns(allIds);
+        _applicationProvider.GetPagedListAsync(0, int.MaxValue, null, "Onboarding", null, null, null, null)
+            .Returns(new PagedResultDto<OnboardingApplicationRecord>(3, [
+                new OnboardingApplicationRecord { Id = idA, Category = "Onboarding" },
+                new OnboardingApplicationRecord { Id = idB, Category = "Onboarding" },
+                new OnboardingApplicationRecord { Id = idC, Category = "Onboarding" }
+            ]));
+
+        _worksheetInstanceAppService.GetListByCorrelationIdsAsync(Arg.Any<List<Guid>>(), ApplicationCorrelationProvider).Returns(new List<WorksheetInstanceDataDto>
+        {
+            WorksheetInstanceFor(idA, ("score", "Charlie")),
+            WorksheetInstanceFor(idB, ("score", "Apple")),
+            WorksheetInstanceFor(idC, ("score", "Bravo"))
+        });
+
+        var result = await _appService.GetListAsync(new OnboardingListRequestDto
+        {
+            Sorting = "fields.score asc",
+            SkipCount = 0,
+            MaxResultCount = 2
+        });
+
+        result.TotalCount.ShouldBe(3);
+        result.Items.Select(i => i.Id).ShouldBe([idB, idC]);
+    }
+
+    [Fact]
+    public async Task GetColumnSchemaAsync_DedupesFieldsAcrossWorksheets_PreservesOrder()
+    {
+        var formVersionId = Guid.NewGuid();
+        var ws1 = Guid.NewGuid();
+        var ws2 = Guid.NewGuid();
+
+        _applicationProvider.GetFormVersionIdsAsync("Onboarding").Returns(new List<Guid> { formVersionId });
+
+        _worksheetAppService.GetListByCorrelationAsync(formVersionId, "FormVersion").Returns(new List<WorksheetDto>
+        {
+            new() {
+                Id = ws1,
+                Sections = [
+                    new WorksheetSectionDto { Order = 0, Fields = [
+                        new CustomFieldDto { Key = "branch", Label = "Branch", Order = 0, Enabled = true },
+                        new CustomFieldDto { Key = "ministry", Label = "Ministry", Order = 1, Enabled = true }
+                    ]}
+                ]
+            },
+            new() {
+                Id = ws2,
+                Sections = [
+                    new WorksheetSectionDto { Order = 0, Fields = [
+                        new CustomFieldDto { Key = "branch", Label = "Branch", Order = 0, Enabled = true }, // duplicate
+                        new CustomFieldDto { Key = "hidden", Label = "Hidden", Order = 1, Enabled = false }, // disabled
+                        new CustomFieldDto { Key = "email", Label = "Email", Order = 2, Enabled = true }
+                    ]}
+                ]
+            }
+        });
+
+        var result = await _appService.GetColumnSchemaAsync();
+
+        result.Columns!.Select(c => c.Key).ShouldBe(["branch", "ministry", "email"]);
+    }
+
+    [Fact]
+    public async Task GetColumnSchemaAsync_ReturnsColumns_WithNoApplicationsSubmittedYet()
+    {
+        var formVersionId = Guid.NewGuid();
+
+        _applicationProvider.GetFormVersionIdsAsync("Onboarding").Returns(new List<Guid> { formVersionId });
+
+        _worksheetAppService.GetListByCorrelationAsync(formVersionId, "FormVersion").Returns(new List<WorksheetDto>
+        {
+            new() {
+                Id = Guid.NewGuid(),
+                Sections = [
+                    new WorksheetSectionDto { Order = 0, Fields = [
+                        new CustomFieldDto { Key = "branch", Label = "Branch", Order = 0, Enabled = true }
+                    ]}
+                ]
+            }
+        });
+
+        var result = await _appService.GetColumnSchemaAsync();
+
+        result.Columns!.Select(c => c.Key).ShouldBe(["branch"]);
+    }
+
+    [Fact]
+    public async Task GetColumnSchemaAsync_CombinesFieldsAcrossFormVersions_ByKeyEvenWithDifferentLabel()
+    {
+        var oldFormVersionId = Guid.NewGuid();
+        var newFormVersionId = Guid.NewGuid();
+
+        // Both versions are published and mapped — GetFormVersionIdsAsync now returns every
+        // published version, not just the latest, so both contribute columns here.
+        _applicationProvider.GetFormVersionIdsAsync("Onboarding")
+            .Returns(new List<Guid> { oldFormVersionId, newFormVersionId });
+
+        _worksheetAppService.GetListByCorrelationAsync(oldFormVersionId, "FormVersion").Returns(new List<WorksheetDto>
+        {
+            new() {
+                Id = Guid.NewGuid(),
+                Sections = [
+                    new WorksheetSectionDto { Order = 0, Fields = [
+                        new CustomFieldDto { Key = "branch", Label = "Branch (old wording)", Order = 0, Enabled = true }
+                    ]}
+                ]
+            }
+        });
+        _worksheetAppService.GetListByCorrelationAsync(newFormVersionId, "FormVersion").Returns(new List<WorksheetDto>
+        {
+            new() {
+                Id = Guid.NewGuid(),
+                Sections = [
+                    new WorksheetSectionDto { Order = 0, Fields = [
+                        new CustomFieldDto { Key = "branch", Label = "Branch (new wording)", Order = 0, Enabled = true },
+                        new CustomFieldDto { Key = "ministry", Label = "Ministry", Order = 1, Enabled = true }
+                    ]}
+                ]
+            }
+        });
+
+        var result = await _appService.GetColumnSchemaAsync();
+
+        // Same key across versions collapses to one column — the first version encountered wins the label.
+        result.Columns!.Select(c => c.Key).ShouldBe(["branch", "ministry"]);
+        result.Columns!.First(c => c.Key == "branch").Label.ShouldBe("Branch (old wording)");
+    }
+
+    [Fact]
+    public async Task GetColumnSchemaAsync_AppendsMappedCoreFieldColumns_AfterWorksheetColumns()
+    {
+        var formVersionId = Guid.NewGuid();
+
+        _applicationProvider.GetFormVersionIdsAsync("Onboarding").Returns(new List<Guid> { formVersionId });
+        _worksheetAppService.GetListByCorrelationAsync(formVersionId, "FormVersion").Returns(new List<WorksheetDto>
+        {
+            new() {
+                Id = Guid.NewGuid(),
+                Sections = [
+                    new WorksheetSectionDto { Order = 0, Fields = [
+                        new CustomFieldDto { Key = "branch", Label = "Branch", Order = 0, Enabled = true }
+                    ]}
+                ]
+            }
+        });
+        _applicationProvider.GetMappedCoreFieldColumnsAsync("Onboarding").Returns(new List<OnboardingColumnDto>
+        {
+            new() { Key = "ProjectName", Label = "Project Name", Type = "String", Selected = true },
+            new() { Key = "branch", Label = "Branch", Type = "String", Selected = true } // duplicate key — should be deduped
+        });
+
+        var result = await _appService.GetColumnSchemaAsync();
+
+        result.Columns!.Select(c => c.Key).ShouldBe(["branch", "ProjectName"]);
+    }
+
+    [Fact]
+    public async Task GetListAsync_MergesCoreFieldValues_IntoFields()
+    {
+        var appId = Guid.NewGuid();
+
+        _applicationProvider.GetPagedListAsync(
+                Arg.Any<int>(), Arg.Any<int>(), Arg.Any<string>(), "Onboarding", Arg.Any<string>(),
+                Arg.Any<IReadOnlyList<Guid>>(), Arg.Any<IReadOnlyList<ColumnFilterDto>>(), Arg.Any<IReadOnlyList<Guid>>())
+            .Returns(new PagedResultDto<OnboardingApplicationRecord>(1, [
+                new OnboardingApplicationRecord
+                {
+                    Id = appId,
+                    Category = "Onboarding",
+                    CoreFieldValues = new Dictionary<string, object> { ["ProjectName"] = "Bridge Repair" }
+                }
+            ]));
+
+        var result = await _appService.GetListAsync(new OnboardingListRequestDto());
+
+        result.Items[0].Fields["ProjectName"].ShouldBe("Bridge Repair");
+    }
+
+    [Fact]
+    public async Task GetListAsync_SortByMappedCoreField_PassesThroughToProvider_NoInMemoryFetchAll()
+    {
+        _applicationProvider.GetMappedCoreFieldColumnsAsync("Onboarding").Returns(new List<OnboardingColumnDto>
+        {
+            new() { Key = "ProjectName", Label = "Project Name", Type = "String", Selected = true }
+        });
+
+        (int Skip, int Take, string Sorting)? captured = null;
+        _applicationProvider
+            .When(p => p.GetPagedListAsync(
+                Arg.Any<int>(), Arg.Any<int>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(),
+                Arg.Any<IReadOnlyList<Guid>>(), Arg.Any<IReadOnlyList<ColumnFilterDto>>(), Arg.Any<IReadOnlyList<Guid>>()))
+            .Do(call => captured = (call.ArgAt<int>(0), call.ArgAt<int>(1), call.ArgAt<string>(2)));
+
+        await _appService.GetListAsync(new OnboardingListRequestDto
+        {
+            Sorting = "fields.ProjectName asc",
+            SkipCount = 5,
+            MaxResultCount = 10
+        });
+
+        // A core field is provider-handled: paging/sort go straight to SQL — no "fetch everything,
+        // sort in memory" fallback (which would show up as Skip=0, Take=int.MaxValue, Sorting=null).
+        captured.ShouldNotBeNull();
+        captured!.Value.Skip.ShouldBe(5);
+        captured.Value.Take.ShouldBe(10);
+        captured.Value.Sorting.ShouldBe("ProjectName ASC");
+    }
+
+    [Fact]
+    public async Task GetListAsync_ColumnFilterOnMappedCoreField_RoutedAsStaticFilter_NotWorksheetScan()
+    {
+        _applicationProvider.GetMappedCoreFieldColumnsAsync("Onboarding").Returns(new List<OnboardingColumnDto>
+        {
+            new() { Key = "ProjectName", Label = "Project Name", Type = "String", Selected = true }
+        });
+
+        IReadOnlyList<ColumnFilterDto> capturedStaticFilters = null;
+        IReadOnlyList<Guid> capturedDynamicMatchIds = null;
+        _applicationProvider
+            .When(p => p.GetPagedListAsync(
+                Arg.Any<int>(), Arg.Any<int>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(),
+                Arg.Any<IReadOnlyList<Guid>>(), Arg.Any<IReadOnlyList<ColumnFilterDto>>(), Arg.Any<IReadOnlyList<Guid>>()))
+            .Do(call =>
+            {
+                capturedStaticFilters = call.ArgAt<IReadOnlyList<ColumnFilterDto>>(6);
+                capturedDynamicMatchIds = call.ArgAt<IReadOnlyList<Guid>>(7);
+            });
+
+        await _appService.GetListAsync(new OnboardingListRequestDto
+        {
+            ColumnFilters = [new ColumnFilterDto { Name = "ProjectName", Value = "bridge" }]
+        });
+
+        capturedStaticFilters.ShouldNotBeNull();
+        capturedStaticFilters!.ShouldContain(f => f.Name == "ProjectName" && f.Value == "bridge");
+        // Worksheet match precomputation never ran for this filter.
+        capturedDynamicMatchIds.ShouldBeNull();
+    }
+
+    [Fact]
+    public async Task ValidateAsync_ExplicitTenantNameFieldKey_OverridesSavedMapping()
+    {
+        var id = Guid.NewGuid();
+        _applicationProvider.GetByIdAsync(id).Returns(new OnboardingApplicationRecord { Id = id, Category = "Onboarding" });
+        _worksheetInstanceAppService.GetListByCorrelationIdsAsync(Arg.Any<List<Guid>>(), ApplicationCorrelationProvider).Returns(new List<WorksheetInstanceDataDto>
+        {
+            WorksheetInstanceFor(id, ("explicitKey", "Brand New Co"), ("savedKey", "acme"))
+        });
+
+        // Simulates a previously saved column mapping pointing at a different (colliding) field.
+        _settingManager.GetOrNullAsync(OnboardingColumnConfigSettings.TenantNameFieldKey, Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>())
+            .Returns("savedKey");
+
+        var result = await _appService.ValidateAsync(id, tenantNameFieldKey: "explicitKey", superUsersFieldKey: null);
+
+        result.Issues.ShouldNotContain(i => i.StartsWith("[Tenant Name]"));
+    }
+
+    [Fact]
+    public async Task ValidateAsync_AggregatesFailuresFromAllStepsInOrder()
+    {
+        var id = Guid.NewGuid();
+        _applicationProvider.GetByIdAsync(id).Returns(new OnboardingApplicationRecord { Id = id, Category = "Onboarding" });
+        _worksheetInstanceAppService.GetListByCorrelationIdsAsync(Arg.Any<List<Guid>>(), ApplicationCorrelationProvider).Returns(new List<WorksheetInstanceDataDto>
+        {
+            WorksheetInstanceFor(id, ("tn", "acme"), ("su", "not-an-email"))
+        });
+
+        var result = await _appService.ValidateAsync(id, tenantNameFieldKey: "tn", superUsersFieldKey: "su");
+
+        result.IsValid.ShouldBeFalse();
+        result.Issues.Count.ShouldBe(2);
+        result.Issues[0].ShouldStartWith("[Tenant Name]");
+        result.Issues[1].ShouldStartWith("[Super Users]");
+    }
+
+    [Fact]
+    public async Task CreateTenantAsync_NoValidSuperUsers_ThrowsAndDoesNotCreateTenant()
+    {
+        var id = Guid.NewGuid();
+        _applicationProvider.GetByIdAsync(id).Returns(new OnboardingApplicationRecord { Id = id, Category = "Onboarding" });
+        _worksheetInstanceAppService.GetListByCorrelationIdsAsync(Arg.Any<List<Guid>>(), ApplicationCorrelationProvider).Returns(new List<WorksheetInstanceDataDto>
+        {
+            WorksheetInstanceFor(id, ("tn", "Brand New Co"), ("su", "not-an-email"))
+        });
+
+        await Should.ThrowAsync<UserFriendlyException>(() => _appService.CreateTenantAsync(id, new CreateTenantInputDto
+        {
+            TenantNameFieldKey = "tn",
+            SuperUsersFieldKey = "su"
+        }));
+
+        await _tenantAppService.DidNotReceive().CreateAsync(Arg.Any<TenantCreateDto>());
+    }
+
+    [Fact]
+    public async Task CreateTenantAsync_DuplicateTenantName_ThrowsAndDoesNotCreateTenant()
+    {
+        var id = Guid.NewGuid();
+        _applicationProvider.GetByIdAsync(id).Returns(new OnboardingApplicationRecord { Id = id, Category = "Onboarding" });
+        _worksheetInstanceAppService.GetListByCorrelationIdsAsync(Arg.Any<List<Guid>>(), ApplicationCorrelationProvider).Returns(new List<WorksheetInstanceDataDto>
+        {
+            // "acme" is seeded by the test host, so this collides even though super users resolve fine.
+            WorksheetInstanceFor(id, ("tn", "acme"), ("su", "first@example.com"))
+        });
+        _userLookup.FindUserGuidByEmailAsync("first@example.com").Returns("guid-1");
+
+        await Should.ThrowAsync<UserFriendlyException>(() => _appService.CreateTenantAsync(id, new CreateTenantInputDto
+        {
+            TenantNameFieldKey = "tn",
+            SuperUsersFieldKey = "su"
+        }));
+
+        await _tenantAppService.DidNotReceive().CreateAsync(Arg.Any<TenantCreateDto>());
+        await _applicationProvider.DidNotReceive().CloseApplicationAsync(Arg.Any<Guid>());
+    }
+
+    [Fact]
+    public async Task CreateTenantAsync_ValidSuperUsers_CreatesTenantAndAssignsRemainingAsManagers()
+    {
+        var id = Guid.NewGuid();
+        var newTenantId = Guid.NewGuid();
+
+        _applicationProvider.GetByIdAsync(id).Returns(new OnboardingApplicationRecord { Id = id, Category = "Onboarding" });
+        _worksheetInstanceAppService.GetListByCorrelationIdsAsync(Arg.Any<List<Guid>>(), ApplicationCorrelationProvider).Returns(new List<WorksheetInstanceDataDto>
+        {
+            WorksheetInstanceFor(id, ("tn", "New Co"), ("su", "first@example.com,second@example.com"), ("branch", "North"))
+        });
+
+        _userLookup.FindUserGuidByEmailAsync("first@example.com").Returns("guid-1");
+        _userLookup.FindUserGuidByEmailAsync("second@example.com").Returns("guid-2");
+
+        _tenantAppService.CreateAsync(Arg.Any<TenantCreateDto>())
+            .Returns(new TenantDto { Id = newTenantId, Name = "New Co" });
+
+        await _appService.CreateTenantAsync(id, new CreateTenantInputDto
+        {
+            TenantNameFieldKey = "tn",
+            SuperUsersFieldKey = "su",
+            BranchFieldKey = "branch"
+        });
+
+        await _tenantAppService.Received(1).CreateAsync(Arg.Is<TenantCreateDto>(d =>
+            d.Name == "New Co" && d.Branch == "North" && d.UserIdentifier == "guid-1"));
+        await _tenantAppService.Received(1).AssignManagerAsync(Arg.Is<TenantAssignManagerDto>(d =>
+            d.TenantId == newTenantId && d.UserIdentifier == "guid-2"));
+        await _applicationProvider.Received(1).CloseApplicationAsync(id);
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/TenantAppService_Tests.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/TenantAppService_Tests.cs
index 37dcc34065..96f8c73743 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/TenantAppService_Tests.cs
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/TenantAppService_Tests.cs
@@ -4,8 +4,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using Shouldly;
+using Unity.TenantManagement.Application;
 using Unity.TenantManagement.Application.Contracts;
 using Volo.Abp;
+using Volo.Abp.TenantManagement;
 using Xunit;
 
 namespace Unity.TenantManagement;
@@ -19,7 +21,12 @@ protected override void AfterAddApplication(IServiceCollection services)
         // Create a Substitute and replace original one in Service Collection
         var tenantConnectionStringBuilder = Substitute.For<ITenantConnectionStringBuilder>();
 
-        tenantConnectionStringBuilder.Build(Arg.Any<string>()).Returns("acme test connection");
+        tenantConnectionStringBuilder.GenerateCredentialsAsync()
+            .Returns(Task.FromResult(new TenantDbCredentials("T_ABC123", "T_ABC123", "XYZ789")));
+        tenantConnectionStringBuilder.GenerateReadOnlyCredentials(Arg.Any<TenantDbCredentials>())
+            .Returns(new TenantDbCredentials("T_ABC123", "T_ABC123_readonly", "RO12345"));
+        tenantConnectionStringBuilder.Build(Arg.Any<string>(), Arg.Any<TenantDbCredentials>())
+            .Returns("acme test connection");
 
         services.AddSingleton(tenantConnectionStringBuilder);
     }
@@ -75,6 +82,11 @@ public async Task CreateAsync()
         var tenant = await _tenantAppService.CreateAsync(new TenantCreateDto { Name = tenancyName });
         tenant.Name.ShouldBe(tenancyName);
         tenant.Id.ShouldNotBe(Guid.Empty);
+
+        var tenantRepository = GetRequiredService<ITenantRepository>();
+        var tenantInDb = await tenantRepository.GetAsync(tenant.Id, includeDetails: true);
+        tenantInDb.ConnectionStrings.ShouldContain(cs => cs.Name == UnityTenantManagementConsts.TenantConnectionStringName);
+        tenantInDb.ConnectionStrings.ShouldContain(cs => cs.Name == UnityTenantManagementConsts.TenantReadOnlyConnectionStringName);
     }
 
     [Fact]
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/Validation/OnboardingValidationStepsTests.cs b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/Validation/OnboardingValidationStepsTests.cs
new file mode 100644
index 0000000000..972c606df6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.Application.Tests/Validation/OnboardingValidationStepsTests.cs
@@ -0,0 +1,164 @@
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using NSubstitute;
+using Shouldly;
+using Unity.TenantManagement;
+using Volo.Abp.TenantManagement;
+using Xunit;
+
+namespace Unity.TenantManagement.Validation;
+
+public class SuperUsersValidationStepTests
+{
+    private static OnboardingRequestDto RequestWithSuperUsers(string superUsers) =>
+        new() { SuperUsers = superUsers };
+
+    [Fact]
+    public async Task ValidateAsync_NoEmailsParsed_ReturnsFailure()
+    {
+        var lookup = Substitute.For<IOnboardingUserLookup>();
+        var step = new SuperUsersValidationStep(lookup);
+
+        var result = await step.ValidateAsync(RequestWithSuperUsers("not an email"));
+
+        result.IsValid.ShouldBeFalse();
+        await lookup.DidNotReceive().FindUserGuidByEmailAsync(Arg.Any<string>());
+    }
+
+    [Fact]
+    public async Task ValidateAsync_AnyParsedEmailResolves_ReturnsSuccess()
+    {
+        var lookup = Substitute.For<IOnboardingUserLookup>();
+        lookup.FindUserGuidByEmailAsync("first@example.com").Returns((string)null);
+        lookup.FindUserGuidByEmailAsync("second@example.com").Returns("guid-123");
+        var step = new SuperUsersValidationStep(lookup);
+
+        var result = await step.ValidateAsync(RequestWithSuperUsers("first@example.com; second@example.com"));
+
+        result.IsValid.ShouldBeTrue();
+    }
+
+    [Fact]
+    public async Task ValidateAsync_NoneOfTheParsedEmailsResolve_ReturnsFailure()
+    {
+        var lookup = Substitute.For<IOnboardingUserLookup>();
+        lookup.FindUserGuidByEmailAsync(Arg.Any<string>()).Returns((string)null);
+        var step = new SuperUsersValidationStep(lookup);
+
+        var result = await step.ValidateAsync(RequestWithSuperUsers("first@example.com,second@example.com"));
+
+        result.IsValid.ShouldBeFalse();
+        result.Issue.ShouldNotBeNullOrEmpty();
+    }
+
+    [Theory]
+    [InlineData("a@example.com,b@example.com", new[] { "a@example.com", "b@example.com" })]
+    [InlineData("a@example.com;b@example.com", new[] { "a@example.com", "b@example.com" })]
+    [InlineData("a@example.com|b@example.com", new[] { "a@example.com", "b@example.com" })]
+    [InlineData(" a@example.com , not-an-email , b@example.com ", new[] { "a@example.com", "b@example.com" })]
+    public void ParseEmails_HandlesDelimitersAndDropsNonEmailTokens(string input, string[] expected)
+    {
+        var result = SuperUsersValidationStep.ParseEmails(input);
+
+        result.ShouldBe(expected);
+    }
+
+    [Fact]
+    public void ParseEmails_ExtractsEmailsFromFormioDataGridJson()
+    {
+        const string dataGridJson = """
+        {
+          "rows": [
+            {
+              "cells": [
+                { "key": "s03_SuperUserName", "value": "Kingsley Shacklebolt" },
+                { "key": "s03_SuperUserEmail", "value": "kingsley.shacklebolt@gov.bc.ca" },
+                { "key": "s03_SuperUserTitle", "value": "Minister for Magic" }
+              ]
+            },
+            {
+              "cells": [
+                { "key": "s03_SuperUserName", "value": "Minerva McGonagall" },
+                { "key": "s03_SuperUserEmail", "value": "m.mcgonagall@hogwarts.ac.uk" },
+                { "key": "s03_SuperUserTitle", "value": "External Liaison Officer" }
+              ]
+            }
+          ]
+        }
+        """;
+
+        var result = SuperUsersValidationStep.ParseEmails(dataGridJson);
+
+        result.ShouldBe(["kingsley.shacklebolt@gov.bc.ca", "m.mcgonagall@hogwarts.ac.uk"]);
+    }
+
+    [Fact]
+    public void ParseEmails_DataGridRowsWithoutEmailColumn_ReturnsEmpty()
+    {
+        const string dataGridJson = """
+        {
+          "rows": [
+            { "cells": [ { "key": "s03_SuperUserName", "value": "Kingsley Shacklebolt" } ] }
+          ]
+        }
+        """;
+
+        var result = SuperUsersValidationStep.ParseEmails(dataGridJson);
+
+        result.ShouldBeEmpty();
+    }
+}
+
+public class TenantNameUniquenessStepTests
+{
+    private static OnboardingRequestDto RequestWithTenantName(string tenantName) =>
+        new() { TenantName = tenantName };
+
+    // Tenant's (Guid, string, string) constructor is internal to the ABP assembly; reflection is the
+    // only way to build a real instance here, since this test only needs a non-null "found" result.
+    private static Tenant NewTenant(string name) =>
+        (Tenant)typeof(Tenant)
+            .GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic, [typeof(Guid), typeof(string), typeof(string)])!
+            .Invoke([Guid.NewGuid(), name, name.ToUpperInvariant()]);
+
+    [Fact]
+    public async Task ValidateAsync_BlankTenantName_ReturnsFailureWithoutQueryingRepository()
+    {
+        var tenantRepository = Substitute.For<ITenantRepository>();
+        var step = new TenantNameUniquenessStep(tenantRepository);
+
+        var result = await step.ValidateAsync(RequestWithTenantName("   "));
+
+        result.IsValid.ShouldBeFalse();
+        await tenantRepository.DidNotReceive().FindByNameAsync(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<System.Threading.CancellationToken>());
+    }
+
+    [Fact]
+    public async Task ValidateAsync_NameAlreadyExists_ReturnsFailure()
+    {
+        var tenantRepository = Substitute.For<ITenantRepository>();
+        var existing = NewTenant("Acme");
+        tenantRepository.FindByNameAsync("ACME", Arg.Any<bool>(), Arg.Any<System.Threading.CancellationToken>())
+            .Returns(existing);
+        var step = new TenantNameUniquenessStep(tenantRepository);
+
+        var result = await step.ValidateAsync(RequestWithTenantName("Acme"));
+
+        result.IsValid.ShouldBeFalse();
+        result.Issue.ShouldContain("Acme");
+    }
+
+    [Fact]
+    public async Task ValidateAsync_NameIsUnique_ReturnsSuccess()
+    {
+        var tenantRepository = Substitute.For<ITenantRepository>();
+        tenantRepository.FindByNameAsync(Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<System.Threading.CancellationToken>())
+            .Returns((Tenant)null);
+        var step = new TenantNameUniquenessStep(tenantRepository);
+
+        var result = await step.ValidateAsync(RequestWithTenantName("Brand New Co"));
+
+        result.IsValid.ShouldBeTrue();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj
index 6561e399e8..75e6846d56 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj
@@ -17,6 +17,8 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.3" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.3" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="10.3.0" />
+    <!-- Explicit reference to fix vulnerable transitive dependency -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Bundling/UnityThemeUX2GlobalScriptContributor.cs b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Bundling/UnityThemeUX2GlobalScriptContributor.cs
index ac4c3a644e..836c089f1f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Bundling/UnityThemeUX2GlobalScriptContributor.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Bundling/UnityThemeUX2GlobalScriptContributor.cs
@@ -48,7 +48,8 @@ public override void ConfigureBundle(BundleConfigurationContext context)
         context.Files.Add("/themes/ux2/layout.js");
         context.Files.Add("/themes/ux2/plugins/filterRow.js");
         context.Files.Add("/themes/ux2/plugins/scrollResize.js");
-        context.Files.Add("/themes/ux2/plugins/colvisAlpha.js");
+        context.Files.Add("/themes/ux2/plugins/colvisAlpha.js");        
+        context.Files.Add("/themes/ux2/plugins/tableContextMenu.js");        
         context.Files.Add("/themes/ux2/table-utils.js");
         context.Files.Add("/themes/ux2/json-editor.js");
         context.Files.Add("/js/DateUtils.js");
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Bundling/UnityThemeUX2GlobalStyleContributor.cs b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Bundling/UnityThemeUX2GlobalStyleContributor.cs
index a1beefb47f..8564213d1f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Bundling/UnityThemeUX2GlobalStyleContributor.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Bundling/UnityThemeUX2GlobalStyleContributor.cs
@@ -12,6 +12,7 @@ public override void ConfigureBundle(BundleConfigurationContext context)
         context.Files.Add("/themes/ux2/fluenticons.min.css");
         context.Files.Add("/themes/ux2/layout.css");
         context.Files.Add("/themes/ux2/unity-styles.css");
+        context.Files.Add("/themes/ux2/plugins/tableContextMenu.css");
         context.Files.Add("/themes/ux2/json-editor.css");
 
         context.Files.AddIfNotContains("/libs/datatables.net-bs5/css/dataTables.bootstrap5.min.css");
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml
index a0178963b9..4cb2f91070 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml
@@ -1,8 +1,10 @@
-@using Unity.AspNetCore.Mvc.UI.Theme.UX2.Themes.UX2.Components.Brand
+@using System.Linq
+@using Unity.AspNetCore.Mvc.UI.Theme.UX2.Themes.UX2.Components.Brand
 @using Unity.AspNetCore.Mvc.UI.Theme.UX2.Themes.UX2.Components.Menu
 @using Volo.Abp.Authorization.Permissions
 @using Volo.Abp.Features
 @using Volo.Abp.MultiTenancy
+@using Volo.Abp.Security.Claims
 @using Volo.Abp.Users;
 
 @inject ICurrentUser CurrentUser
@@ -44,7 +46,10 @@
             {
                 <abp-dropdown-item href="/ApplicantPortalSettings">Applicant Portal Configuration</abp-dropdown-item>
             }          
-            @if (CurrentUser.IsInRole("system_admin") && await FeatureChecker.IsEnabledAsync("SettingManagement.Enable"))
+            @* "system_admin" is a DB-managed role, not a Keycloak-native one - it's only ever
+               present as an AbpClaimTypes.Role claim (dynamically recomputed by ABP from the DB
+               on every request), never in client_roles/CurrentUser.IsInRole. *@
+            @if (CurrentUser.FindClaims(AbpClaimTypes.Role).Any(c => c.Value == "system_admin") && await FeatureChecker.IsEnabledAsync("SettingManagement.Enable"))
             {
                 <abp-dropdown-item href="/ConfigurationManagement">Configuration Management</abp-dropdown-item>
             }
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Layouts/Empty.cshtml b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Layouts/Empty.cshtml
index 66fe02aee6..cb0780c51b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Layouts/Empty.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Layouts/Empty.cshtml
@@ -64,6 +64,8 @@
         @await Component.InvokeLayoutHookAsync(LayoutHooks.PageContent.Last, StandardLayouts.Empty)
     </div>
 
+    <script src="~/js/jquery-polyfills.js"></script>
+
     <abp-script-bundle name="@UnityThemeUX2Bundles.Scripts.Global" />
 
     <script src="~/Abp/ApplicationLocalizationScript?cultureName=@CultureInfo.CurrentUICulture.Name"></script>
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/js/DateUtils.js b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/js/DateUtils.js
index 651e25ebc5..02fac32e74 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/js/DateUtils.js
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/js/DateUtils.js
@@ -1,29 +1,32 @@
-/**
+/**
  * Date utility functions for Grant Manager application
+ *
+ * BC TIMEZONE NOTES (2026):
+ *   - BC Pacific zones (Vancouver, Victoria, etc.) do NOT observe DST in 2026.
+ *     They remain on PST (UTC-8) year-round. Use formatUtcToBcPacificDateTime / bcPstInputToUtcIso.
+ *   - BC Mountain zones (Peace River / NE BC) DO observe DST: MST (UTC-7) in winter,
+ *     MDT (UTC-6) in summer. Use formatUtcToBcMountainDateTime for those.
  */
 const DateUtils = (function () {
     'use strict';
 
+    // BC PST is a fixed UTC-8 offset -- no DST in 2026.
+    const BC_PST_OFFSET_MS = -8 * 60 * 60 * 1000;
+
     /**
-     * Formats a UTC date string to local date format
+     * Formats a UTC date string to the browser's local date format.
+     * NOTE: Uses the browser's system timezone. For BC PST (no DST) use formatUtcToBcPacificDateTime.
      * @param {string|Date} dateUtc - The UTC date to format
      * @param {string} type - The type of formatting (for DataTables compatibility)
      * @param {object} options - Additional formatting options
-     * @returns {string|number|null} Formatted date string or timestamp for sorting, null if input is invalid
+     * @returns {string} Formatted date string, or numeric timestamp string for sorting, empty string if input is invalid
      */
     function formatUtcDateToLocal(dateUtc, type, options) {
-        if (!dateUtc) {
-            return null;
-        }
-
-        const date = new Date(dateUtc);
-
-        // Required for DataTables sorting & filtering
         if (type === 'sort' || type === 'type') {
-            return date.getTime();
+            return dateUtc ? String(new Date(dateUtc).getTime()) : '0';
         }
-
-        return date.toLocaleDateString(
+        if (!dateUtc) return '';
+        return new Date(dateUtc).toLocaleDateString(
             abp.localization.currentCulture.name,
             {
                 year: 'numeric',
@@ -34,8 +37,134 @@ const DateUtils = (function () {
         );
     }
 
+    /**
+     * Formats a UTC date/time string as a BC Pacific date (date only).
+     * BC PST is fixed at UTC-8 -- no DST adjustment in 2026.
+     * @param {string|Date} dateUtc
+     * @param {string} type - DataTables type ('sort'|'type' returns numeric timestamp)
+     * @param {object} options - Additional Intl.DateTimeFormat options
+     */
+    function formatUtcToBcPacificDate(dateUtc, type, options) {
+        if (type === 'sort' || type === 'type') {
+            return dateUtc ? String(new Date(dateUtc).getTime()) : '0';
+        }
+        if (!dateUtc) return '';
+        return new Date(dateUtc).toLocaleDateString(abp.localization.currentCulture.name, {
+            timeZone: 'Etc/GMT+8',
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit',
+            ...options
+        });
+    }
+
+    /**
+     * Formats a UTC date/time string as a BC Pacific date+time string with "PST" label.
+     * BC PST is fixed at UTC-8 -- no DST adjustment in 2026.
+     * @param {string|Date} dateUtc
+     * @param {string} type - DataTables type ('sort'|'type' returns numeric timestamp)
+     */
+    function formatUtcToBcPacificDateTime(dateUtc, type) {
+        if (type === 'sort' || type === 'type') {
+            return dateUtc ? String(new Date(dateUtc).getTime()) : '0';
+        }
+        if (!dateUtc) return '';
+        const formatted = new Date(dateUtc).toLocaleString(abp.localization.currentCulture.name, {
+            timeZone: 'Etc/GMT+8',
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit',
+            hour: 'numeric',
+            minute: '2-digit'
+        });
+        return formatted + ' PST';
+    }
+
+    /**
+     * Formats a UTC date/time string for the BC Mountain timezone (Peace River / NE BC).
+     * Mountain Time observes DST in 2026: MST (UTC-7) in winter, MDT (UTC-6) in summer.
+     * @param {string|Date} dateUtc
+     * @param {string} type - DataTables type ('sort'|'type' returns numeric timestamp)
+     */
+    function formatUtcToBcMountainDateTime(dateUtc, type) {
+        if (type === 'sort' || type === 'type') {
+            return dateUtc ? String(new Date(dateUtc).getTime()) : '0';
+        }
+        if (!dateUtc) return '';
+        // America/Edmonton follows MST/MDT -- DST applies in NE BC.
+        return new Date(dateUtc).toLocaleString(abp.localization.currentCulture.name, {
+            timeZone: 'America/Edmonton',
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit',
+            hour: 'numeric',
+            minute: '2-digit',
+            timeZoneName: 'short'
+        });
+    }
+
+    /**
+     * Converts a datetime-local input string (YYYY-MM-DDTHH:mm) to a UTC ISO string,
+     * treating the input as BC Pacific Standard Time (fixed UTC-8, no DST in 2026).
+     * Use this instead of new Date(localString).toISOString() which relies on the
+     * browser's potentially incorrect DST-adjusted timezone offset.
+     * @param {string} localDatetimeString - Value from a datetime-local input
+     * @returns {string} UTC ISO 8601 string, or empty string if input is empty/invalid
+     */
+    function bcPstInputToUtcIso(localDatetimeString) {
+        if (!localDatetimeString) return '';
+        // Append the BC PST fixed offset so Date parses it as UTC-8, not browser-local.
+        const withOffset = localDatetimeString + '-08:00';
+        const date = new Date(withOffset);
+        return Number.isNaN(date.getTime()) ? '' : date.toISOString();
+    }
+
+    /**
+     * Converts a UTC timestamp (ms since epoch) to a datetime-local string (YYYY-MM-DDTHH:mm)
+     * in BC Pacific Standard Time (fixed UTC-8, no DST in 2026).
+     * Use this to populate datetime-local inputs with the correct BC PST time.
+     * @param {number} utcMs - Milliseconds since Unix epoch
+     * @returns {string} datetime-local string in BC PST
+     */
+    function utcMsToBcPstDatetimeLocal(utcMs) {
+        // Shift UTC ms by -8h to get BC PST, then read UTC getters (which now represent PST).
+        const shifted = new Date(utcMs + BC_PST_OFFSET_MS);
+        const pad = n => String(n).padStart(2, '0');
+        return `${shifted.getUTCFullYear()}-${pad(shifted.getUTCMonth() + 1)}-${pad(shifted.getUTCDate())}` +
+               `T${pad(shifted.getUTCHours())}:${pad(shifted.getUTCMinutes())}`;
+    }
+
+    /**
+     * Formats a date-only UTC string without local timezone conversion.
+     * Use this for date-only fields (Due Date, Decision Date, Project Start/End Date)
+     * where the stored date should be displayed as-is regardless of browser timezone.
+     * @param {string} dateUtc - The UTC date string to format
+     * @param {string} type - The type of formatting (for DataTables compatibility)
+     * @returns {string|number|null} Formatted date string or timestamp for sorting, empty string if input is invalid
+     */
+    function formatDate(dateUtc, type) {
+        if (!dateUtc) return '';
+        if (type === 'sort' || type === 'type') {
+            return new Date(dateUtc).getTime();
+        }
+        try {
+            return luxon.DateTime.fromISO(dateUtc, {
+                locale: abp.localization.currentCulture.name,
+            }).toUTC().toLocaleString();
+        } catch (e) {
+            console.warn('Date parse error:', e);
+            return dateUtc;
+        }
+    }
+
     // Public API
     return {
-        formatUtcDateToLocal: formatUtcDateToLocal
+        formatUtcDateToLocal: formatUtcDateToLocal,
+        formatUtcToBcPacificDate: formatUtcToBcPacificDate,
+        formatUtcToBcPacificDateTime: formatUtcToBcPacificDateTime,
+        formatUtcToBcMountainDateTime: formatUtcToBcMountainDateTime,
+        bcPstInputToUtcIso: bcPstInputToUtcIso,
+        utcMsToBcPstDatetimeLocal: utcMsToBcPstDatetimeLocal,
+        formatDate: formatDate
     };
-})();
\ No newline at end of file
+})();
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/layout.css b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/layout.css
index 6fb5270b48..10037a60d0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/layout.css
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/layout.css
@@ -31,24 +31,25 @@ body {
     white-space: nowrap;
     text-overflow: ellipsis;
     font-weight: 700;
+    justify-content: center;
 }
 
-    .btn i {
-        font-size: 1.25rem;
-    }
+.btn i {
+    font-size: 1.25rem;
+}
 
-        .btn i:first-child {
-            margin-right: 0.375rem;
-        }
+.btn i:first-child {
+    margin-right: 0.375rem;
+}
 
-        .btn i:last-child {
-            margin-left: 0.375rem;
-        }
+.btn i:last-child {
+    margin-left: 0.375rem;
+}
 
-    .btn:hover {
-        box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.18);
-        border-color: var(--bc-colors-blue-primary);
-    }
+.btn:hover {
+    box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.18);
+    border-color: var(--bc-colors-blue-primary);
+}
 
 .btn-light {
     --bs-btn-color: var(--bc-colors-grey-text-500);
@@ -137,10 +138,6 @@ div.dt-container.dt-scroll-resize {
     overflow-y: visible;
 }
 
-.dt-container .dt-scroll-head {
-    min-height: 44px;
-}
-
 .dt-container .dt-scroll-head table {
     margin-top: 0px !important;
 }
@@ -348,15 +345,15 @@ ul.pagination {
     padding-bottom: 0.4rem
 }
 
-    .navbar .dropdown-menu a {
-        font-size: 1rem;
-        padding: 10px 15px;
-        display: block;
-        min-width: 210px;
-        text-align: left;
-        border-radius: 0.25rem;
-        min-height: 44px;
-    }
+.navbar .dropdown-menu a {
+    font-size: 1rem;
+    padding: 10px 15px;
+    display: block;
+    min-width: 210px;
+    text-align: left;
+    border-radius: 0.25rem;
+    min-height: 44px;
+}
 
 .navbar .dropdown-submenu a::after {
     transform: rotate(-90deg);
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/plugins/tableContextMenu.css b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/plugins/tableContextMenu.css
new file mode 100644
index 0000000000..b018118eb9
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/plugins/tableContextMenu.css
@@ -0,0 +1,54 @@
+/* DataTable Context Menu Styling */
+
+#dt-context-menu {
+    position: fixed;
+    min-width: 200px;
+    max-width: calc(100vw - 1rem);
+    max-height: calc(100vh - 1rem);
+    overflow-y: auto;
+    padding: 0.5rem;
+    margin: 0;
+    list-style: none;
+    background-color: var(--bs-body-bg, #fff);
+    border: var(--bs-border-width, 1px) solid var(--bs-border-color, #dee2e6);
+    border-radius: var(--bs-border-radius, 0.5rem);
+    box-shadow: var(--bs-box-shadow, 0 0.5rem 1rem rgba(0, 0, 0, 0.15));
+    z-index: 10000;
+}
+
+.dt-context-menu-item {
+    padding: 0;
+    margin: 0;
+}
+
+.dt-context-menu-link {
+    display: block;
+    padding: 0.5rem 1rem;
+    text-decoration: none;
+    white-space: nowrap;
+    cursor: pointer;
+    user-select: none;
+    font-size: 0.875rem;
+    border: 2px solid transparent;
+    border-radius: var(--bs-border-radius, 0.5rem);
+    transition: background-color 0.15s ease-in-out, color 0.15s ease-in-out, border-color 0.15s ease-in-out;
+}
+
+.dt-context-menu-link:hover,
+.dt-context-menu-link:focus-visible {
+    color: var(--bc-colors-blue-primary, #2E5DD7);
+    outline: none;
+    border: 2px solid var(--bc-colors-blue-primary, #2E5DD7);
+}
+
+.dt-context-menu-link:active {
+    color: var(--bs-body-bg, #fff);
+    background-color: var(--bc-colors-blue-primary, #2E5DD7);
+}
+
+.dt-context-menu-separator {
+    height: 0;
+    margin: 0.5rem 0;
+    padding: 0;
+    border-top: var(--bs-border-width, 1px) solid var(--bs-border-color, #dee2e6);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/plugins/tableContextMenu.js b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/plugins/tableContextMenu.js
new file mode 100644
index 0000000000..7325d43fc2
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/plugins/tableContextMenu.js
@@ -0,0 +1,593 @@
+(function ($) {
+    'use strict';
+
+    // Constants
+    const MENU_Z_INDEX = 10000;
+    const MENU_VIEWPORT_PADDING = 8;
+    const OFFSCREEN_OFFSET = '-9999px';
+    const MENU_ID = 'dt-context-menu';
+
+    function getTableSettings(dtApi) {
+        return dtApi?.settings?.()?.[0] ?? null;
+    }
+
+    function getFilterRowPlugin(dtApi) {
+        return getTableSettings(dtApi)?._filterRow ?? null;
+    }
+
+    function getFilterRowElement(dtApi) {
+        return getFilterRowPlugin(dtApi)?.dom?.filterRow ?? $();
+    }
+
+    function getFilterInputs(dtApi) {
+        return getFilterRowElement(dtApi).find('input.custom-filter-input');
+    }
+
+    function getButtonsForTable(dtApi) {
+        return $(dtApi?.buttons?.().nodes?.() ?? []);
+    }
+
+    function getFilterButton(dtApi) {
+        // Try to find filter button through table's button API first
+        const $tableButtons = getButtonsForTable(dtApi);
+        if ($tableButtons.length > 0) {
+            const $filterFromAPI = $tableButtons.filter('[id="btn-toggle-filter"]');
+            if ($filterFromAPI.length > 0) {
+                return $filterFromAPI;
+            }
+        }
+
+        // Fallback: search the table's scope or page-wide
+        const $scopeRoot = getScopeRoot(dtApi);
+        const $filterScoped = $scopeRoot.find('#btn-toggle-filter');
+        if ($filterScoped.length > 0) {
+            return $filterScoped;
+        }
+
+        // Final fallback: page-wide search
+        return $('#btn-toggle-filter');
+    }
+
+    function getScopeRoot(dtApi) {
+        const $container = $(dtApi?.table?.().container?.() ?? []);
+        return $container.closest('.tab-pane, .modal, .card, .content, body').first();
+    }
+
+    function findScopedElements(dtApi, selector) {
+        const $scopeRoot = getScopeRoot(dtApi);
+        const $scopedMatches = $scopeRoot.find(selector);
+        return $scopedMatches.length > 0 ? $scopedMatches : $(selector);
+    }
+
+    function getMenuContainer() {
+        return $('#' + MENU_ID);
+    }
+
+    function getMenuItems($menuContainer) {
+        return $menuContainer.find('.dt-context-menu-link:visible');
+    }
+
+    function focusMenuItem($menuContainer, index) {
+        const $items = getMenuItems($menuContainer);
+        if ($items.length === 0) {
+            return;
+        }
+
+        const normalizedIndex = ((index % $items.length) + $items.length) % $items.length;
+        $items.attr('tabindex', '-1');
+
+        const $target = $items.eq(normalizedIndex);
+        $target.attr('tabindex', '0').trigger('focus');
+        $menuContainer.data('activeIndex', normalizedIndex);
+    }
+
+    function focusFirstMenuItem($menuContainer) {
+        focusMenuItem($menuContainer, 0);
+    }
+
+    function rememberFocusTarget(element) {
+        const $menuContainer = getMenuContainer();
+        $menuContainer.data('returnFocus', element ?? null);
+    }
+
+    function restoreFocus() {
+        const $menuContainer = getMenuContainer();
+        const returnFocus = $menuContainer.data('returnFocus');
+        if (!returnFocus || typeof returnFocus.focus !== 'function') {
+            return;
+        }
+
+        const hadTabIndex = returnFocus.hasAttribute('tabindex');
+        if (!hadTabIndex) {
+            returnFocus.setAttribute('tabindex', '-1');
+        }
+
+        returnFocus.focus();
+
+        if (!hadTabIndex) {
+            returnFocus.addEventListener('blur', function cleanupFocusTarget() {
+                returnFocus.removeAttribute('tabindex');
+            }, { once: true });
+        }
+    }
+
+    function handleMenuKeydown(e) {
+        const $menuContainer = getMenuContainer();
+        const $items = getMenuItems($menuContainer);
+        const currentIndex = $items.index(globalThis.document.activeElement);
+
+        if ($items.length === 0) {
+            return;
+        }
+
+        switch (e.key) {
+            case 'ArrowDown':
+                e.preventDefault();
+                focusMenuItem($menuContainer, currentIndex + 1);
+                break;
+            case 'ArrowUp':
+                e.preventDefault();
+                focusMenuItem($menuContainer, currentIndex - 1);
+                break;
+            case 'Home':
+                e.preventDefault();
+                focusMenuItem($menuContainer, 0);
+                break;
+            case 'End':
+                e.preventDefault();
+                focusMenuItem($menuContainer, $items.length - 1);
+                break;
+            case 'Tab':
+                hideMenu();
+                break;
+            case ' ':
+                if (currentIndex > -1) {
+                    e.preventDefault();
+                    $items.eq(currentIndex).trigger('click');
+                }
+                break;
+            case 'Escape':
+                e.preventDefault();
+                hideMenu();
+                break;
+            default:
+                break;
+        }
+    }
+
+    function appendMenuAction($menuContainer, label, handler) {
+        $menuContainer.append(
+            $('<li class="dt-context-menu-item" role="none"></li>').append(
+                $('<a href="#" class="dt-context-menu-link" role="menuitem" tabindex="-1">')
+                    .text(label)
+                    .on('click', handler)
+                    .on('mouseover', function () {
+                        getMenuItems($menuContainer).blur(); // When mouse enters an item, remove focus from all items so :hover takes precedence
+                    })
+            )
+        );
+    }
+
+    function positionMenu($menuContainer, clientX, clientY) {
+        $menuContainer.css({
+            position: 'fixed',
+            display: 'block',
+            visibility: 'hidden',
+            zIndex: MENU_Z_INDEX
+        });
+
+        const menuWidth = $menuContainer.outerWidth() ?? 0;
+        const menuHeight = $menuContainer.outerHeight() ?? 0;
+        const maxLeft = Math.max(MENU_VIEWPORT_PADDING, globalThis.innerWidth - menuWidth - MENU_VIEWPORT_PADDING);
+        const maxTop = Math.max(MENU_VIEWPORT_PADDING, globalThis.innerHeight - menuHeight - MENU_VIEWPORT_PADDING);
+        const left = Math.min(Math.max(MENU_VIEWPORT_PADDING, clientX), maxLeft);
+        const top = Math.min(Math.max(MENU_VIEWPORT_PADDING, clientY), maxTop);
+
+        $menuContainer.css({
+            left: left + 'px',
+            top: top + 'px',
+            visibility: 'visible'
+        });
+    }
+
+    function showMenu($menuContainer, clientX, clientY, focusTarget) {
+        rememberFocusTarget(focusTarget);
+        positionMenu($menuContainer, clientX, clientY);
+        $menuContainer.attr('aria-hidden', 'false');
+        focusFirstMenuItem($menuContainer);
+    }
+
+    /**
+     * Handle filter column lookup and auto-population.
+     */
+    function handleFilterAction(e, $cell, dtApi) {
+        e.preventDefault();
+        hideMenu();
+
+        const cellText = ($cell.text() ?? '').trim();
+        const filterRow = getFilterRowPlugin(dtApi);
+
+        // Show the filter row if not already visible
+        filterRow?.show?.();
+
+        // Resolve the column name for the clicked cell
+        try {
+            const cellInfo = dtApi.cell($cell[0])?.index?.();
+            if (!cellInfo) {
+                return;
+            }
+
+            const colIdx = cellInfo.column;
+            const settings = dtApi.settings?.();
+            const aoColumns = settings?.[0]?.aoColumns;
+            if (!aoColumns?.[colIdx]) {
+                return;
+            }
+
+            const colName = aoColumns[colIdx].name;
+            if (!colName) {
+                return;
+            }
+
+            // Find the filter input for this column and set the value
+            const filterRowElement = getFilterRowElement(dtApi);
+            const $input = filterRowElement.find('input.custom-filter-input').filter(function () {
+                return $(this).data('column-name') === colName;
+            });
+
+            if ($input.length > 0) {
+                $input.val(cellText).trigger('keyup');
+            }
+        } catch (err) {
+            console.debug('Filter action error:', err);
+        }
+    }
+
+    /**
+     * Handle clear filter action.
+     */
+    function handleClearFilterAction(e, dtApi) {
+        e.preventDefault();
+        hideMenu();
+
+        const filterRow = getFilterRowPlugin(dtApi);
+        filterRow?.clearFilters?.();
+    }
+
+    /**
+     * Handle generic toolbar button click.
+     */
+    function handleToolbarButtonClick(e, $btn) {
+        e.preventDefault();
+        hideMenu();
+        $btn?.[0]?.click?.();
+    }
+
+    /**
+     * Check if a button is enabled (not hidden/disabled).
+     */
+    function isButtonEnabled($btn) {
+        return !$btn.hasClass('action-bar-btn-unavailable')
+            && !$btn.prop('disabled')
+            && !$btn.hasClass('d-none')
+            && !$btn.hasClass('dt-button-disabled');
+    }
+
+    /**
+     * Handle dismiss on outside click.
+     */
+    function dismissClickHandler(e) {
+        if (!$(e.target).closest('#' + MENU_ID).length) {
+            hideMenu();
+        }
+    }
+
+    /**
+     * Handle dismiss on scroll.
+     */
+    function dismissScrollHandler() {
+        hideMenu();
+    }
+
+    /**
+     * Handle row selection with callback.
+     */
+    function handleRowSelection(dtApi, rowIndex, callback) {
+        requestAnimationFrame(function () {
+            const selectedRows = dtApi.rows({ selected: true }).indexes();
+            if (!selectedRows.includes(rowIndex)) {
+                dtApi.rows({ selected: true }).deselect();
+                dtApi.row(rowIndex).select();
+            }
+            requestAnimationFrame(callback);
+        });
+    }
+
+    /**
+     * Hide the context menu and clean up event handlers.
+     */
+    function hideMenu() {
+        const $menuContainer = getMenuContainer();
+        if ($menuContainer.length > 0) {
+            $menuContainer
+                .hide()
+                .attr('aria-hidden', 'true')
+                .off('keydown.dt-context-menu')
+                .removeData('activeIndex');
+        }
+
+        $(document).off('click.dt-context-menu');
+        $(globalThis).off('scroll.dt-context-menu resize.dt-context-menu');
+
+        restoreFocus();
+    }
+
+    /**
+     * Copy text to clipboard with fallback.
+     */
+    function copyToClipboard(text) {
+        if (navigator.clipboard?.writeText) {
+            navigator.clipboard.writeText(text)
+                .then(() => {
+                    abp.notify.success((abp.localization.getResource('GrantManager')('DataTable:ContextMenu:CopiedToClipboard') ?? 'Copied to clipboard'),'Success');
+                })
+                .catch(() => {
+                    fallbackCopy(text);
+                });
+        } else {
+            fallbackCopy(text);
+        }
+    }
+
+    /**
+     * Fallback copy using textarea hack (legacy support).
+     */
+    function fallbackCopy(text) {
+        const $textarea = $('<textarea>')
+            .val(text)
+            .css({
+                position: 'fixed',
+                left: OFFSCREEN_OFFSET,
+                top: OFFSCREEN_OFFSET
+            })
+            .appendTo('body');
+
+        try {
+            $textarea[0]?.select?.();
+            const execCommand = document['execCommand']?.bind(document);
+            const success = execCommand ? execCommand('copy') : false;
+            if (success) {
+                abp.notify.success(
+                    (abp.localization.getResource('GrantManager')('DataTable:ContextMenu:CopiedToClipboard') ?? 'Copied to clipboard'),
+                    'Success'
+                );
+            } else {
+                abp.notify.error('Copy failed. Please try again.', 'Error');
+            }
+        } catch (err) {
+            console.debug('Fallback copy error:', err);
+            abp.notify.error('Copy failed. Please try again.', 'Error');
+        } finally {
+            $textarea.remove();
+        }
+    }
+
+    /**
+     * Add filter toolbar item to menu.
+     */
+    function addFilterItem(toolbarItems, labels, dtApi) {
+        const $filterBtn = getFilterButton(dtApi);
+        const filterRowPlugin = getFilterRowPlugin(dtApi);
+        if ($filterBtn.length > 0 && $filterBtn.is(':visible') && filterRowPlugin) {
+            toolbarItems.push({
+                label: labels.filter,
+                filterAction: true
+            });
+        }
+    }
+
+    /**
+     * Add clear filter toolbar item to menu if filters are active.
+     */
+    function addClearFilterItem(toolbarItems, labels, dtApi) {
+        const filterRowPlugin = getFilterRowPlugin(dtApi);
+        if (filterRowPlugin) {
+            const hasColumnFilters = getFilterInputs(dtApi).toArray().some(function (element) {
+                return Boolean($(element).val()?.trim?.());
+            });
+            const hasSearchFilter = Boolean(dtApi.search?.()?.trim?.());
+            const hasActiveFilters = hasColumnFilters || hasSearchFilter;
+
+            if (hasActiveFilters) {
+                toolbarItems.push({
+                    label: labels.clearFilter,
+                    clearFilterAction: true
+                });
+            }
+        }
+    }
+
+    /**
+     * Render filter menu item.
+     */
+    function renderFilterMenuItem($menuContainer, item, $cell, dtApi) {
+        appendMenuAction($menuContainer, item.label, function (e) {
+            handleFilterAction(e, $cell, dtApi);
+        });
+    }
+
+    /**
+     * Render clear filter menu item.
+     */
+    function renderClearFilterMenuItem($menuContainer, item, dtApi) {
+        appendMenuAction($menuContainer, item.label, function (e) {
+            handleClearFilterAction(e, dtApi);
+        });
+    }
+
+    /**
+     * Render toolbar button menu item.
+     */
+    function renderToolbarButtonMenuItem($menuContainer, item) {
+        appendMenuAction($menuContainer, item.label, function (e) {
+            handleToolbarButtonClick(e, item.$btn);
+        });
+    }
+
+    /**
+     * Render custom action menu item.
+     */
+    function renderCustomActionMenuItem($menuContainer, $btn, btnText) {
+        appendMenuAction($menuContainer, btnText, function (e) {
+            handleToolbarButtonClick(e, $btn);
+        });
+    }
+
+    /**
+     * Initialize a context menu for a DataTable.
+     * Features:
+     * - Right-click selection: if row not selected, select it; if already selected, keep selection
+     * - Copy: copies the right-clicked cell's rendered text to clipboard
+     * - Toolbar items: Filtering
+     * - Custom actions: mirrors visible/enabled ActionBar buttons
+     * 
+     * @param {DataTables.Api} dtApi - The initialized DataTable API instance
+     * @param {Object} options - Configuration options
+     * @param {boolean} [options.enabled=true] - Whether context menu is enabled
+     * @param {string} [options.actionsSelector='[data-selector$="-table-actions"]'] - Selector for custom action buttons
+     * @param {boolean} [options.copyEnabled=true] - Whether Copy action is available
+     * @param {Object} [options.labels={}] - Localization overrides { copy, filter, clearFilter }
+     */
+    globalThis.initializeTableContextMenu = function (dtApi, options) {
+        options = options ?? {};
+
+        const enabled = options.enabled !== false;
+        const actionsSelector = options.actionsSelector ?? '[data-selector$="-table-actions"]';
+        const copyEnabled = options.copyEnabled !== false;
+        const labels = options.labels ?? {};
+
+        if (!enabled || !dtApi?.table) {
+            return;
+        }
+
+        // Initialize labels with defaults
+        const l = abp.localization.getResource('GrantManager');
+        const defaultLabels = {
+            copy: l('DataTable:ContextMenu:Copy') ?? 'Copy',
+            filter: l('DataTable:ContextMenu:Filter') ?? 'Filter',
+            clearFilter: l('DataTable:ContextMenu:ClearFilter') ?? 'Clear Filters'
+        };
+
+        const finalLabels = $.extend({}, defaultLabels, labels);
+
+        // Create menu container (single, reused)
+        let $menuContainer = getMenuContainer();
+        if ($menuContainer.length === 0) {
+            $menuContainer = $('<ul id="dt-context-menu" class="dt-context-menu" style="display: none;" role="menu" aria-hidden="true"></ul>');
+            $('body').append($menuContainer);
+        }
+
+        // Event handler for right-click on table
+        const dtBody = dtApi.table()?.body?.();
+        if (dtBody) {
+            $(dtBody).off('contextmenu.dt-context-menu').on('contextmenu.dt-context-menu', function (e) {
+                // Allow browser's default context menu when Ctrl is held
+                if (e.ctrlKey) {
+                    return;
+                }
+
+                e.preventDefault();
+                e.stopPropagation();
+
+                const $cell = $(e.target).closest('td, th');
+                if ($cell.length === 0) {
+                    return;
+                }
+
+                const $row = $cell.closest('tr');
+                const rowNode = $row[0];
+                if (!rowNode) {
+                    return;
+                }
+
+                const rowIndex = dtApi.row(rowNode)?.index?.();
+                if (rowIndex === undefined || rowIndex === -1) {
+                    return;
+                }
+
+                handleRowSelection(dtApi, rowIndex, () => {
+                    buildAndShowMenu(e.clientX, e.clientY, $cell, dtApi, finalLabels, actionsSelector, copyEnabled);
+                });
+            });
+        }
+
+        /**
+         * Build and display the context menu at the given coordinates.
+         */
+        function buildAndShowMenu(pageX, pageY, $cell, dtApi, labels, actionsSelector, copyEnabled) {
+            const $menuContainer = getMenuContainer();
+            $menuContainer.empty();
+
+            // Copy
+            if (copyEnabled) {
+                const cellText = ($cell.text() ?? '').trim();
+                appendMenuAction($menuContainer, labels.copy, function (e) {
+                    e.preventDefault();
+                    copyToClipboard(cellText);
+                    hideMenu();
+                });
+            }
+
+            // Toolbar
+            const toolbarItems = [];
+
+            addFilterItem(toolbarItems, labels, dtApi);
+            addClearFilterItem(toolbarItems, labels, dtApi);
+
+            if (toolbarItems.length > 0) {
+                if (copyEnabled)
+                    $menuContainer.append($('<li class="dt-context-menu-separator"></li>'));
+
+                toolbarItems.forEach(function (item) {
+                    if (item.filterAction) {
+                        renderFilterMenuItem($menuContainer, item, $cell, dtApi);
+                    } else if (item.clearFilterAction) {
+                        renderClearFilterMenuItem($menuContainer, item, dtApi);
+                    } else if (item.$btn?.length > 0) {
+                        renderToolbarButtonMenuItem($menuContainer, item);
+                    }
+                });
+            }
+
+            // Custom Actions (ActionBar buttons)
+            const $customBtns = findScopedElements(dtApi, actionsSelector).filter(function () {
+                return isButtonEnabled($(this));
+            });
+
+            if ($customBtns.length > 0) {
+                if (copyEnabled || toolbarItems.length > 0)
+                    $menuContainer.append($('<li class="dt-context-menu-separator"></li>'));
+
+                $customBtns.each(function () {
+                    const $btn = $(this);
+                    const btnText = ($btn.text() ?? '').trim();
+
+                    if (btnText?.length > 0) {
+                        renderCustomActionMenuItem($menuContainer, $btn, btnText);
+                    }
+                });
+            }
+
+            // Attach event handlers
+            $(document).off('click.dt-context-menu').on('click.dt-context-menu', dismissClickHandler);
+            $(globalThis)
+                .off('scroll.dt-context-menu resize.dt-context-menu')
+                .on('scroll.dt-context-menu', dismissScrollHandler)
+                .on('resize.dt-context-menu', dismissScrollHandler);
+            $menuContainer.off('keydown.dt-context-menu').on('keydown.dt-context-menu', handleMenuKeydown);
+
+            showMenu($menuContainer, pageX, pageY, $cell[0]);
+        }
+    };
+
+}(jQuery));
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
index 0b00bdc5e8..981f3ec37c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
@@ -230,7 +230,10 @@ function initializeDataTable(options) {
         onStateLoaded,
         fixedHeaders = false,
         lengthMenu = [25, 50, 75, 100, -1],
-        deferRender = false
+        deferRender = false,
+        enableContextMenu = false,
+        contextMenuActionsSelector = '[data-selector$="-table-actions"]',
+        contextMenuLabels = {}
     } = options;
 
     // Process columns and visibility
@@ -350,6 +353,11 @@ function initializeDataTable(options) {
             }
         },
         stateLoadParams: function (settings, data) {
+            // Discard stale state when column count has changed so defaultVisibleColumns applies cleanly
+            if (data?.columns && data.columns.length !== settings.aoColumns.length) {
+                return false;
+            }
+
             if (data?.externalSearch) {
                 let externalSearch = $(settings.oInit.externalSearchInputId);
                 if (externalSearch.length) externalSearch.val(data.externalSearch);
@@ -448,6 +456,16 @@ function initializeDataTable(options) {
         iDt.settings()[0]._scrollResize = new DataTable.ScrollResize(iDt);
     }
 
+    // Initialize Context Menu plugin if enabled
+    if (enableContextMenu && typeof globalThis.initializeTableContextMenu === 'function') {
+        initializeTableContextMenu(iDt, {
+            enabled: true,
+            actionsSelector: contextMenuActionsSelector,
+            copyEnabled: true,
+            labels: contextMenuLabels
+        });
+    }
+
     return iDt;
 }
 
diff --git a/applications/Unity.GrantManager/scripts/Decrypt-TenantConnectionString.ps1 b/applications/Unity.GrantManager/scripts/Decrypt-TenantConnectionString.ps1
new file mode 100644
index 0000000000..32ab789e89
--- /dev/null
+++ b/applications/Unity.GrantManager/scripts/Decrypt-TenantConnectionString.ps1
@@ -0,0 +1,65 @@
+<#
+.SYNOPSIS
+    Decrypts an ABP-encrypted tenant connection string.
+
+.DESCRIPTION
+    Mirrors ABP's StringEncryptionService (AES-256-CBC, PBKDF2/SHA-1, 1000 iterations).
+    Use this to recover a plain-text connection string from the value stored in the
+    AbpTenantConnectionStrings table.
+
+.PARAMETER EncryptedText
+    The base64-encoded encrypted value from the database.
+
+.PARAMETER PassPhrase
+    The pass phrase from appsettings.json -> StringEncryption -> DefaultPassPhrase.
+
+.PARAMETER Salt
+    The salt used by ABP's StringEncryptionService (default matches ABP's built-in default).
+
+.PARAMETER InitVector
+    The AES initialisation vector used by ABP's StringEncryptionService (default matches ABP's built-in default).
+
+.PARAMETER KeySize
+    AES key size in bits. Must match the value configured in AbpStringEncryptionOptions (default: 256).
+
+.EXAMPLE
+    .\Decrypt-TenantConnectionString.ps1 `
+        -EncryptedText "abc123==" `
+        -PassPhrase "g2IuZx7PwXDvCmlW"
+#>
+param(
+    [Parameter(Mandatory)][string] $EncryptedText,
+    [Parameter(Mandatory)][string] $PassPhrase,
+    [string] $Salt       = "hgt!16kl",
+    [string] $InitVector = "jkE49230Tf093b42",
+    [int]    $KeySize    = 256
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+$cipherBytes = [Convert]::FromBase64String($EncryptedText)
+$saltBytes   = [Text.Encoding]::ASCII.GetBytes($Salt)
+$ivBytes     = [Text.Encoding]::ASCII.GetBytes($InitVector)
+
+$deriveBytes = New-Object System.Security.Cryptography.Rfc2898DeriveBytes($PassPhrase, $saltBytes, 1000)
+$keyBytes    = $deriveBytes.GetBytes($KeySize / 8)
+
+$aes      = [System.Security.Cryptography.Aes]::Create()
+$aes.Mode = [System.Security.Cryptography.CipherMode]::CBC
+$aes.Key  = $keyBytes
+$aes.IV   = $ivBytes
+
+$ms = New-Object System.IO.MemoryStream(, $cipherBytes)
+$cs = New-Object System.Security.Cryptography.CryptoStream($ms, $aes.CreateDecryptor(), [System.Security.Cryptography.CryptoStreamMode]::Read)
+$sr = New-Object System.IO.StreamReader($cs)
+
+try {
+    Write-Output $sr.ReadToEnd()
+} finally {
+    $sr.Dispose()
+    $cs.Dispose()
+    $ms.Dispose()
+    $aes.Dispose()
+    $deriveBytes.Dispose()
+}
diff --git a/applications/Unity.GrantManager/scripts/Encrypt-TenantConnectionString.ps1 b/applications/Unity.GrantManager/scripts/Encrypt-TenantConnectionString.ps1
new file mode 100644
index 0000000000..450a53fca3
--- /dev/null
+++ b/applications/Unity.GrantManager/scripts/Encrypt-TenantConnectionString.ps1
@@ -0,0 +1,65 @@
+<#
+.SYNOPSIS
+    Encrypts a plain-text tenant connection string using ABP's StringEncryptionService algorithm.
+
+.DESCRIPTION
+    Mirrors ABP's StringEncryptionService (AES-256-CBC, PBKDF2/SHA-1, 1000 iterations).
+    Use this to produce the encrypted value that should be stored in the
+    AbpTenantConnectionStrings table, or to verify an existing encrypted value.
+
+.PARAMETER PlainText
+    The plain-text connection string to encrypt.
+
+.PARAMETER PassPhrase
+    The pass phrase from appsettings.json -> StringEncryption -> DefaultPassPhrase.
+
+.PARAMETER Salt
+    The salt used by ABP's StringEncryptionService (default matches ABP's built-in default).
+
+.PARAMETER InitVector
+    The AES initialisation vector used by ABP's StringEncryptionService (default matches ABP's built-in default).
+
+.PARAMETER KeySize
+    AES key size in bits. Must match the value configured in AbpStringEncryptionOptions (default: 256).
+
+.EXAMPLE
+    .\Encrypt-TenantConnectionString.ps1 `
+        -PlainText "Host=localhost;Database=T_ABC123;Username=T_ABC123;Password=XYZ789" `
+        -PassPhrase "g2IuZx7PwXDvCmlW"
+#>
+param(
+    [Parameter(Mandatory)][string] $PlainText,
+    [Parameter(Mandatory)][string] $PassPhrase,
+    [string] $Salt       = "hgt!16kl",
+    [string] $InitVector = "jkE49230Tf093b42",
+    [int]    $KeySize    = 256
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+$plainBytes = [Text.Encoding]::UTF8.GetBytes($PlainText)
+$saltBytes  = [Text.Encoding]::ASCII.GetBytes($Salt)
+$ivBytes    = [Text.Encoding]::ASCII.GetBytes($InitVector)
+
+$deriveBytes = New-Object System.Security.Cryptography.Rfc2898DeriveBytes($PassPhrase, $saltBytes, 1000)
+$keyBytes    = $deriveBytes.GetBytes($KeySize / 8)
+
+$aes      = [System.Security.Cryptography.Aes]::Create()
+$aes.Mode = [System.Security.Cryptography.CipherMode]::CBC
+$aes.Key  = $keyBytes
+$aes.IV   = $ivBytes
+
+$ms = New-Object System.IO.MemoryStream
+$cs = New-Object System.Security.Cryptography.CryptoStream($ms, $aes.CreateEncryptor(), [System.Security.Cryptography.CryptoStreamMode]::Write)
+
+try {
+    $cs.Write($plainBytes, 0, $plainBytes.Length)
+    $cs.FlushFinalBlock()
+    Write-Output ([Convert]::ToBase64String($ms.ToArray()))
+} finally {
+    $cs.Dispose()
+    $ms.Dispose()
+    $aes.Dispose()
+    $deriveBytes.Dispose()
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateFundingHistoryDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateFundingHistoryDto.cs
index 9de866e604..326d83fc08 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateFundingHistoryDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateFundingHistoryDto.cs
@@ -12,5 +12,6 @@ public class CreateUpdateFundingHistoryDto
     public decimal? OneTimeConsideration { get; set; }    
     public decimal? ReconsiderationAmount { get; set; }
     public decimal? TotalGrantAmount { get; set; }
+    public DateTime? PaidDate { get; set; }
     public string? FundingNotes { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateReportsHistoryDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateReportsHistoryDto.cs
index e3d66bfb30..a90cc1de51 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateReportsHistoryDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/CreateUpdateReportsHistoryDto.cs
@@ -8,6 +8,7 @@ public class CreateUpdateReportsHistoryDto
     public string? FiscalYear { get; set; }
     public DateTime? ReportDate { get; set; }
     public bool? Outstanding { get; set; }
+    public bool? SignedOff { get; set; }
     public bool? IncompleteReport { get; set; }
     public string? Note { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/FundingHistoryDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/FundingHistoryDto.cs
index dfdf5afaad..d95cd64eb6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/FundingHistoryDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/FundingHistoryDto.cs
@@ -13,5 +13,6 @@ public class FundingHistoryDto : AuditedEntityDto<Guid>
     public decimal? OneTimeConsideration { get; set; }    
     public decimal? ReconsiderationAmount { get; set; }
     public decimal? TotalGrantAmount { get; set; }
+    public DateTime? PaidDate { get; set; }
     public string? FundingNotes { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/ReportsHistoryDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/ReportsHistoryDto.cs
index a9161dc025..836088495f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/ReportsHistoryDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/ReportsHistoryDto.cs
@@ -9,6 +9,7 @@ public class ReportsHistoryDto : AuditedEntityDto<Guid>
     public string? FiscalYear { get; set; }
     public DateTime? ReportDate { get; set; }
     public bool? Outstanding { get; set; }
+    public bool? SignedOff { get; set; }
     public bool? IncompleteReport { get; set; }
     public string? Note { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/Payments/ApplicantPaymentDetailsDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/Payments/ApplicantPaymentDetailsDto.cs
index bd3812e099..675196ed38 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/Payments/ApplicantPaymentDetailsDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/Payments/ApplicantPaymentDetailsDto.cs
@@ -14,6 +14,9 @@ public class ApplicantPaymentDetailsDto : EntityDto<Guid>
     public PaymentRequestStatus Status { get; set; }
     public decimal Amount { get; set; }
     public string? PaymentStatus { get; set; }
+    public string? InvoiceStatus { get; set; }
+    public string? CasResponse { get; set; }
+    public string Category { get; set; } = string.Empty;
     public string SupplierNumber { get; set; } = string.Empty;
     public string SupplierName { get; set; } = string.Empty;
     public SiteDto? Site { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/OrgInfoItemDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/OrgInfoItemDto.cs
index 4de11bf387..7c9bb154b8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/OrgInfoItemDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/OrgInfoItemDto.cs
@@ -14,7 +14,11 @@ public class OrgInfoItemDto
         public string? NonRegOrgName { get; set; }
         public string? FiscalMonth { get; set; }
         public int? FiscalDay { get; set; }
+        // Kept for Grants Portal backward compatibility — the portal reads this JSON key.
+        // Value is sourced from Applicant.ApproxNumberOfEmployees, not Applicant.OrganizationSize.
+        // Portal developer can migrate to ApproxNumberOfEmployees once this field is confirmed stable.
         public string? OrganizationSize { get; set; }
+        public string? ApproxNumberOfEmployees { get; set; }
         public string? Sector { get; set; }
         public string? SubSector { get; set; }
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantListDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantListDto.cs
index 117abbfcdb..b8ab20408b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantListDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantListDto.cs
@@ -14,11 +14,10 @@ public class ApplicantListDto : AuditedEntityDto<Guid>
     public string? OrganizationType { get; set; }
     public string? Status { get; set; }
     public bool? RedStop { get; set; }
-    
+
     // Additional columns (initially hidden)
     public string? NonRegisteredBusinessName { get; set; }
     public string? NonRegOrgName { get; set; }
-    public string? OrganizationSize { get; set; }
     public string? Sector { get; set; }
     public string? SubSector { get; set; }
     public string? ApproxNumberOfEmployees { get; set; }
@@ -28,10 +27,5 @@ public class ApplicantListDto : AuditedEntityDto<Guid>
     public string? BusinessNumber { get; set; }
     public int? FiscalDay { get; set; }
     public DateTime? StartedOperatingDate { get; set; }
-    public string? SupplierId { get; set; }
-    public string? SupplierNumber { get; set; }
-    public string? SupplierName { get; set; }
-    public string? SupplierStatus { get; set; }
-    public decimal? MatchPercentage { get; set; }
     public bool IsDuplicated { get; set; }
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantListRequestDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantListRequestDto.cs
index ea33404c85..550d5430a4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantListRequestDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantListRequestDto.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Volo.Abp.Application.Dtos;
 
 namespace Unity.GrantManager.Applicants;
@@ -5,4 +6,5 @@ namespace Unity.GrantManager.Applicants;
 public class ApplicantListRequestDto : PagedAndSortedResultRequestDto
 {
     public string? Filter { get; set; }
+    public List<string>? RequestedFields { get; set; }
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantTenantDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantTenantDto.cs
index e9e5b5c24a..efed16a462 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantTenantDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantTenantDto.cs
@@ -7,6 +7,7 @@ public class ApplicantTenantDto
     {
         public Guid TenantId { get; set; }
         public string TenantName { get; set; } = string.Empty;
-        public Dictionary<string, string> Metadata { get; set; } = [];
+        public string? DisplayName { get; set; }
+        public string? DefaultFromAddress { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applications/IApplicationBulkActionsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applications/IApplicationBulkActionsAppService.cs
index 20b6988185..b7f21dadab 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applications/IApplicationBulkActionsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applications/IApplicationBulkActionsAppService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Unity.GrantManager.GrantApplications;
 using Volo.Abp.Application.Services;
 
 namespace Unity.GrantManager.Applications
@@ -13,6 +14,8 @@ public interface IApplicationBulkActionsAppService : IApplicationService
         /// <param name="input">Request containing list of application IDs</param>
         /// <returns>Cache key to retrieve the stored IDs</returns>
         Task<StoreApplicationIdsResultDto> StoreApplicationIdsAsync(StoreApplicationIdsRequestDto input);
+        Task<List<BulkPublishDto>> GetApplicationsForBulkPublish(Guid[] applicationGuids, bool excludePublished = true);
+        Task BulkPublishApplications(Guid[] applicationGuids);
     }
 
     public class StoreApplicationIdsRequestDto
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationRequestDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationRequestDto.cs
index 0dfccaa949..e7dc04658f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationRequestDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationRequestDto.cs
@@ -6,8 +6,8 @@ namespace Unity.GrantManager.GrantApplications;
 public class AIGenerationRequestDto : EntityDto<Guid>
 {
     public Guid? ApplicationId { get; set; }
+    public Guid? OperationId { get; set; }
     public string OperationType { get; set; } = string.Empty;
-    public string RequestKey { get; set; } = string.Empty;
     public AIGenerationRequestStatus Status { get; set; }
     public DateTime? StartedAt { get; set; }
     public DateTime? CompletedAt { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationStatusDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationStatusDto.cs
new file mode 100644
index 0000000000..f229885d76
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationStatusDto.cs
@@ -0,0 +1,9 @@
+namespace Unity.GrantManager.GrantApplications;
+
+public class AIGenerationStatusDto
+{
+    public AIGenerationRequestDto? GenerationRequest { get; set; }
+    public string? FailureReason { get; set; }
+    public bool IsGenerating { get; set; }
+    public int RetryAfterSeconds { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicantPortalStatusDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicantPortalStatusDto.cs
new file mode 100644
index 0000000000..deac223c2e
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicantPortalStatusDto.cs
@@ -0,0 +1,16 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.GrantManager.GrantApplications;
+
+[Serializable]
+public class ApplicantPortalStatusDto : EntityDto<Guid>
+{
+    public string ExternalStatus { get; set; } = string.Empty;
+
+    public string InternalStatus { get; set; } = string.Empty;
+
+    public string? NotifiedStatus { get; set; }
+
+    public string StatusCode { get; set; } = string.Empty;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicantSummaryDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicantSummaryDto.cs
index c8d35e6141..332d0f7986 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicantSummaryDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicantSummaryDto.cs
@@ -14,7 +14,7 @@ public class ApplicantSummaryDto
     public string? OrgStatus { get; set; }
     public string? BusinessNumber { get; set; }
     public string? OrganizationType { get; set; }
-    public string? OrganizationSize { get; set; }
+    public string? ApproxNumberOfEmployees { get; set; }
     public string? SectorSubSectorIndustryDesc { get; set; }
     public bool? RedStop { get; set; }
     public bool? IndigenousOrgInd { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicationApplicantInfoDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicationApplicantInfoDto.cs
index 502af75bcc..53d68e3670 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicationApplicantInfoDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/ApplicationApplicantInfoDto.cs
@@ -20,6 +20,7 @@ public class ApplicationApplicantInfoDto : GrantApplicationApplicantDto
     public string SigningAuthorityCellPhone { get; set; } = string.Empty;
     public string ApplicationReferenceNo { get; set; } = string.Empty;
     public string ApplicationStatus { get; set; } = string.Empty;
+    public bool ExternalStatusVisibility { get; set; } = false;
     public GrantApplicationState ApplicationStatusCode { get; set; }
     public List<ApplicantAddressDto> ApplicantAddresses { get; set; } = [];
     public Guid ApplicationFormId { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs
index 5f8979af48..819e281758 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs
@@ -6,5 +6,4 @@ public class GenerateApplicationAnalysisBackgroundJobArgs
     public Guid? TenantId { get; set; }
     public Guid? RequestedByUserId { get; set; }
     public string? PromptVersion { get; set; }
-    public string RequestKey { get; set; } = string.Empty;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs
index 8ac67c4d4d..6e59353451 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs
@@ -6,5 +6,4 @@ public class GenerateApplicationScoringBackgroundJobArgs
     public Guid? TenantId { get; set; }
     public Guid? RequestedByUserId { get; set; }
     public string? PromptVersion { get; set; }
-    public string RequestKey { get; set; } = string.Empty;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs
index 7b2b4f6d63..987a6037b8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs
@@ -10,5 +10,4 @@ public class GenerateAttachmentSummaryBackgroundJobArgs
     public Guid? RequestedByUserId { get; set; }
     public List<Guid>? AttachmentIds { get; set; }
     public string? PromptVersion { get; set; }
-    public string RequestKey { get; set; } = string.Empty;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJobArgs.cs
deleted file mode 100644
index 55b88431b4..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJobArgs.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
-
-public class RunApplicationAIPipelineJobArgs
-{
-    public Guid ApplicationId { get; set; }
-    public Guid? TenantId { get; set; }
-    public Guid? RequestedByUserId { get; set; }
-    public string? PromptVersion { get; set; }
-    public string RequestKey { get; set; } = string.Empty;
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/BulkPublishDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/BulkPublishDto.cs
new file mode 100644
index 0000000000..f0461e734b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/BulkPublishDto.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace Unity.GrantManager.GrantApplications;
+
+public class BulkPublishDto
+{
+    public BulkPublishDto()
+    {
+        ReferenceNo = string.Empty;
+        ApplicantName = string.Empty;
+        FormName = string.Empty;
+        ApplicationStatus = string.Empty;
+    }
+
+    public Guid ApplicationId { get; set; }
+    public string ReferenceNo { get; set; }
+    public string ApplicantName { get; set; }
+    public string FormName { get; set; }
+    public DateTime? FinalDecisionDate { get; set; }
+    public string ApplicationStatus { get; set; }
+    public bool ExternalStatusVisibility { get; set; }
+    public string ExternalStatus { get; set; } = string.Empty;
+    public string PublishedStatus { get; set; } = string.Empty;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/CreateUpdateApplicantInfoDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/CreateUpdateApplicantInfoDto.cs
index cce17c3579..6c9fb44c49 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/CreateUpdateApplicantInfoDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/CreateUpdateApplicantInfoDto.cs
@@ -13,7 +13,7 @@ public class CreateUpdateApplicantInfoDto : CustomDataFieldDto
         public string? OrgStatus { get; set; }
         public string? BusinessNumber { get; set; }
         public string? OrganizationType { get; set; }
-        public string? OrganizationSize { get; set; }
+        public string? ApproxNumberOfEmployees { get; set; }
 
         public string? Sector { get; set; }
         public string? SubSector { get; set; }
@@ -67,7 +67,7 @@ public class UpsertApplicantInfoDto : CustomDataFieldDto
         public string? OrgNumber { get; set; }
         public string? OrgStatus { get; set; }
         public string? OrganizationType { get; set; }
-        public string? OrganizationSize { get; set; }
+        public string? ApproxNumberOfEmployees { get; set; }
 
         public string? Sector { get; set; }
         public string? SubSector { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/CreateUpdateApplicationResultsDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/CreateUpdateApplicationResultsDto.cs
index d399a559a4..e2273582f6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/CreateUpdateApplicationResultsDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/CreateUpdateApplicationResultsDto.cs
@@ -20,6 +20,6 @@ public class CreateUpdateAssessmentResultsDto : CustomDataFieldDto
         public decimal? RecommendedAmount { get; set; }
         public string? DeclineRational { get; set; }
         public string? AssessmentResultStatus { get; set; }
-        public string? RiskRanking { get; set;} 
+        public string? RiskRanking { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationApplicant.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationApplicant.cs
index b5f642253c..423b60e6aa 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationApplicant.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationApplicant.cs
@@ -15,7 +15,7 @@ public class GrantApplicationApplicantDto : AuditedEntityDto<Guid>
     public string OrgStatus { get; set; } = string.Empty;
     public string BusinessNumber { get; set; } = string.Empty;
     public string OrganizationType { get; set; } = string.Empty;
-    public string OrganizationSize { get; set; } = string.Empty;
+    public string ApproxNumberOfEmployees { get; set; } = string.Empty;
     public string SectorSubSectorIndustryDesc { get; set; } = string.Empty;
     public bool RedStop { get; set; } = false;
     public string IndigenousOrgInd { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
index 1f703d5204..bcd98265cf 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
@@ -39,6 +39,7 @@ public class GrantApplicationDto : AuditedEntityDto<Guid>
     public string? DeclineRational { get; set; } = string.Empty;
     public string? Notes { get; set; } = string.Empty;
     public string? AssessmentResultStatus { get; set; } = string.Empty;
+    public bool ExternalStatusVisibility { get; set; } = false;
     public DateTime? AssessmentResultDate { get; set; }
     public GrantApplicationState StatusCode { get; set; }
     public DateTime? FinalDecisionDate { get; set; }
@@ -68,7 +69,7 @@ public class GrantApplicationDto : AuditedEntityDto<Guid>
     public GrantApplicationAssigneeDto? Owner { get; set; } = new();
     public string? OrgStatus { get; set; } = string.Empty;
     public string? BusinessNumber { get; set; } = string.Empty;
-    public string? OrganizationSize { get; set; } = string.Empty;
+    public string? ApproxNumberOfEmployees { get; set; } = string.Empty;
     public string? OrgNumber { get; set; } = string.Empty;
     public string? SectorSubSectorIndustryDesc { get; set; } = string.Empty;
     public string? SigningAuthorityFullName { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationLiteDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationLiteDto.cs
index 0d9267bc8c..ae10638d09 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationLiteDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationLiteDto.cs
@@ -11,4 +11,5 @@ public class GrantApplicationLiteDto : AuditedEntityDto<Guid>
     public string OrganizationName { get; set; } = string.Empty;
     public string UnityApplicantId { get; set; } = string.Empty;
     public string UnityApplicationId { get; set; } = string.Empty;
+    public bool ExternalStatusVisibility { get; set; } = false;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationStatusService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationStatusService.cs
index fb8dafc378..de39f48b06 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationStatusService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationStatusService.cs
@@ -7,6 +7,6 @@ namespace Unity.GrantManager.GrantApplications;
 public interface IApplicationStatusService : IApplicationService
 {
     Task<IList<ApplicationStatusDto>> GetListAsync();
-
+    Task<IList<ApplicantPortalStatusDto>> GetApplicantPortalStatusListAsync();
     Task UpdateExternalStatusLabelsAsync(UpdateApplicationStatusExternalLabelsDto input);
 }
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 1c876c1425..351083a38f 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
@@ -1,32 +1,30 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Unity.Modules.Shared;
-using Volo.Abp.Application.Dtos;
-
-namespace Unity.GrantManager.GrantApplications;
-
-public interface IGrantApplicationAppService
-{
-    Task<ApplicationStatusDto> GetApplicationStatusAsync(Guid id);
-    Task<ListResultDto<ApplicationActionDto>> GetActions(Guid applicationId, bool includeInternal = false);        
-    Task<GrantApplicationDto> UpdateProjectInfoAsync(Guid id, CreateUpdateProjectInfoDto input);
-    Task<GrantApplicationDto> UpdatePartialProjectInfoAsync(Guid id, PartialUpdateDto<UpdateProjectInfoDto> input);        
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Unity.Modules.Shared;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.GrantManager.GrantApplications;
+
+public interface IGrantApplicationAppService
+{
+    Task<ApplicationStatusDto> GetApplicationStatusAsync(Guid id);
+    Task<ListResultDto<ApplicationActionDto>> GetActions(Guid applicationId, bool includeInternal = false);        
+    Task<GrantApplicationDto> UpdateProjectInfoAsync(Guid id, CreateUpdateProjectInfoDto input);
+    Task<GrantApplicationDto> UpdatePartialProjectInfoAsync(Guid id, PartialUpdateDto<UpdateProjectInfoDto> input);        
     Task<GrantApplicationDto> UpdateAssessmentResultsAsync(Guid id, CreateUpdateAssessmentResultsDto input);
+    Task<GrantApplicationDto> UpdateExternalStatusVisibilityAsync(Guid id, bool externalStatusVisibility);
     Task UpdateSupplierNumberAsync(Guid applicationId, string supplierNumber);
     Task<List<GrantApplicationLiteDto>> GetAllApplicationsAsync();
     Task<IList<GrantApplicationDto>> GetApplicationDetailsListAsync(List<Guid> applicationIds);
     Task<GrantApplicationDto> GetAsync(Guid id);
+    Task<GrantApplicationLiteDto> GetBasicAsync(Guid id);
     Task<GrantApplicationDto> TriggerAction(Guid applicationId, GrantApplicationAction triggerAction);
-    Task<AIGenerationRequestDto> QueueAIGenerationAsync(Guid applicationId, string? promptVersion = null);
-    Task<AIGenerationRequestDto> QueueApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null);
-    Task<AIGenerationRequestDto> QueueAttachmentSummaryAsync(QueueAttachmentSummaryRequestDto input, string? promptVersion = null);
-    Task<AIGenerationRequestDto> QueueApplicationScoringAsync(Guid applicationId, string? promptVersion = null);
-    Task<AIGenerationRequestDto?> GetAIGenerationStatusAsync(Guid applicationId, string operationType, string? promptVersion = null);
-    Task<AIGenerationRequestDto> QueueAllAIStagesAsync(Guid applicationId, string? promptVersion = null);
     Task<Guid?> GetAccountCodingIdFromFormIdAsync(Guid formId);
     Task<string> DismissAIAnalysisItemAsync(Guid applicationId, string itemId);
     Task<string> RestoreAIAnalysisItemAsync(Guid applicationId, string itemId);
+    Task<AIGenerationStatusDto> GetAIGenerationStatusAsync(Guid applicationId, string operationType);
     Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplicationListInputDto input);
     Task<bool> IsApplicantRedStopAsync(Guid applicationId);
+    string? GetWorkflowDiagram(bool isDirectApproval);
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/UpdateApplicantSummaryDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/UpdateApplicantSummaryDto.cs
index 0571deb1a3..fcf960d18f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/UpdateApplicantSummaryDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/UpdateApplicantSummaryDto.cs
@@ -13,7 +13,7 @@ public class UpdateApplicantSummaryDto
     public string? OrgStatus { get; set; }
     public string? BusinessNumber { get; set; }
     public string? OrganizationType { get; set; }
-    public string? OrganizationSize { get; set; }
+    public string? ApproxNumberOfEmployees { get; set; }
     public string? SectorSubSectorIndustryDesc { get; set; }
     public bool? RedStop { get; set; }
     public bool? IndigenousOrgInd { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/UpdateApplicationStatusExternalLabelDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/UpdateApplicationStatusExternalLabelDto.cs
index 28cb19e244..bff7e07050 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/UpdateApplicationStatusExternalLabelDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/UpdateApplicationStatusExternalLabelDto.cs
@@ -11,4 +11,7 @@ public class UpdateApplicationStatusExternalLabelDto
     [Required]
     [StringLength(ApplicationStatusConsts.MaxNameLength, MinimumLength = 1)]
     public string ExternalStatus { get; set; } = string.Empty;
+
+    [StringLength(ApplicationStatusConsts.MaxNameLength)]
+    public string? NotifiedStatus { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantManagerFeaturesDefinitionProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantManagerFeaturesDefinitionProvider.cs
index e9e3e3803c..2fa79c7c18 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantManagerFeaturesDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantManagerFeaturesDefinitionProvider.cs
@@ -1,5 +1,6 @@
 using Unity.Flex.Localization;
 using Unity.GrantManager.Localization;
+using Unity.Modules.Shared.Specializations;
 using Unity.Notifications.Localization;
 using Unity.Payments.Localization;
 using Volo.Abp.Features;
@@ -68,6 +69,14 @@ public override void Define(IFeatureDefinitionContext context)
                     displayName: LocalizableString
                                     .Create<GrantManagerResource>("Analytics"),
                 valueType: new ToggleStringValueType());
+
+            var specializationGroup = context.AddGroup(SpecializationConsts.GroupName);
+
+            specializationGroup.AddFeature(SpecializationConsts.Onboarding,
+                defaultValue: defaultValue,
+                displayName: LocalizableString
+                                .Create<GrantManagerResource>("Onboarding"),
+                valueType: new ToggleStringValueType());
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Identity/UserSearchDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Identity/UserSearchDto.cs
index 0ea0841997..87207a3838 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Identity/UserSearchDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Identity/UserSearchDto.cs
@@ -12,5 +12,7 @@ public class UserSearchDto
         public string LastName { get; set; } = string.Empty;
 
         public string UserGuid { get; set; } = string.Empty;
+
+        public string Email { get; set; } = string.Empty;
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Intakes/IChefsAttachmentDownloadService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Intakes/IChefsAttachmentDownloadService.cs
new file mode 100644
index 0000000000..6ff49c8198
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Intakes/IChefsAttachmentDownloadService.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Threading.Tasks;
+using Unity.GrantManager.Attachments;
+
+namespace Unity.GrantManager.Intakes;
+
+public interface IChefsAttachmentDownloadService
+{
+    Task<BlobDto> DownloadAsync(Guid? formSubmissionId, Guid? chefsFileAttachmentId, string name);
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Integration/Chefs/IFormsApiService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Integration/Chefs/IFormsApiService.cs
index d3b6276b71..6fac6da835 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Integration/Chefs/IFormsApiService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Integration/Chefs/IFormsApiService.cs
@@ -8,6 +8,7 @@ namespace Unity.GrantManager.Integrations.Chefs
     public interface IFormsApiService : IApplicationService
     {
         Task<JObject?> GetFormDataAsync(string chefsFormId, string chefsFormVersionId);
+        Task<JObject?> GetFormVersionDataAsync(Guid applicationFormId, string chefsFormVersionId);
         Task<JObject> GetForm(Guid? formId, string chefsApplicationFormGuid, string encryptedApiKey);
         Task<JObject?> GetSubmissionDataAsync(Guid chefsFormId, Guid submissionId);
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Integration/Css/ICssUsersApiService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Integration/Css/ICssUsersApiService.cs
index d08adfe688..f1fdb24c05 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Integration/Css/ICssUsersApiService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Integration/Css/ICssUsersApiService.cs
@@ -6,6 +6,6 @@ namespace Unity.GrantManager.Integrations.Css
     public interface ICssUsersApiService : IApplicationService
     {
         Task<UserSearchResult> FindUserAsync(string directory, string guid);
-        Task<UserSearchResult> SearchUsersAsync(string directory, string? firstName = null, string? lastName = null);
+        Task<UserSearchResult> SearchUsersAsync(string directory, string? firstName = null, string? lastName = null, string? email = null);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/CreateUpdateNotificationDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/CreateUpdateNotificationDto.cs
new file mode 100644
index 0000000000..9c8659e0d7
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/CreateUpdateNotificationDto.cs
@@ -0,0 +1,31 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Unity.GrantManager.Notifications
+{
+    public class CreateUpdateNotificationDto
+    {
+        [Required]
+        public Guid FormId { get; set; }
+
+        [Required]
+        public Guid EmailTemplateId { get; set; }
+
+        [Required]
+        public string TriggerType { get; set; } = "Event";
+
+        public string? TriggerDetail { get; set; }
+        public bool IsActive { get; set; } = true;
+
+        public string? EventType { get; set; }
+        public Guid? ApplicationStatusId { get; set; }
+
+        public string? ApplicationStatus { get; set; }
+
+        public string? DateField { get; set; }
+
+        public string? RecipientCategory { get; set; }
+
+        public string? RecipientIdentifier { get; set; }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/CreateEmailDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/CreateEmailDto.cs
similarity index 78%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/CreateEmailDto.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/CreateEmailDto.cs
index b2fc692506..82823a2a4b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/CreateEmailDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/CreateEmailDto.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Unity.GrantManager.Emails
+namespace Unity.GrantManager.Notifications.Email
 {
     public class CreateEmailDto
     {
@@ -27,5 +27,10 @@ public class CreateEmailDto
         public Guid EmailId { get; set; } = Guid.Empty;
         public Guid CurrentUserId { get; set; }
         public string EmailTemplateName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Optional specific UTC date/time to send the email. Leave null to send immediately.
+        /// </summary>
+        public DateTime? SendOnDateTime { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/EmailDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/EmailDto.cs
similarity index 86%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/EmailDto.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/EmailDto.cs
index 5a7e071820..36e8129a68 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/EmailDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/EmailDto.cs
@@ -1,7 +1,7 @@
 using System;
 using Volo.Abp.Application.Dtos;
 
-namespace Unity.GrantManager.Emails
+namespace Unity.GrantManager.Notifications.Email
 {
     public class EmailDto : EntityDto<Guid>
     {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/IEmailAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/IEmailAppService.cs
similarity index 51%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/IEmailAppService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/IEmailAppService.cs
index 37ef649a82..913b1f7edd 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/IEmailAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/IEmailAppService.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Unity.GrantManager.Emails
+namespace Unity.GrantManager.Notifications.Email
 {
     public interface IEmailAppService
     {
-        Task<bool> CreateAsync(CreateEmailDto dto);
+        Task<bool> SendAsync(CreateEmailDto dto);
+        Task<bool> SaveDraftAsync(CreateEmailDto dto);
         Task<Guid> InitializeDraftAsync(Guid applicationId);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/IEmailsService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/IEmailsService.cs
similarity index 89%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/IEmailsService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/IEmailsService.cs
index 326c73229b..e59dfef4ce 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/IEmailsService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/IEmailsService.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Unity.GrantManager.Emails
+namespace Unity.GrantManager.Notifications.Email
 {
     public interface IEmailsService
     {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/UpdateEmailDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/UpdateEmailDto.cs
similarity index 87%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/UpdateEmailDto.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/UpdateEmailDto.cs
index 013962807d..43df079df4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/UpdateEmailDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Email/UpdateEmailDto.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Unity.GrantManager.Emails
+namespace Unity.GrantManager.Notifications.Email
 {
     public class UpdateEmailDto
     {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/GetNotificationsInput.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/GetNotificationsInput.cs
new file mode 100644
index 0000000000..4ff590e3aa
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/GetNotificationsInput.cs
@@ -0,0 +1,11 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.GrantManager.Notifications
+{
+    public class GetNotificationsInput : PagedAndSortedResultRequestDto
+    {
+        public Guid? FormId { get; set; }
+        public string? Filter { get; set; }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/IAutomatedNotificationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/IAutomatedNotificationAppService.cs
new file mode 100644
index 0000000000..48900f935a
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/IAutomatedNotificationAppService.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.Notifications
+{
+    public interface IAutomatedNotificationAppService : IApplicationService
+    {
+        Task<PagedResultDto<NotificationDto>> GetListAsync(GetNotificationsInput input);
+        Task<NotificationDto> GetAsync(Guid id);
+        Task<NotificationDto> CreateAsync(CreateUpdateNotificationDto input);
+        Task<NotificationDto> UpdateAsync(Guid id, CreateUpdateNotificationDto input);
+        Task DeleteAsync(Guid id);
+        Task CancelAsync(Guid id);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/INotificationListAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/INotificationListAppService.cs
new file mode 100644
index 0000000000..58630134b7
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/INotificationListAppService.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.Notifications;
+
+public interface INotificationListAppService : IApplicationService
+{
+    Task<PagedResultDto<NotificationSummaryDto>> GetListAsync(NotificationListInputDto input);
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/INotificationsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/INotificationsAppService.cs
index 24b50ac1c5..aedf23e936 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/INotificationsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/INotificationsAppService.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Unity.Notifications.TeamsNotifications;
+using Unity.GrantManager.Notifications.Teams;
 
 namespace Unity.GrantManager.Notifications
 {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/NotificationDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/NotificationDto.cs
new file mode 100644
index 0000000000..815c3fadbe
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/NotificationDto.cs
@@ -0,0 +1,21 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.GrantManager.Notifications
+{
+    public class NotificationDto : EntityDto<Guid>
+    {
+        public Guid FormId { get; set; }
+        public Guid EmailTemplateId { get; set; }
+        public string? TemplateName { get; set; }
+        public string TriggerType { get; set; } = string.Empty;
+        public string? TriggerDetail { get; set; }
+        public bool IsActive { get; set; }
+        public string? EventType { get; set; }
+        public Guid? ApplicationStatusId { get; set; }
+        public string? ApplicationStatus { get; set; }
+        public string? DateField { get; set; }
+        public string? RecipientCategory { get; set; }
+        public string? RecipientIdentifier { get; set; }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/NotificationListInputDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/NotificationListInputDto.cs
new file mode 100644
index 0000000000..09ec1ac077
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/NotificationListInputDto.cs
@@ -0,0 +1,13 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.GrantManager.Notifications;
+
+public class NotificationListInputDto : PagedAndSortedResultRequestDto
+{
+    // BC/Vancouver-local calendar date (date-only). Inclusive start of that day.
+    public DateTime? DateFrom { get; set; }
+
+    // BC/Vancouver-local calendar date (date-only). Inclusive end of that day.
+    public DateTime? DateTo { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/NotificationSummaryDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/NotificationSummaryDto.cs
new file mode 100644
index 0000000000..f623f6bb73
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/NotificationSummaryDto.cs
@@ -0,0 +1,20 @@
+using System;
+using Unity.Notifications.Emails;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.GrantManager.Notifications;
+
+public class NotificationSummaryDto : EntityDto<Guid>
+{
+    public Guid ApplicationId { get; set; }
+    public string SubmissionReferenceNo { get; set; } = string.Empty;
+    public string ApplicantName { get; set; } = string.Empty;
+    public DateTime? SentDateTime { get; set; }
+    public string Status { get; set; } = string.Empty;
+    public string FromAddress { get; set; } = string.Empty;
+    public string ToAddress { get; set; } = string.Empty;
+    public string Subject { get; set; } = string.Empty;
+    public RecipientType? Recipient { get; set; }
+    public EmailType? EmailType { get; set; }
+    public string EmailTypeText { get; set; } = string.Empty;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Facts.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Teams/Facts.cs
similarity index 84%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Facts.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Teams/Facts.cs
index 6569cfe5ec..4fc1001d1a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Facts.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Notifications/Teams/Facts.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Unity.Notifications.TeamsNotifications
+namespace Unity.GrantManager.Notifications.Teams
 {
     public class Fact
     {
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 1b84ea5227..06d1486eaf 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
@@ -47,6 +47,7 @@ public override void Define(IPermissionDefinitionContext context)
             applicatPermissions.AddChild(GrantApplicationPermissions.Applicants.ViewList, L("Permission:GrantApplicationManagement.Applicants.ViewList"));
             applicatPermissions.AddChild(GrantApplicationPermissions.Applicants.Edit, L("Permission:GrantApplicationManagement.Applicants.Edit"));
             applicatPermissions.AddChild(GrantApplicationPermissions.Applicants.AssignApplicant, L("Permission:GrantApplicationManagement.Applicants.AssignApplicant"));
+            applicatPermissions.AddChild(GrantApplicationPermissions.Applicants.Delete, L("Permission:GrantApplicationManagement.Applicants.Delete"));
             var applicantInfoPermissions = applicatPermissions.AddChild(
                 GrantApplicationPermissions.Applicants.ApplicantInfoDefault,
                 L("Permission:GrantApplicationManagement.Applicants.ApplicantInfo"));
@@ -69,6 +70,12 @@ public override void Define(IPermissionDefinitionContext context)
             approvalPermissions.AddChild(GrantApplicationPermissions.Approvals.DeferAfterApproval, L("Permission:GrantApplicationManagement.Approvals.DeferAfterApproval"));
             approvalPermissions.AddChild(GrantApplicationPermissions.Approvals.BulkApplicationApproval, L("Permission:GrantApplicationManagement.Approvals.BulkApplicationApproval"));
 
+            // External Status Visibility
+            var statusVisibilityPermissions = grantApplicationPermissionsGroup.AddPermission(UnitySelector.Application.Status.Default, L(UnitySelector.Application.Status.Default));
+            statusVisibilityPermissions.AddUnityChild(UnitySelector.Application.Status.Publish);
+            statusVisibilityPermissions.AddUnityChild(UnitySelector.Application.Status.Unpublish);
+            statusVisibilityPermissions.AddUnityChild(UnitySelector.Application.Status.BulkPublish);
+
             // Comments
             var appCommentPermissions = grantApplicationPermissionsGroup.AddPermission(GrantApplicationPermissions.Comments.Default, L("Permission:GrantApplicationManagement.Comments.Default"));
             appCommentPermissions.AddChild(GrantApplicationPermissions.Comments.Add, L("Permission:GrantApplicationManagement.Comments.Add"));
@@ -86,6 +93,7 @@ public override void Define(IPermissionDefinitionContext context)
             settingManagement.AddPermission(UnitySettingManagementPermissions.UserInterface, L("Permission:UnitySettingManagementPermissions.UserInterface"));
             settingManagement.AddPermission(UnitySettingManagementPermissions.BackgroundJobSettings, L("Permission:UnitySettingManagementPermissions.BackgroundJobs"));
             settingManagement.AddPermission(UnitySettingManagementPermissions.ConfigurePayments, L("Permission:UnitySettingManagementPermissions.ConfigurePayments"));
+            settingManagement.AddPermission(UnitySettingManagementPermissions.EditProgramDetails, L("Permission:UnitySettingManagementPermissions.EditProgramDetails"));
 
             var emailingPermission = context.GetPermissionOrNull(SettingManagementPermissions.Emailing);
             if (emailingPermission != null)
@@ -114,7 +122,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));           
+            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.Contracts/Permissions/GrantManagerPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantManagerPermissionDefinitionProvider.cs
index 06eefb1396..53d584174d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantManagerPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantManagerPermissionDefinitionProvider.cs
@@ -19,6 +19,9 @@ public override void Define(IPermissionDefinitionContext context)
         grantManagerPermissionsGroup.AddPermission(GrantManagerPermissions.Intakes.Default, L("Permission:GrantManagerManagement.Intakes.Default"));
 
         grantManagerPermissionsGroup.AddPermission(GrantManagerPermissions.ApplicationForms.Default, L("Permission:GrantManagerManagement.ApplicationForms.Default"));
+
+        var notificationSchedulerPermissions = grantManagerPermissionsGroup.AddPermission(GrantManagerPermissions.NotificationScheduler.Default, L("Permission:GrantManagerManagement.NotificationScheduler.Default"));
+        notificationSchedulerPermissions.AddChild(GrantManagerPermissions.NotificationScheduler.ManageSchedules, L("Permission:GrantManagerManagement.NotificationScheduler.ManageSchedules"));
     }
 
     private static LocalizableString L(string name)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/IProgramDetailsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/IProgramDetailsAppService.cs
new file mode 100644
index 0000000000..589462dae0
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/IProgramDetailsAppService.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.SettingManagement;
+
+public interface IProgramDetailsAppService : IApplicationService
+{
+    Task<ProgramDetailsDto> GetProgramDetailsAsync();
+    Task UpdateProgramDetailsAsync(UpdateProgramDetailsDto input);
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/ProgramDetailsDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/ProgramDetailsDto.cs
new file mode 100644
index 0000000000..7ca2ea34d4
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/ProgramDetailsDto.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Unity.GrantManager.SettingManagement;
+
+[Serializable]
+public class ProgramDetailsDto
+{
+    public string DisplayName { get; set; } = string.Empty;
+
+    public string Division { get; set; } = string.Empty;
+
+    public string Branch { get; set; } = string.Empty;
+
+    public string Description { get; set; } = string.Empty;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/UpdateProgramDetailsDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/UpdateProgramDetailsDto.cs
new file mode 100644
index 0000000000..25eb70a238
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/UpdateProgramDetailsDto.cs
@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Unity.GrantManager.SettingManagement;
+
+public class UpdateProgramDetailsDto
+{
+    [StringLength(ProgramDetailsConsts.MaxDisplayNameLength)]
+    public string? DisplayName { get; set; }
+
+    [StringLength(ProgramDetailsConsts.MaxDivisionLength)]
+    public string? Division { get; set; }
+
+    [StringLength(ProgramDetailsConsts.MaxBranchLength)]
+    public string? Branch { get; set; }
+
+    [StringLength(ProgramDetailsConsts.MaxDescriptionLength)]
+    public string? Description { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/DataProviders/OrgInfoDataProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/DataProviders/OrgInfoDataProvider.cs
index 8b02ea0817..287cf93a98 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/DataProviders/OrgInfoDataProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/DataProviders/OrgInfoDataProvider.cs
@@ -56,7 +56,7 @@ join applicant in applicantsQuery on submission.ApplicantId equals applicant.Id
                         applicant.NonRegOrgName,
                         applicant.FiscalMonth,
                         applicant.FiscalDay,
-                        applicant.OrganizationSize,
+                        applicant.ApproxNumberOfEmployees,
                         applicant.Sector,
                         applicant.SubSector
                     })
@@ -75,7 +75,8 @@ join applicant in applicantsQuery on submission.ApplicantId equals applicant.Id
                     NonRegOrgName = r.NonRegOrgName,
                     FiscalMonth = r.FiscalMonth,
                     FiscalDay = r.FiscalDay,
-                    OrganizationSize = r.OrganizationSize,
+                    OrganizationSize = r.ApproxNumberOfEmployees,
+                    ApproxNumberOfEmployees = r.ApproxNumberOfEmployees,
                     Sector = r.Sector,
                     SubSector = r.SubSector
                 }));
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/DataProviders/SubmissionInfoDataProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/DataProviders/SubmissionInfoDataProvider.cs
index ed12b08554..d56d98fa28 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/DataProviders/SubmissionInfoDataProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/DataProviders/SubmissionInfoDataProvider.cs
@@ -1,9 +1,9 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using Unity.GrantManager.ApplicantProfile.ProfileData;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Integrations;
@@ -67,7 +67,9 @@ join status in statusesQuery on application.ApplicationStatusId equals status.Id
                         submission.Submission,
                         application.ReferenceNo,
                         FormName = form.ApplicationFormName ?? string.Empty,
-                        Status = status.ExternalStatus
+                        Status = application.ExternalStatusVisibility
+                            ? status.NotifiedStatus ?? status.ExternalStatus
+                            : status.ExternalStatus
                     }).ToListAsync();
 
                 dto.Submissions.AddRange(results.Select(s => new SubmissionInfoItemDto
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Payments/ApplicantPaymentsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Payments/ApplicantPaymentsAppService.cs
index 5942eb2d9b..159192fb42 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Payments/ApplicantPaymentsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Payments/ApplicantPaymentsAppService.cs
@@ -23,7 +23,9 @@ public class ApplicantPaymentsAppService(
     public async Task<ApplicantPaymentSummaryDto> GetPaymentSummaryByApplicantIdAsync(Guid applicantId)
     {
         var applications = await applicationRepository.GetByApplicantIdAsync(applicantId);
-        var totalApproved = applications.Sum(a => a.ApprovedAmount);
+        var totalApproved = applications
+            .Where(a => a.ApplicationLinks == null || !a.ApplicationLinks.Any(l => l.LinkType == ApplicationLinkType.Parent))
+            .Sum(a => a.ApprovedAmount);
 
         if (applications.Count == 0)
             return new ApplicantPaymentSummaryDto { TotalApprovedAmount = totalApproved };
@@ -51,6 +53,7 @@ public async Task<List<ApplicantPaymentDetailsDto>> GetPaymentListByApplicantIdA
         if (applications.Count == 0) return [];
 
         var referenceMap = applications.ToDictionary(a => a.Id, a => a.ReferenceNo);
+        var categoryMap = applications.ToDictionary(a => a.Id, a => a.ApplicationForm?.Category ?? string.Empty);
         var applicationIds = applications.Select(a => a.Id).ToList();
         var payments = await paymentRequestAppService.GetListByApplicationIdsAsync(applicationIds);
 
@@ -64,6 +67,9 @@ public async Task<List<ApplicantPaymentDetailsDto>> GetPaymentListByApplicantIdA
             Status = p.Status,
             Amount = p.Amount,
             PaymentStatus = p.PaymentStatus,
+            InvoiceStatus = p.InvoiceStatus,
+            CasResponse = p.CasResponse,
+            Category = categoryMap.TryGetValue(p.CorrelationId, out var cat) ? cat : string.Empty,
             SupplierNumber = p.SupplierNumber,
             SupplierName = p.SupplierName,
             Site = p.Site
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Queries/ApplicantProfileQueryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Queries/ApplicantProfileQueryService.cs
index 99bb33d239..f9571442f7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Queries/ApplicantProfileQueryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/Queries/ApplicantProfileQueryService.cs
@@ -10,6 +10,7 @@
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Settings;
+using Volo.Abp.TenantManagement;
 
 namespace Unity.GrantManager.ApplicantProfile
 {
@@ -22,6 +23,7 @@ namespace Unity.GrantManager.ApplicantProfile
     public class ApplicantProfileQueryService(
             ICurrentTenant currentTenant,
             IRepository<ApplicantTenantMap, Guid> applicantTenantMapRepository,
+            IRepository<Tenant, Guid> tenantRepository,
             IEnumerable<IApplicantProfileDataProvider> dataProviders,
             ISettingProvider settingProvider,
             ILogger<ApplicantProfileQueryService> logger)
@@ -63,7 +65,7 @@ public async Task<ApplicantProfileDto> GetApplicantProfileAsync(ApplicantProfile
         /// </summary>
         /// <remarks>The method extracts the username portion from the subject identifier in the request
         /// to match tenant mappings. This operation is asynchronous and queries the host database for relevant tenant
-        /// associations.</remarks>
+        /// associations. Tenant display names are batch-loaded for efficiency, falling back to the tenant name if not set.</remarks>
         /// <param name="request">An object containing applicant profile information, including the subject identifier used to locate tenant
         /// mappings.</param>
         /// <returns>A list of <see cref="ApplicantTenantDto"/> objects representing the tenants linked to the applicant. The
@@ -75,7 +77,7 @@ public async Task<List<ApplicantTenantDto>> GetApplicantTenantsAsync(ApplicantPr
             if (subUsername is null) return [];
             List<ApplicantTenantDto> mappings = [];
 
-            // Query the ApplicantTenantMaps table in the host database
+            // Query 1: Get all tenant mappings for the applicant
             using (currentTenant.Change(null))
             {
                 var queryable = await applicantTenantMapRepository.GetQueryableAsync();
@@ -89,6 +91,33 @@ public async Task<List<ApplicantTenantDto>> GetApplicantTenantsAsync(ApplicantPr
                     .ToListAsync();
             }
 
+            if (mappings.Count == 0)
+            {
+                return mappings;
+            }
+
+            // Query 2: Batch-load all tenants by their IDs to get display names
+            using (currentTenant.Change(null))
+            {
+                var tenantIds = mappings.Select(m => m.TenantId).ToHashSet();
+                var queryable = await tenantRepository.GetQueryableAsync();
+                var tenants = await queryable.Where(t => tenantIds.Contains(t.Id)).ToListAsync();
+                // Create a map of tenant ID to DisplayName (with fallback to Name)
+                var tenantDisplayNames = tenants.ToDictionary(
+                    t => t.Id,
+                    t => GetTenantDisplayName(t)
+                );
+
+                // Populate DisplayName for each mapping
+                foreach (var mapping in mappings)
+                {
+                    if (tenantDisplayNames.TryGetValue(mapping.TenantId, out var displayName))
+                    {
+                        mapping.DisplayName = displayName;
+                    }
+                }
+            }
+
             // Apply tenant specific metadata
             foreach (var map in mappings)
             {
@@ -107,8 +136,24 @@ private async Task AddTenantMetadataAsync(ApplicantTenantDto tenantMap)
             using (currentTenant.Change(tenantMap.TenantId))
             {
                 var defaultEmailAddress = await settingProvider.GetOrNullAsync(NotificationsSettings.Mailing.DefaultFromAddress);
-                tenantMap.Metadata[ApplicantTenantMetadataKeys.DefaultFromAddress] = defaultEmailAddress ?? "NoReply@gov.bc.ca";
+                tenantMap.DefaultFromAddress = defaultEmailAddress ?? "NoReply@gov.bc.ca";
+            }
+        }
+
+        /// <summary>
+        /// Extracts the DisplayName from the tenant's extra properties, falling back to the tenant's Name.
+        /// </summary>
+        private static string GetTenantDisplayName(Volo.Abp.TenantManagement.Tenant tenant)
+        {
+            if (tenant.ExtraProperties.TryGetValue("DisplayName", out var displayNameObj))
+            {
+                var displayName = displayNameObj?.ToString()?.Trim();
+                if (!string.IsNullOrEmpty(displayName))
+                {
+                    return displayName;
+                }
             }
+            return tenant.Name;
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
index 0746a6744b..15c346d508 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
@@ -35,8 +35,7 @@ public class ApplicantAppService(IApplicantRepository applicantRepository,
                                  IApplicantAddressRepository addressRepository,
                                  IOrgBookService orgBookService,
                                  IApplicantAgentRepository applicantAgentRepository,
-                                 IApplicationRepository applicationRepository,
-                                 IRepository<Supplier, Guid> supplierRepository) : GrantManagerAppService, IApplicantAppService
+                                 IApplicationRepository applicationRepository) : GrantManagerAppService, IApplicantAppService
 {                                   
 
     private const string ApplicantIdDataKey = "ApplicantId";
@@ -653,6 +652,15 @@ private async Task UpdateAddress(List<ApplicantAddress> applicantAddresses, Addr
     [RemoteService(true)]
     public async Task TransferApplicantApplicationsAsync(TransferApplicantApplicationsDto dto)
     {
+        var principal = await applicantRepository.GetAsync(dto.PrincipalApplicantId);
+        var nonPrincipal = await applicantRepository.GetAsync(dto.NonPrincipalApplicantId);
+
+        if ((principal != null && principal.IsDeleted) || (nonPrincipal != null && nonPrincipal.IsDeleted))
+        {
+            throw new UserFriendlyException(
+                "One or more selected applicants have been deleted. Please refresh the applicant list to update the view.");
+        }
+
         var applications = await applicationRepository.GetByApplicantIdAsync(dto.NonPrincipalApplicantId);
         foreach (var application in applications)
         {
@@ -669,6 +677,14 @@ public async Task SetDuplicatedAsync(SetApplicantDuplicateDto dto)
     {
         // Set principal as not duplicated
         var principal = await applicantRepository.GetAsync(dto.PrincipalApplicantId);
+        var nonPrincipal = await applicantRepository.GetAsync(dto.NonPrincipalApplicantId);
+
+        if ((principal != null && principal.IsDeleted) || (nonPrincipal != null && nonPrincipal.IsDeleted))
+        {
+            throw new UserFriendlyException(
+                "One or more selected applicants have been deleted. Please refresh the applicant list to update the view.");
+        }
+
         if (principal != null && principal.IsDuplicated)
         {
             principal.IsDuplicated = false;
@@ -676,7 +692,6 @@ public async Task SetDuplicatedAsync(SetApplicantDuplicateDto dto)
         }
 
         // Set non-principal as duplicated
-        var nonPrincipal = await applicantRepository.GetAsync(dto.NonPrincipalApplicantId);
         if (nonPrincipal != null && !nonPrincipal.IsDuplicated)
         {
             nonPrincipal.IsDuplicated = true;
@@ -684,6 +699,30 @@ public async Task SetDuplicatedAsync(SetApplicantDuplicateDto dto)
         }
     }
 
+    [RemoteService(true)]
+    [Authorize(GrantApplicationPermissions.Applicants.Delete)]
+    public async Task<bool> HasSubmissionsAsync(Guid id)
+    {
+        return await applicationRepository.HasApplicationsByApplicantIdAsync(id);
+    }
+
+    [RemoteService(true)]
+    [Authorize(GrantApplicationPermissions.Applicants.Delete)]
+    public async Task DeleteApplicantAsync(Guid id)
+    {
+        if (await applicationRepository.HasApplicationsByApplicantIdAsync(id))
+        {
+            throw new UserFriendlyException(
+                "This applicant cannot be deleted because it is associated with one or more submissions.");
+        }
+
+        var applicant = await applicantRepository.GetAsync(id);
+        applicant.IsDeleted = true;
+        applicant.DeletionTime = Clock.Now;
+        applicant.DeleterId = CurrentUser.Id;
+        await applicantRepository.UpdateAsync(applicant, autoSave: true);
+    }
+
     private async Task UpdateApplicationFormSubmissionsAsync(Guid applicationId, Guid newApplicantId)
     {
         try
@@ -731,71 +770,38 @@ private async Task UpdateApplicantAgentRecordsAsync(Guid oldApplicantId, Guid ne
     [RemoteService(true)]
     public async Task<PagedResultDto<ApplicantListDto>> GetListAsync(ApplicantListRequestDto input)
     {
-        var query = await applicantRepository.GetQueryableAsync();
-
-        // Apply default sorting (client-side DataTable handles search, sorting, and paging)
-        query = query.OrderByDescending(a => a.CreationTime);
-
-        // Get total count
-        var totalCount = await query.CountAsync();
+        var listRecords = await applicantRepository.GetApplicantListRecordsAsync(input.RequestedFields);
 
-        // Execute query
-        var applicants = await query.ToListAsync();
-
-        // Batch-load supplier data for all applicants in one query
-        var supplierIds = applicants
-            .Where(a => a.SupplierId.HasValue)
-            .Select(a => a.SupplierId!.Value)
-            .Distinct()
-            .ToList();
-
-        Dictionary<Guid, Supplier> supplierMap = new();
-        if (supplierIds.Count > 0)
-        {
-            var suppliers = await supplierRepository.GetListAsync(s => supplierIds.Contains(s.Id));
-            supplierMap = suppliers.ToDictionary(s => s.Id);
-        }
-
-        // Map to DTOs
-        var items = applicants.Select(applicant =>
+        var items = listRecords.Select(applicant => new ApplicantListDto
             {
-                supplierMap.TryGetValue(applicant.SupplierId ?? Guid.Empty, out var supplier);
-                return new ApplicantListDto
-                {
-                    Id = applicant.Id,
-                    ApplicantName = applicant.ApplicantName,
-                    UnityApplicantId = applicant.UnityApplicantId,
-                    OrgName = applicant.OrgName,
-                    OrgNumber = applicant.OrgNumber,
-                    OrgStatus = applicant.OrgStatus,
-                    OrganizationType = applicant.OrganizationType,
-                    Status = applicant.Status,
-                    RedStop = applicant.RedStop,
-                    NonRegisteredBusinessName = applicant.NonRegisteredBusinessName,
-                    NonRegOrgName = applicant.NonRegOrgName,
-                    OrganizationSize = applicant.OrganizationSize,
-                    Sector = applicant.Sector,
-                    SubSector = applicant.SubSector,
-                    ApproxNumberOfEmployees = applicant.ApproxNumberOfEmployees,
-                    IndigenousOrgInd = applicant.IndigenousOrgInd,
-                    SectorSubSectorIndustryDesc = applicant.SectorSubSectorIndustryDesc,
-                    FiscalMonth = applicant.FiscalMonth,
-                    BusinessNumber = applicant.BusinessNumber,
-                    FiscalDay = applicant.FiscalDay,
-                    StartedOperatingDate = applicant.StartedOperatingDate.HasValue
-                        ? applicant.StartedOperatingDate.Value.ToDateTime(TimeOnly.MinValue)
-                        : null,
-                    SupplierId = applicant.SupplierId?.ToString(),
-                    SupplierNumber = supplier?.Number,
-                    SupplierName = supplier?.Name,
-                    SupplierStatus = supplier?.Status,
-                    MatchPercentage = applicant.MatchPercentage,
-                    IsDuplicated = applicant.IsDuplicated,
-                    CreationTime = applicant.CreationTime,
-                    LastModificationTime = applicant.LastModificationTime
-                };
+                Id = applicant.Id,
+                ApplicantName = applicant.ApplicantName,
+                UnityApplicantId = applicant.UnityApplicantId,
+                OrgName = applicant.OrgName,
+                OrgNumber = applicant.OrgNumber,
+                OrgStatus = applicant.OrgStatus,
+                OrganizationType = applicant.OrganizationType,
+                Status = applicant.Status,
+                RedStop = applicant.RedStop,
+                NonRegisteredBusinessName = applicant.NonRegisteredBusinessName,
+                NonRegOrgName = applicant.NonRegOrgName,
+                Sector = applicant.Sector,
+                SubSector = applicant.SubSector,
+                ApproxNumberOfEmployees = applicant.ApproxNumberOfEmployees,
+                IndigenousOrgInd = applicant.IndigenousOrgInd,
+                SectorSubSectorIndustryDesc = applicant.SectorSubSectorIndustryDesc,
+                FiscalMonth = applicant.FiscalMonth,
+                BusinessNumber = applicant.BusinessNumber,
+                FiscalDay = applicant.FiscalDay,
+                StartedOperatingDate = applicant.StartedOperatingDate.HasValue
+                    ? applicant.StartedOperatingDate.Value.ToDateTime(TimeOnly.MinValue)
+                    : null,
+                IsDuplicated = applicant.IsDuplicated,
+                CreationTime = applicant.CreationTime,
+                LastModificationTime = applicant.LastModificationTime
             }).ToList();
-
-        return new PagedResultDto<ApplicantListDto>(totalCount, items);
+        // Use items.Count while client side datatables are used. When going to server
+        // side actually query the correct amount with paging enabled.
+        return new PagedResultDto<ApplicantListDto>(items.Count, items);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantSupplierAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantSupplierAppService.cs
index b49bfd1371..daa5c3be42 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantSupplierAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantSupplierAppService.cs
@@ -184,10 +184,17 @@ public async Task HandleSupplierAfterMergeAsync(HandleSupplierAfterMergeDto dto)
         await EnsureNoPendingPaymentsForApplicantAsync(dto.NonPrincipalId);
 
         var principal = await applicantRepository.GetAsync(dto.PrincipalId);
+        var nonPrincipal = await applicantRepository.GetAsync(dto.NonPrincipalId);
+
+        if ((principal != null && principal.IsDeleted) || (nonPrincipal != null && nonPrincipal.IsDeleted))
+        {
+            throw new UserFriendlyException(
+                "One or more selected applicants have been deleted. Please refresh the applicant list to update the view.");
+        }
+
         principal.SupplierId = dto.SelectedSupplierId;
         await applicantRepository.UpdateAsync(principal);
 
-        var nonPrincipal = await applicantRepository.GetAsync(dto.NonPrincipalId);
         nonPrincipal.SupplierId = dto.SelectedSupplierId;
         await applicantRepository.UpdateAsync(nonPrincipal);
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs
index 8a359cc45c..0ac2b2f453 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs
@@ -25,4 +25,6 @@ public interface IApplicantAppService : IApplicationService
     Task<Applicant> PartialUpdateApplicantSummaryAsync(Guid applicantId, PartialUpdateDto<UpdateApplicantSummaryDto> input);
     Task UpdateApplicantContactAddressesAsync(Guid applicantId, UpdateApplicantContactAddressesDto input);
     Task UpdateApplicantStatusAsync(Guid applicantId, string status);
+    Task DeleteApplicantAsync(Guid id);
+    Task<bool> HasSubmissionsAsync(Guid id);
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs
index 1fc0efd1bb..e4f8289d3a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs
@@ -220,11 +220,7 @@ public async Task SavePaymentConfiguration(FormPaymentConfigurationDto dto)
                     throw new BusinessException(GrantManagerDomainErrorCodes.ChildFormCannotReferenceSelf);
                 }
 
-                var parentForm = await Repository.FindAsync(dto.ParentFormId.Value);
-                if (parentForm is null)
-                {
-                    throw new BusinessException(GrantManagerDomainErrorCodes.ChildFormRequiresParentForm);
-                }
+                var parentForm = await Repository.FindAsync(dto.ParentFormId.Value) ?? throw new BusinessException(GrantManagerDomainErrorCodes.ChildFormRequiresParentForm);
             }
         }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormSycnronizationService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormSycnronizationService.cs
index 1516292892..29491c9f2f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormSycnronizationService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormSycnronizationService.cs
@@ -9,7 +9,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using Unity.Notifications.TeamsNotifications;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Forms;
 using Unity.GrantManager.Intakes;
@@ -22,6 +21,7 @@
 using Volo.Abp.Security.Encryption;
 using Volo.Abp.TenantManagement;
 using Unity.GrantManager.Notifications;
+using Unity.GrantManager.Notifications.Teams;
 
 namespace Unity.GrantManager.ApplicationForms
 {
@@ -200,7 +200,7 @@ private async Task ProcessSubmission(ApplicationFormDto applicationFormDto, JObj
                     {
                         HashSet<string> newChefsSubmissions = await GetChefsSubmissions(applicationFormDto, numberOfDaysToCheck);
                         HashSet<string> existingSubmissions = GetSubmissionsByForm(applicationFormDto.Id);
-                        missingSubmissions = newChefsSubmissions.Except(existingSubmissions).ToHashSet();
+                        missingSubmissions = [.. newChefsSubmissions.Except(existingSubmissions)];
                         if (missingSubmissions.Count > 0)
                         {
                             formsMissingSubmissions++;
@@ -247,7 +247,7 @@ private async Task ProcessSubmission(ApplicationFormDto applicationFormDto, JObj
                 
                 await _notificationsAppService.PostToTeamsAsync(activityTitle, activitySubtitle, _facts);
             }
-            return (missingSubmissions ?? new HashSet<string>(), missingSubmissionsReportBuilder.ToString());
+            return (missingSubmissions ?? [], missingSubmissionsReportBuilder.ToString());
         }
 
         private async Task<string?> GetTenantNameAsync()
@@ -277,7 +277,7 @@ public async Task<IList<ApplicationFormDto>> GetConnectedApplicationFormsAsync()
         {
             IQueryable<ApplicationForm> queryableApplicationForms = _applicationFormRepository.GetQueryableAsync().Result;
             var forms = queryableApplicationForms.Where(x => (x.ApiKey ?? string.Empty) != string.Empty).ToList();
-            return await Task.FromResult<IList<ApplicationFormDto>>(ObjectMapper.Map<List<ApplicationForm>, List<ApplicationFormDto>>(forms.ToList()));
+            return await Task.FromResult<IList<ApplicationFormDto>>(ObjectMapper.Map<List<ApplicationForm>, List<ApplicationFormDto>>([.. forms]));
         }
 
         public async Task<HashSet<string>> GetChefsSubmissions(ApplicationFormDto applicationFormDto, int numberOfDaysToCheck)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs
index 528a13cc91..63fa4d8cf8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs
@@ -257,10 +257,15 @@ private async Task UpdateApplicationFormVersionFields(ApplicationFormVersion app
         public async Task<int> GetFormVersionByApplicationIdAsync(Guid applicationId)
         {
             var formSubmission = await formSubmissionRepository.GetByApplicationAsync(applicationId);
+
+            if (formSubmission == null)
+            {
+                return 0;
+            }
             
             if (formSubmission.FormVersionId == null)
             {
-                return await HandleEmptyFormVersionIdAsync(formSubmission);
+                return await HandleEmptyFormVersionIdAsync(formSubmission!);
             }
 
             return await GetVersion(formSubmission.FormVersionId ?? Guid.Empty);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applications/ApplicationBulkActionsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applications/ApplicationBulkActionsAppService.cs
index f8290e94ad..669d03e32c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applications/ApplicationBulkActionsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applications/ApplicationBulkActionsAppService.cs
@@ -1,56 +1,113 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using Unity.GrantManager.GrantApplications;
+using Unity.Modules.Shared;
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
 
-namespace Unity.GrantManager.Applications
+namespace Unity.GrantManager.Applications;
+
+[Dependency(ReplaceServices = true)]
+[ExposeServices(typeof(ApplicationBulkActionsAppService), typeof(IApplicationBulkActionsAppService))]
+[Authorize]
+public class ApplicationBulkActionsAppService(
+    ApplicationIdsCacheService cacheService,
+    IApplicationRepository applicationRepository,
+    IApplicationStatusRepository applicationStatusRepository,
+    IApplicationFormRepository applicationFormRepository) : GrantManagerAppService, IApplicationBulkActionsAppService
 {
-    [Dependency(ReplaceServices = true)]
-    [ExposeServices(typeof(ApplicationBulkActionsAppService), typeof(IApplicationBulkActionsAppService))]
-    [Authorize]
-    public class ApplicationBulkActionsAppService : GrantManagerAppService, IApplicationBulkActionsAppService
-    {
-        private readonly ApplicationIdsCacheService _cacheService;
+    private readonly ApplicationIdsCacheService _cacheService = cacheService;
 
-        public ApplicationBulkActionsAppService(ApplicationIdsCacheService cacheService)
+    /// <summary>
+    /// Stores application IDs in distributed cache for bulk operations
+    /// </summary>
+    /// <param name="input">Request containing list of application IDs</param>
+    /// <returns>Cache key to retrieve the stored IDs</returns>
+    public async Task<StoreApplicationIdsResultDto> StoreApplicationIdsAsync(StoreApplicationIdsRequestDto input)
+    {
+        if (input == null || input.ApplicationIds == null || input.ApplicationIds.Count == 0)
         {
-            _cacheService = cacheService;
+            throw new UserFriendlyException("No application IDs provided");
         }
 
-        /// <summary>
-        /// Stores application IDs in distributed cache for bulk operations
-        /// </summary>
-        /// <param name="input">Request containing list of application IDs</param>
-        /// <returns>Cache key to retrieve the stored IDs</returns>
-        public async Task<StoreApplicationIdsResultDto> StoreApplicationIdsAsync(StoreApplicationIdsRequestDto input)
+        try
         {
-            if (input == null || input.ApplicationIds == null || input.ApplicationIds.Count == 0)
-            {
-                throw new UserFriendlyException("No application IDs provided");
-            }
+            var cacheKey = await _cacheService.StoreApplicationIdsAsync(input.ApplicationIds);
+
+            Logger.LogInformation(
+                "User {UserId} stored {Count} application IDs for bulk operation with cache key: {CacheKey}",
+                CurrentUser?.Id,
+                input.ApplicationIds.Count,
+                cacheKey);
 
-            try
+            return new StoreApplicationIdsResultDto
             {
-                var cacheKey = await _cacheService.StoreApplicationIdsAsync(input.ApplicationIds);
-
-                Logger.LogInformation(
-                    "User {UserId} stored {Count} application IDs for bulk operation with cache key: {CacheKey}",
-                    CurrentUser?.Id,
-                    input.ApplicationIds.Count,
-                    cacheKey);
-
-                return new StoreApplicationIdsResultDto
-                {
-                    CacheKey = cacheKey
-                };
-            }
-            catch (Exception ex)
+                CacheKey = cacheKey
+            };
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Failed to store application IDs for bulk operation");
+            throw new UserFriendlyException("Failed to prepare bulk operation. Please try again.");
+        }
+    }
+
+    /// <summary>
+    /// Get applications for bulk publish with internal and external status information
+    /// </summary>
+    /// <param name="applicationGuids"></param>
+    /// <param name="excludePublished"></param>
+    /// <returns></returns>
+    [Authorize(UnitySelector.Application.Status.BulkPublish)]
+    public async Task<List<BulkPublishDto>> GetApplicationsForBulkPublish(Guid[] applicationGuids, bool excludePublished = true)
+    {
+        var applicationsQuery = await applicationRepository.GetQueryableAsync();
+        var statusesQuery = await applicationStatusRepository.GetQueryableAsync();
+        var formsQuery = await applicationFormRepository.GetQueryableAsync();
+
+        var results = await (
+            from application in applicationsQuery
+            join form in formsQuery on application.ApplicationFormId equals form.Id
+            join status in statusesQuery on application.ApplicationStatusId equals status.Id
+            where applicationGuids.Contains(application.Id) && (!excludePublished || !application.ExternalStatusVisibility)
+            select new BulkPublishDto
             {
-                Logger.LogError(ex, "Failed to store application IDs for bulk operation");
-                throw new UserFriendlyException("Failed to prepare bulk operation. Please try again.");
-            }
+                ApplicationId = application.Id,
+                ReferenceNo = application.ReferenceNo,
+                ApplicantName = application.Applicant.ApplicantName ?? string.Empty,
+                ApplicationStatus = status.InternalStatus,
+                FormName = form.ApplicationFormName ?? string.Empty,
+                FinalDecisionDate = application.FinalDecisionDate,
+                ExternalStatusVisibility = application.ExternalStatusVisibility,
+                ExternalStatus = application.ExternalStatusVisibility
+                    ? status.NotifiedStatus ?? status.ExternalStatus
+                    : status.ExternalStatus,
+                PublishedStatus = status.NotifiedStatus ?? status.ExternalStatus,
+            }).ToListAsync();
+
+        return results;
+    }
+
+    /// <summary>
+    /// Bulk publish applications by setting the ExternalStatusVisibility to true for the specified application GUIDs.
+    /// </summary>
+    /// <param name="applicationGuids">The GUIDs of the applications to be bulk published.</param>
+    /// <returns>A task representing the asynchronous operation.</returns>
+    [Authorize(UnitySelector.Application.Status.BulkPublish)]
+    public async Task BulkPublishApplications(Guid[] applicationGuids)
+    {
+        var applications = await applicationRepository
+                .GetListAsync(x => applicationGuids.Contains(x.Id) && !x.ExternalStatusVisibility);
+
+        foreach (var application in applications)
+        {
+            application.ExternalStatusVisibility = true;
+            await applicationRepository.UpdateAsync(application);
         }
     }
 }
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 92f939ed5d..cca9d11cb8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
@@ -1,5 +1,4 @@
-using Unity.GrantManager.Applications;
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authorization.Infrastructure;
 using System;
 using System.Collections.Generic;
@@ -12,6 +11,7 @@
 using Unity.Flex.Scoresheets.Enums;
 using Unity.Flex.Scoresheets.Events;
 using Unity.Flex.Worksheets.Definitions;
+using Unity.GrantManager.Applications;
 using Unity.GrantManager.Comments;
 using Unity.GrantManager.Exceptions;
 using Unity.GrantManager.Workflow;
@@ -93,7 +93,7 @@ public async Task<AssessmentDisplayListDto> GetDisplayList(Guid applicationId)
 
             // If AI Scoring feature is disabled or user lacks permission, filter out AI assessments
             var aiScoringEnabled = await _featureChecker.IsEnabledAsync("Unity.AI.Scoring");
-            var canViewAI = await AuthorizationService.IsGrantedAsync(AIPermissions.Analysis.ViewScoringResult);
+            var canViewAI = await AuthorizationService.IsGrantedAsync(AIPermissions.Analysis.ViewScoringResult);
             assessmentList = assessmentList
                 .Where(a => !a.IsAiAssessment || (aiScoringEnabled && canViewAI))
                 .OrderByDescending(a => a.IsAiAssessment)
@@ -278,7 +278,7 @@ public async Task<List<AssessmentAction>> GetPermittedActions(Guid assessmentId)
         }
 
         /// <summary>
-        /// Generate a DOT graph from the Asssessment workflow.
+        /// Generate a Mermaid graph from the Asssessment workflow.
         /// </summary>
         public static string? GetWorkflowDiagram()
         {
@@ -394,7 +394,7 @@ public async Task UpdateAssessmentScore(AssessmentScoresDto dto)
         /// <exception cref="BusinessException">
         /// Thrown when the specified assessment is not an AI assessment.
         /// </exception>
-        [Authorize(AIPermissions.Analysis.ViewScoringResult)]
+        [Authorize(AIPermissions.Analysis.ViewScoringResult)]
         public async Task<AssessmentDto> CloneFromAiAsync(Guid aiAssessmentId)
         {
             if (!await _featureChecker.IsEnabledAsync("Unity.AI.Scoring"))
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAuthorizationHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAuthorizationHandler.cs
index 3a8a4bbffd..0458eee55e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAuthorizationHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAuthorizationHandler.cs
@@ -8,6 +8,7 @@
 using Volo.Abp;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Security.Claims;
 
 namespace Unity.GrantManager.Assessments;
 public class AssessmentAuthorizationHandler : AuthorizationHandler<OperationAuthorizationRequirement, Assessment>, ISingletonDependency
@@ -81,7 +82,8 @@ protected virtual async Task<bool> CheckPolicyAsync(string permissionName, Autho
     {
         Check.NotNull(principal, nameof(principal));
 
-        var userIdOrNull = principal.Claims?.FirstOrDefault(c => c.Type == "UserId");
+        var userIdOrNull = principal.Claims?.FirstOrDefault(c => c.Type == AbpClaimTypes.UserId)
+            ?? principal.Claims?.FirstOrDefault(c => c.Type == "UserId");
         if (userIdOrNull == null || userIdOrNull.Value.IsNullOrWhiteSpace())
         {
             return null;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assignments/ApplicationAssignmentsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assignments/ApplicationAssignmentsAppService.cs
index 95fc01d378..2656e06db5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assignments/ApplicationAssignmentsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assignments/ApplicationAssignmentsAppService.cs
@@ -10,6 +10,7 @@
 using Unity.GrantManager.Identity;
 using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Local;
 
 namespace Unity.GrantManager.Assignments;
 
@@ -18,13 +19,13 @@ namespace Unity.GrantManager.Assignments;
 [ExposeServices(typeof(ApplicationAssignmentsAppService), typeof(IApplicationAssignmentsService))]
 public class ApplicationAssignmentsAppService(IApplicationManager applicationManager,
     IPersonRepository personRepository,
+    ILocalEventBus localEventBus,
     IApplicationAssignmentRepository applicationAssignmentRepository)
     : ApplicationService, IApplicationAssignmentsService
 {
     public async Task<List<GrantApplicationAssigneeDto>> GetListWithApplicationIdsAsync(List<Guid> ids)
     {
         var assignments = await applicationAssignmentRepository.GetListAsync(e => ids.Contains(e.ApplicationId));
-
         return ObjectMapper.Map<List<ApplicationAssignment>, List<GrantApplicationAssigneeDto>>(assignments.OrderBy(t => t.Id).ToList());
     }
 
@@ -41,6 +42,7 @@ public async Task InsertAssigneeAsync(Guid applicationId, Guid assigneeId, strin
             {
                 await applicationManager.UpdateAssigneeAsync(applicationId, assigneeId, duty);
             }
+            await localEventBus.PublishAsync(new Events.ApplicationChangedEvent { Action = GrantApplicationAction.Internal_Assign, ApplicationId = applicationId });
         }
         catch (Exception ex)
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ApplicationChangedEvent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ApplicationChangedEvent.cs
index 8e9197a323..33a784ed75 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ApplicationChangedEvent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ApplicationChangedEvent.cs
@@ -10,5 +10,7 @@ public class ApplicationChangedEvent
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public GrantApplicationAction Action { get; set; }
+
+        public Guid? TenantId { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ApplicationChangedHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ApplicationChangedHandler.cs
deleted file mode 100644
index 48d19f0495..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ApplicationChangedHandler.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System.Threading.Tasks;
-using Unity.GrantManager.Applications;
-using Unity.GrantManager.GrantApplications;
-using Unity.Notifications.Emails;
-using Unity.Notifications.Events;
-using Unity.Notifications.Settings;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.EventBus;
-using Volo.Abp.EventBus.Local;
-using Volo.Abp.Features;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.Settings;
-
-namespace Unity.GrantManager.Events
-{
-    internal class ApplicationChangedHandler : ILocalEventHandler<ApplicationChangedEvent>, ITransientDependency
-    {
-        private readonly IApplicantAgentRepository _applicantAgentRepository;
-        private readonly IFeatureChecker _featureChecker;
-        private readonly ILocalEventBus _localEventBus;
-        private readonly ISettingProvider _settingProvider;
-        private readonly ICurrentTenant _currentTenant;
-
-        public ApplicationChangedHandler(
-            IApplicantAgentRepository applicantAgentRepository,
-            ILocalEventBus localEventBus,
-            IFeatureChecker featureChecker,
-            ISettingProvider settingProvider,
-            ICurrentTenant currentTenant)
-        {
-            _applicantAgentRepository = applicantAgentRepository;
-            _localEventBus = localEventBus;
-            _featureChecker = featureChecker;
-            _settingProvider = settingProvider;
-            _currentTenant = currentTenant;
-        }
-
-        public async Task HandleEventAsync(ApplicationChangedEvent eventData)
-        {
-            if (await _featureChecker.IsEnabledAsync("Unity.Notifications"))
-            {
-                await EmailNotificationEventAsync(eventData);
-            }
-        }
-
-        private async Task EmailNotificationEventAsync(ApplicationChangedEvent eventData)
-        {
-            var applicantAgent = await _applicantAgentRepository.FirstOrDefaultAsync(a => a.ApplicationId == eventData.ApplicationId);
-            if (applicantAgent == null) return;
-
-            string? emailTo = applicantAgent.Email;
-            var defaultFromAddress = await _settingProvider.GetOrNullAsync(NotificationsSettings.Mailing.DefaultFromAddress);
-            string emailFrom = defaultFromAddress ?? "NoReply@gov.bc.ca";
-
-            if (!string.IsNullOrEmpty(emailTo))
-            {
-                switch (eventData.Action)
-                {
-                    case GrantApplicationAction.Approve:
-                        {
-                            await _localEventBus.PublishAsync(
-                                new EmailNotificationEvent
-                                {
-                                    Action = EmailAction.SendApproval,
-                                    TenantId = _currentTenant.Id,
-                                    ApplicationId = eventData.ApplicationId,
-                                    RetryAttempts = 0,
-                                    EmailAddress = emailTo,
-                                    EmailFrom = emailFrom
-                                }
-                            );
-                            break;
-                        }
-                    case GrantApplicationAction.Deny:
-                        {
-                            await _localEventBus.PublishAsync(
-                                new EmailNotificationEvent
-                                {
-                                    Action = EmailAction.SendDecline,
-                                    TenantId = _currentTenant.Id,
-                                    ApplicationId = eventData.ApplicationId,
-                                    RetryAttempts = 0,
-                                    EmailAddress = emailTo,
-                                    EmailFrom = emailFrom
-                                }
-                            );
-                            break;
-                        }
-                    default: break;
-                }
-            }
-        }
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/DateBasedScheduledNotificationJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/DateBasedScheduledNotificationJob.cs
new file mode 100644
index 0000000000..8f384f7101
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/DateBasedScheduledNotificationJob.cs
@@ -0,0 +1,417 @@
+using Microsoft.Extensions.Logging;
+using Quartz;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.Notifications;
+using Unity.Notifications.Emails;
+using Unity.Notifications.EmailGroups;
+using Unity.Notifications.Settings;
+using Unity.Notifications.Templates;
+using Volo.Abp.BackgroundWorkers.Quartz;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.EventBus.Local;
+using Volo.Abp.Features;
+using Volo.Abp.Identity.Integration;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Settings;
+using Volo.Abp.TenantManagement;
+using Unity.Notifications.Events;
+using Unity.Modules.Shared.Utils;
+using Unity.GrantManager.Settings;
+using Volo.Abp.SettingManagement;
+
+namespace Unity.GrantManager.Events
+{
+    /// <summary>
+    /// Quartz background job that runs nightly to process date-based scheduled notifications.
+    /// Checks if application trigger dates (DueDate, NotificationDate, ContractNotificationDate) have passed
+    /// and sends emails accordingly.
+    /// </summary>
+    [DisallowConcurrentExecution]
+    public class DateBasedScheduledNotificationJob : QuartzBackgroundWorkerBase, ITransientDependency
+    {
+        private readonly IRepository<ScheduledNotification, Guid> _scheduledNotificationRepository;
+        private readonly IApplicationRepository _applicationRepository;
+        private readonly IRepository<ScheduledNotificationTracking, Guid> _trackingRepository;
+        private readonly IApplicantAgentRepository _applicantAgentRepository;
+        private readonly ITenantRepository _tenantRepository;
+        private readonly ILocalEventBus _localEventBus;
+        private readonly ITemplateService _templateService;
+        private readonly IEmailGroupsAppService _emailGroupsAppService;
+        private readonly IEmailGroupUsersAppService _emailGroupUsersAppService;
+        private readonly IIdentityUserIntegrationService _identityUserIntegrationService;
+        private readonly IFeatureChecker _featureChecker;
+        private readonly ISettingProvider _settingProvider;
+        private readonly ICurrentTenant _currentTenant;
+        private readonly ScheduledNotificationHelper _scheduledNotificationHelper;
+        private readonly ILogger<DateBasedScheduledNotificationJob> _logger;
+
+        public DateBasedScheduledNotificationJob(
+            IRepository<ScheduledNotification, Guid> scheduledNotificationRepository,
+            IApplicationRepository applicationRepository,
+            IRepository<ScheduledNotificationTracking, Guid> trackingRepository,
+            IApplicantAgentRepository applicantAgentRepository,
+            ITenantRepository tenantRepository,
+            ILocalEventBus localEventBus,
+            ITemplateService templateService,
+            IEmailGroupsAppService emailGroupsAppService,
+            IEmailGroupUsersAppService emailGroupUsersAppService,
+            IIdentityUserIntegrationService identityUserIntegrationService,
+            IFeatureChecker featureChecker,
+            ISettingProvider settingProvider,
+            ICurrentTenant currentTenant,
+            ScheduledNotificationHelper scheduledNotificationHelper,
+            SettingManager settingManager,
+            ILogger<DateBasedScheduledNotificationJob> logger)
+        {
+            _scheduledNotificationRepository = scheduledNotificationRepository;
+            _applicationRepository = applicationRepository;
+            _trackingRepository = trackingRepository;
+            _applicantAgentRepository = applicantAgentRepository;
+            _tenantRepository = tenantRepository;
+            _localEventBus = localEventBus;
+            _templateService = templateService;
+            _emailGroupsAppService = emailGroupsAppService;
+            _emailGroupUsersAppService = emailGroupUsersAppService;
+            _identityUserIntegrationService = identityUserIntegrationService;
+            _featureChecker = featureChecker;
+            _settingProvider = settingProvider;
+            _currentTenant = currentTenant;
+            _scheduledNotificationHelper = scheduledNotificationHelper;
+            _logger = logger;
+
+            // 2 AM PST = 10 AM UTC
+            const string defaultCronExpression = "0 0 2 * * ?";
+            string cronExpression = defaultCronExpression;
+
+            try
+            {
+                var settingsValue = SettingDefinitions
+                    .GetSettingsValue(settingManager,
+                        SettingsConstants.BackgroundJobs.DateBasedNotificationSchedule_Expression);
+
+                if (!settingsValue.IsNullOrEmpty())
+                {
+                    if (CronExpression.IsValidExpression(settingsValue))
+                    {
+                        cronExpression = settingsValue;
+                    }
+                    else
+                    {
+                        _logger.LogWarning("Invalid cron expression '{CronExpression}' for date-based notifications, reverting to default '{DefaultCronExpression}'",
+                            settingsValue, defaultCronExpression);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning(ex, "Error reading cron setting for date-based notifications, reverting to default '{CronExpression}'", defaultCronExpression);
+            }
+
+            if (!cronExpression.IsNullOrEmpty())
+            {
+                JobDetail = JobBuilder
+                    .Create<DateBasedScheduledNotificationJob>()
+                    .WithIdentity(nameof(DateBasedScheduledNotificationJob))
+                    .Build();
+
+                Trigger = TriggerBuilder
+                    .Create()
+                    .WithIdentity(nameof(DateBasedScheduledNotificationJob))
+                    .WithSchedule(CronScheduleBuilder.CronSchedule(cronExpression)
+                        .WithMisfireHandlingInstructionIgnoreMisfires())
+                    .Build();
+                }
+        }
+
+        public override async Task Execute(IJobExecutionContext context)
+        {
+            try
+            {
+                _logger.LogInformation("DateBasedScheduledNotificationJob: Starting execution.");
+
+                // Get all active tenants
+                var allTenants = await _tenantRepository.GetListAsync();
+
+                if (allTenants.Count == 0)
+                {
+                    _logger.LogInformation("DateBasedScheduledNotificationJob: No tenants found.");
+                    return;
+                }
+
+                _logger.LogInformation("DateBasedScheduledNotificationJob: Processing notifications for {TenantCount} tenant(s).", allTenants.Count);
+
+                // Process each tenant separately
+                foreach (var tenant in allTenants)
+                {
+                    using (_currentTenant.Change(tenant.Id))
+                    {
+                        _logger.LogDebug("DateBasedScheduledNotificationJob: Processing notifications for tenant '{TenantName}' ({TenantId}).", tenant.Name, tenant.Id);
+                        await ProcessTenantNotificationsAsync();
+                    }
+                }
+
+                _logger.LogInformation("DateBasedScheduledNotificationJob: Completed execution.");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "DateBasedScheduledNotificationJob: Error during execution.");
+            }
+        }
+
+        private async Task ProcessTenantNotificationsAsync()
+        {
+            try
+            {
+                // Check if Notifications feature is enabled for this tenant
+                if (!await _featureChecker.IsEnabledAsync("Unity.Notifications"))
+                {
+                    _logger.LogInformation("DateBasedScheduledNotificationJob: Notifications feature is not enabled for current tenant, skipping.");
+                    return;
+                }
+
+                // Get all active date-based notifications for this tenant (now in correct tenant context)
+                var notifications = (await _scheduledNotificationRepository.GetListAsync(
+                    n => n.IsActive
+                      && !string.IsNullOrEmpty(n.DateField)))
+                    .ToList();
+
+                if (notifications.Count == 0)
+                {
+                    _logger.LogDebug("DateBasedScheduledNotificationJob: No active date-based notifications found for current tenant.");
+                    return;
+                }
+
+                _logger.LogInformation("DateBasedScheduledNotificationJob: Processing {Count} date-based notifications for current tenant.", notifications.Count);
+
+                // Extract unique FormIds from date-based notifications only
+                // (notifications are already filtered to include only those with DateField set, meaning TriggerType is "Date")
+                var formIds = notifications
+                    .Where(n => !string.IsNullOrEmpty(n.DateField)) // Explicit check for Date trigger type
+                    .Select(n => n.FormId)
+                    .Distinct()
+                    .ToList();
+
+                if (formIds.Count == 0)
+                {
+                    _logger.LogDebug("DateBasedScheduledNotificationJob: No forms with date-based notifications found for current tenant.");
+                    return;
+                }
+
+                var today = DateTime.UtcNow.Date;
+
+                // OPTIMIZATION: Single query to get all applications for all forms with past dates
+                // Only queries applications where FormId exists in ScheduledNotifications with Date trigger type
+                var allApplications = (await _applicationRepository.GetListAsync(
+                    a => formIds.Contains(a.ApplicationFormId)
+                      && ((a.DueDate != null && a.DueDate <= today) ||
+                          (a.ProjectStartDate != null && a.ProjectStartDate <= today) ||
+                          (a.ProjectEndDate != null && a.ProjectEndDate <= today) ||
+                          (a.NotificationDate != null && a.NotificationDate <= today) ||
+                          (a.ContractExecutionDate != null && a.ContractExecutionDate <= today))))
+                    .ToList();
+
+                if (allApplications.Count == 0)
+                {
+                    _logger.LogDebug("DateBasedScheduledNotificationJob: No applications with past dates found across all forms.");
+                    return;
+                }
+
+                // OPTIMIZATION: Batch query all tracking records for all notifications
+                var notificationIds = notifications.Select(n => n.Id).ToList();
+                var allTracking = (await _trackingRepository.GetListAsync(
+                    t => notificationIds.Contains(t.ScheduledNotificationId)))
+                    .ToList();
+
+                // OPTIMIZATION: Batch load all needed templates upfront instead of querying per notification (N+1 problem)
+                var uniqueTemplateIds = notifications.Select(n => n.EmailTemplateId).Distinct().ToHashSet();
+                var templatesDict = (await _templateService.GetTemplatesByTenant())
+                    .Where(t => uniqueTemplateIds.Contains(t.Id))
+                    .ToDictionary(t => t.Id);
+
+                // OPTIMIZATION: Batch load all ApplicantAgents instead of querying per application (N+1 problem)
+                // This reduces 4000+ queries to 1 single batch query
+                var applicationIds = allApplications.Select(a => a.Id).ToList();
+                var applicantAgentsDict = (await _applicantAgentRepository.GetListAsync(
+                    a => a.ApplicationId != null && applicationIds.Contains(a.ApplicationId.Value)))
+                    .ToDictionary(a => a.ApplicationId!.Value, a => a);
+
+                var defaultFromAddress = await _settingProvider.GetOrNullAsync(NotificationsSettings.Mailing.DefaultFromAddress);
+                string emailFrom = defaultFromAddress ?? "NoReply@gov.bc.ca";
+                
+                // OPTIMIZATION: Collect all tracking records to batch insert at end
+                var trackingRecordsToInsert = new List<ScheduledNotificationTracking>();
+
+                // Group by notification and process
+                foreach (var notification in notifications)
+                {
+                    // Get template from pre-loaded dictionary instead of querying per notification
+                    if (!templatesDict.TryGetValue(notification.EmailTemplateId, out var template))
+                    {
+                        _logger.LogWarning(
+                            "DateBasedScheduledNotificationJob: Email template {TemplateId} not found for notification {NotificationId}, skipping.",
+                            notification.EmailTemplateId, notification.Id);
+                        continue;
+                    }
+
+                    // Get applications for this form
+                    var applicationsForForm = allApplications
+                        .Where(a => a.ApplicationFormId == notification.FormId)
+                        .ToList();
+
+                    if (applicationsForForm.Count == 0)
+                    {
+                        _logger.LogDebug(
+                            "DateBasedScheduledNotificationJob: No applications with past dates found for form {FormId}, skipping notification {NotificationId}.",
+                            notification.FormId, notification.Id);
+                        continue;
+                    }
+
+                    // Get already-notified app IDs for this specific notification
+                    var notifiedAppIds = allTracking
+                        .Where(t => t.ScheduledNotificationId == notification.Id
+                                 && t.DateField == notification.DateField)
+                        .Select(t => t.ApplicationId)
+                        .ToHashSet();
+
+                    // Filter out already-notified applications
+                    var applicationsToProcess = applicationsForForm
+                        .Where(a => !notifiedAppIds.Contains(a.Id))
+                        .ToList();
+
+                    if (applicationsToProcess.Count == 0)
+                    {
+                        _logger.LogDebug(
+                            "DateBasedScheduledNotificationJob: All applications have already been notified for notification {NotificationId}, skipping.",
+                            notification.Id);
+                        continue;
+                    }
+
+                    _logger.LogInformation(
+                        "DateBasedScheduledNotificationJob: Processing {Count} applications with past dates for notification {NotificationId}.",
+                        applicationsToProcess.Count, notification.Id);
+
+                    // Process applications for this notification - pass cached agents and batch list
+                    foreach (var application in applicationsToProcess)
+                    {
+                        var tracking = await ProcessApplicationForNotificationAsync(
+                            notification, application, template, emailFrom, applicantAgentsDict);
+                        if (tracking != null)
+                        {
+                            trackingRecordsToInsert.Add(tracking);
+                        }
+                    }
+                }
+
+                // OPTIMIZATION: Batch insert all tracking records at once instead of individual inserts
+                if (trackingRecordsToInsert.Count > 0)
+                {
+                    _logger.LogInformation(
+                        "DateBasedScheduledNotificationJob: Batch inserting {Count} tracking records for current tenant.",
+                        trackingRecordsToInsert.Count);
+                    await _trackingRepository.InsertManyAsync(trackingRecordsToInsert, autoSave: true);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "DateBasedScheduledNotificationJob: Error processing notifications for current tenant.");
+            }
+        }
+
+        private async Task<ScheduledNotificationTracking?> ProcessApplicationForNotificationAsync(
+            ScheduledNotification notification,
+            Application application,
+            EmailTemplate template,
+            string emailFrom,
+            Dictionary<Guid, ApplicantAgent> applicantAgentsDict)
+      {
+            try
+            {
+                // Build token values and render template
+                // OPTIMIZATION: Use pre-loaded applicant agent from cache instead of querying per application
+                applicantAgentsDict.TryGetValue(application.Id, out var applicantAgent);
+                var tokenValues = ScheduledNotificationHelper.BuildTokenValues(application, applicantAgent);
+                string subject = ScheduledNotificationHelper.RenderTemplate(template.Subject, tokenValues);
+                string body = ScheduledNotificationHelper.RenderTemplate(
+                    string.IsNullOrWhiteSpace(template.BodyHTML) ? template.BodyText : template.BodyHTML,
+                    tokenValues);
+
+
+                // Build email event with common properties
+                var emailEvent = new EmailNotificationEvent
+                {
+                    TenantId = _currentTenant.Id,
+                    ApplicationId = application.Id,
+                    ScheduledNotificationId = notification.Id,
+                    TemplateId = template.Id,
+                    EmailTemplateName = template.Name,
+                    Subject = subject,
+                    Body = body,
+                    EmailFrom = emailFrom,
+                    Action = EmailAction.SendDateDriven, // Default action, may be overridden in helper methods
+                    RetryAttempts = 0
+                };
+
+                // Publish based on recipient category
+                if (string.Equals(notification.RecipientCategory, "Internal", StringComparison.OrdinalIgnoreCase))
+                {
+                    await _scheduledNotificationHelper.PublishToEmailGroupAsync(
+                        _emailGroupsAppService, _emailGroupUsersAppService, _identityUserIntegrationService,
+                        _localEventBus, notification, emailEvent);
+                }
+                else if (string.Equals(notification.RecipientCategory, "External", StringComparison.OrdinalIgnoreCase))
+                {
+                    await _scheduledNotificationHelper.PublishToExternalRecipientAsync(
+                        _localEventBus, notification, application, applicantAgent, emailEvent);
+                }
+                else
+                {
+                    _logger.LogWarning(
+                        "DateBasedScheduledNotificationJob: Unknown recipient category '{Category}' for notification {NotificationId}, skipping.",
+                        notification.RecipientCategory, notification.Id);
+                    return null;
+                }
+
+                // Create tracking record to prevent duplicate notifications
+                return CreateTrackingRecord(notification, application);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex,
+                    "DateBasedScheduledNotificationJob: Error processing application {ApplicationId} for notification {NotificationId}.",
+                    application.Id, notification.Id);
+                return null;
+            }
+        }
+
+        private ScheduledNotificationTracking? CreateTrackingRecord(
+            ScheduledNotification notification,
+            Application application)
+        {
+            if (string.IsNullOrEmpty(notification.DateField))
+            {
+                _logger.LogWarning(
+                    "DateBasedScheduledNotificationJob: DateField is null or empty for notification {NotificationId}, cannot create tracking record.",
+                    notification.Id);
+                return null;
+            }
+
+            var tracking = new ScheduledNotificationTracking(
+                Guid.NewGuid(),
+                application.Id,
+                notification.Id,
+                notification.DateField,
+                DateTime.UtcNow);
+
+            _logger.LogInformation(
+                "DateBasedScheduledNotificationJob: Notification {NotificationId} ready to be tracked for application {ApplicationId}.",
+                notification.Id, application.Id);
+
+            return tracking;
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationEventHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationEventHandler.cs
new file mode 100644
index 0000000000..82200085a5
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationEventHandler.cs
@@ -0,0 +1,151 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.Notifications;
+using Unity.Notifications.EmailGroups;
+using Unity.Notifications.Emails;
+using Unity.Notifications.Events;
+using Unity.Notifications.Settings;
+using Unity.Notifications.Templates;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.EventBus;
+using Volo.Abp.EventBus.Local;
+using Volo.Abp.Features;
+using Volo.Abp.Identity.Integration;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Settings;
+
+namespace Unity.GrantManager.Events
+{
+    internal class ScheduledNotificationEventHandler(
+        IRepository<ScheduledNotification, Guid> scheduledNotificationRepository,
+        IApplicationRepository applicationRepository,
+        IApplicantAgentRepository applicantAgentRepository,
+        ILocalEventBus localEventBus,
+        ITemplateService templateService,
+        IEmailGroupsAppService emailGroupsAppService,
+        IEmailGroupUsersAppService emailGroupUsersAppService,
+        IIdentityUserIntegrationService identityUserIntegrationService,
+        IFeatureChecker featureChecker,
+        ISettingProvider settingProvider,
+        ICurrentTenant currentTenant,
+        ScheduledNotificationHelper scheduledNotificationHelper,
+        ILogger<ScheduledNotificationEventHandler> logger)
+        : ILocalEventHandler<ApplicationChangedEvent>, ITransientDependency
+    {
+        public async Task HandleEventAsync(ApplicationChangedEvent eventData)
+        {
+            if (!await featureChecker.IsEnabledAsync("Unity.Notifications"))
+            {
+                return;
+            }
+
+            try
+            {
+                // includeDetails: true to load Applicant navigation property for token substitution
+                var application = await applicationRepository.GetAsync(eventData.ApplicationId, includeDetails: true);
+                if (application == null)
+                {
+                    logger.LogWarning("ScheduledNotificationEventHandler: Application {ApplicationId} not found.", eventData.ApplicationId);
+                    return;
+                }
+
+                // Find all active event-based scheduled notifications for this form that match the new application status
+                var notifications = (await scheduledNotificationRepository.GetListAsync(
+                    n => n.FormId == application.ApplicationFormId
+                      && n.TriggerType == "Event"
+                      && n.IsActive
+                      && n.ApplicationStatusId == application.ApplicationStatusId))
+                    .ToList();
+
+                if (notifications.Count == 0)
+                {
+                    return;
+                }
+
+                var defaultFromAddress = await settingProvider.GetOrNullAsync(NotificationsSettings.Mailing.DefaultFromAddress);
+                string emailFrom = defaultFromAddress ?? "NoReply@gov.bc.ca";
+
+                // Fetch applicant agent once for the whole batch - used for contact tokens and recipient resolution
+                var applicantAgent = await applicantAgentRepository.FirstOrDefaultAsync(a => a.ApplicationId == application.Id);
+
+                foreach (var notification in notifications)
+                {
+                    await ProcessNotificationAsync(notification, application, applicantAgent, emailFrom);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "ScheduledNotificationEventHandler: Error processing event for application {ApplicationId}.", eventData.ApplicationId);
+            }
+        }
+
+        private async Task ProcessNotificationAsync(
+            ScheduledNotification notification,
+            Application application,
+            ApplicantAgent? applicantAgent,
+            string emailFrom)
+        {
+            if (string.IsNullOrWhiteSpace(notification.RecipientCategory) ||
+                string.IsNullOrWhiteSpace(notification.RecipientIdentifier))
+            {
+                logger.LogWarning(
+                    "ScheduledNotificationEventHandler: Scheduled notification {NotificationId} has no recipient category or identifier, skipping.",
+                    notification.Id);
+                return;
+            }
+
+            var template = await templateService.GetTemplateById(notification.EmailTemplateId);
+            if (template == null)
+            {
+                logger.LogWarning(
+                    "ScheduledNotificationEventHandler: Email template {TemplateId} not found for scheduled notification {NotificationId}, skipping.",
+                    notification.EmailTemplateId, notification.Id);
+                return;
+            }
+
+            var tokenValues = ScheduledNotificationHelper.BuildTokenValues(application, applicantAgent);
+            string subject = ScheduledNotificationHelper.RenderTemplate(template.Subject, tokenValues);
+            string body = ScheduledNotificationHelper.RenderTemplate(
+                string.IsNullOrWhiteSpace(template.BodyHTML) ? template.BodyText : template.BodyHTML,
+                tokenValues);
+
+            // Build email event with common properties
+            var emailEvent = new EmailNotificationEvent
+            {
+                Action = EmailAction.SendEventDriven,
+                TenantId = currentTenant.Id,
+                ApplicationId = application.Id,
+                ScheduledNotificationId = notification.Id,
+                TemplateId = template.Id,
+                EmailTemplateName = template.Name,
+                Subject = subject,
+                Body = body,
+                EmailFrom = emailFrom,
+                RetryAttempts = 0
+            };
+
+            // Publish based on recipient category
+            if (string.Equals(notification.RecipientCategory, "Internal", StringComparison.OrdinalIgnoreCase))
+            {
+                await scheduledNotificationHelper.PublishToEmailGroupAsync(
+                    emailGroupsAppService, emailGroupUsersAppService, identityUserIntegrationService,
+                    localEventBus, notification, emailEvent);
+            }
+            else if (string.Equals(notification.RecipientCategory, "External", StringComparison.OrdinalIgnoreCase))
+            {
+                await scheduledNotificationHelper.PublishToExternalRecipientAsync(
+                    localEventBus, notification, application, applicantAgent, emailEvent);
+            }
+            else
+            {
+                logger.LogWarning(
+                    "ScheduledNotificationEventHandler: Unknown RecipientCategory '{Category}' on notification {NotificationId}, skipping.",
+                    notification.RecipientCategory, notification.Id);
+            }
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationHelper.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationHelper.cs
new file mode 100644
index 0000000000..11addcbd97
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Events/ScheduledNotificationHelper.cs
@@ -0,0 +1,272 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.Notifications;
+using Unity.Notifications.EmailGroups;
+using Unity.Notifications.Emails;
+using Unity.Notifications.Events;
+using Unity.Notifications.Templates;
+using Volo.Abp.EventBus.Local;
+using Volo.Abp.Identity.Integration;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.GrantManager.Events
+{
+    /// <summary>
+    /// Helper service for scheduled notification processing - shared logic between
+    /// event-based (ScheduledNotificationEventHandler) and date-based (DateBasedScheduledNotificationJob) handlers.
+    /// </summary>
+    public partial class ScheduledNotificationHelper(ILoggerFactory loggerFactory)
+    {
+        private readonly ILogger<ScheduledNotificationHelper> _logger = loggerFactory.CreateLogger<ScheduledNotificationHelper>();
+
+        /// <summary>
+        /// Generated regex for template token replacement - compiled at compile-time.
+        /// Matches {{token}} patterns where token is one or more word characters.
+        /// </summary>
+        [GeneratedRegex(@"\{\{(\w+)\}\}")]
+        private static partial Regex TokenRegex();
+        /// <summary>
+        /// Builds the token-to-value dictionary from the application and applicant agent,
+        /// matching the MapTo paths defined in the TemplateVariable seed data.
+        /// </summary>
+        public static Dictionary<string, string> BuildTokenValues(Application application, ApplicantAgent? applicantAgent)
+        {
+            Applicant? applicant = null;
+            try { applicant = application.Applicant; } catch { /* navigation property may not be loaded */ }
+
+            ApplicationStatus? applicationStatus = null;
+            try { applicationStatus = application.ApplicationStatus; } catch { /* navigation property may not be loaded */ }
+
+            ApplicationForm? applicationForm = null;
+            try { applicationForm = application.ApplicationForm; } catch { /* navigation property may not be loaded */ }
+
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                ["applicant_name"]              = applicant?.ApplicantName ?? string.Empty,
+                ["applicant_id"]                = applicant?.UnityApplicantId ?? string.Empty,
+                ["organization_name"]           = applicant?.OrgName ?? applicant?.NonRegisteredBusinessName ?? string.Empty,
+                ["submission_number"]           = application.ReferenceNo,
+                ["submission_date"]             = application.SubmissionDate.ToString("yyyy-MM-dd"),
+                ["status"]                      = applicationStatus?.StatusCode.ToString() ?? string.Empty,
+                ["approved_amount"]             = application.ApprovedAmount.ToString("$#,##0.00"),
+                ["requested_amount"]            = application.RequestedAmount.ToString("$#,##0.00"),
+                ["recommended_amount"]          = application.RecommendedAmount.ToString("$#,##0.00"),
+                ["approval_date"]               = application.FinalDecisionDate?.ToString("yyyy-MM-dd") ?? string.Empty,
+                ["decline_rationale"]           = application.DeclineRational ?? string.Empty,
+                ["community"]                   = application.Community ?? string.Empty,
+                ["project_name"]                = application.ProjectName,
+                ["project_summary"]             = application.ProjectSummary ?? string.Empty,
+                ["project_start_date"]          = application.ProjectStartDate?.ToString("yyyy-MM-dd") ?? string.Empty,
+                ["project_end_date"]            = application.ProjectEndDate?.ToString("yyyy-MM-dd") ?? string.Empty,
+                ["signing_authority_full_name"] = application.SigningAuthorityFullName ?? string.Empty,
+                ["signing_authority_title"]     = application.SigningAuthorityTitle ?? string.Empty,
+                ["contact_full_name"]           = applicantAgent?.Name ?? string.Empty,
+                ["contact_title"]               = applicantAgent?.Title ?? string.Empty,
+                ["category"]                    = applicationForm?.Category ?? string.Empty,
+                ["today_date"]                  = $"{DateTime.Today.ToString("MMMM d, yyyy")}",
+                ["unity_application_id"]        = application.UnityApplicationId ?? string.Empty
+            };
+        }
+
+        /// <summary>
+        /// Replaces all {{token}} occurrences in the template text with their resolved values.
+        /// Unknown tokens are left as-is.
+        /// </summary>
+        public static string RenderTemplate(string template, Dictionary<string, string> tokenValues)
+        {
+            if (string.IsNullOrEmpty(template)) return template;
+
+            return TokenRegex().Replace(template, match =>
+            {
+                var token = match.Groups[1].Value;
+                return tokenValues.TryGetValue(token, out var value) ? value : match.Value;
+            });
+        }
+
+
+        /// <summary>
+        /// Internal category: RecipientIdentifier is a comma-separated list of email group names.
+        /// Resolve the groups, their users, and their identity email addresses.
+        /// </summary>
+        public async Task PublishToEmailGroupAsync(
+            IEmailGroupsAppService emailGroupsAppService,
+            IEmailGroupUsersAppService emailGroupUsersAppService,
+            IIdentityUserIntegrationService identityUserIntegrationService,
+            ILocalEventBus localEventBus,
+            ScheduledNotification notification,
+            EmailNotificationEvent emailEvent)
+        {
+            var recipientEmails = await GetInternalRecipientEmailAddressesAsync(
+                notification,
+                emailGroupsAppService,
+                emailGroupUsersAppService,
+                identityUserIntegrationService);
+
+            var recipients = recipientEmails
+                .Split(';', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            if (recipients.Count == 0)
+            {
+                _logger.LogWarning(
+                    "ScheduledNotificationHelper: No resolvable email addresses in any groups for notification {NotificationId}, skipping.",
+                    notification.Id);
+                return;
+            }
+
+            emailEvent.EmailAddressList = [.. recipients];
+            await localEventBus.PublishAsync(emailEvent);
+        }
+
+        /// <summary>
+        /// External category: RecipientIdentifier is a comma-separated list of "ApplicationContact" and/or "SigningAuthority".
+        /// Resolve the emails from the application record for each recipient type.
+        /// </summary>
+        public async Task PublishToExternalRecipientAsync(
+            ILocalEventBus localEventBus,
+            ScheduledNotification notification,
+            Application application,
+            ApplicantAgent? applicantAgent,
+            EmailNotificationEvent emailEvent)
+        {
+            // Split comma-separated recipient identifiers and collect unique email addresses
+            var recipientIdentifiers = notification.RecipientIdentifier?
+                .Split(',')
+                .Select(r => r.Trim())
+                .Where(r => !string.IsNullOrWhiteSpace(r))
+                .ToList() ?? [];
+
+            if (recipientIdentifiers.Count == 0)
+            {
+                _logger.LogWarning(
+                    "ScheduledNotificationHelper: No recipient identifiers provided for notification {NotificationId}, skipping.",
+                    notification.Id);
+                return;
+            }
+
+            var emailAddresses = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var recipientId in recipientIdentifiers)
+            {
+                string? emailTo = null;
+
+                if (string.Equals(recipientId, "ApplicationContact", StringComparison.OrdinalIgnoreCase))
+                {
+                    emailTo = applicantAgent?.Email;
+                }
+                else if (string.Equals(recipientId, "SigningAuthority", StringComparison.OrdinalIgnoreCase))
+                {
+                    emailTo = application.SigningAuthorityEmail;
+                }
+                else
+                {
+                    _logger.LogWarning(
+                        "ScheduledNotificationHelper: Unknown external RecipientIdentifier '{Identifier}' for notification {NotificationId}, skipping identifier.",
+                        recipientId, notification.Id);
+                    continue;
+                }
+
+                if (string.IsNullOrWhiteSpace(emailTo))
+                {
+                    _logger.LogWarning(
+                        "ScheduledNotificationHelper: No email address found for '{Identifier}' on application {ApplicationId}, skipping identifier.",
+                        recipientId, application.Id);
+                    continue;
+                }
+
+                emailAddresses.Add(emailTo);
+            }
+
+            if (emailAddresses.Count == 0)
+            {
+                _logger.LogWarning(
+                    "ScheduledNotificationHelper: No resolvable email addresses for any recipients on application {ApplicationId}, skipping notification {NotificationId}.",
+                    application.Id, notification.Id);
+                return;
+            }
+
+            emailEvent.EmailAddressList = [.. emailAddresses];
+            await localEventBus.PublishAsync(emailEvent);
+        }
+
+        /// <summary>
+        /// Resolves internal recipient email addresses by looking up email groups and their member email addresses.
+        /// Used for draft creation and other contexts where only a string list of emails is needed.
+        /// </summary>
+        public async Task<string> GetInternalRecipientEmailAddressesAsync(
+            ScheduledNotification notification,
+            IEmailGroupsAppService emailGroupsAppService,
+            IEmailGroupUsersAppService emailGroupUsersAppService,
+            IIdentityUserIntegrationService identityUserIntegrationService)
+        {
+            try
+            {
+                var emailAddresses = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                var allGroups = await emailGroupsAppService.GetListAsync();
+
+                // Split comma-separated recipient identifiers and process each
+                var recipientIdentifiers = notification.RecipientIdentifier?
+                    .Split(',')
+                    .Select(r => r.Trim())
+                    .Where(r => !string.IsNullOrWhiteSpace(r))
+                    .ToList() ?? [];
+
+                foreach (var recipientId in recipientIdentifiers)
+                {
+                    var group = allGroups.FirstOrDefault(g =>
+                        string.Equals(g.Name, recipientId, StringComparison.OrdinalIgnoreCase));
+
+                    if (group == null)
+                    {
+                        _logger.LogWarning(
+                            "ScheduledNotificationHelper: Email group '{GroupName}' not found for notification {NotificationId}.",
+                            recipientId, notification.Id);
+                        continue;
+                    }
+
+                    var groupUsers = await emailGroupUsersAppService.GetEmailGroupUsersByGroupIdAsync(group.Id);
+                    if (groupUsers.Count == 0)
+                    {
+                        _logger.LogWarning(
+                            "ScheduledNotificationHelper: Email group '{GroupName}' has no members for notification {NotificationId}.",
+                            recipientId, notification.Id);
+                        continue;
+                    }
+
+                    foreach (var groupUser in groupUsers)
+                    {
+                        try
+                        {
+                            var userInfo = await identityUserIntegrationService.FindByIdAsync(groupUser.UserId);
+                            if (userInfo?.Email != null)
+                            {
+                                emailAddresses.Add(userInfo.Email);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.LogWarning(ex,
+                                "ScheduledNotificationHelper: Error retrieving email for user {UserId} in group '{GroupName}'.",
+                                groupUser.UserId, recipientId);
+                        }
+                    }
+                }
+
+                return string.Join("; ", emailAddresses);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex,
+                    "ScheduledNotificationHelper: Error getting internal recipient email addresses for notification {NotificationId}.",
+                    notification.Id);
+                return string.Empty;
+            }
+        }           
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/AIGenerationStatusAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/AIGenerationStatusAppService.cs
index e887a1fc8a..a4d311a8df 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/AIGenerationStatusAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/AIGenerationStatusAppService.cs
@@ -1,31 +1,48 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Unity.AI.Domain;
 using Unity.GrantManager.GrantApplications;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.Linq;
 
 namespace Unity.GrantManager.GrantApplications;
 
 public class AIGenerationStatusAppService(
     IRepository<AIGenerationRequest, Guid> generationRequestRepository,
-    ICurrentTenant currentTenant)
+    IRepository<AIOperation, Guid> operationRepository,
+    ICurrentTenant currentTenant,
+    IAsyncQueryableExecuter asyncQueryableExecuter)
     : ApplicationService, IAIGenerationStatusAppService
 {
     public virtual async Task<AIGenerationRequestDto?> GetLatestAsync(Guid applicationId, string operationType, Guid? tenantId = null)
     {
+        var operationName = AIGenerationRequestKeyHelper.ResolveOperationName(operationType);
+
+        if (operationName == null)
+        {
+            return null;
+        }
+
+        var operation = await ResolveOperationAsync(operationName);
+        if (operation == null)
+        {
+            return null;
+        }
+
         var query = await generationRequestRepository.GetQueryableAsync();
         var resolvedTenantId = tenantId ?? currentTenant.Id;
 
-        var item = query
+        var item = await asyncQueryableExecuter.FirstOrDefaultAsync(
+            query
             .Where(x =>
                 x.ApplicationId == applicationId &&
-                x.OperationType == operationType &&
+                x.OperationId == operation.Id &&
                 x.TenantId == resolvedTenantId)
             .OrderByDescending(x => x.CreationTime)
-            .ThenByDescending(x => x.Id)
-            .FirstOrDefault();
+            .ThenByDescending(x => x.Id));
 
         return item == null
             ? null
@@ -33,8 +50,8 @@ public class AIGenerationStatusAppService(
             {
                 Id = item.Id,
                 ApplicationId = item.ApplicationId,
-                OperationType = item.OperationType,
-                RequestKey = item.RequestKey,
+                OperationId = item.OperationId,
+                OperationType = operationType,
                 Status = item.Status,
                 StartedAt = item.StartedAt,
                 CompletedAt = item.CompletedAt,
@@ -42,4 +59,11 @@ public class AIGenerationStatusAppService(
                 IsActive = item.IsActive
             };
     }
+
+    private async Task<AIOperation?> ResolveOperationAsync(string operationName)
+    {
+        var operations = await operationRepository.GetQueryableAsync();
+        return await asyncQueryableExecuter.FirstOrDefaultAsync(
+            operations.Where(operation => operation.Name == operationName));
+    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationApplicantAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationApplicantAppService.cs
index e2043e9a16..a1a83b12db 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationApplicantAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationApplicantAppService.cs
@@ -106,6 +106,7 @@ public async Task<ApplicationApplicantInfoDto> GetApplicantInfoBasicAsync(Guid a
             ApplicantName = applicantInfo.Applicant?.ApplicantName ?? string.Empty,
             ApplicationReferenceNo = applicantInfo.ReferenceNo,
             ApplicationStatus = applicantInfo.ApplicationStatus.InternalStatus,
+            ExternalStatusVisibility = applicantInfo.ExternalStatusVisibility,
             ApplicationStatusCode = applicantInfo.ApplicationStatus.StatusCode
         };
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs
index f67026cfb5..51d12a9b10 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationLinksAppService.cs
@@ -15,10 +15,10 @@ namespace Unity.GrantManager.GrantApplications;
 
 [Authorize]
 [ExposeServices(typeof(ApplicationLinksAppService), typeof(IApplicationLinksService))]
-public class ApplicationLinksAppService : CrudAppService<
+public class ApplicationLinksAppService(IRepository<ApplicationLink, Guid> repository) : CrudAppService<
         ApplicationLink,
         ApplicationLinksDto,
-        Guid>, IApplicationLinksService
+        Guid>(repository), IApplicationLinksService
 {
     // Validation Error Messages
     private const string ERROR_MULTIPLE_PARENTS = "Error: A submission can not have two parents. Please revise the link type.";
@@ -32,29 +32,31 @@ public class ApplicationLinksAppService : CrudAppService<
     public IApplicationRepository ApplicationRepository { get; set; } = null!;
     public IApplicantRepository ApplicantRepository { get; set; } = null!;
     public IApplicationFormAppService ApplicationFormAppService { get; set; } = null!;
-
-    public ApplicationLinksAppService(IRepository<ApplicationLink, Guid> repository) : base(repository) { }
+    public IRepository<ApplicationStatus, Guid> ApplicationStatusRepository { get; set; } = null!;
 
     public async Task<List<ApplicationLinksInfoDto>> GetListByApplicationAsync(Guid applicationId)
     {
         var applicationLinksQuery = await ApplicationLinksRepository.GetQueryableAsync();
         var applicationsQuery = await ApplicationRepository.GetQueryableAsync();
         var applicantsQuery = await ApplicantRepository.GetQueryableAsync();
+        var statusQuery = await ApplicationStatusRepository.GetQueryableAsync();
 
         // Get basic application and applicant data without form details
         var basicQuery = from applicationLinks in applicationLinksQuery
                         join application in applicationsQuery on applicationLinks.LinkedApplicationId equals application.Id into appLinks
                         from application in appLinks.DefaultIfEmpty() // Left join for safety
+                        join status in statusQuery on application.ApplicationStatusId equals status.Id into appStatuses
+                        from status in appStatuses.DefaultIfEmpty() // Left join to avoid split query navigation issue
                         join applicant in applicantsQuery on application.ApplicantId equals applicant.Id into applicants
                         from applicant in applicants.DefaultIfEmpty() // Left join for safety
                         where applicationLinks.ApplicationId == applicationId || applicationLinks.LinkedApplicationId == applicationId
                         select new
                         {
                             Id = applicationLinks.Id,
-                            ApplicationId = application.Id,
-                            ApplicationStatus = application.ApplicationStatus.InternalStatus,
-                            ReferenceNumber = application.ReferenceNo,
-                            ProjectName = application.ProjectName,
+                            ApplicationId = application != null ? application.Id : Guid.Empty,
+                            ApplicationStatus = status != null ? status.InternalStatus : GrantManagerConsts.UnknownValue,
+                            ReferenceNumber = application != null ? application.ReferenceNo : GrantManagerConsts.UnknownValue,
+                            ProjectName = application != null ? application.ProjectName : GrantManagerConsts.UnknownValue,
                             ApplicantName = applicant.ApplicantName ?? GrantManagerConsts.UnknownValue,
                             LinkType = applicationLinks.LinkType
                         };
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationStatusAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationStatusAppService.cs
index 4427a21044..648088d64b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationStatusAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationStatusAppService.cs
@@ -14,6 +14,7 @@ namespace Unity.GrantManager.GrantApplications;
 public class ApplicationStatusAppService : ApplicationService, IApplicationStatusService
 {
     private readonly IApplicationStatusRepository _applicationStatusRepository;
+
     public ApplicationStatusAppService(IApplicationStatusRepository repository)
     {
         _applicationStatusRepository = repository;
@@ -26,6 +27,13 @@ public virtual async Task<IList<ApplicationStatusDto>> GetListAsync()
         return ObjectMapper.Map<List<ApplicationStatus>, List<ApplicationStatusDto>>(statuses.OrderBy(s => s.StatusCode).ToList());
     }
 
+    public virtual async Task<IList<ApplicantPortalStatusDto>> GetApplicantPortalStatusListAsync()
+    {
+        var statuses = await _applicationStatusRepository.GetListAsync();
+
+        return ObjectMapper.Map<List<ApplicationStatus>, List<ApplicantPortalStatusDto>>(statuses.OrderBy(s => s.StatusCode).ToList());
+    }
+
     public virtual async Task UpdateExternalStatusLabelsAsync(UpdateApplicationStatusExternalLabelsDto input)
     {
         // Load all statuses in a single query by IDs
@@ -38,6 +46,7 @@ public virtual async Task UpdateExternalStatusLabelsAsync(UpdateApplicationStatu
             if (statusMap.TryGetValue(statusDto.Id, out var status))
             {
                 status.ExternalStatus = statusDto.ExternalStatus;
+                status.NotifiedStatus = string.IsNullOrWhiteSpace(statusDto.NotifiedStatus) ? null : statusDto.NotifiedStatus;
                 await _applicationStatusRepository.UpdateAsync(status);
             }
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AIApplicationInputDataProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AIApplicationInputDataProvider.cs
new file mode 100644
index 0000000000..f4ec8982cb
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AIApplicationInputDataProvider.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Unity.AI.Models;
+using Unity.AI.Operations;
+using Unity.GrantManager.Applications;
+using Unity.Flex.Domain.Scoresheets;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.GrantManager.GrantApplications.Automation;
+
+public class AIApplicationInputDataProvider(
+    IApplicationRepository applicationRepository,
+    IApplicationFormRepository applicationFormRepository,
+    IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
+    IApplicationFormVersionRepository applicationFormVersionRepository,
+    IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
+    IScoresheetRepository scoresheetRepository) : IAIApplicationInputDataProvider, ITransientDependency
+{
+    public async Task<ApplicationFormSnapshot?> GetApplicationFormAsync(Guid applicationId)
+    {
+        var application = await applicationRepository.FindAsync(applicationId);
+        if (application == null)
+        {
+            return null;
+        }
+
+        var form = await applicationFormRepository.FindAsync(application.ApplicationFormId);
+        return form == null ? null : new ApplicationFormSnapshot { ScoresheetId = form.ScoresheetId };
+    }
+
+    public async Task<ApplicationSubmissionSnapshot?> GetApplicationSubmissionAsync(Guid applicationId)
+    {
+        var submission = await applicationFormSubmissionRepository.GetByApplicationAsync(applicationId);
+        return submission == null
+            ? null
+            : new ApplicationSubmissionSnapshot
+            {
+                ApplicationFormVersionId = submission.ApplicationFormVersionId,
+                Submission = submission.Submission?.ToString()
+            };
+    }
+
+    public async Task<ApplicationFormVersionSnapshot?> GetApplicationFormVersionAsync(Guid? formVersionId)
+    {
+        if (formVersionId == null)
+        {
+            return null;
+        }
+
+        var version = await applicationFormVersionRepository.FindAsync(formVersionId.Value);
+        return version == null ? null : new ApplicationFormVersionSnapshot { FormSchema = version.FormSchema };
+    }
+
+    public async Task<List<AttachmentSummarySnapshot>> GetAttachmentSummariesAsync(Guid applicationId)
+    {
+        var attachments = await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId);
+        return attachments
+            .Select(a => new AttachmentSummarySnapshot(
+                string.IsNullOrWhiteSpace(a.FileName) ? "attachment" : a.FileName.Trim(),
+                string.IsNullOrWhiteSpace(a.AISummary) ? null : a.AISummary.Trim()))
+            .ToList();
+    }
+
+    public async Task<ScoresheetSnapshot?> GetScoresheetAsync(Guid scoresheetId)
+    {
+        var scoresheet = await scoresheetRepository.GetWithChildrenAsync(scoresheetId);
+        if (scoresheet == null)
+        {
+            return null;
+        }
+
+        return new ScoresheetSnapshot
+        {
+            Sections = scoresheet.Sections
+                .Select(section => new ScoresheetSectionSnapshot
+                {
+                    Name = section.Name,
+                    Order = (int)section.Order,
+                    Fields = section.Fields
+                        .Select(field => new ScoresheetFieldSnapshot
+                        {
+                            Id = field.Id,
+                            Label = field.Label,
+                            Description = field.Description,
+                            Type = field.Type.ToString(),
+                            Order = (int)field.Order,
+                            Definition = field.Definition
+                        })
+                        .ToList()
+                })
+                .ToList()
+        };
+    }
+
+    public async Task<bool> HasAttachmentsAsync(Guid applicationId)
+    {
+        var queryable = await applicationChefsFileAttachmentRepository.GetQueryableAsync();
+        return await queryable.AnyAsync(a => a.ApplicationId == applicationId);
+    }
+
+    public async Task<bool> HasSubmissionAsync(Guid applicationId)
+    {
+        var submission = await applicationFormSubmissionRepository.GetByApplicationAsync(applicationId);
+        return submission != null && !string.IsNullOrWhiteSpace(submission.Submission);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/ApplicationAIGenerationQueue.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/ApplicationAIGenerationQueue.cs
index 6eec9bc4aa..dbcdc17c33 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/ApplicationAIGenerationQueue.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/ApplicationAIGenerationQueue.cs
@@ -2,15 +2,23 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Unity.AI.Domain;
 using Unity.AI.Automation;
+using Unity.AI.Features;
+using Unity.AI.Localization;
+using Unity.AI.Operations;
 using Unity.AI.RateLimit;
 using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 using Medallion.Threading;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Localization;
+using Volo.Abp;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Features;
+using Volo.Abp.Linq;
 using Volo.Abp.Users;
 
 namespace Unity.GrantManager.GrantApplications.Automation;
@@ -18,20 +26,25 @@ namespace Unity.GrantManager.GrantApplications.Automation;
 public class ApplicationAIGenerationQueue(
     IBackgroundJobManager backgroundJobManager,
     IRepository<AIGenerationRequest, Guid> generationRequestRepository,
+    IRepository<AIOperation, Guid> operationRepository,
     IDistributedLockProvider distributedLockProvider,
+    IAIGenerationPrerequisiteValidator aiGenerationPrerequisiteValidator,
+    IFeatureChecker featureChecker,
     IAIRateLimiter aiRateLimiter,
+    IAsyncQueryableExecuter asyncQueryableExecuter,
     ICurrentUser currentUser,
-    ILogger<ApplicationAIGenerationQueue> logger)
+    ILogger<ApplicationAIGenerationQueue> logger,
+    IStringLocalizer<AIResource> localizer)
     : IApplicationAIGenerationQueue, ITransientDependency
 {
+    private readonly IAsyncQueryableExecuter _asyncQueryableExecuter = asyncQueryableExecuter;
     public async Task QueueAttachmentSummaryAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null, List<Guid>? attachmentIds = null)
     {
-        var requestKey = AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.AttachmentSummaryOperationType);
         await EnsureRequestAndEnqueueAsync(
-            requestKey,
             tenantId,
             AIGenerationRequestKeyHelper.AttachmentSummaryOperationType,
             applicationId,
+            () => aiGenerationPrerequisiteValidator.EnsureAttachmentSummaryAvailableAsync(applicationId),
             () =>
             {
                 return backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummaryBackgroundJobArgs
@@ -40,20 +53,18 @@ await EnsureRequestAndEnqueueAsync(
                     AttachmentIds = attachmentIds,
                     PromptVersion = promptVersion,
                     RequestedByUserId = currentUser.Id,
-                    TenantId = tenantId,
-                    RequestKey = requestKey
+                    TenantId = tenantId
                 });
             });
     }
 
     public async Task QueueApplicationAnalysisAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null)
     {
-        var requestKey = AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType);
         await EnsureRequestAndEnqueueAsync(
-            requestKey,
             tenantId,
             AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType,
             applicationId,
+            () => aiGenerationPrerequisiteValidator.EnsureApplicationAnalysisAvailableAsync(applicationId),
             () =>
             {
                 return backgroundJobManager.EnqueueAsync(new GenerateApplicationAnalysisBackgroundJobArgs
@@ -61,20 +72,18 @@ await EnsureRequestAndEnqueueAsync(
                     ApplicationId = applicationId,
                     PromptVersion = promptVersion,
                     RequestedByUserId = currentUser.Id,
-                    TenantId = tenantId,
-                    RequestKey = requestKey
+                    TenantId = tenantId
                 });
             });
     }
 
     public async Task QueueApplicationScoringAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null)
     {
-        var requestKey = AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.ApplicationScoringOperationType);
         await EnsureRequestAndEnqueueAsync(
-            requestKey,
             tenantId,
             AIGenerationRequestKeyHelper.ApplicationScoringOperationType,
             applicationId,
+            () => aiGenerationPrerequisiteValidator.EnsureApplicationScoringAvailableAsync(applicationId),
             () =>
             {
                 return backgroundJobManager.EnqueueAsync(new GenerateApplicationScoringBackgroundJobArgs
@@ -82,59 +91,101 @@ await EnsureRequestAndEnqueueAsync(
                     ApplicationId = applicationId,
                     PromptVersion = promptVersion,
                     RequestedByUserId = currentUser.Id,
-                    TenantId = tenantId,
-                    RequestKey = requestKey
+                    TenantId = tenantId
                 });
             });
     }
 
     public async Task QueueAllAIStagesAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null)
     {
-        var requestKey = AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.PipelineOperationType);
-        await EnsureRequestAndEnqueueAsync(
-            requestKey,
-            tenantId,
-            AIGenerationRequestKeyHelper.PipelineOperationType,
-            applicationId,
-            () =>
+        var hasEnabledStage = false;
+        var enqueuedStage = false;
+        UserFriendlyException? lastStageException = null;
+
+        if (await featureChecker.IsEnabledAsync(AIFeatures.AttachmentSummaries))
+        {
+            hasEnabledStage = true;
+            try
             {
-                return backgroundJobManager.EnqueueAsync(new RunApplicationAIPipelineJobArgs
-                {
-                    ApplicationId = applicationId,
-                    PromptVersion = promptVersion,
-                    RequestedByUserId = currentUser.Id,
-                    TenantId = tenantId,
-                    RequestKey = requestKey
-                });
-            });
+                await QueueAttachmentSummaryAsync(applicationId, tenantId, promptVersion);
+                enqueuedStage = true;
+            }
+            catch (UserFriendlyException ex)
+            {
+                lastStageException = ex;
+            }
+        }
+
+        if (await featureChecker.IsEnabledAsync(AIFeatures.ApplicationAnalysis))
+        {
+            hasEnabledStage = true;
+            try
+            {
+                await QueueApplicationAnalysisAsync(applicationId, tenantId, promptVersion);
+                enqueuedStage = true;
+            }
+            catch (UserFriendlyException ex)
+            {
+                lastStageException = ex;
+            }
+        }
+
+        if (await featureChecker.IsEnabledAsync(AIFeatures.Scoring))
+        {
+            hasEnabledStage = true;
+            try
+            {
+                await QueueApplicationScoringAsync(applicationId, tenantId, promptVersion);
+                enqueuedStage = true;
+            }
+            catch (UserFriendlyException ex)
+            {
+                lastStageException = ex;
+            }
+        }
+
+        if (!hasEnabledStage)
+        {
+            throw new UserFriendlyException(localizer[AILocalizationKeys.GenerateAllDisabled]);
+        }
+
+        if (!enqueuedStage && lastStageException != null)
+        {
+            throw lastStageException;
+        }
     }
 
     private async Task EnsureRequestAndEnqueueAsync(
-        string requestKey,
         Guid? tenantId,
         string operationType,
-        Guid? applicationId,
+        Guid applicationId,
+        Func<Task> validateInput,
         Func<Task> enqueue)
     {
-        var requestLock = distributedLockProvider.CreateLock($"ai-generation:{requestKey}");
+        var operation = await ResolveOperationAsync(operationType);
+        var requestLock = distributedLockProvider.CreateLock($"ai-generation:{tenantId}:{applicationId}:{operation.Id}");
 
         using (await requestLock.AcquireAsync())
         {
             var query = await generationRequestRepository.GetQueryableAsync();
             var existingRequests = query.Where(x =>
-                x.RequestKey == requestKey
+                x.TenantId == tenantId
+                && x.ApplicationId == applicationId
+                && x.OperationId == operation.Id
                 && (x.Status == AIGenerationRequestStatus.Queued || x.Status == AIGenerationRequestStatus.Running));
 
-            var existing = existingRequests
-                .OrderByDescending(x => x.CreationTime)
-                .ThenByDescending(x => x.Id)
-                .FirstOrDefault();
+            var existing = await _asyncQueryableExecuter.FirstOrDefaultAsync(
+                existingRequests
+                    .OrderByDescending(x => x.CreationTime)
+                    .ThenByDescending(x => x.Id));
 
             if (existing != null)
             {
                 return;
             }
 
+            await validateInput();
+
             // Single chokepoint for all AI generate flows (manual + auto).
             // The limiter is a no-op for system/background callers without an authenticated user.
             await aiRateLimiter.EnsureAsync();
@@ -142,9 +193,8 @@ private async Task EnsureRequestAndEnqueueAsync(
             var request = new AIGenerationRequest(
                 Guid.NewGuid(),
                 tenantId,
-                operationType,
-                applicationId,
-                requestKey);
+                operation.Id,
+                applicationId);
 
             await generationRequestRepository.InsertAsync(request, autoSave: true);
 
@@ -160,6 +210,32 @@ private async Task EnsureRequestAndEnqueueAsync(
         }
     }
 
+    private static string ResolveOperationName(string operationType)
+        => AIGenerationRequestKeyHelper.ResolveOperationName(operationType)
+            ?? throw new UserFriendlyException($"AI operation '{operationType}' is not configured.");
+
+    private async Task<AIOperation> ResolveOperationAsync(string operationType)
+    {
+        var operationName = ResolveOperationName(operationType);
+        var operations = await operationRepository.GetQueryableAsync();
+        var operation = await _asyncQueryableExecuter.FirstOrDefaultAsync(
+            operations.Where(operation =>
+                operation.IsActive &&
+                operation.Name == operationName));
+
+        if (operation == null)
+        {
+            throw new UserFriendlyException($"AI operation '{operationType}' is not configured.");
+        }
+
+        if (!operation.IsActive)
+        {
+            throw new UserFriendlyException($"AI operation '{operationType}' is not configured.");
+        }
+
+        return operation;
+    }
+
     private async Task MarkFailedBestEffortAsync(AIGenerationRequest request, Exception exception)
     {
         try
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AttachmentSummaryDataProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AttachmentSummaryDataProvider.cs
new file mode 100644
index 0000000000..12c8b8f0d9
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/AttachmentSummaryDataProvider.cs
@@ -0,0 +1,54 @@
+using Microsoft.Extensions.Localization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.AI.Localization;
+using Unity.AI.Operations;
+using Unity.GrantManager.Applications;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Uow;
+using Volo.Abp;
+
+namespace Unity.GrantManager.GrantApplications.Automation;
+
+public class AttachmentSummaryDataProvider(
+    IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
+    IUnitOfWorkManager unitOfWorkManager,
+    IStringLocalizer<AIResource> localizer) : IAttachmentSummaryDataProvider, ITransientDependency
+{
+    public async Task<AttachmentSummarySource?> GetAttachmentAsync(Guid attachmentId)
+    {
+        using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
+        var attachment = await applicationChefsFileAttachmentRepository.FindAsync(attachmentId);
+        await uow.CompleteAsync();
+
+        return attachment == null
+            ? null
+            : new AttachmentSummarySource(
+                attachment.Id,
+                attachment.FileName,
+                attachment.ChefsSubmissionId,
+                attachment.ChefsFileId);
+    }
+
+    public async Task UpdateAttachmentSummaryAsync(Guid attachmentId, string summary)
+    {
+        using var uow = unitOfWorkManager.Begin(requiresNew: true);
+        var attachment = await applicationChefsFileAttachmentRepository.FindAsync(attachmentId)
+            ?? throw new UserFriendlyException(localizer[AILocalizationKeys.AttachmentNotFound]);
+        attachment.AISummary = summary;
+        await applicationChefsFileAttachmentRepository.UpdateAsync(attachment);
+        await uow.CompleteAsync();
+    }
+
+    public async Task<List<Guid>> GetApplicationAttachmentIdsAsync(Guid applicationId)
+    {
+        using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
+        var ids = (await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId))
+            .Select(a => a.Id)
+            .ToList();
+        await uow.CompleteAsync();
+        return ids;
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIGenerationLogScope.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIGenerationLogScope.cs
new file mode 100644
index 0000000000..c70a8addf9
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIGenerationLogScope.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+
+namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
+
+internal static class AIGenerationLogScope
+{
+    public static IDisposable? Begin(
+        ILogger logger,
+        string operationType,
+        Guid applicationId,
+        Guid? tenantId,
+        string? promptVersion,
+        Guid? requestedByUserId)
+    {
+        return logger.BeginScope(new Dictionary<string, object?>
+        {
+            ["AIOperationType"] = operationType,
+            ["AIApplicationId"] = applicationId,
+            ["AITenantId"] = tenantId,
+            ["AIPromptVersion"] = promptVersion,
+            ["AIRequestedByUserId"] = requestedByUserId
+        });
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIGenerationRequestJobHelper.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIGenerationRequestJobHelper.cs
index 59a1fb80f8..7a28bd3c2c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIGenerationRequestJobHelper.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIGenerationRequestJobHelper.cs
@@ -3,6 +3,7 @@
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using Unity.AI.Domain;
 using Unity.AI.RateLimit;
 using Unity.GrantManager.GrantApplications;
 using Volo.Abp.Domain.Repositories;
@@ -55,10 +56,18 @@ public static async Task MarkFailedAsync(
     public static async Task MarkRunningInNewUowAsync(
         IUnitOfWorkManager unitOfWorkManager,
         IRepository<AIGenerationRequest, Guid> generationRequestRepository,
-        string requestKey)
+        IRepository<AIOperation, Guid> operationRepository,
+        Guid? tenantId,
+        Guid applicationId,
+        string operationType)
     {
         using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
-        var request = await GetLatestRequestAsync(generationRequestRepository, x => x.RequestKey == requestKey);
+        var operation = await ResolveOperationAsync(operationRepository, operationType);
+        var request = await GetLatestRequestAsync(
+            generationRequestRepository,
+            x => x.TenantId == tenantId
+                 && x.ApplicationId == applicationId
+                 && x.OperationId == operation.Id);
         await MarkRunningAsync(generationRequestRepository, request);
         await uow.CompleteAsync();
     }
@@ -66,10 +75,18 @@ public static async Task MarkRunningInNewUowAsync(
     public static async Task MarkCompletedInNewUowAsync(
         IUnitOfWorkManager unitOfWorkManager,
         IRepository<AIGenerationRequest, Guid> generationRequestRepository,
-        string requestKey)
+        IRepository<AIOperation, Guid> operationRepository,
+        Guid? tenantId,
+        Guid applicationId,
+        string operationType)
     {
         using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
-        var request = await GetLatestRequestAsync(generationRequestRepository, x => x.RequestKey == requestKey);
+        var operation = await ResolveOperationAsync(operationRepository, operationType);
+        var request = await GetLatestRequestAsync(
+            generationRequestRepository,
+            x => x.TenantId == tenantId
+                 && x.ApplicationId == applicationId
+                 && x.OperationId == operation.Id);
         await MarkCompletedAsync(generationRequestRepository, request);
         await uow.CompleteAsync();
     }
@@ -77,11 +94,19 @@ public static async Task MarkCompletedInNewUowAsync(
     public static async Task MarkFailedInNewUowAsync(
         IUnitOfWorkManager unitOfWorkManager,
         IRepository<AIGenerationRequest, Guid> generationRequestRepository,
-        string requestKey,
+        IRepository<AIOperation, Guid> operationRepository,
+        Guid? tenantId,
+        Guid applicationId,
+        string operationType,
         string? failureReason)
     {
         using var uow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
-        var request = await GetLatestRequestAsync(generationRequestRepository, x => x.RequestKey == requestKey);
+        var operation = await ResolveOperationAsync(operationRepository, operationType);
+        var request = await GetLatestRequestAsync(
+            generationRequestRepository,
+            x => x.TenantId == tenantId
+                 && x.ApplicationId == applicationId
+                 && x.OperationId == operation.Id);
         await MarkFailedAsync(generationRequestRepository, request, failureReason);
         await uow.CompleteAsync();
     }
@@ -91,7 +116,7 @@ public static async Task StampRateLimitBestEffortAsync(
         ILogger logger,
         Guid? requestedByUserId,
         Guid applicationId,
-        string requestKey)
+        string operationType)
     {
         try
         {
@@ -101,10 +126,25 @@ public static async Task StampRateLimitBestEffortAsync(
         {
             logger.LogWarning(
                 ex,
-                "AI rate-limit cooldown stamp failed after completed AI generation request for application {ApplicationId} and request {RequestKey}.",
+                "AI rate-limit cooldown stamp failed after completed AI generation request for application {ApplicationId} and operation {OperationType}.",
                 applicationId,
-                requestKey);
+                operationType);
+        }
+    }
+
+    private static async Task<AIOperation> ResolveOperationAsync(
+        IRepository<AIOperation, Guid> operationRepository,
+        string operationType)
+    {
+        var operationName = AIGenerationRequestKeyHelper.ResolveOperationName(operationType);
+        if (operationName == null)
+        {
+            throw new ArgumentException($"Unknown AI operation type '{operationType}'.", nameof(operationType));
         }
+
+        var operation = await operationRepository.FirstOrDefaultAsync(item => item.Name == operationName);
+
+        return operation ?? throw new InvalidOperationException($"AI operation '{operationType}' is not configured.");
     }
 
     public static async Task<AIGenerationRequest?> GetLatestRequestAsync(
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisJob.cs
index 2094abad65..fac08879b1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisJob.cs
@@ -1,20 +1,27 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
+using Unity.AI.Domain;
 using Unity.AI.Operations;
 using Unity.AI.RateLimit;
+using Unity.GrantManager.Applications;
 using Unity.GrantManager.GrantApplications;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
+using Volo.Abp.ObjectMapping;
 
 namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 
 public class GenerateApplicationAnalysisJob(
+    IAIApplicationInputBuilder inputBuilder,
     IApplicationAnalysisService applicationAnalysisService,
+    IApplicationRepository applicationRepository,
+    IObjectMapper objectMapper,
     IRepository<AIGenerationRequest, Guid> generationRequestRepository,
+    IRepository<AIOperation, Guid> operationRepository,
     ICurrentTenant currentTenant,
     IUnitOfWorkManager unitOfWorkManager,
     IAIRateLimiter aiRateLimiter,
@@ -22,21 +29,50 @@ public class GenerateApplicationAnalysisJob(
 {
     public override async Task ExecuteAsync(GenerateApplicationAnalysisBackgroundJobArgs args)
     {
+        using var logScope = AIGenerationLogScope.Begin(
+            logger,
+            AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType,
+            args.ApplicationId,
+            args.TenantId,
+            args.PromptVersion,
+            args.RequestedByUserId);
+
         using (currentTenant.Change(args.TenantId))
         {
-            await AIGenerationRequestJobHelper.MarkRunningInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey);
+            await AIGenerationRequestJobHelper.MarkRunningInNewUowAsync(
+                unitOfWorkManager,
+                generationRequestRepository,
+                operationRepository,
+                args.TenantId,
+                args.ApplicationId,
+                AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType);
             try
             {
-                logger.LogInformation("Executing AI application analysis job for application {ApplicationId}.", args.ApplicationId);
-                await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
-                logger.LogInformation("Completed AI application analysis job for application {ApplicationId}.", args.ApplicationId);
-
-                await AIGenerationRequestJobHelper.StampRateLimitBestEffortAsync(aiRateLimiter, logger, args.RequestedByUserId, args.ApplicationId, args.RequestKey);
-                await AIGenerationRequestJobHelper.MarkCompletedInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey);
+                var application = await applicationRepository.GetAsync(args.ApplicationId);
+                var applicationInput = objectMapper.Map<Application, AIApplicationPromptDataDto>(application);
+                var input = await inputBuilder.BuildApplicationAnalysisInputAsync(applicationInput, args.PromptVersion);
+                var analysisJson = await applicationAnalysisService.RegenerateAsync(input);
+                application.AIAnalysis = analysisJson;
+                await applicationRepository.UpdateAsync(application);
+                await AIGenerationRequestJobHelper.StampRateLimitBestEffortAsync(aiRateLimiter, logger, args.RequestedByUserId, args.ApplicationId, AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType);
+                await AIGenerationRequestJobHelper.MarkCompletedInNewUowAsync(
+                    unitOfWorkManager,
+                    generationRequestRepository,
+                    operationRepository,
+                    args.TenantId,
+                    args.ApplicationId,
+                    AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType);
             }
             catch (Exception ex)
             {
-                await AIGenerationRequestJobHelper.MarkFailedInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey, ex.Message);
+                await AIGenerationRequestJobHelper.MarkFailedInNewUowAsync(
+                    unitOfWorkManager,
+                    generationRequestRepository,
+                    operationRepository,
+                    args.TenantId,
+                    args.ApplicationId,
+                    AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType,
+                    ex.Message);
                 throw;
             }
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs
index cd4d2513ad..d171503d61 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs
@@ -1,8 +1,10 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Unity.AI.Operations;
 using Unity.AI.RateLimit;
-using Unity.GrantManager.GrantApplications;
+using Unity.GrantManager.Applications;
 using Unity.GrantManager.GrantApplications.Automation.Events;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
@@ -10,12 +12,17 @@
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
+using Volo.Abp.ObjectMapping;
 
 namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 
 public class GenerateApplicationScoringJob(
-    IApplicationScoringAppService applicationScoringAppService,
+    IAIApplicationInputBuilder inputBuilder,
+    IApplicationScoringService applicationScoringService,
+    IApplicationRepository applicationRepository,
+    IObjectMapper objectMapper,
     IRepository<AIGenerationRequest, Guid> generationRequestRepository,
+    IRepository<AIOperation, Guid> operationRepository,
     ICurrentTenant currentTenant,
     IUnitOfWorkManager unitOfWorkManager,
     ILocalEventBus localEventBus,
@@ -24,28 +31,54 @@ public class GenerateApplicationScoringJob(
 {
     public override async Task ExecuteAsync(GenerateApplicationScoringBackgroundJobArgs args)
     {
+        using var logScope = AIGenerationLogScope.Begin(
+            logger,
+            AIGenerationRequestKeyHelper.ApplicationScoringOperationType,
+            args.ApplicationId,
+            args.TenantId,
+            args.PromptVersion,
+            args.RequestedByUserId);
+
         using (currentTenant.Change(args.TenantId))
         {
-            await AIGenerationRequestJobHelper.MarkRunningInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey);
+            await AIGenerationRequestJobHelper.MarkRunningInNewUowAsync(
+                unitOfWorkManager,
+                generationRequestRepository,
+                operationRepository,
+                args.TenantId,
+                args.ApplicationId,
+                AIGenerationRequestKeyHelper.ApplicationScoringOperationType);
             try
             {
-                logger.LogInformation("Executing AI application scoring job for application {ApplicationId}.", args.ApplicationId);
-                var result = await applicationScoringAppService.GenerateApplicationScoringForPipelineAsync(args.ApplicationId, args.PromptVersion);
-                if (result.Completed)
+                var application = await applicationRepository.GetAsync(args.ApplicationId);
+                var applicationInput = objectMapper.Map<Application, AIApplicationPromptDataDto>(application);
+                var input = await inputBuilder.BuildApplicationScoringInputAsync(applicationInput, args.PromptVersion);
+                var scoresheetAnswers = await applicationScoringService.RegenerateAsync(input);
+                application.AIScoresheetAnswers = scoresheetAnswers;
+                await applicationRepository.UpdateAsync(application);
+                await localEventBus.PublishAsync(new ApplicationAIScoringGeneratedEvent
                 {
-                    await localEventBus.PublishAsync(new ApplicationAIScoringGeneratedEvent
-                    {
-                        ApplicationId = args.ApplicationId
-                    });
-                }
-                logger.LogInformation("Completed AI application scoring job for application {ApplicationId}.", args.ApplicationId);
-
-                await AIGenerationRequestJobHelper.StampRateLimitBestEffortAsync(aiRateLimiter, logger, args.RequestedByUserId, args.ApplicationId, args.RequestKey);
-                await AIGenerationRequestJobHelper.MarkCompletedInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey);
+                    ApplicationId = args.ApplicationId
+                });
+                await AIGenerationRequestJobHelper.StampRateLimitBestEffortAsync(aiRateLimiter, logger, args.RequestedByUserId, args.ApplicationId, AIGenerationRequestKeyHelper.ApplicationScoringOperationType);
+                await AIGenerationRequestJobHelper.MarkCompletedInNewUowAsync(
+                    unitOfWorkManager,
+                    generationRequestRepository,
+                    operationRepository,
+                    args.TenantId,
+                    args.ApplicationId,
+                    AIGenerationRequestKeyHelper.ApplicationScoringOperationType);
             }
             catch (Exception ex)
             {
-                await AIGenerationRequestJobHelper.MarkFailedInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey, ex.Message);
+                await AIGenerationRequestJobHelper.MarkFailedInNewUowAsync(
+                    unitOfWorkManager,
+                    generationRequestRepository,
+                    operationRepository,
+                    args.TenantId,
+                    args.ApplicationId,
+                    AIGenerationRequestKeyHelper.ApplicationScoringOperationType,
+                    ex.Message);
                 throw;
             }
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryJob.cs
index 036c9b5823..2ebab73bef 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryJob.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
+using Unity.AI.Domain;
 using Unity.AI.Operations;
 using Unity.AI.RateLimit;
 using Unity.GrantManager.GrantApplications;
@@ -15,6 +16,7 @@ namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 public class GenerateAttachmentSummaryJob(
     IAttachmentSummaryService attachmentSummaryService,
     IRepository<AIGenerationRequest, Guid> generationRequestRepository,
+    IRepository<AIOperation, Guid> operationRepository,
     ICurrentTenant currentTenant,
     IUnitOfWorkManager unitOfWorkManager,
     IAIRateLimiter aiRateLimiter,
@@ -22,22 +24,46 @@ public class GenerateAttachmentSummaryJob(
 {
     public override async Task ExecuteAsync(GenerateAttachmentSummaryBackgroundJobArgs args)
     {
+        using var logScope = AIGenerationLogScope.Begin(
+            logger,
+            AIGenerationRequestKeyHelper.AttachmentSummaryOperationType,
+            args.ApplicationId,
+            args.TenantId,
+            args.PromptVersion,
+            args.RequestedByUserId);
+
         using (currentTenant.Change(args.TenantId))
         {
-            await AIGenerationRequestJobHelper.MarkRunningInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey);
+            await AIGenerationRequestJobHelper.MarkRunningInNewUowAsync(
+                unitOfWorkManager,
+                generationRequestRepository,
+                operationRepository,
+                args.TenantId,
+                args.ApplicationId,
+                AIGenerationRequestKeyHelper.AttachmentSummaryOperationType);
             try
             {
-                logger.LogInformation(
-                    "Executing AI attachment summary job for application {ApplicationId}.",
-                    args.ApplicationId);
                 await attachmentSummaryService.GenerateForApplicationAsync(args.ApplicationId, args.PromptVersion, args.AttachmentIds);
 
-                await AIGenerationRequestJobHelper.StampRateLimitBestEffortAsync(aiRateLimiter, logger, args.RequestedByUserId, args.ApplicationId, args.RequestKey);
-                await AIGenerationRequestJobHelper.MarkCompletedInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey);
+                await AIGenerationRequestJobHelper.StampRateLimitBestEffortAsync(aiRateLimiter, logger, args.RequestedByUserId, args.ApplicationId, AIGenerationRequestKeyHelper.AttachmentSummaryOperationType);
+                await AIGenerationRequestJobHelper.MarkCompletedInNewUowAsync(
+                    unitOfWorkManager,
+                    generationRequestRepository,
+                    operationRepository,
+                    args.TenantId,
+                    args.ApplicationId,
+                    AIGenerationRequestKeyHelper.AttachmentSummaryOperationType);
             }
             catch (Exception ex)
             {
-                await AIGenerationRequestJobHelper.MarkFailedInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey, ex.Message);
+                await AIGenerationRequestJobHelper.MarkFailedInNewUowAsync(
+                    unitOfWorkManager,
+                    generationRequestRepository,
+                    operationRepository,
+                    args.TenantId,
+                    args.ApplicationId,
+                    AIGenerationRequestKeyHelper.AttachmentSummaryOperationType,
+                    ex.Message);
                 throw;
             }
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJob.cs
deleted file mode 100644
index 269d08aae6..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJob.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Unity.AI.RateLimit;
-using Unity.GrantManager.Applications;
-using Unity.GrantManager.Attachments;
-using Unity.GrantManager.GrantApplications;
-using Unity.GrantManager.GrantApplications.Automation.Events;
-using Volo.Abp.BackgroundJobs;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.EventBus.Local;
-using Volo.Abp.Features;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.Uow;
-
-namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
-
-public class RunApplicationAIPipelineJob(
-    IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
-    IAttachmentSummaryAppService attachmentSummaryAppService,
-    IApplicationAnalysisAppService applicationAnalysisAppService,
-    IApplicationScoringAppService applicationScoringAppService,
-    IFeatureChecker featureChecker,
-    ILocalEventBus localEventBus,
-    IRepository<AIGenerationRequest, Guid> generationRequestRepository,
-    ICurrentTenant currentTenant,
-    IUnitOfWorkManager unitOfWorkManager,
-    IAIRateLimiter aiRateLimiter,
-    ILogger<RunApplicationAIPipelineJob> logger) : AsyncBackgroundJob<RunApplicationAIPipelineJobArgs>, ITransientDependency
-{
-    public override async Task ExecuteAsync(RunApplicationAIPipelineJobArgs args)
-    {
-        if (string.IsNullOrWhiteSpace(args.RequestKey))
-        {
-            throw new ArgumentException("RequestKey is required.", nameof(args));
-        }
-
-        using (currentTenant.Change(args.TenantId))
-        {
-            await AIGenerationRequestJobHelper.MarkRunningInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey);
-
-            try
-            {
-                var attachmentSummariesEnabled = await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries");
-                var applicationAnalysisEnabled = await featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis");
-                var scoringEnabled = await featureChecker.IsEnabledAsync("Unity.AI.Scoring");
-
-                if (!attachmentSummariesEnabled && !applicationAnalysisEnabled && !scoringEnabled)
-                {
-                    logger.LogDebug("All AI features are disabled, skipping queued AI generation for application {ApplicationId}.", args.ApplicationId);
-                    await AIGenerationRequestJobHelper.StampRateLimitBestEffortAsync(aiRateLimiter, logger, args.RequestedByUserId, args.ApplicationId, args.RequestKey);
-                    await AIGenerationRequestJobHelper.MarkCompletedInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey);
-                    return;
-                }
-
-                logger.LogInformation("Executing queued AI content pipeline for application {ApplicationId}.", args.ApplicationId);
-
-                if (attachmentSummariesEnabled)
-                {
-                    var attachmentIds = await GetAttachmentIdsAsync(args.ApplicationId);
-                    var attachmentResults = await attachmentSummaryAppService.GenerateAttachmentSummariesForPipelineAsync(attachmentIds, args.PromptVersion);
-                    logger.LogInformation("Completed AI attachment summaries for application {ApplicationId} with {AttachmentCount} result(s).", args.ApplicationId, attachmentResults.Count);
-                }
-
-                Exception? analysisException = null;
-                Exception? scoringException = null;
-
-                if (applicationAnalysisEnabled)
-                {
-                    try
-                    {
-                        var analysisResult = await applicationAnalysisAppService.GenerateApplicationAnalysisForPipelineAsync(args.ApplicationId, args.PromptVersion);
-                        if (analysisResult.Completed)
-                        {
-                            logger.LogInformation("Completed AI application analysis stage for application {ApplicationId}.", args.ApplicationId);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        analysisException = ex;
-                        logger.LogError(ex, "Error executing AI application analysis stage for application {ApplicationId}.", args.ApplicationId);
-                    }
-                }
-
-                if (scoringEnabled)
-                {
-                    try
-                    {
-                        var result = await applicationScoringAppService.GenerateApplicationScoringForPipelineAsync(args.ApplicationId, args.PromptVersion);
-                        if (result.Completed)
-                        {
-                            await localEventBus.PublishAsync(new ApplicationAIScoringGeneratedEvent
-                            {
-                                ApplicationId = args.ApplicationId
-                            });
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        scoringException = ex;
-                        logger.LogError(ex, "Error executing AI application scoring stage for application {ApplicationId}.", args.ApplicationId);
-                    }
-                }
-
-                if (scoringException != null)
-                {
-                    throw scoringException;
-                }
-
-                if (analysisException != null)
-                {
-                    throw analysisException;
-                }
-
-                await AIGenerationRequestJobHelper.StampRateLimitBestEffortAsync(aiRateLimiter, logger, args.RequestedByUserId, args.ApplicationId, args.RequestKey);
-                await AIGenerationRequestJobHelper.MarkCompletedInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey);
-            }
-            catch (Exception ex)
-            {
-                await AIGenerationRequestJobHelper.MarkFailedInNewUowAsync(unitOfWorkManager, generationRequestRepository, args.RequestKey, ex.Message);
-                throw;
-            }
-        }
-    }
-
-    private async Task<List<Guid>> GetAttachmentIdsAsync(Guid applicationId)
-    {
-        var attachments = await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId);
-        return attachments.Select(a => a.Id).ToList();
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/BulkApprovalsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/BulkApprovalsAppService.cs
index be2ee1672e..60d663f617 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/BulkApprovalsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/BulkApprovalsAppService.cs
@@ -14,7 +14,8 @@
 namespace Unity.GrantManager.GrantApplications
 {
     [Authorize]
-    public class BulkApprovalsAppService(IApplicationRepository applicationRepository,
+    public class BulkApprovalsAppService(
+        IApplicationRepository applicationRepository,
         IApplicationManager applicationManager,
         ILocalEventBus localEventBus,
         IUnitOfWorkManager unitofWorkManager) : GrantManagerAppService, IBulkApprovalsAppService
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 6178fea11f..602de5054d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -12,23 +12,25 @@
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Unity.Flex.WorksheetInstances;
-using Unity.Flex.Worksheets;
+using Unity.AI.Automation;
 using Unity.AI.Models;
+using Unity.AI.Permissions;
+using Unity.AI.RateLimit;
 using Unity.AI.Responses;
+using Unity.Flex.WorksheetInstances;
+using Unity.Flex.Worksheets;
 using Unity.GrantManager.Applicants;
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Events;
 using Unity.GrantManager.Flex;
-using Unity.GrantManager.Identity;
 using Unity.GrantManager.GlobalTag;
+using Unity.GrantManager.Identity;
 using Unity.GrantManager.Payments;
 using Unity.Modules.Shared;
 using Unity.Modules.Shared.Correlation;
+using Unity.Modules.Shared.Specializations;
 using Unity.Payments.PaymentRequests;
-using Unity.AI.Automation;
-using Unity.AI.Permissions;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Authorization;
@@ -45,20 +47,20 @@ namespace Unity.GrantManager.GrantApplications;
 [Dependency(ReplaceServices = true)]
 [ExposeServices(typeof(GrantApplicationAppService), typeof(IGrantApplicationAppService))]
 public class GrantApplicationAppService(
-    IApplicationManager applicationManager,
-    IApplicationRepository applicationRepository,
-    IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
-    IApplicationStatusRepository applicationStatusRepository,
+    IApplicationManager applicationManager,
+    IApplicationRepository applicationRepository,
+    IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
+    IApplicationStatusRepository applicationStatusRepository,
     IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
     IApplicantRepository applicantRepository,
     IApplicationFormRepository applicationFormRepository,
     IApplicantAgentRepository applicantAgentRepository,
     IApplicantAddressRepository applicantAddressRepository,
     IApplicantSupplierAppService applicantSupplierService,
-    IPaymentRequestAppService paymentRequestService,
-    IApplicationAIGenerationQueue aiGenerationQueue,
-    IAIGenerationStatusAppService aiGenerationStatusAppService,
-    IFeatureChecker featureChecker)
+    IPaymentRequestAppService paymentRequestService,
+    IAIGenerationStatusAppService aiGenerationStatusAppService,
+    IAIRateLimiter aiRateLimiter,
+    IFeatureChecker featureChecker)
     : GrantManagerAppService, IGrantApplicationAppService
 #pragma warning restore S107 // Methods should not have too many parameters
 {
@@ -159,6 +161,7 @@ public async Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplica
                 ContractExecutionDate = rec.ContractExecutionDate,
                 RiskRanking = rec.RiskRanking,
                 UnityApplicationId = rec.UnityApplicationId,
+                ExternalStatusVisibility = rec.ExternalStatusVisibility,
 
                 // From ApplicationStatus
                 Status = rec.Status,
@@ -179,7 +182,7 @@ public async Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplica
                     OrgStatus = rec.ApplicantOrgStatus ?? string.Empty,
                     BusinessNumber = rec.ApplicantBusinessNumber ?? string.Empty,
                     OrganizationType = rec.ApplicantOrganizationType ?? string.Empty,
-                    OrganizationSize = rec.ApplicantOrganizationSize ?? string.Empty,
+                    ApproxNumberOfEmployees = rec.ApplicantApproxNumberOfEmployees ?? string.Empty,
                     SectorSubSectorIndustryDesc = rec.ApplicantSectorSubSectorIndustryDesc ?? string.Empty,
                     RedStop = rec.ApplicantRedStop ?? false,
                     IndigenousOrgInd = rec.ApplicantIndigenousOrgInd ?? string.Empty,
@@ -193,7 +196,7 @@ public async Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplica
                 OrgStatus = rec.ApplicantOrgStatus,
                 BusinessNumber = rec.ApplicantBusinessNumber,
                 OrgNumber = rec.ApplicantOrgNumber,
-                OrganizationSize = rec.ApplicantOrganizationSize,
+                ApproxNumberOfEmployees = rec.ApplicantApproxNumberOfEmployees,
                 SectorSubSectorIndustryDesc = rec.ApplicantSectorSubSectorIndustryDesc,
                 Sector = rec.ApplicantSector,
                 SubSector = rec.ApplicantSubSector,
@@ -342,7 +345,7 @@ public async Task<GrantApplicationDto> GetAsync(Guid id)
         {
             appDto.OrganizationName = application.Applicant.OrgName;
             appDto.OrgNumber = application.Applicant.OrgNumber;
-            appDto.OrganizationSize = application.Applicant.OrganizationSize;
+            appDto.ApproxNumberOfEmployees = application.Applicant.ApproxNumberOfEmployees;
             appDto.OrgStatus = application.Applicant.OrgStatus;
             appDto.BusinessNumber = application.Applicant.BusinessNumber;
             appDto.NonRegOrgName = application.Applicant.NonRegOrgName;
@@ -419,6 +422,15 @@ public async Task<GrantApplicationDto> UpdateAssessmentResultsAsync(Guid id, Cre
         return ObjectMapper.Map<Application, GrantApplicationDto>(application);
     }
 
+    [Authorize(UnitySelector.Review.AssessmentResults.Update.Default)]
+    public async Task<GrantApplicationDto> UpdateExternalStatusVisibilityAsync(Guid id, bool externalStatusVisibility)
+    {
+        var application = await applicationRepository.GetAsync(id);
+        application.ExternalStatusVisibility = externalStatusVisibility;
+        await applicationRepository.UpdateAsync(application);
+        return ObjectMapper.Map<Application, GrantApplicationDto>(application);
+    }
+
     private async Task PublishCustomFieldsAsync(Guid applicationId, UpdateProjectInfoDto dto)
     {
         if (dto.WorksheetIds?.Count > 0)
@@ -827,7 +839,7 @@ public async Task UpdateMergedApplicantAsync(Guid applicationId, CreateUpdateApp
         applicant.OrgName = input.OrgName ?? "";
         applicant.OrgNumber = input.OrgNumber ?? "";
         applicant.OrgStatus = input.OrgStatus ?? "";
-        applicant.OrganizationSize = input.OrganizationSize ?? "";
+        applicant.ApproxNumberOfEmployees = input.ApproxNumberOfEmployees ?? "";
         applicant.Sector = input.Sector ?? "";
         applicant.SubSector = input.SubSector ?? "";
         applicant.SectorSubSectorIndustryDesc = input.SectorSubSectorIndustryDesc ?? "";
@@ -1104,6 +1116,16 @@ public async Task<bool> IsApplicantRedStopAsync(Guid applicationId)
     /// <returns>A list of application actions with their state machine permitted and authorization status.</returns>
     public async Task<ListResultDto<ApplicationActionDto>> GetActions(Guid applicationId, bool includeInternal = false)
     {
+        if (await featureChecker.IsEnabledAsync(SpecializationConsts.Onboarding))
+        {
+            var onboardingManager = LazyServiceProvider.LazyGetRequiredService<OnboardingApplicationManager>();
+            var onboardingActionList = await onboardingManager.GetActions(applicationId);
+            var onboardingDtos = ObjectMapper.Map<List<ApplicationActionResultItem>, List<ApplicationActionDto>>(onboardingActionList);
+            foreach (var item in onboardingDtos)
+                item.IsAuthorized = true;
+            return new ListResultDto<ApplicationActionDto>(onboardingDtos);
+        }
+
         var actionList = await applicationManager.GetActions(applicationId);
         var application = await applicationRepository.GetAsync(applicationId, true);
 
@@ -1137,6 +1159,14 @@ private static OperationAuthorizationRequirement GetActionAuthorizationRequireme
     /// <param name="triggerAction">The action to be invoked on an Application</param>
     public async Task<GrantApplicationDto> TriggerAction(Guid applicationId, GrantApplicationAction triggerAction)
     {
+        if (await featureChecker.IsEnabledAsync(SpecializationConsts.Onboarding))
+        {
+            var onboardingManager = LazyServiceProvider.LazyGetRequiredService<OnboardingApplicationManager>();
+            var onboardingApplication = await onboardingManager.TriggerAction(applicationId, triggerAction);
+            await LocalEventBus.PublishAsync(new ApplicationChangedEvent { Action = triggerAction, ApplicationId = applicationId });
+            return ObjectMapper.Map<Application, GrantApplicationDto>(onboardingApplication);
+        }
+
         // AUTHORIZATION HANDLING
         var application = await applicationRepository.GetAsync(applicationId, true);
         if (!await AuthorizationService.IsGrantedAsync(application, GetActionAuthorizationRequirement(triggerAction)))
@@ -1152,156 +1182,93 @@ public async Task<GrantApplicationDto> TriggerAction(Guid applicationId, GrantAp
 
         application = await applicationManager.TriggerAction(applicationId, triggerAction);
 
+        // After the workflow state change, publish to the local event bus
         await LocalEventBus.PublishAsync(
             new ApplicationChangedEvent
             {
-                Action = triggerAction,
-                ApplicationId = applicationId
+                ApplicationId = applicationId,
+                Action = triggerAction,  // e.g. GrantApplicationAction.Approve / Deny
+                TenantId = CurrentTenant.Id
             }
         );
 
         return ObjectMapper.Map<Application, GrantApplicationDto>(application);
     }
 
-    public async Task<AIGenerationRequestDto> QueueAIGenerationAsync(Guid applicationId, string? promptVersion = null)
+    /// <summary>
+    /// Generate a Mermaid graph from the Asssessment workflow.
+    /// </summary>
+    public string? GetWorkflowDiagram(bool isDirectApproval)
     {
-        await EnsureAIAnalysisEnabledAsync();
-        return await QueueApplicationAnalysisAsync(applicationId, promptVersion);
+        return applicationManager.GetWorkflowDiagram(isDirectApproval);
     }
 
-    [Authorize(AIPermissions.Analysis.GenerateApplicationAnalysis)]
-    public async Task<AIGenerationRequestDto> QueueApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null)
+    private async Task EnsureAIGenerationStatusAccessAsync(string operationType)
     {
-        await EnsureAIAnalysisEnabledAsync();
-        await aiGenerationQueue.QueueApplicationAnalysisAsync(applicationId, CurrentTenant.Id, promptVersion);
-
-        var request = await aiGenerationStatusAppService.GetLatestAsync(
-            applicationId,
-            AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType,
-            CurrentTenant.Id);
-
-        return request ?? throw new UserFriendlyException("Unable to queue AI analysis request.");
-    }
-
-    [Authorize(AIPermissions.Analysis.GenerateAttachmentSummaries)]
-    public async Task<AIGenerationRequestDto> QueueAttachmentSummaryAsync(QueueAttachmentSummaryRequestDto input, string? promptVersion = null)
-    {
-        await EnsureAttachmentSummariesEnabledAsync();
-        var attachmentIds = await ResolveAttachmentSummaryIdsAsync(input);
-        await aiGenerationQueue.QueueAttachmentSummaryAsync(input.ApplicationId, CurrentTenant.Id, promptVersion, attachmentIds);
-
-        var request = await aiGenerationStatusAppService.GetLatestAsync(
-            input.ApplicationId,
-            AIGenerationRequestKeyHelper.AttachmentSummaryOperationType,
-            CurrentTenant.Id);
-
-        return request ?? throw new UserFriendlyException("Unable to queue AI attachment summary request.");
+        switch (operationType)
+        {
+            case AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType:
+                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewApplicationAnalysis);
+                return;
+            case AIGenerationRequestKeyHelper.AttachmentSummaryOperationType:
+                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewAttachmentSummary);
+                return;
+            case AIGenerationRequestKeyHelper.ApplicationScoringOperationType:
+                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewScoringResult);
+                return;
+            case AIGenerationRequestKeyHelper.PipelineOperationType:
+                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewApplicationAnalysis);
+                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewAttachmentSummary);
+                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewScoringResult);
+                return;
+            default:
+                throw new UserFriendlyException("Unknown AI generation operation type.");
+        }
     }
 
-    [Authorize(AIPermissions.Analysis.GenerateScoring)]
-    public async Task<AIGenerationRequestDto> QueueApplicationScoringAsync(Guid applicationId, string? promptVersion = null)
+    private async Task EnsureAttachmentSummariesEnabledAsync()
     {
-        await EnsureScoringEnabledAsync();
-        await aiGenerationQueue.QueueApplicationScoringAsync(applicationId, CurrentTenant.Id, promptVersion);
-
-        var request = await aiGenerationStatusAppService.GetLatestAsync(
-            applicationId,
-            AIGenerationRequestKeyHelper.ApplicationScoringOperationType,
-            CurrentTenant.Id);
-
-        return request ?? throw new UserFriendlyException("Unable to queue AI scoring request.");
+        if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
+        {
+            throw new UserFriendlyException("AI attachment summaries are not enabled.");
+        }
     }
 
-    public async Task<AIGenerationRequestDto?> GetAIGenerationStatusAsync(Guid applicationId, string operationType, string? promptVersion = null)
+    private async Task<List<Guid>> ResolveAttachmentSummaryIdsAsync(QueueAttachmentSummaryRequestDto input)
     {
-        await EnsureAIGenerationStatusAccessAsync(operationType);
-        return await aiGenerationStatusAppService.GetLatestAsync(applicationId, operationType, CurrentTenant.Id);
-    }
+        if (input == null)
+        {
+            throw new UserFriendlyException("Attachment summary request is required.");
+        }
 
-    [Authorize(AIPermissions.Analysis.GenerateApplicationAnalysis)]
-    [Authorize(AIPermissions.Analysis.GenerateAttachmentSummaries)]
-    [Authorize(AIPermissions.Analysis.GenerateScoring)]
-    public async Task<AIGenerationRequestDto> QueueAllAIStagesAsync(Guid applicationId, string? promptVersion = null)
-    {
-        await EnsureAttachmentSummariesEnabledAsync();
-        await EnsureAIAnalysisEnabledAsync();
-        await EnsureScoringEnabledAsync();
-        await aiGenerationQueue.QueueAllAIStagesAsync(applicationId, CurrentTenant.Id, promptVersion);
+        if (input.ApplicationId == Guid.Empty)
+        {
+            throw new UserFriendlyException("Application id is required.");
+        }
 
-        var request = await aiGenerationStatusAppService.GetLatestAsync(
-            applicationId,
-            AIGenerationRequestKeyHelper.PipelineOperationType,
-            CurrentTenant.Id);
+        var applicationAttachmentIds = (await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == input.ApplicationId))
+            .Select(a => a.Id)
+            .ToList();
 
-        return request ?? throw new UserFriendlyException("Unable to queue AI generation request.");
-    }
+        if (applicationAttachmentIds.Count == 0)
+        {
+            throw new UserFriendlyException("No attachments were found to generate summaries.");
+        }
 
-    private async Task EnsureAIGenerationStatusAccessAsync(string operationType)
-    {
-        switch (operationType)
-        {
-            case AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType:
-                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewApplicationAnalysis);
-                return;
-            case AIGenerationRequestKeyHelper.AttachmentSummaryOperationType:
-                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewAttachmentSummary);
-                return;
-            case AIGenerationRequestKeyHelper.ApplicationScoringOperationType:
-                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewScoringResult);
-                return;
-            case AIGenerationRequestKeyHelper.PipelineOperationType:
-                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewApplicationAnalysis);
-                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewAttachmentSummary);
-                await AuthorizationService.CheckAsync(AIPermissions.Analysis.ViewScoringResult);
-                return;
-            default:
-                throw new UserFriendlyException("Unknown AI generation operation type.");
+        if (input.AttachmentIds is not { Count: > 0 })
+        {
+            return applicationAttachmentIds;
         }
-    }
 
-    private async Task EnsureAttachmentSummariesEnabledAsync()
-    {
-        if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
-        {
-            throw new UserFriendlyException("AI attachment summaries are not enabled.");
-        }
-    }
-
-    private async Task<List<Guid>> ResolveAttachmentSummaryIdsAsync(QueueAttachmentSummaryRequestDto input)
-    {
-        if (input == null)
-        {
-            throw new UserFriendlyException("Attachment summary request is required.");
-        }
-
-        if (input.ApplicationId == Guid.Empty)
-        {
-            throw new UserFriendlyException("Application id is required.");
-        }
-
-        var applicationAttachmentIds = (await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == input.ApplicationId))
-            .Select(a => a.Id)
-            .ToList();
-
-        if (applicationAttachmentIds.Count == 0)
-        {
-            throw new UserFriendlyException("No attachments were found to generate summaries.");
-        }
-
-        if (input.AttachmentIds is not { Count: > 0 })
-        {
-            return applicationAttachmentIds;
-        }
-
-        var applicationAttachmentIdSet = applicationAttachmentIds.ToHashSet();
-        var selectedAttachmentIds = input.AttachmentIds.Distinct().ToList();
-        if (selectedAttachmentIds.Any(id => !applicationAttachmentIdSet.Contains(id)))
-        {
-            throw new UserFriendlyException("One or more selected attachments do not belong to the application.");
-        }
-
-        return selectedAttachmentIds;
-    }
+        var applicationAttachmentIdSet = applicationAttachmentIds.ToHashSet();
+        var selectedAttachmentIds = input.AttachmentIds.Distinct().ToList();
+        if (selectedAttachmentIds.Any(id => !applicationAttachmentIdSet.Contains(id)))
+        {
+            throw new UserFriendlyException("One or more selected attachments do not belong to the application.");
+        }
+
+        return selectedAttachmentIds;
+    }
 
     private async Task EnsureAIAnalysisEnabledAsync()
     {
@@ -1337,12 +1304,37 @@ from applicant in applicantGroup.DefaultIfEmpty()
                         UnityApplicationId = applications.UnityApplicationId ?? string.Empty,
                         ApplicantName = applicant != null ? (applicant.ApplicantName ?? GrantManagerConsts.UnknownValue) : GrantManagerConsts.UnknownValue,
                         OrganizationName = applicant != null ? (applicant.OrgName ?? string.Empty) : string.Empty,
-                        UnityApplicantId = applicant != null ? (applicant.UnityApplicantId ?? string.Empty) : string.Empty
+                        UnityApplicantId = applicant != null ? (applicant.UnityApplicantId ?? string.Empty) : string.Empty,
+                        ExternalStatusVisibility = applications.ExternalStatusVisibility
                     };
 
         return await query.ToListAsync();
     }
 
+    public async Task<GrantApplicationLiteDto> GetBasicAsync(Guid id)
+    {
+        var applicationsQuery = await applicationRepository.GetQueryableAsync();
+        var applicantsQuery = await applicantRepository.GetQueryableAsync();
+
+        var query = from applications in applicationsQuery
+                    join applicant in applicantsQuery on applications.ApplicantId equals applicant.Id into applicantGroup
+                    from applicant in applicantGroup.DefaultIfEmpty()
+                    where applications.Id == id
+                    select new GrantApplicationLiteDto
+                    {
+                        Id = applications.Id,
+                        ProjectName = applications.ProjectName,
+                        ReferenceNo = applications.ReferenceNo,
+                        UnityApplicationId = applications.UnityApplicationId ?? string.Empty,
+                        ApplicantName = applicant != null ? (applicant.ApplicantName ?? GrantManagerConsts.UnknownValue) : GrantManagerConsts.UnknownValue,
+                        OrganizationName = applicant != null ? (applicant.OrgName ?? string.Empty) : string.Empty,
+                        UnityApplicantId = applicant != null ? (applicant.UnityApplicantId ?? string.Empty) : string.Empty,
+                        ExternalStatusVisibility = applications.ExternalStatusVisibility
+                    };
+
+        return await query.FirstOrDefaultAsync() ?? throw new EntityNotFoundException();
+    }
+
     private static Dictionary<string, object> ExtractCustomFieldsForWorksheet(dynamic customFields, Guid worksheetId)
     {
         var result = new Dictionary<string, object>();
@@ -1366,14 +1358,30 @@ public async Task<string> DismissAIAnalysisItemAsync(Guid applicationId, string
         return await UpdateAIAnalysisItemDismissedStateAsync(applicationId, itemId, isDismissed: true);
     }
 
-    public async Task<string> RestoreAIAnalysisItemAsync(Guid applicationId, string itemId)
-    {
-        return await UpdateAIAnalysisItemDismissedStateAsync(applicationId, itemId, isDismissed: false);
-    }
-
-    private async Task<string> UpdateAIAnalysisItemDismissedStateAsync(Guid applicationId, string itemId, bool isDismissed)
-    {
-        if (string.IsNullOrWhiteSpace(itemId))
+    public async Task<string> RestoreAIAnalysisItemAsync(Guid applicationId, string itemId)
+    {
+        return await UpdateAIAnalysisItemDismissedStateAsync(applicationId, itemId, isDismissed: false);
+    }
+
+    public async Task<AIGenerationStatusDto> GetAIGenerationStatusAsync(Guid applicationId, string operationType)
+    {
+        await EnsureAIGenerationStatusAccessAsync(operationType);
+
+        var request = await aiGenerationStatusAppService.GetLatestAsync(applicationId, operationType, CurrentTenant.Id);
+        var state = await aiRateLimiter.GetStateAsync();
+
+        return new AIGenerationStatusDto
+        {
+            GenerationRequest = request,
+            IsGenerating = state.IsGenerating,
+            RetryAfterSeconds = state.RetryAfterSeconds,
+            FailureReason = request?.FailureReason
+        };
+    }
+
+    private async Task<string> UpdateAIAnalysisItemDismissedStateAsync(Guid applicationId, string itemId, bool isDismissed)
+    {
+        if (string.IsNullOrWhiteSpace(itemId))
         {
             throw new UserFriendlyException("AI analysis item id is required.");
         }
@@ -1462,4 +1470,4 @@ private static void UpdateFindingDismissedState(IEnumerable<ApplicationAnalysisF
             return null;
         }
     }
-}
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs
index c2eca7860d..01bd3c112c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs
@@ -1,6 +1,7 @@
 using Riok.Mapperly.Abstractions;
 using System;
 using System.Reflection;
+using Unity.AI.Operations;
 using Unity.GrantManager.ApplicantProfile;
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.Applications;
@@ -122,7 +123,7 @@ public partial class ApplicationToGrantApplicationDtoMapper : MapperBase<Applica
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrganizationType))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrgStatus))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.BusinessNumber))]
-    [MapperIgnoreTarget(nameof(GrantApplicationDto.OrganizationSize))]
+    [MapperIgnoreTarget(nameof(GrantApplicationDto.ApproxNumberOfEmployees))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrgNumber))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.SectorSubSectorIndustryDesc))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.PaymentInfo))]
@@ -163,7 +164,7 @@ public partial class ApplicationToGrantApplicationDtoMapper : MapperBase<Applica
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrganizationType))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrgStatus))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.BusinessNumber))]
-    [MapperIgnoreTarget(nameof(GrantApplicationDto.OrganizationSize))]
+    [MapperIgnoreTarget(nameof(GrantApplicationDto.ApproxNumberOfEmployees))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrgNumber))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.SectorSubSectorIndustryDesc))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.PaymentInfo))]
@@ -216,6 +217,7 @@ public partial class PersonToGrantApplicationAssigneeDtoMapper : MapperBase<Pers
 }
 
 [Mapper] public partial class ApplicationStatusToApplicationStatusDtoMapper : MapperBase<ApplicationStatus, ApplicationStatusDto> { public override partial ApplicationStatusDto Map(ApplicationStatus source); public override partial void Map(ApplicationStatus source, ApplicationStatusDto destination); }
+[Mapper] public partial class ApplicationStatusToApplicantPortalStatusDtoMapper : MapperBase<ApplicationStatus, ApplicantPortalStatusDto> { public override partial ApplicantPortalStatusDto Map(ApplicationStatus source); public override partial void Map(ApplicationStatus source, ApplicantPortalStatusDto destination); }
 
 [Mapper]
 public partial class AssessmentCommentToCommentDtoMapper : MapperBase<AssessmentComment, CommentDto>
@@ -536,7 +538,6 @@ public partial class ApplicationActionResultItemToDtoMapper : MapperBase<Applica
 [Mapper] public partial class CommunityToDtoMapper : MapperBase<Community, CommunityDto> { public override partial CommunityDto Map(Community source); public override partial void Map(Community source, CommunityDto destination); }
 [Mapper] public partial class RegionalDistrictToDtoMapper : MapperBase<RegionalDistrict, RegionalDistrictDto> { public override partial RegionalDistrictDto Map(RegionalDistrict source); public override partial void Map(RegionalDistrict source, RegionalDistrictDto destination); }
 [Mapper] public partial class ApplicationTagsToDtoMapper : MapperBase<ApplicationTags, ApplicationTagsDto> { public override partial ApplicationTagsDto Map(ApplicationTags source); public override partial void Map(ApplicationTags source, ApplicationTagsDto destination); }
-[Mapper] public partial class AIGenerationRequestToDtoMapper : MapperBase<AIGenerationRequest, AIGenerationRequestDto> { public override partial AIGenerationRequestDto Map(AIGenerationRequest source); public override partial void Map(AIGenerationRequest source, AIGenerationRequestDto destination); }
 [Mapper(AllowNullPropertyAssignment = true)]
 public partial class ApplicantToGrantApplicationApplicantDtoMapper : MapperBase<Applicant, GrantApplicationApplicantDto>
 {
@@ -769,6 +770,16 @@ public partial class ReportsHistoryDtoToEntityMapper : MapperBase<ReportsHistory
     public override partial void Map(ReportsHistoryDto source, ReportsHistory destination);
 }
 
+[Mapper]
+public partial class ApplicationToAIApplicationPromptDataDtoMapper : MapperBase<Application, AIApplicationPromptDataDto>
+{
+    [MapProperty(nameof(Application.Id), nameof(AIApplicationPromptDataDto.ApplicationId))]
+    public override partial AIApplicationPromptDataDto Map(Application source);
+
+    [MapProperty(nameof(Application.Id), nameof(AIApplicationPromptDataDto.ApplicationId))]
+    public override partial void Map(Application source, AIApplicationPromptDataDto destination);
+}
+
 [Mapper]
 public partial class ApplicationToApplicantInfoDtoMapper : MapperBase<Application, ApplicantInfoDto>
 {
@@ -967,6 +978,13 @@ public override void Map(UpdateApplicantSummaryDto source, Applicant destination
         {
             destination.IndigenousOrgInd = GrantManagerMapperlyHelpers.BoolToIndigenousOrgInd(source.IndigenousOrgInd);
         }
+
+        // FiscalDay: DTO is string?, entity is int? — CopyNonDefault skips mismatched
+        // types entirely, so the value is never written without this explicit conversion.
+        if (source.FiscalDay != null)
+        {
+            destination.FiscalDay = int.TryParse(source.FiscalDay, out var d) ? d : null;
+        }
     }
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
index 376f652db0..d131c10dac 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
@@ -9,6 +9,7 @@
 using System.Text.Json.Serialization;
 using Unity.GrantManager.Assessments;
 using Unity.GrantManager.Attachments;
+using Unity.GrantManager.Events;
 using Unity.GrantManager.Intake;
 using Unity.GrantManager.Integrations.Css;
 using Unity.TenantManagement;
@@ -149,6 +150,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
         context.Services.AddScoped<IGeocoderApiService, GeocoderApiService>();    
         context.Services.AddScoped<IAnalyticsUrlProvider, MatomoUrlProvider>();
         context.Services.AddScoped<GeocoderApiService>();
+        context.Services.AddScoped<ScheduledNotificationHelper>();
 
         context.Services.Configure<CasClientOptions>(configuration.GetSection("Payments"));
         context.Services.Configure<CssApiOptions>(configuration.GetSection("CssApi"));
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/OrganizationEditHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/OrganizationEditHandler.cs
index 78770d0bf5..a5dcf37ede 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/OrganizationEditHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/OrganizationEditHandler.cs
@@ -32,7 +32,7 @@ public virtual async Task<string> HandleAsync(PluginDataPayload payload)
         applicant.OrgStatus = innerData.Status;
         applicant.NonRegOrgName = innerData.NonRegOrgName;
         applicant.FiscalMonth = innerData.FiscalMonth;
-        applicant.OrganizationSize = innerData.OrganizationSize;
+        applicant.ApproxNumberOfEmployees = innerData.ApproxNumberOfEmployees ?? innerData.OrganizationSize;
 
         if (int.TryParse(innerData.FiscalDay, out var fiscalDay))
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Messages/Commands/OrganizationEditData.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Messages/Commands/OrganizationEditData.cs
index e2d08dc007..48deb25541 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Messages/Commands/OrganizationEditData.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Messages/Commands/OrganizationEditData.cs
@@ -25,6 +25,13 @@ public class OrganizationEditData
     [JsonProperty("fiscalDay")]
     public string? FiscalDay { get; set; }
 
+    // Kept for Grants Portal backward compatibility — portal sends "organizationSize" in the PUT payload.
+    // OrganizationEditHandler falls back to this value when ApproxNumberOfEmployees is not present.
     [JsonProperty("organizationSize")]
     public string? OrganizationSize { get; set; }
+
+    // Preferred field — portal developer should migrate the PUT payload to send "approxNumberOfEmployees"
+    // instead of "organizationSize" after deployment. Handler uses this when present.
+    [JsonProperty("approxNumberOfEmployees")]
+    public string? ApproxNumberOfEmployees { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Handlers/TenantCreatedEventHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Handlers/TenantCreatedEventHandler.cs
index a210176c75..7f725c1034 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Handlers/TenantCreatedEventHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Handlers/TenantCreatedEventHandler.cs
@@ -1,9 +1,12 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Unity.GrantManager.Data;
 using Unity.GrantManager.Identity;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus;
+using Volo.Abp.FeatureManagement;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.TenantManagement;
 
@@ -15,18 +18,20 @@ public class TenantCreatedEventHandler
         private readonly ITenantRepository _tenantRepository;
         private readonly ICurrentTenant _currentTenant;
         private readonly IUserImportAppService _userImportAppService;
-
+        private readonly IFeatureAppService _featureAppService;
         private readonly GrantManagerDbMigrationService _grantManagerDbMigrationService;
 
         public TenantCreatedEventHandler(ITenantRepository tenantRepository,
             ICurrentTenant currentTenant,
             IUserImportAppService userImportAppService,
+            IFeatureAppService featureAppService,
             GrantManagerDbMigrationService grantManagerDbMigrationService)
         {
             _tenantRepository = tenantRepository;
             _grantManagerDbMigrationService = grantManagerDbMigrationService;
             _currentTenant = currentTenant;
             _userImportAppService = userImportAppService;
+            _featureAppService = featureAppService;
         }
 
         public async Task HandleEventAsync(TenantCreatedEto tenantCreatedEto)
@@ -42,6 +47,33 @@ await _grantManagerDbMigrationService
                 await _userImportAppService.ImportUserAsync(new ImportUserDto()
                 { Directory = "IDIR", Guid = userIdentifier, Roles = new string[] { UnityRoles.ProgramManager } });
             }
+
+            await EnableRequestedFeaturesAsync(tenantCreatedEto, tenant.Id);
+        }
+
+        private async Task EnableRequestedFeaturesAsync(TenantCreatedEto eto, Guid tenantId)
+        {
+            if (!eto.Properties.TryGetValue("FeatureKeys", out var featureKeysRaw))
+                return;
+
+            var featureUpdates = BuildFeatureUpdates(featureKeysRaw);
+            if (featureUpdates.Count == 0) return;
+
+            await _featureAppService.UpdateAsync(
+                "T", // TenantFeatureValueProvider.ProviderName
+                tenantId.ToString(),
+                new UpdateFeaturesDto { Features = featureUpdates });
+        }
+
+        internal static List<UpdateFeatureDto> BuildFeatureUpdates(string? featureKeysRaw)
+        {
+            if (string.IsNullOrWhiteSpace(featureKeysRaw))
+                return [];
+
+            return featureKeysRaw
+                .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+                .Select(key => new UpdateFeatureDto { Name = key, Value = "true" })
+                .ToList();
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/HealthChecks/BackgroundWorkers/DataHealthCheckWorker.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/HealthChecks/BackgroundWorkers/DataHealthCheckWorker.cs
index 055ebe647d..23b42e4cdb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/HealthChecks/BackgroundWorkers/DataHealthCheckWorker.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/HealthChecks/BackgroundWorkers/DataHealthCheckWorker.cs
@@ -118,11 +118,12 @@ private async Task SendEmailAlert(string emailBody, string subject)
             </html>";
 
             await _emailNotificationService.SendEmailNotification(
-                "grantmanagementsupport@gov.bc.ca",
-                htmlBody,
-                subject,
-                "NoReply@gov.bc.ca", "html",
-                "");
+                new EmailMessageParams(
+                    "grantmanagementsupport@gov.bc.ca",
+                    htmlBody,
+                    subject,
+                    "NoReply@gov.bc.ca",
+                    ""), "html");
 
             Logger.LogInformation("Missing Alerts Sent...");
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/CssOnboardingUserLookup.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/CssOnboardingUserLookup.cs
new file mode 100644
index 0000000000..37aaed4647
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/CssOnboardingUserLookup.cs
@@ -0,0 +1,24 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.Integrations.Css;
+using Unity.TenantManagement;
+using Volo.Abp;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.GrantManager.Identity;
+
+[RemoteService(false)]
+[ExposeServices(typeof(IOnboardingUserLookup))]
+public class CssOnboardingUserLookup(ICssUsersApiService cssUsersApiService)
+    : IOnboardingUserLookup, ITransientDependency
+{
+    public async Task<string?> FindUserGuidByEmailAsync(string email)
+    {
+        var result = await cssUsersApiService.SearchUsersAsync("idir", email: email);
+        if (!result.Success || result.Data == null || result.Data.Length == 0)
+            return null;
+
+        var guid = result.Data[0].Attributes?.IdirUserGuid?.FirstOrDefault();
+        return string.IsNullOrWhiteSpace(guid) ? null : guid;
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/JWTTokenAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/JWTTokenAppService.cs
index fbffc4435c..4f0874e3e2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/JWTTokenAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/JWTTokenAppService.cs
@@ -5,8 +5,10 @@
 using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
+using Unity.AI.Permissions;
 using Unity.Modules.Shared.Permissions;
 using Volo.Abp;
+using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Users;
 
@@ -18,20 +20,28 @@ public class JwtTokenAppService : GrantManagerAppService
         private readonly ICurrentTenant _currentTenant;
         private readonly ICurrentUser _currentUser;
         private readonly IConfiguration _configuration;
+        private readonly IPermissionChecker _permissionChecker;
 
-        public JwtTokenAppService(ICurrentTenant currentTenant, ICurrentUser currentUser, IConfiguration configuration)
+        public JwtTokenAppService(
+            ICurrentTenant currentTenant,
+            ICurrentUser currentUser,
+            IConfiguration configuration,
+            IPermissionChecker permissionChecker)
         {
             _currentTenant = currentTenant;
             _currentUser = currentUser;
             _configuration = configuration;
+            _permissionChecker = permissionChecker;
         }
 
-        public Task<string> GenerateJWTTokenAsync()
+        public async Task<string> GenerateJWTTokenAsync()
         {
             // Get user & tenant info
             var userId = _currentUser.GetId().ToString();
             var tenant = _currentTenant.Name ?? "UnknownTenant";
             var isITAdmin = _currentUser.IsInRole(IdentityConsts.ITAdminRoleName);
+            var canEditDataModel = await _permissionChecker.IsGrantedAsync(
+                AIPermissions.Reporting.CreateEditDataModel);
 
             // Build claims
             var claims = new[]
@@ -39,6 +49,7 @@ public Task<string> GenerateJWTTokenAsync()
                 new Claim("user_id", userId),
                 new Claim("tenant", tenant),
                 new Claim("is_it_admin", isITAdmin.ToString().ToLower()),
+                new Claim("can_edit_data_model", canEditDataModel.ToString().ToLower()),
                 new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString())
             };
 
@@ -63,7 +74,7 @@ public Task<string> GenerateJWTTokenAsync()
 
             // Return encoded JWT
             var jwt = new JwtSecurityTokenHandler().WriteToken(token);
-            return Task.FromResult(jwt);
+            return jwt;
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UnityPermissionAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UnityPermissionAppService.cs
index 4eff3d210f..48e2774535 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UnityPermissionAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UnityPermissionAppService.cs
@@ -1,9 +1,11 @@
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.SimpleStateChecking;
+using Volo.Abp.Security.Claims;
 
 namespace Unity.GrantManager.Identity;
 
@@ -21,10 +23,14 @@ public class UnityPermissionAppService(
 {
     protected override Task<bool> HasAdminRoleAsync()
     {
+        // AbpClaimTypes.Role (not UnityClaimsTypes.Role/"client_roles") - it's dynamically
+        // recomputed by ABP from the DB on every request, so it reflects the user's current
+        // DB-assigned roles even though the cookie no longer stamps them at login.
+        var roles = CurrentUser.FindClaims(AbpClaimTypes.Role).Select(c => c.Value);
         return Task.FromResult(
-            CurrentUser.IsInRole("admin") ||
-            CurrentUser.IsInRole(UnityRoles.SystemAdmin) ||
-            CurrentUser.IsInRole(UnityRoles.ProgramManager)
+            roles.Contains("admin") ||
+            roles.Contains(UnityRoles.SystemAdmin) ||
+            roles.Contains(UnityRoles.ProgramManager)
         );
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs
index 01547def96..0fdbe22eaf 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs
@@ -71,7 +71,7 @@ public async Task ImportUserAsync(ImportUserDto importUserDto)
             var displayName = cssUser.Attributes?.DisplayName?[0] ?? identityUser.NormalizedUserName.ToString();
 
             await UpdateAdditionalUserPropertiesAsync(identityUser, oidcSub, displayName);
-            await SyncUserToCurrentTenantAsync(newUserId, identityUser, oidcSub, displayName);
+            await SyncUserToCurrentTenantAsync(identityUser, oidcSub, displayName);
         }
 
         /// <summary>
@@ -104,7 +104,7 @@ public async Task AutoImportUserInternalAsync(ImportUserDto importUserDto,
             }
             
             await UpdateAdditionalUserPropertiesAsync(identityUser, oidcSub, displayName);
-            await SyncUserToCurrentTenantAsync(newUserId, identityUser, oidcSub, displayName);
+            await SyncUserToCurrentTenantAsync(identityUser, oidcSub, displayName);
         }
 
         /// <summary>
@@ -125,7 +125,9 @@ public async Task<IList<UserDto>> SearchAsync(UserSearchDto importUserSearchDto)
                     new ValidationResult("Only idir search is supported")
                 }); // for now
 
-            if (string.IsNullOrEmpty(importUserSearchDto.FirstName) && string.IsNullOrEmpty(importUserSearchDto.LastName))
+            if (string.IsNullOrEmpty(importUserSearchDto.FirstName) &&
+                string.IsNullOrEmpty(importUserSearchDto.LastName) &&
+                string.IsNullOrEmpty(importUserSearchDto.Email))
                 return users;
 
             if (!string.IsNullOrEmpty(importUserSearchDto.FirstName) && importUserSearchDto.FirstName.Length < 2)
@@ -146,7 +148,16 @@ public async Task<IList<UserDto>> SearchAsync(UserSearchDto importUserSearchDto)
                     });
             }
 
-            var result = await _cssUsersApiService.SearchUsersAsync(importUserSearchDto.Directory, importUserSearchDto.FirstName, importUserSearchDto.LastName);
+            if (!string.IsNullOrEmpty(importUserSearchDto.Email) && importUserSearchDto.Email.Length < 2)
+            {
+                throw new AbpValidationException("Validation Error",
+                    new List<ValidationResult>()
+                    {
+                        new ValidationResult("Email length must be greater than 2")
+                    });
+            }
+
+            var result = await _cssUsersApiService.SearchUsersAsync(importUserSearchDto.Directory, importUserSearchDto.FirstName, importUserSearchDto.LastName, importUserSearchDto.Email);
 
             if (!result.Success) throw new UserFriendlyException("Error searching directory users");
 
@@ -227,14 +238,14 @@ public async Task SetUserRolesAsync(Guid userId, string[] roleNames)
             return null;
         }       
 
-        private async Task SyncUserToCurrentTenantAsync(Guid userId, IdentityUser user, string oidcSub, string displayName)
+        private async Task SyncUserToCurrentTenantAsync(IdentityUser user, string oidcSub, string displayName)
         {
-            var existingUser = await _personRepository.FindByOidcSub(oidcSub);            
+            var existingUser = await _personRepository.FindByOidcSub(oidcSub);
             if (existingUser == null)
             {
                 await _personRepository.InsertAsync(new Person()
                 {
-                    Id = userId,
+                    Id = user.Id,
                     OidcSub = oidcSub.ToSubjectWithoutIdp(),
                     OidcDisplayName = displayName,
                     FullName = $"{user.Name} {user.Surname}",
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ApplicantLookupService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ApplicantLookupService.cs
index 33cd8db501..48bdcb431f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ApplicantLookupService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ApplicantLookupService.cs
@@ -32,7 +32,7 @@ public async Task<string> ApplicantLookupByApplicantId(string unityApplicantId)
             try
             {
                 Applicant? applicant = await applicantRepository.GetByUnityApplicantIdAsync(unityApplicantId);
-                if (applicant == null)
+                if (applicant == null || applicant.IsDeleted)
                 {
                     throw new KeyNotFoundException("Applicant not found.");
                 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/BackgroundWorkers/IntakeSyncWorker.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/BackgroundWorkers/IntakeSyncWorker.cs
index 5f90f6eb81..dd35d8aaf0 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/BackgroundWorkers/IntakeSyncWorker.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/BackgroundWorkers/IntakeSyncWorker.cs
@@ -92,11 +92,12 @@ public override async Task Execute(IJobExecutionContext context)
                 </html>";
 
                 await _emailNotificationService.SendEmailNotification(
-                    "grantmanagementsupport@gov.bc.ca",
-                    htmlBody,
-                    "Unity Failed Submissions Notification",
-                    "NoReply@gov.bc.ca", "html",
-                    ""); 
+                    new EmailMessageParams(
+                        "grantmanagementsupport@gov.bc.ca",
+                        htmlBody,
+                        "Unity Failed Submissions Notification",
+                        "NoReply@gov.bc.ca",
+                        ""), "html"); 
 
                 Logger.LogInformation("Missing Submissions Email Sent...");
             }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ChefsAttachmentDownloadService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ChefsAttachmentDownloadService.cs
new file mode 100644
index 0000000000..cc8f1116c7
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ChefsAttachmentDownloadService.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Net.Http;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.Attachments;
+using Unity.GrantManager.Integrations;
+using Unity.Modules.Shared.Http;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Linq;
+using Volo.Abp.Security.Encryption;
+
+namespace Unity.GrantManager.Intakes;
+
+public class ChefsAttachmentDownloadService(
+    IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
+    IRepository<ApplicationForm, Guid> applicationFormRepository,
+    IAsyncQueryableExecuter asyncExecuter,
+    IEndpointManagementAppService endpointManagementAppService,
+    IResilientHttpRequest resilientRestClient,
+    IStringEncryptionService stringEncryptionService) : IChefsAttachmentDownloadService, ITransientDependency
+{
+    [Volo.Abp.Uow.UnitOfWork(isTransactional: false)]
+    public async Task<BlobDto> DownloadAsync(Guid? formSubmissionId, Guid? chefsFileAttachmentId, string name)
+    {
+        if (formSubmissionId == null)
+        {
+            throw new ApiException(400, "Missing required parameter 'formId' when calling GetSubmission");
+        }
+
+        if (chefsFileAttachmentId == null)
+        {
+            throw new ApiException(400, "Missing required parameter 'chefsFileAttachmentId' when calling GetFileAttachment");
+        }
+
+        ApplicationForm? applicationForm = await GetApplicationFormBySubmissionId(formSubmissionId)
+            ?? throw new ApiException(400, "Missing Form configuration");
+
+        if (applicationForm.ChefsApplicationFormGuid == null)
+        {
+            throw new ApiException(400, "Missing CHEFS form Id");
+        }
+
+        if (applicationForm.ApiKey == null)
+        {
+            throw new ApiException(400, "Missing CHEFS Api Key");
+        }
+
+        string chefsApi = await endpointManagementAppService.GetChefsApiBaseUrlAsync();
+        string url = $"{chefsApi}/files/{chefsFileAttachmentId}";
+        var decryptedApiKey = stringEncryptionService.Decrypt(applicationForm.ApiKey!);
+
+        using var response = await resilientRestClient.HttpAsync(
+            HttpMethod.Get,
+            url,
+            null,
+            null,
+            basicAuth: (applicationForm.ChefsApplicationFormGuid!, decryptedApiKey ?? string.Empty)
+        );
+
+        if (((int)response.StatusCode) != 200)
+        {
+            var errorContent = response.Content != null ? await response.Content.ReadAsStringAsync() : string.Empty;
+            throw new ApiException((int)response.StatusCode, "Error calling GetChefsFileAttachment: " + errorContent, response.ReasonPhrase ?? $"{response.StatusCode}");
+        }
+
+        var contentBytes = response.Content != null ? await response.Content.ReadAsByteArrayAsync() : [];
+        var contentType = response.Content?.Headers?.ContentType?.MediaType ?? "application/octet-stream";
+        if (!string.IsNullOrEmpty(name) && name.Contains('%'))
+        {
+            name = Uri.UnescapeDataString(name);
+        }
+
+        return new BlobDto { Name = name, Content = contentBytes, ContentType = contentType };
+    }
+
+    private async Task<ApplicationForm?> GetApplicationFormBySubmissionId(Guid? formSubmissionId)
+    {
+        ApplicationForm? applicationFormData = null;
+
+        if (formSubmissionId != null)
+        {
+            var query = from applicationSubmission in await applicationFormSubmissionRepository.GetQueryableAsync()
+                        join applicationForm in await applicationFormRepository.GetQueryableAsync() on applicationSubmission.ApplicationFormId equals applicationForm.Id
+                        where applicationSubmission.ChefsSubmissionGuid == formSubmissionId.ToString()
+                        select applicationForm;
+            applicationFormData = await asyncExecuter.FirstOrDefaultAsync(query);
+        }
+        return applicationFormData;
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ChefsFileAttachmentStreamProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ChefsFileAttachmentStreamProvider.cs
index d043403326..07e9587f77 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ChefsFileAttachmentStreamProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/ChefsFileAttachmentStreamProvider.cs
@@ -1,102 +1,41 @@
+using Microsoft.Extensions.Logging;
 using System;
 using System.IO;
-using System.Net.Http;
 using System.Threading.Tasks;
-using Unity.GrantManager.Applications;
-using Unity.GrantManager.Integrations;
-using Unity.Modules.Shared.Http;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Security.Encryption;
 
 namespace Unity.GrantManager.Intakes;
 
 public class ChefsFileAttachmentStreamProvider(
-    IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
-    IRepository<ApplicationForm, Guid> applicationFormRepository,
-    IEndpointManagementAppService endpointManagementAppService,
-    IResilientHttpRequest resilientRestClient,
-    IStringEncryptionService stringEncryptionService)
+    IChefsAttachmentDownloadService chefsAttachmentDownloadService,
+    ILogger<ChefsFileAttachmentStreamProvider> logger)
     : IChefsFileAttachmentStreamProvider, ITransientDependency
 {
     public async Task<ChefsFileAttachmentStream> OpenAsync(Guid formSubmissionId, Guid chefsFileAttachmentId, string name)
     {
-        var applicationForm = await GetApplicationFormBySubmissionId(formSubmissionId)
-            ?? throw new ApiException(400, "Missing Form configuration");
-
-        if (applicationForm.ChefsApplicationFormGuid == null)
-        {
-            throw new ApiException(400, "Missing CHEFS form Id");
-        }
-
-        if (applicationForm.ApiKey == null)
-        {
-            throw new ApiException(400, "Missing CHEFS Api Key");
-        }
-
-        var chefsApi = await endpointManagementAppService.GetChefsApiBaseUrlAsync();
-        var url = $"{chefsApi}/files/{chefsFileAttachmentId}";
-        var decryptedApiKey = stringEncryptionService.Decrypt(applicationForm.ApiKey);
-
-        using var response = await resilientRestClient.HttpAsync(
-            HttpMethod.Get,
-            url,
-            null,
-            null,
-            basicAuth: (applicationForm.ChefsApplicationFormGuid, decryptedApiKey ?? string.Empty),
-            completionOption: HttpCompletionOption.ResponseHeadersRead
-        );
-
-        if (((int)response.StatusCode) != 200)
-        {
-            var errorContent = response.Content != null ? await response.Content.ReadAsStringAsync() : string.Empty;
-            throw new ApiException((int)response.StatusCode, "Error calling GetChefsFileAttachment: " + errorContent, response.ReasonPhrase ?? $"{response.StatusCode}");
-        }
-
-        var contentType = response.Content?.Headers?.ContentType?.MediaType ?? "application/octet-stream";
-        var extension = !string.IsNullOrEmpty(name) ? Path.GetExtension(Uri.UnescapeDataString(name)) : string.Empty;
-        var tempPath = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid():N}{extension}");
-
         try
         {
-            await using (var writeStream = new FileStream(tempPath, FileMode.CreateNew, FileAccess.Write, FileShare.None, 81920, FileOptions.Asynchronous | FileOptions.SequentialScan))
-            await using (var contentStream = await response.Content!.ReadAsStreamAsync())
-            {
-                await contentStream.CopyToAsync(writeStream);
-            }
-
-            var readStream = new FileStream(tempPath, FileMode.Open, FileAccess.Read, FileShare.Read, 81920, FileOptions.Asynchronous | FileOptions.SequentialScan | FileOptions.DeleteOnClose);
-            return new ChefsFileAttachmentStream(readStream, contentType);
+            var file = await chefsAttachmentDownloadService.DownloadAsync(formSubmissionId, chefsFileAttachmentId, name);
+            var content = file.Content ?? [];
+            var stream = new MemoryStream(content, writable: false);
+
+            logger.LogInformation(
+                "Opened CHEFS attachment {ChefsFileAttachmentId} for submission {FormSubmissionId}. ContentType: {ContentType}; DownloadedLength: {DownloadedLength}.",
+                chefsFileAttachmentId,
+                formSubmissionId,
+                file.ContentType,
+                content.Length);
+
+            return new ChefsFileAttachmentStream(stream, file.ContentType);
         }
-        catch
+        catch (Exception ex)
         {
-            TryDeleteTempFile(tempPath);
+            logger.LogWarning(
+                ex,
+                "Failed to open CHEFS attachment {ChefsFileAttachmentId} for submission {FormSubmissionId}.",
+                chefsFileAttachmentId,
+                formSubmissionId);
             throw;
         }
     }
-
-    private async Task<ApplicationForm?> GetApplicationFormBySubmissionId(Guid formSubmissionId)
-    {
-        var submission = await applicationFormSubmissionRepository.FirstOrDefaultAsync(
-            x => x.ChefsSubmissionGuid == formSubmissionId.ToString());
-
-        return submission == null
-            ? null
-            : await applicationFormRepository.FirstOrDefaultAsync(x => x.Id == submission.ApplicationFormId);
-    }
-
-    private static void TryDeleteTempFile(string tempPath)
-    {
-        try
-        {
-            if (File.Exists(tempPath))
-            {
-                File.Delete(tempPath);
-            }
-        }
-        catch
-        {
-            // Best-effort cleanup; never throw from cleanup path.
-        }
-    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/IntakeFormSubmissionManager.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/IntakeFormSubmissionManager.cs
index a44176990f..ed497b2a36 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/IntakeFormSubmissionManager.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/IntakeFormSubmissionManager.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Linq;
@@ -8,12 +7,14 @@
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.Intakes.Events;
+using Unity.GrantManager.Integrations.Chefs;
 using Unity.GrantManager.Intakes.Mapping;
 using Volo.Abp;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Domain.Services;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Uow;
+using Unity.GrantManager.Events;
 
 namespace Unity.GrantManager.Intakes
 {
@@ -25,8 +26,10 @@ public class IntakeFormSubmissionManager(IUnitOfWorkManager _unitOfWorkManager,
                                              IApplicationFormSubmissionRepository _applicationFormSubmissionRepository,
                                              IIntakeFormSubmissionMapper _intakeFormSubmissionMapper,
                                              IApplicationFormVersionRepository _applicationFormVersionRepository,
+                                             IApplicationFormRepository _applicationFormRepository,
                                              CustomFieldsIntakeSubmissionMapper _customFieldsIntakeSubmissionMapper,
                                              ILocalEventBus localEventBus,
+                                             IFormsApiService _formsApiService,
                                              ISequenceRepository _sequenceRepository) : DomainService, IIntakeFormSubmissionManager
     {
         public async Task<string?> GetApplicationFormVersionMapping(string chefsFormVersionId)
@@ -91,9 +94,9 @@ await localEventBus.PublishAsync(new ApplicationProcessEvent
                 ApplicationFormSubmission = newSubmission,
                 RawSubmission = formSubmission
             });
-
+            
+            await localEventBus.PublishAsync(new ApplicationChangedEvent { Action = GrantApplicationAction.Submit, ApplicationId = application.Id });
             await uow.SaveChangesAsync();
-
             return application.Id;
         }
 
@@ -251,13 +254,43 @@ private async Task<Application> CreateNewApplicationAsync(IntakeMapping intakeMa
 
         public async Task ResyncSubmissionAttachments(Guid applicationId)
         {
-            var query = from applicationFormSubmission in await _applicationFormSubmissionRepository.GetQueryableAsync()
-                        where applicationFormSubmission.ApplicationId == applicationId
-                        select applicationFormSubmission;
-            ApplicationFormSubmission? applicationFormSubmissionData = await AsyncExecuter.FirstOrDefaultAsync(query);
-            if (applicationFormSubmissionData == null) return;
-            var formSubmission = JsonConvert.DeserializeObject<dynamic>(applicationFormSubmissionData.Submission)!;
+            var query = from s in await _applicationFormSubmissionRepository.GetQueryableAsync()
+                        where s.ApplicationId == applicationId
+                        select s;
+            var submissionRecord = await AsyncExecuter.FirstOrDefaultAsync(query);
+            if (submissionRecord == null) return;
+
+            var applicationForm = await _applicationFormRepository.GetAsync(submissionRecord.ApplicationFormId);
+
+            if (!Guid.TryParse(applicationForm.ChefsApplicationFormGuid, out var chefsFormId))
+            {
+                Logger.LogWarning("ResyncSubmissionAttachments: invalid ChefsApplicationFormGuid on form {FormId}", submissionRecord.ApplicationFormId);
+                throw new BusinessException(message: $"Application form {submissionRecord.ApplicationFormId} has an invalid CHEFS form GUID.");
+            }
+
+            if (!Guid.TryParse(submissionRecord.ChefsSubmissionGuid, out var chefsSubmissionId))
+            {
+                Logger.LogWarning("ResyncSubmissionAttachments: invalid ChefsSubmissionGuid on submission record {RecordId}", submissionRecord.Id);
+                throw new BusinessException(message: $"Submission record {submissionRecord.Id} has an invalid CHEFS submission GUID.");
+            }
+
+            var formSubmission = await _formsApiService.GetSubmissionDataAsync(chefsFormId, chefsSubmissionId);
+
+            if (formSubmission == null)
+            {
+                Logger.LogWarning("ResyncSubmissionAttachments: CHEFS returned no data for submission {SubmissionId}", chefsSubmissionId);
+                throw new BusinessException(message: $"CHEFS returned no data for submission {chefsSubmissionId}. Resync aborted — existing attachments are unchanged.");
+            }
+
+            if (formSubmission["submission"]?["submission"]?["data"] == null || formSubmission["version"] == null)
+            {
+                Logger.LogWarning("ResyncSubmissionAttachments: CHEFS response for submission {SubmissionId} has unexpected shape", chefsSubmissionId);
+                throw new BusinessException(message: $"CHEFS response for submission {chefsSubmissionId} has unexpected shape. Resync aborted — existing attachments are unchanged.");
+            }
+
+            using var uow = _unitOfWorkManager.Begin(isTransactional: true);
             await _intakeFormSubmissionMapper.ResyncSubmissionAttachments(applicationId, formSubmission);
+            await uow.SaveChangesAsync();
         }
     }
 }
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 66efab4511..56fcf4a3bb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/SubmissionAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/SubmissionAppService.cs
@@ -21,15 +21,16 @@
 namespace Unity.GrantManager.Intakes;
 
 [Authorize]
-public class SubmissionAppService(
-        IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
-        IRepository<ApplicationForm, Guid> applicationFormRepository,
-        IEndpointManagementAppService endpointManagementAppService,
-        IResilientHttpRequest resilientRestClient,
-        IStringEncryptionService stringEncryptionService,
-        IApplicationRepository applicationRepository,
-        ITenantRepository tenantRepository
-        ) : GrantManagerAppService, ISubmissionAppService
+public class SubmissionAppService(
+        IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
+        IRepository<ApplicationForm, Guid> applicationFormRepository,
+        IEndpointManagementAppService endpointManagementAppService,
+        IResilientHttpRequest resilientRestClient,
+        IStringEncryptionService stringEncryptionService,
+    IChefsAttachmentDownloadService chefsAttachmentDownloadService,
+    IApplicationRepository applicationRepository,
+    ITenantRepository tenantRepository
+        ) : GrantManagerAppService, ISubmissionAppService
 {
 
     protected new ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance);
@@ -59,57 +60,10 @@ ITenantRepository tenantRepository
     }
 
     [AllowAnonymous]
-    public async Task<BlobDto> GetChefsFileAttachment(Guid? formSubmissionId, Guid? chefsFileAttachmentId, string name)
-    {
-        if (formSubmissionId == null)
-        {
-            throw new ApiException(400, "Missing required parameter 'formId' when calling GetSubmission");
-        }
-
-        if (chefsFileAttachmentId == null)
-        {
-            throw new ApiException(400, "Missing required parameter 'chefsFileAttachmentId' when calling GetFileAttachment");
-        }
-
-        ApplicationForm? applicationForm = await GetApplicationFormBySubmissionId(formSubmissionId) ?? throw new ApiException(400, "Missing Form configuration");
-        if (applicationForm.ChefsApplicationFormGuid == null)
-        {
-            throw new ApiException(400, "Missing CHEFS form Id");
-        }
-
-        if (applicationForm.ApiKey == null)
-        {
-            throw new ApiException(400, "Missing CHEFS Api Key");
-        }
-
-        string chefsApi = await endpointManagementAppService.GetChefsApiBaseUrlAsync();
-        string url = $"{chefsApi}/files/{chefsFileAttachmentId}";
-        var decryptedApiKey = stringEncryptionService.Decrypt(applicationForm.ApiKey!);
-
-        var response = await resilientRestClient.HttpAsync(
-            HttpMethod.Get,
-            url,
-            null,
-            null,
-            basicAuth: (applicationForm.ChefsApplicationFormGuid!, decryptedApiKey ?? string.Empty)
-        );
-
-        if (((int)response.StatusCode) != 200)
-        {
-            var errorContent = response.Content != null ? await response.Content.ReadAsStringAsync() : string.Empty;
-            throw new ApiException((int)response.StatusCode, "Error calling GetChefsFileAttachment: " + errorContent, response.ReasonPhrase ?? $"{response.StatusCode}");
-        }
-
-        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 };
-    }
+    public async Task<BlobDto> GetChefsFileAttachment(Guid? formSubmissionId, Guid? chefsFileAttachmentId, string name)
+    {
+        return await chefsAttachmentDownloadService.DownloadAsync(formSubmissionId, chefsFileAttachmentId, name);
+    }
 
     public async Task<ApplicationForm?> GetApplicationFormBySubmissionId(Guid? formSubmissionId)
     {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Integrations/Chefs/FormsApiService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Integrations/Chefs/FormsApiService.cs
index d522017699..28a4e2b8ae 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Integrations/Chefs/FormsApiService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Integrations/Chefs/FormsApiService.cs
@@ -65,6 +65,23 @@ public async Task<JObject> GetForm(Guid? formId, string chefsApplicationFormGuid
             return await ParseJsonResponseAsync(response) ?? [];
         }
 
+        public async Task<JObject?> GetFormVersionDataAsync(Guid applicationFormId, string chefsFormVersionId)
+        {
+            var applicationForm = await applicationFormRepository.GetAsync(applicationFormId);
+
+            if (applicationForm == null || string.IsNullOrEmpty(applicationForm.ChefsApplicationFormGuid))
+            {
+                logger.LogWarning("No application form or CHEFS configuration found for ApplicationFormId: {ApplicationFormId}", applicationFormId);
+                return null;
+            }
+
+            string chefsApi = await GetChefsApiBaseUrlAsync();
+            string url = $"{chefsApi}/forms/{applicationForm.ChefsApplicationFormGuid}/versions/{chefsFormVersionId}";
+
+            var response = await GetRequestAsync(url, applicationForm.ChefsApplicationFormGuid!, applicationForm.ApiKey!);
+            return await ParseJsonResponseAsync(response);
+        }
+
         public async Task<JObject?> GetSubmissionDataAsync(Guid chefsFormId, Guid submissionId)
         {
             var applicationForm = await (await applicationFormRepository.GetQueryableAsync())
@@ -91,9 +108,12 @@ private async Task<HttpResponseMessage> GetRequestAsync(string url, string chefs
                 throw new ArgumentException("API key is missing or empty");
 
             var decryptedApiKey = stringEncryptionService.Decrypt(encryptedApiKey) ?? string.Empty;
+            var sanitizedUrl = url.Replace(Environment.NewLine, string.Empty, StringComparison.Ordinal)
+                                  .Replace("\n", string.Empty, StringComparison.Ordinal)
+                                  .Replace("\r", string.Empty, StringComparison.Ordinal);
             logger.LogInformation(
                 "Sending GET request to {Url} using basic auth with FormGuid: {FormGuid}",
-                url.Replace(Environment.NewLine, "").Replace("\n", "").Replace("\r", ""),
+                sanitizedUrl,
                 chefsApplicationFormGuid
             );
 
@@ -110,7 +130,7 @@ private async Task<HttpResponseMessage> GetRequestAsync(string url, string chefs
                 var content = await response.Content.ReadAsStringAsync();
                 logger.LogError(
                     "Request to {Url} failed with status {StatusCode} ({Reason}). Response: {Content}",
-                    url.Replace(Environment.NewLine, "").Replace("\n", "").Replace("\r", ""),
+                    sanitizedUrl,
                     response.StatusCode,
                     response.ReasonPhrase,
                     content
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Integrations/Css/CssApiService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Integrations/Css/CssApiService.cs
index c734129591..1c54e1c59f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Integrations/Css/CssApiService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Integrations/Css/CssApiService.cs
@@ -35,7 +35,7 @@ public async Task<UserSearchResult> FindUserAsync(string directory, string guid)
             return await SearchSsoAsync(directory, parameters);
         }
 
-        public async Task<UserSearchResult> SearchUsersAsync(string directory, string? firstName = null, string? lastName = null)
+        public async Task<UserSearchResult> SearchUsersAsync(string directory, string? firstName = null, string? lastName = null, string? email = null)
         {
             var parameters = new Dictionary<string, string>();
 
@@ -45,6 +45,9 @@ public async Task<UserSearchResult> SearchUsersAsync(string directory, string? f
             if (!string.IsNullOrWhiteSpace(lastName) && lastName.Length >= 2)
                 parameters.Add(nameof(lastName), lastName);
 
+            if (!string.IsNullOrWhiteSpace(email) && email.Length >= 2)
+                parameters.Add(nameof(email), email);
+
             return await SearchSsoAsync(directory, parameters);
         }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/AutomatedNotificationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/AutomatedNotificationAppService.cs
new file mode 100644
index 0000000000..fba613275c
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/AutomatedNotificationAppService.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+using Microsoft.EntityFrameworkCore;
+
+namespace Unity.GrantManager.Notifications
+{
+    public class AutomatedNotificationAppService(IRepository<ScheduledNotification, Guid> repository) : ApplicationService, IAutomatedNotificationAppService
+    {
+        private readonly IRepository<ScheduledNotification, Guid> _repository = repository;
+
+        public async Task<NotificationDto> CreateAsync(CreateUpdateNotificationDto input)
+        {
+            var entity = new ScheduledNotification
+            {
+                FormId = input.FormId,
+                EmailTemplateId = input.EmailTemplateId,
+                TriggerType = input.TriggerType,
+                TriggerDetail = input.TriggerDetail,
+                IsActive = input.IsActive,
+                EventType = input.EventType,
+                ApplicationStatusId = input.ApplicationStatusId,
+                ApplicationStatus = input.ApplicationStatus,
+                DateField = input.DateField,
+                RecipientCategory = input.RecipientCategory,
+                RecipientIdentifier = input.RecipientIdentifier
+            };
+
+            await _repository.InsertAsync(entity, autoSave: true);
+
+            return new NotificationDto
+            {
+                Id = entity.Id,
+                FormId = entity.FormId,
+                EmailTemplateId = entity.EmailTemplateId,
+                TemplateName = null,
+                TriggerType = entity.TriggerType,
+                TriggerDetail = entity.TriggerDetail,
+                IsActive = entity.IsActive,
+                EventType = entity.EventType,
+                ApplicationStatusId = entity.ApplicationStatusId,
+                ApplicationStatus = entity.ApplicationStatus,
+                DateField = entity.DateField
+            };
+        }
+
+        public async Task DeleteAsync(Guid id)
+        {
+            await _repository.DeleteAsync(id, autoSave: true);
+        }
+
+        public async Task CancelAsync(Guid id)
+        {
+            var entity = await _repository.GetAsync(id);
+            entity.IsActive = false;
+            await _repository.UpdateAsync(entity, autoSave: true);
+        }
+
+        public async Task<NotificationDto> GetAsync(Guid id)
+        {
+            var e = await _repository.GetAsync(id);
+            return new NotificationDto
+            {
+                Id = e.Id,
+                FormId = e.FormId,
+                EmailTemplateId = e.EmailTemplateId,
+                TemplateName = null,
+                TriggerType = e.TriggerType,
+                TriggerDetail = e.TriggerDetail,
+                IsActive = e.IsActive,
+                EventType = e.EventType,
+                ApplicationStatusId = e.ApplicationStatusId,
+                ApplicationStatus = e.ApplicationStatus,
+                DateField = e.DateField,
+                RecipientCategory = e.RecipientCategory,
+                RecipientIdentifier = e.RecipientIdentifier
+            };
+        }
+
+        public async Task<PagedResultDto<NotificationDto>> GetListAsync(GetNotificationsInput input)
+        {
+            var query = await _repository.GetQueryableAsync();
+            if (input.FormId.HasValue)
+            {
+                query = query.Where(x => x.FormId == input.FormId.Value);
+            }
+            // Filtering by template name not supported here because templates are stored in the Notifications module.
+
+            var total = await AsyncExecuter.CountAsync(query);
+
+            var list = await query
+                .OrderByDescending(x => x.CreationTime)
+                .Skip(input.SkipCount)
+                .Take(input.MaxResultCount)
+                .ToListAsync();
+
+            var items = list.Select(e => new NotificationDto
+            {
+                Id = e.Id,
+                FormId = e.FormId,
+                EmailTemplateId = e.EmailTemplateId,
+                TemplateName = null,
+                TriggerType = e.TriggerType,
+                TriggerDetail = e.TriggerDetail,
+                IsActive = e.IsActive,
+                EventType = e.EventType,
+                ApplicationStatusId = e.ApplicationStatusId,
+                ApplicationStatus = e.ApplicationStatus,
+                DateField = e.DateField,
+                RecipientCategory = e.RecipientCategory,
+                RecipientIdentifier = e.RecipientIdentifier
+            }).ToList();
+
+            return new PagedResultDto<NotificationDto>(total, items);
+        }
+
+        public async Task<NotificationDto> UpdateAsync(Guid id, CreateUpdateNotificationDto input)
+        {
+            var e = await _repository.GetAsync(id);
+            e.EmailTemplateId = input.EmailTemplateId;
+            e.TriggerType = input.TriggerType;
+            e.TriggerDetail = input.TriggerDetail;
+            e.IsActive = input.IsActive;
+            e.EventType = input.EventType;
+            e.ApplicationStatusId = input.ApplicationStatusId;
+            e.ApplicationStatus = input.ApplicationStatus;
+            e.DateField = input.DateField;
+            e.RecipientCategory = input.RecipientCategory;
+            e.RecipientIdentifier = input.RecipientIdentifier;
+
+            await _repository.UpdateAsync(e, autoSave: true);
+
+            return new NotificationDto
+            {
+                Id = e.Id,
+                FormId = e.FormId,
+                EmailTemplateId = e.EmailTemplateId,
+                TemplateName = null,
+                TriggerType = e.TriggerType,
+                TriggerDetail = e.TriggerDetail,
+                IsActive = e.IsActive,
+                EventType = e.EventType,
+                ApplicationStatusId = e.ApplicationStatusId,
+                ApplicationStatus = e.ApplicationStatus,
+                DateField = e.DateField
+            };
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/EmailAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/EmailAppService.cs
index 7e8ad607fd..ec1c2febf5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/EmailAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/EmailAppService.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using System;
 using System.Threading.Tasks;
+using Unity.GrantManager.Notifications.Email;
 using Unity.Modules.Shared.Utils;
 using Unity.Notifications.EmailNotifications;
 using Unity.Notifications.Emails;
@@ -9,7 +10,7 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Local;
 
-namespace Unity.GrantManager.Emails
+namespace Unity.GrantManager.Notifications
 {
     [Authorize]
     [Dependency(ReplaceServices = true)]
@@ -20,7 +21,7 @@ public async Task<Guid> InitializeDraftAsync(Guid applicationId)
         {
             return await emailNotificationService.InitializeDraftAsync(applicationId);
         }
-        public async Task<bool> CreateAsync(CreateEmailDto dto)
+        public async Task<bool> SendAsync(CreateEmailDto dto)
         {
             EmailNotificationEvent emailNotificationEvent = GetEmailNotificationEvent(dto);
             emailNotificationEvent.Action = EmailAction.SendCustom;
@@ -55,7 +56,8 @@ private EmailNotificationEvent GetEmailNotificationEvent(CreateEmailDto dto)
                 Bcc = bccList,
                 Subject = dto.EmailSubject,
                 Body = dto.EmailBody,
-                EmailTemplateName = dto.EmailTemplateName
+                EmailTemplateName = dto.EmailTemplateName,
+                SendOnDateTime = dto.SendOnDateTime
             };
         }
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationListAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationListAppService.cs
new file mode 100644
index 0000000000..ca0390c772
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationListAppService.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Localization;
+using Unity.GrantManager.Applications;
+using Unity.Notifications.Emails;
+using Unity.Notifications.Localization;
+using Unity.Notifications.Permissions;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Features;
+
+namespace Unity.GrantManager.Notifications;
+
+[Authorize(NotificationsPermissions.NotificationList.View)]
+[RequiresFeature("Unity.Notifications")]
+public class NotificationListAppService(
+    IEmailLogsRepository emailLogsRepository,
+    IRepository<Application, Guid> applicationRepository,
+    IRepository<Applicant, Guid> applicantRepository,
+    IStringLocalizer<NotificationsResource> notificationsLocalizer)
+    : ApplicationService, INotificationListAppService
+{
+    private static readonly TimeZoneInfo VancouverTimeZone =
+        TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time");
+
+    public virtual async Task<PagedResultDto<NotificationSummaryDto>> GetListAsync(NotificationListInputDto input)
+    {
+        var sorting = ResolveSorting(input.Sorting);
+        var (fromUtc, toUtc) = ConvertToUtcRange(input.DateFrom, input.DateTo);
+
+        var query = await emailLogsRepository.GetQueryableAsync();
+
+        // Filter on the sent date, falling back to the creation date for rows that were never
+        // sent (drafts, failures, scheduled emails). Otherwise their null SentDateTime would
+        // drop them from every window except "All time".
+        if (fromUtc.HasValue)
+        {
+            query = query.Where(e => (e.SentDateTime ?? e.CreationTime) >= fromUtc.Value);
+        }
+
+        if (toUtc.HasValue)
+        {
+            query = query.Where(e => (e.SentDateTime ?? e.CreationTime) <= toUtc.Value);
+        }
+
+        query = query.OrderBy(sorting);
+
+        // The list runs client-side (serverSideEnabled is off in Index.js): return every row in the
+        // date window and let DataTables page, search and sort in the browser. TotalCount is the full
+        // match count, not a page. This mirrors the Applications list, whose repository likewise does
+        // not apply skip/take in client-side mode (GetApplicationListRecordsAsync) and sets
+        // totalCount = items.Count to avoid a redundant count query. The 6-month default bounds the
+        // payload; full server-side paging is a future option if volume ever requires it.
+        var logs = await AsyncExecuter.ToListAsync(query);
+        var totalCount = logs.Count;
+
+        var applicationIds = logs.Select(l => l.ApplicationId).Distinct().ToArray();
+        var applications = await applicationRepository.GetListAsync(a => applicationIds.Contains(a.Id));
+        var referenceByAppId = applications.ToDictionary(a => a.Id, a => a.ReferenceNo);
+        var applicantIdByAppId = applications.ToDictionary(a => a.Id, a => a.ApplicantId);
+
+        var applicantIds = logs.Select(l => l.ApplicantId)
+            .Concat(applicantIdByAppId.Values)
+            .Distinct()
+            .ToArray();
+        var applicants = await applicantRepository.GetListAsync(a => applicantIds.Contains(a.Id));
+        var applicantNameById = applicants.ToDictionary(a => a.Id, a => a.ApplicantName ?? string.Empty);
+
+        var items = logs.Select(log =>
+        {
+            referenceByAppId.TryGetValue(log.ApplicationId, out var referenceNo);
+
+            // Prefer the EmailLog.ApplicantId; fall back to the application's applicant.
+            var applicantId = log.ApplicantId != Guid.Empty
+                ? log.ApplicantId
+                : applicantIdByAppId.GetValueOrDefault(log.ApplicationId);
+            applicantNameById.TryGetValue(applicantId, out var applicantName);
+
+            return new NotificationSummaryDto
+            {
+                Id = log.Id,
+                ApplicationId = log.ApplicationId,
+                SubmissionReferenceNo = referenceNo ?? string.Empty,
+                ApplicantName = applicantName ?? string.Empty,
+                SentDateTime = log.SentDateTime,
+                Status = log.Status,
+                FromAddress = log.FromAddress,
+                ToAddress = log.ToAddress,
+                Subject = log.Subject,
+                Recipient = log.Recipient,
+                EmailType = log.EmailType,
+                EmailTypeText = GetEmailTypeText(log.EmailType)
+            };
+        }).ToList();
+
+        return new PagedResultDto<NotificationSummaryDto>(totalCount, items);
+    }
+
+    // Converts a Vancouver-local date range (date-only) to an inclusive UTC range:
+    // From -> start of local day, To -> end of local day (23:59:59.9999999). Mirrors ApplicationRepository.
+    private static (DateTime? FromUtc, DateTime? ToUtc) ConvertToUtcRange(DateTime? fromLocal, DateTime? toLocal)
+    {
+        DateTime? fromUtc = null;
+        DateTime? toUtc = null;
+
+        if (fromLocal.HasValue)
+        {
+            var localFrom = DateTime.SpecifyKind(fromLocal.Value.Date, DateTimeKind.Unspecified);
+            fromUtc = TimeZoneInfo.ConvertTimeToUtc(localFrom, VancouverTimeZone);
+        }
+
+        if (toLocal.HasValue)
+        {
+            var localToEndOfDay = DateTime.SpecifyKind(toLocal.Value.Date.AddDays(1).AddTicks(-1), DateTimeKind.Unspecified);
+            toUtc = TimeZoneInfo.ConvertTimeToUtc(localToEndOfDay, VancouverTimeZone);
+        }
+
+        return (fromUtc, toUtc);
+    }
+
+    // Maps the EmailType enum to the user-facing label shown on the Notification List
+    private string GetEmailTypeText(EmailType? emailType)
+    {
+        return emailType switch
+        {
+            EmailType.Manual => notificationsLocalizer["NotificationList:EmailType:Manual"].Value,
+            EmailType.DateBased => notificationsLocalizer["NotificationList:EmailType:Scheduled"].Value,
+            EmailType.EventBased => notificationsLocalizer["NotificationList:EmailType:EventBased"].Value,
+            EmailType.Delayed => notificationsLocalizer["NotificationList:EmailType:Delayed"].Value,
+            // Fallback for any future unmapped value: show the raw enum name rather than a blank cell.
+            _ => emailType?.ToString() ?? string.Empty
+        };
+    }
+
+    private const string DefaultSorting = "SentDateTime DESC";
+
+    // Only EmailLog-backed columns can be sorted at the database level. Joined columns
+    // (Submission Id, Applicant Name) are not sortable server-side; any unrecognized
+    // value falls back to the default so client input is never forwarded raw into the
+    // dynamic-LINQ ordering.
+    private static readonly HashSet<string> SortableColumns = new(StringComparer.OrdinalIgnoreCase)
+    {
+        nameof(EmailLog.SentDateTime),
+        nameof(EmailLog.Status),
+        nameof(EmailLog.FromAddress),
+        nameof(EmailLog.ToAddress),
+        nameof(EmailLog.Subject),
+        nameof(EmailLog.Recipient),
+        nameof(EmailLog.EmailType)
+    };
+
+    private static string ResolveSorting(string? requested)
+    {
+        if (string.IsNullOrWhiteSpace(requested))
+        {
+            return DefaultSorting;
+        }
+
+        var parts = requested.Trim().Split(' ', StringSplitOptions.RemoveEmptyEntries);
+        var column = parts[0].TrimEnd(',');
+
+        if (!SortableColumns.TryGetValue(column, out var canonicalColumn))
+        {
+            return DefaultSorting;
+        }
+
+        var descending = parts.Length > 1 && parts[1].StartsWith("DESC", StringComparison.OrdinalIgnoreCase);
+        return $"{canonicalColumn} {(descending ? "DESC" : "ASC")}";
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationsAppService.cs
index 908079048e..8e50a4188e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationsAppService.cs
@@ -3,7 +3,8 @@
 using System.Threading.Tasks;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Integrations;
-using Unity.Notifications.TeamsNotifications;
+using Unity.GrantManager.Notifications.Teams;
+using Unity.Notifications.Teams;
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
@@ -14,16 +15,10 @@ namespace Unity.GrantManager.Notifications
     // This class is responsible for first lookup up the Teams channel URL from the database and then posting notifications to the Teams Service.
     [Dependency(ReplaceServices = true)]
     [ExposeServices(typeof(NotificationsAppService), typeof(INotificationsAppService))]
-    public class NotificationsAppService : INotificationsAppService, ITransientDependency
+    public class NotificationsAppService(IDynamicUrlRepository dynamicUrlRepository) : INotificationsAppService, ITransientDependency
     {
-        private readonly IDynamicUrlRepository _dynamicUrlRepository;
-        private readonly TeamsNotificationService _teamsNotificationService;
-
-        public NotificationsAppService(IDynamicUrlRepository dynamicUrlRepository)
-        {
-            _dynamicUrlRepository = dynamicUrlRepository;
-            _teamsNotificationService = new TeamsNotificationService();
-        }
+        private readonly IDynamicUrlRepository _dynamicUrlRepository = dynamicUrlRepository;
+        private readonly TeamsNotificationService _teamsNotificationService = new();
 
         [UnitOfWork]
         public async Task<string> InitializeTeamsChannelAsync(string keyName)
@@ -72,7 +67,7 @@ public async Task PostToTeamsAsync(string activityTitle, string activitySubtitle
             {
                 return;
             }
-            List<Fact> facts = new() { };
+            List<Fact> facts = [];
             string messageCard = TeamsNotificationService.InitializeMessageCard(activityTitle, activitySubtitle, facts);
             await TeamsNotificationService.PostToTeamsChannelAsync(teamsChannel, messageCard);
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/Configuration/FormMetadataService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/Configuration/FormMetadataService.cs
index 5f2600d744..3faabbe7ce 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/Configuration/FormMetadataService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/Configuration/FormMetadataService.cs
@@ -272,15 +272,16 @@ private static bool IsContainerSegment(string segment)
                 return formVersion.FormSchema;
             }
 
-            if (formVersion.ChefsApplicationFormGuid == null || formVersion.ChefsFormVersionGuid == null)
+            if (formVersion.ChefsFormVersionGuid == null)
             {
                 logger.LogError("Form version {FormVersionId} is missing CHEFS configuration", formVersionId);
                 return null;
             }
 
-            // Call off to CHEFS to get the schema
-            dynamic? formSchemaResponse = await formsApiService.GetFormDataAsync(
-                formVersion.ChefsApplicationFormGuid,
+            // ChefsApplicationFormGuid on ApplicationFormVersion can contain stale/incorrect data.
+            // Resolve the parent ApplicationForm via FK to get the authoritative CHEFS form GUID and API key.
+            dynamic? formSchemaResponse = await formsApiService.GetFormVersionDataAsync(
+                formVersion.ApplicationFormId,
                 formVersion.ChefsFormVersionGuid);
 
             if (formSchemaResponse == null || formSchemaResponse?.schema == null)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/SubmissionsDynamicViewGeneratorHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/SubmissionsDynamicViewGeneratorHandler.cs
index 9ffb415a5d..02b9f2b665 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/SubmissionsDynamicViewGeneratorHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/SubmissionsDynamicViewGeneratorHandler.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Notifications;
-using Unity.Notifications.TeamsNotifications;
+using Unity.GrantManager.Notifications.Teams;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
@@ -73,7 +73,15 @@ private async Task NotifyTeamsAsync(SubmissionsDynamicViewGenerationArgs viewGen
                 var activityTitle = "Reporting view generation failed";
                 var activitySubtitle = $"Form version {viewGenerationEvent.ApplicationFormVersionId}";
 
-                await notificationsAppService.PostToTeamsAsync(activityTitle, activitySubtitle, facts);
+                // Ensure a fresh UnitOfWork and tenant context are created when calling
+                // into services that use repositories/DbContext. The original UoW
+                // may have been disposed when this method is invoked from a catch.
+                using (currentTenant.Change(viewGenerationEvent.TenantId))
+                {
+                    using var notifyUow = unitOfWorkManager.Begin(requiresNew: true, isTransactional: false);
+                    await notificationsAppService.PostToTeamsAsync(activityTitle, activitySubtitle, facts);
+                    await notifyUow.CompleteAsync();
+                }
             }
             catch (Exception notifyEx)
             {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/SettingManagement/ProgramDetailsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/SettingManagement/ProgramDetailsAppService.cs
new file mode 100644
index 0000000000..632d7c7a00
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/SettingManagement/ProgramDetailsAppService.cs
@@ -0,0 +1,66 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Unity.GrantManager.Permissions;
+using Volo.Abp.Authorization;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.TenantManagement;
+
+namespace Unity.GrantManager.SettingManagement;
+
+[Authorize(UnitySettingManagementPermissions.EditProgramDetails)]
+public class ProgramDetailsAppService(ITenantRepository tenantRepository)
+    : GrantManagerAppService, IProgramDetailsAppService
+{
+    public virtual async Task<ProgramDetailsDto> GetProgramDetailsAsync()
+    {
+        var tenant = await GetCurrentTenantAsync();
+
+        return new ProgramDetailsDto
+        {
+            DisplayName = GetExtraPropertyValue(tenant, "DisplayName"),
+            Division = GetExtraPropertyValue(tenant, "Division"),
+            Branch = GetExtraPropertyValue(tenant, "Branch"),
+            Description = GetExtraPropertyValue(tenant, "Description")
+        };
+    }
+
+    public virtual async Task UpdateProgramDetailsAsync(UpdateProgramDetailsDto input)
+    {
+        var tenant = await GetCurrentTenantAsync();
+
+        tenant.SetProperty("DisplayName", NormalizeProgramDetail(input.DisplayName));
+        tenant.SetProperty("Division", NormalizeProgramDetail(input.Division));
+        tenant.SetProperty("Branch", NormalizeProgramDetail(input.Branch));
+        tenant.SetProperty("Description", NormalizeProgramDetail(input.Description));
+
+        using (CurrentTenant.Change(null))
+        {
+            await tenantRepository.UpdateAsync(tenant);
+        }
+    }
+
+    protected virtual async Task<Tenant> GetCurrentTenantAsync()
+    {
+        if (!CurrentTenant.Id.HasValue)
+        {
+            throw new AbpAuthorizationException("Program details can only be managed within a tenant context.");
+        }
+
+        var tenantId = CurrentTenant.Id.Value;
+        using (CurrentTenant.Change(null))
+        {
+            return await tenantRepository.FindAsync(tenantId) ?? throw new EntityNotFoundException(typeof(Tenant), tenantId);
+        }
+    }
+
+    protected virtual string GetExtraPropertyValue(Tenant tenant, string propertyName)
+    {
+        return tenant.GetProperty(propertyName)?.ToString() ?? string.Empty;
+    }
+
+    protected virtual string NormalizeProgramDetail(string? value)
+    {
+        return string.IsNullOrWhiteSpace(value) ? string.Empty : value.Trim();
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/TenantManagement/GrantManagerOnboardingApplicationProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/TenantManagement/GrantManagerOnboardingApplicationProvider.cs
new file mode 100644
index 0000000000..740239b020
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/TenantManagement/GrantManagerOnboardingApplicationProvider.cs
@@ -0,0 +1,312 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.GrantApplications;
+using Unity.TenantManagement;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+
+namespace Unity.GrantManager.TenantManagement;
+
+[RemoteService(false)]
+[ExposeServices(typeof(IOnboardingApplicationProvider))]
+public class GrantManagerOnboardingApplicationProvider(
+    IRepository<Application, Guid> applicationRepository,
+    IRepository<ApplicationForm, Guid> applicationFormRepository,
+    IRepository<ApplicationFormVersion, Guid> applicationFormVersionRepository,
+    OnboardingApplicationManager onboardingApplicationManager)
+    : IOnboardingApplicationProvider, ITransientDependency
+{
+    private async Task<IQueryable<Application>> BuildQueryAsync(string category)
+    {
+        return (await applicationRepository.GetQueryableAsync())
+            .AsNoTracking()
+            .Include(a => a.ApplicationForm)
+            .Include(a => a.ApplicationStatus)
+            .Include(a => a.Applicant)
+            .Include(a => a.ApplicantAgent)
+            .Where(a => a.ApplicationForm.Category == category);
+    }
+
+    public async Task<PagedResultDto<OnboardingApplicationRecord>> GetPagedListAsync(
+        int skipCount,
+        int maxResultCount,
+        string? sorting,
+        string category,
+        string? filter = null,
+        IReadOnlyList<Guid>? globalDynamicMatchIds = null,
+        IReadOnlyList<ColumnFilterDto>? staticColumnFilters = null,
+        IReadOnlyList<Guid>? dynamicColumnMatchIds = null)
+    {
+        var query = await BuildQueryAsync(category);
+
+        // Dynamic column filter IDs — empty list means active filters matched nothing
+        if (dynamicColumnMatchIds != null)
+        {
+            if (dynamicColumnMatchIds.Count == 0)
+                return new PagedResultDto<OnboardingApplicationRecord>(0, []);
+            var dynSet = dynamicColumnMatchIds.ToHashSet();
+            query = query.Where(a => dynSet.Contains(a.Id));
+        }
+
+        // Global text search: static fields OR pre-computed worksheet-matched IDs OR core-field matches
+        if (!string.IsNullOrWhiteSpace(filter))
+        {
+            var effectiveMatchIds = await MergeCoreFieldGlobalMatchesAsync(category, filter, globalDynamicMatchIds);
+
+            if (effectiveMatchIds is { Count: > 0 })
+            {
+                var dynSet = effectiveMatchIds.ToHashSet();
+                query = query.Where(a =>
+                    a.ReferenceNo.Contains(filter) ||
+                    a.ApplicationStatus.InternalStatus.Contains(filter) ||
+                    (a.ApplicationForm.Category != null && a.ApplicationForm.Category.Contains(filter)) ||
+                    dynSet.Contains(a.Id));
+            }
+            else
+            {
+                query = query.Where(a =>
+                    a.ReferenceNo.Contains(filter) ||
+                    a.ApplicationStatus.InternalStatus.Contains(filter) ||
+                    (a.ApplicationForm.Category != null && a.ApplicationForm.Category.Contains(filter)));
+            }
+        }
+
+        // Per-column static filters from the FilterRow
+        if (staticColumnFilters != null)
+        {
+#pragma warning disable CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
+                               // Need to suppress this because EF Core does not support StringComparison
+            foreach (var cf in staticColumnFilters.Where(cf => !string.IsNullOrWhiteSpace(cf.Value)))
+            {
+                var loweredValue = cf.Value.ToLowerInvariant();
+                switch (cf.Name.ToLowerInvariant())
+                {
+                    case "submissionnumber":
+                        query = query.Where(a => a.ReferenceNo.ToLower().Contains(loweredValue));
+                        break;
+                    case "status":
+                        query = query.Where(a => a.ApplicationStatus.InternalStatus.ToLower().Contains(loweredValue));
+                        break;
+                    case "category":
+                        query = query.Where(a => a.ApplicationForm.Category != null && a.ApplicationForm.Category.ToLower().Contains(loweredValue));
+                        break;
+                    default:
+                        query = ApplyCoreFieldFilter(query, cf.Name, loweredValue);
+                        break;
+                }
+            }
+#pragma warning restore CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
+        }
+
+        var totalCount = await query.CountAsync();
+        var ordered = ApplySorting(query, sorting);
+
+        var entities = await ordered
+            .Skip(skipCount)
+            .Take(maxResultCount)
+            .ToListAsync();
+
+        var coreFields = await GetMappedCoreFieldsAsync(category);
+        var items = entities.Select(a => ToRecord(a, coreFields)).ToList();
+
+        return new PagedResultDto<OnboardingApplicationRecord>(totalCount, items);
+    }
+
+    public async Task<OnboardingApplicationRecord?> GetByIdAsync(Guid id)
+    {
+        var query = (await applicationRepository.GetQueryableAsync())
+            .AsNoTracking()
+            .Include(a => a.ApplicationForm)
+            .Include(a => a.ApplicationStatus)
+            .Include(a => a.Applicant)
+            .Include(a => a.ApplicantAgent);
+
+        var entity = await query.FirstOrDefaultAsync(a => a.Id == id);
+        if (entity == null) return null;
+
+        var coreFields = await GetMappedCoreFieldsAsync(entity.ApplicationForm.Category ?? string.Empty);
+        return ToRecord(entity, coreFields);
+    }
+
+    private static OnboardingApplicationRecord ToRecord(Application a, IReadOnlyList<CoreFieldDefinition> coreFields) =>
+        new()
+        {
+            Id = a.Id,
+            ReferenceNo = a.ReferenceNo,
+            SubmissionDate = a.SubmissionDate,
+            Status = a.ApplicationStatus.InternalStatus,
+            Category = a.ApplicationForm.Category ?? string.Empty,
+            CoreFieldValues = coreFields.ToDictionary(f => f.Key, f => f.Selector(a))
+        };
+
+    public async Task<List<Guid>> GetAllIdsAsync(string category)
+    {
+        var query = await BuildQueryAsync(category);
+        return await query.Select(a => a.Id).ToListAsync();
+    }
+
+    public async Task<List<Guid>> GetFormVersionIdsAsync(string category)
+    {
+        var versions = await GetFormVersionsAsync(category);
+        return versions.Select(v => v.Id).ToList();
+    }
+
+    public async Task<List<OnboardingColumnDto>> GetMappedCoreFieldColumnsAsync(string category)
+    {
+        var coreFields = await GetMappedCoreFieldsAsync(category);
+        return coreFields
+            .Select(f => new OnboardingColumnDto { Key = f.Key, Label = f.Label, Type = f.Type, Selected = true })
+            .ToList();
+    }
+
+    private async Task<List<CoreFieldDefinition>> GetMappedCoreFieldsAsync(string category)
+    {
+        var versions = await GetFormVersionsAsync(category);
+        if (versions.Count == 0) return [];
+
+        return OnboardingCoreFieldRegistry.Fields
+            .Where(f => versions.Any(v => v.HasSubmissionHeaderMapping(f.Key)))
+            .ToList();
+    }
+
+    // Returns every version across every form in the category — deliberately not filtered to
+    // Published==true. CHEFS sync auto-unpublishes a form's previous version the moment a new
+    // one is published (see ApplicationFormVersionAppService.UnPublishFormVersions), so at most
+    // one version per form is ever Published at a given time. Filtering on that flag would
+    // silently drop every prior version's field mappings/worksheet links as soon as a newer
+    // version goes live. A field mapped on any version (old or new) should still surface its
+    // column; columns are combined across versions by key (see GetColumnSchemaAsync).
+    private async Task<List<ApplicationFormVersion>> GetFormVersionsAsync(string category)
+    {
+        var formIds = await (await applicationFormRepository.GetQueryableAsync())
+            .AsNoTracking()
+            .Where(f => f.Category == category)
+            .Select(f => f.Id)
+            .ToListAsync();
+
+        if (formIds.Count == 0) return [];
+
+        return await (await applicationFormVersionRepository.GetQueryableAsync())
+            .AsNoTracking()
+            .Where(v => formIds.Contains(v.ApplicationFormId))
+            .ToListAsync();
+    }
+
+    public async Task CloseApplicationAsync(Guid applicationId)
+    {
+        await onboardingApplicationManager.TriggerAction(applicationId, GrantApplicationAction.Close);
+    }
+
+    public async Task<List<string>> GetAvailableCategoriesAsync()
+    {
+        var query = await applicationFormRepository.GetQueryableAsync();
+        return await query
+            .AsNoTracking()
+            .Where(f => f.Category != null && f.Category != string.Empty)
+            .Select(f => f.Category!)
+            .Distinct()
+            .OrderBy(c => c)
+            .ToListAsync();
+    }
+
+    private static IQueryable<Application> ApplySorting(IQueryable<Application> query, string? sorting)
+    {
+        if (string.IsNullOrWhiteSpace(sorting))
+            return query.OrderByDescending(a => a.SubmissionDate);
+
+        var parts = sorting.Trim().Split(' ', 2, StringSplitOptions.RemoveEmptyEntries);
+        var field = parts[0];
+        var desc = parts.Length > 1 && parts[1].Equals("DESC", StringComparison.OrdinalIgnoreCase);
+
+        switch (field.ToLowerInvariant())
+        {
+            case "referenceno" or "submissionnumber":
+                return desc ? query.OrderByDescending(a => a.ReferenceNo) : query.OrderBy(a => a.ReferenceNo);
+            case "status":
+                return desc
+                    ? query.OrderByDescending(a => a.ApplicationStatus.InternalStatus)
+                    : query.OrderBy(a => a.ApplicationStatus.InternalStatus);
+            case "submissiondate":
+                return desc ? query.OrderByDescending(a => a.SubmissionDate) : query.OrderBy(a => a.SubmissionDate);
+            case "category":
+                return desc
+                    ? query.OrderByDescending(a => a.ApplicationForm.Category)
+                    : query.OrderBy(a => a.ApplicationForm.Category);
+        }
+
+        // Not a static column — check the core-field registry and sort via its EF navigation
+        // path using dynamic LINQ (System.Linq.Dynamic.Core), same pattern as
+        // ApplicationRepository.MapSortingField for the main Applications list.
+        var coreField = OnboardingCoreFieldRegistry.Fields
+            .FirstOrDefault(f => f.Key.Equals(field, StringComparison.OrdinalIgnoreCase));
+        if (coreField != null)
+        {
+            try
+            {
+                return query.OrderBy($"{coreField.EfPath} {(desc ? "DESC" : "ASC")}");
+            }
+            catch
+            {
+                // Unsupported dynamic LINQ translation — fall through to the default sort.
+            }
+        }
+
+        return query.OrderByDescending(a => a.SubmissionDate);
+    }
+
+    private static IQueryable<Application> ApplyCoreFieldFilter(IQueryable<Application> query, string fieldName, string loweredValue)
+    {
+        var coreField = OnboardingCoreFieldRegistry.Fields
+            .FirstOrDefault(f => f.IsTextFilterable && f.Key.Equals(fieldName, StringComparison.OrdinalIgnoreCase));
+        if (coreField == null) return query;
+
+        try
+        {
+            return query.Where($"{coreField.EfPath} != null && {coreField.EfPath}.ToLower().Contains(@0)", loweredValue);
+        }
+        catch
+        {
+            // Unsupported dynamic LINQ translation — skip this filter rather than fail the whole request.
+            return query;
+        }
+    }
+
+    private async Task<List<Guid>?> MergeCoreFieldGlobalMatchesAsync(
+        string category, string filter, IReadOnlyList<Guid>? existingMatchIds)
+    {
+        var coreMatches = await GetCoreFieldGlobalMatchIdsAsync(category, filter);
+        if (coreMatches.Count == 0) return existingMatchIds?.ToList();
+
+        var merged = new HashSet<Guid>(coreMatches);
+        if (existingMatchIds != null) merged.UnionWith(existingMatchIds);
+        return merged.ToList();
+    }
+
+    private async Task<List<Guid>> GetCoreFieldGlobalMatchIdsAsync(string category, string filter)
+    {
+        var textFields = (await GetMappedCoreFieldsAsync(category)).Where(f => f.IsTextFilterable).ToList();
+        if (textFields.Count == 0) return [];
+
+        var loweredFilter = filter.ToLowerInvariant();
+        var predicate = string.Join(" || ", textFields.Select(f => $"({f.EfPath} != null && {f.EfPath}.ToLower().Contains(@0))"));
+
+        try
+        {
+            var query = await BuildQueryAsync(category);
+            return await query.Where(predicate, loweredFilter).Select(a => a.Id).ToListAsync();
+        }
+        catch
+        {
+            // Unsupported dynamic LINQ translation for one of the mapped fields — skip core-field matching.
+            return [];
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/TenantManagement/OnboardingCoreFieldRegistry.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/TenantManagement/OnboardingCoreFieldRegistry.cs
new file mode 100644
index 0000000000..4a27902cc8
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/TenantManagement/OnboardingCoreFieldRegistry.cs
@@ -0,0 +1,78 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using Unity.GrantManager.Applications;
+
+namespace Unity.GrantManager.TenantManagement;
+
+public sealed record CoreFieldDefinition(string Key, string Label, string Type, string EfPath, Func<Application, object?> Selector)
+{
+    // Only string-shaped fields get server-side Contains filtering (matches how the existing
+    // static columns filter — ToLower().Contains()). Currency/Number/Date fields are still
+    // sortable, just not filterable yet — filtering on those would need a numeric/date-aware
+    // operator instead of substring match.
+    public bool IsTextFilterable => Type is "String" or "Email" or "Phone";
+}
+
+// Key/Label/Type mirror the [DisplayName]/[MapFieldType] attributes on
+// Unity.GrantManager.Intakes.IntakeMapping. EfPath is the EF Core navigation path used for
+// dynamic LINQ (System.Linq.Dynamic.Core) sorting/filtering — see
+// GrantManagerOnboardingApplicationProvider.ApplySorting for the established pattern this
+// mirrors (also used by ApplicationRepository.MapSortingField for the main Applications list).
+// Only fields with a confirmed assignment in IntakeFormSubmissionManager.CreateNewApplicationAsync
+// or ApplicantAppService.CreateOrRetrieveApplicantAsync/CreateApplicantAsync are listed here —
+// several IntakeMapping fields (Mailing*, most Physical*, OrgStatus, IndigenousOrgInd) are never
+// persisted anywhere after intake and are intentionally omitted. Contact* fields ARE persisted,
+// to the nullable Application.ApplicantAgent navigation (not Applicant) — see the ApplicantAgent-
+// backed entries below; querying them requires a `.Include(a => a.ApplicantAgent)`, added in
+// GrantManagerOnboardingApplicationProvider.BuildQueryAsync/GetByIdAsync.
+public static class OnboardingCoreFieldRegistry
+{
+    public static readonly IReadOnlyList<CoreFieldDefinition> Fields =
+    [
+        new("ProjectName", "Project Name", "String", "ProjectName", a => a.ProjectName),
+        new("Acquisition", "Acquisition", "String", "Acquisition", a => a.Acquisition),
+        new("Forestry", "Forestry", "String", "Forestry", a => a.Forestry),
+        new("ForestryFocus", "Forestry Focus", "String", "ForestryFocus", a => a.ForestryFocus),
+        new("PhysicalCity", "Physical City", "String", "City", a => a.City),
+        new("EconomicRegion", "Economic Region", "String", "EconomicRegion", a => a.EconomicRegion),
+        new("CommunityPopulation", "Community Population", "Number", "CommunityPopulation", a => a.CommunityPopulation),
+        new("RequestedAmount", "Requested Amount", "Currency", "RequestedAmount", a => a.RequestedAmount),
+        new("ProjectStartDate", "Project Start Date", "Date", "ProjectStartDate", a => a.ProjectStartDate),
+        new("ProjectEndDate", "Project End Date", "Date", "ProjectEndDate", a => a.ProjectEndDate),
+        new("TotalProjectBudget", "Total Project Budget", "Currency", "TotalProjectBudget", a => a.TotalProjectBudget),
+        new("Community", "Community", "String", "Community", a => a.Community),
+        new("ElectoralDistrict", "Project Electoral District", "String", "ElectoralDistrict", a => a.ElectoralDistrict),
+        new("ApplicantElectoralDistrict", "Applicant Electoral District", "String", "ApplicantElectoralDistrict", a => a.ApplicantElectoralDistrict),
+        new("RegionalDistrict", "Regional District", "String", "RegionalDistrict", a => a.RegionalDistrict),
+        new("SigningAuthorityFullName", "Signing Authority Full Name", "String", "SigningAuthorityFullName", a => a.SigningAuthorityFullName),
+        new("SigningAuthorityTitle", "Signing Authority Title", "String", "SigningAuthorityTitle", a => a.SigningAuthorityTitle),
+        new("SigningAuthorityEmail", "Signing Authority Email", "Email", "SigningAuthorityEmail", a => a.SigningAuthorityEmail),
+        new("SigningAuthorityBusinessPhone", "Signing Authority Business Phone", "Phone", "SigningAuthorityBusinessPhone", a => a.SigningAuthorityBusinessPhone),
+        new("SigningAuthorityCellPhone", "Signing Authority Cell Phone", "Phone", "SigningAuthorityCellPhone", a => a.SigningAuthorityCellPhone),
+        new("Place", "Place", "String", "Place", a => a.Place),
+        new("RiskRanking", "Risk Ranking", "String", "RiskRanking", a => a.RiskRanking),
+        new("ProjectSummary", "Project Summary", "String", "ProjectSummary", a => a.ProjectSummary),
+
+        // Applicant-backed — requires `.Include(a => a.Applicant)` on the query.
+        new("ApplicantName", "Applicant Name", "String", "Applicant.ApplicantName", a => a.Applicant.ApplicantName),
+        new("NonRegisteredBusinessName", "Non-Registered Organization Name", "String", "Applicant.NonRegOrgName", a => a.Applicant.NonRegOrgName),
+        new("OrgName", "Registered Organization Name", "String", "Applicant.OrgName", a => a.Applicant.OrgName),
+        new("OrgNumber", "Registered Organization Number", "String", "Applicant.OrgNumber", a => a.Applicant.OrgNumber),
+        new("BusinessNumber", "Business Number", "String", "Applicant.BusinessNumber", a => a.Applicant.BusinessNumber),
+        new("OrganizationType", "Organization Type", "String", "Applicant.OrganizationType", a => a.Applicant.OrganizationType),
+        new("Sector", "Sector", "String", "Applicant.Sector", a => a.Applicant.Sector),
+        new("SubSector", "Sub-Sector", "String", "Applicant.SubSector", a => a.Applicant.SubSector),
+        new("SectorSubSectorIndustryDesc", "Sub-Sector Industry Description", "String", "Applicant.SectorSubSectorIndustryDesc", a => a.Applicant.SectorSubSectorIndustryDesc),
+        new("ApproxNumberOfEmployees", "Approximate Number Of Employees", "Number", "Applicant.ApproxNumberOfEmployees", a => a.Applicant.ApproxNumberOfEmployees),
+        new("FiscalDay", "Fiscal Year End (FYE) Day", "Number", "Applicant.FiscalDay", a => a.Applicant.FiscalDay),
+        new("FiscalMonth", "Fiscal Year End (FYE) Month", "String", "Applicant.FiscalMonth", a => a.Applicant.FiscalMonth),
+
+        // ApplicantAgent-backed — nullable navigation, requires `.Include(a => a.ApplicantAgent)`.
+        new("ContactFullName", "Contact Full Name", "String", "ApplicantAgent.Name", a => a.ApplicantAgent?.Name),
+        new("ContactTitle", "Contact Title", "String", "ApplicantAgent.Title", a => a.ApplicantAgent?.Title),
+        new("ContactEmail", "Contact Email", "Email", "ApplicantAgent.Email", a => a.ApplicantAgent?.Email),
+        new("ContactBusinessPhone", "Contact Business Phone", "Phone", "ApplicantAgent.Phone", a => a.ApplicantAgent?.Phone),
+        new("ContactCellPhone", "Contact Cell Phone", "Phone", "ApplicantAgent.Phone2", a => a.ApplicantAgent?.Phone2),
+    ];
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/GrantManagerDbMigratorModule.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/GrantManagerDbMigratorModule.cs
index 135f89582e..c310dd2aac 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/GrantManagerDbMigratorModule.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/GrantManagerDbMigratorModule.cs
@@ -1,6 +1,7 @@
 using Unity.AI;
 using Unity.GrantManager.EntityFrameworkCore;
 using Unity.Reporting;
+using Unity.TenantManagement;
 using Volo.Abp.Autofac;
 using Volo.Abp.Http.Client;
 using Volo.Abp.Modularity;
@@ -13,7 +14,10 @@ namespace Unity.GrantManager.DbMigrator;
     typeof(GrantManagerEntityFrameworkCoreModule),
     typeof(GrantManagerApplicationContractsModule),
     typeof(ReportingApplicationModule), // Needed to seed Reporting data
-    typeof(AIApplicationModule)          // Needed to seed AI prompt data
+    typeof(AIApplicationModule),         // Needed to seed AI prompt data
+    typeof(UnityTenantManagementApplicationModule) // Registers EncryptedTenantConnectionStringResolver — without it,
+                                                     // tenant connection strings are resolved undecrypted (stock ABP
+                                                     // resolver), breaking every standard-repository DB call for tenants.
     )]
 public class GrantManagerDbMigratorModule : AbpModule
 {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md
index 909ce676f5..21a27a7214 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/README.md
@@ -6,43 +6,42 @@ This project is responsible for running database migrations for the Unity Grant
 
 The `appsettings.json` file in this project intentionally excludes sensitive information like database passwords to comply with security best practices and avoid SonarQube or Copilot warnings about checking credentials into source control.
 
-### Option 1: Using appsettings.Development.json (Recommended for Local Development)
+### appsettings.secrets.json (used by this project)
 
-Create an `appsettings.Development.json` file in the DbMigrator project directory with your connection strings including passwords:
+`Program.cs` wires configuration up with:
 
-```json
-{
-  "ConnectionStrings": {    
-    "Default": "Host=localhost;port=5432;Database=UnityGrantManager;Username=postgres;Password=your_password_here",
-    "Tenant": "Host=localhost;port=5432;Database=UnityGrantTenant;Username=postgres;Password=your_password_here"
-  }
-}
+```csharp
+Host.CreateDefaultBuilder(args)
+    .AddAppSettingsSecretsJson()
+    ...
 ```
 
-**Note:** This file is excluded from git via `.gitignore` to keep your credentials secure.
+`AddAppSettingsSecretsJson()` is a helper from the ABP Framework (`Volo.Abp.Core`) that adds an **optional** `appsettings.secrets.json` file to the configuration pipeline. Because it's chained onto the host builder after `Host.CreateDefaultBuilder` has already added its default sources, it loads *after* those sources (including environment variables and command-line arguments).
+As a result, any value it defines will override values from earlier providers (including env vars and command-line) when the keys match.
 
-### Option 2: Using User Secrets
-
-Alternatively, you can use .NET User Secrets to store sensitive configuration:
-
-1. Right-click on the `Unity.GrantManager.DbMigrator` project in Visual Studio
-2. Select "Manage User Secrets"
-3. Add your connection strings with passwords:
+Create an `appsettings.secrets.json` file in this project directory with your local connection strings and any other overrides:
 
 ```json
 {
-  "ConnectionStrings": {    
+  "ConnectionStrings": {
     "Default": "Host=localhost;port=5432;Database=UnityGrantManager;Username=postgres;Password=your_password_here",
-    "Tenant": "Host=localhost;port=5432;Database=UnityGrantTenant;Username=postgres;Password=your_password_here"
+    "Tenant": "Host=localhost;port=5432;Database=UnityGrantTenant;Username=postgres;Password=your_password_here",
+    "Onboarding": "Host=localhost;port=5432;Database=UnityOnboarding;Username=postgres;Password=your_password_here"
   }
 }
 ```
 
-User secrets are stored outside of your project directory and are never checked into source control.
+**Note:** This file is excluded from git via the root [`.gitignore`](../../../../.gitignore) (`/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.secrets.json`), so your local credentials are never committed. The `Unity.GrantManager.Web` project uses the same mechanism and has its own gitignore entry for its own `appsettings.secrets.json`.
+
+Because the file is optional, its absence is not an error — omit it entirely if you're configuring everything through environment variables instead.
+
+### Production / CI builds
+
+`appsettings.secrets.json` is **not** referenced anywhere in `Unity.GrantManager.DbMigrator.csproj` (unlike `appsettings.json`, which is explicitly included with `CopyToOutputDirectory`), so even if the file exists on a machine building this project, it is not copied into the build or publish output. Combined with the file being gitignored — meaning a fresh CI checkout never has it on disk in the first place — there's no path for local secrets to leak into a DbMigrator build or the resulting Docker image.
 
 ## Running the Migrator
 
-Once you've configured your connection strings using either option above, you can run the migrator:
+Once you've configured your connection strings via `appsettings.secrets.json` (or environment variables), you can run the migrator:
 
 ```bash
 dotnet run
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
index 2890764e6f..8ade8482cb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 
@@ -14,10 +14,9 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <None Remove="appsettings.secrets.json" />
   </ItemGroup>
 
-  <ItemGroup>    
+  <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -38,6 +37,7 @@
     <PackageReference Include="Volo.Abp.Autofac" Version="10.3.0" />
     <ProjectReference Include="..\..\modules\Unity.AI\src\Unity.AI.Application\Unity.AI.Application.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Reporting\src\Unity.Reporting.Application\Unity.Reporting.Application.csproj" />
+    <ProjectReference Include="..\..\modules\Unity.TenantManagement\src\Unity.TenantManagement.Application\Unity.TenantManagement.Application.csproj" />
     <ProjectReference Include="..\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
     <ProjectReference Include="..\Unity.GrantManager.EntityFrameworkCore\Unity.GrantManager.EntityFrameworkCore.csproj" />
   </ItemGroup>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.json b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.json
index 626191b07d..1e36d565d5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.json
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/appsettings.json
@@ -1,7 +1,11 @@
 {
   "ConnectionStrings": {
     "Default": "Host=localhost;port=5432;Database=UnityGrantManager;Username=postgres;",
-    "Tenant": "Host=localhost;port=5432;Database=UnityGrantTenant;Username=postgres;"
+    "Tenant": "Host=localhost;port=5432;Database=UnityGrantTenant;Username=postgres;",
+    "Onboarding": "Host=localhost;port=5432;Database=UnityOnboarding;Username=postgres;"
+  },
+  "StringEncryption": {
+    "DefaultPassPhrase": "g2IuZx7PwXDvCmlW"
   },
   "Redis": {
     "Configuration": "127.0.0.1"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/GrantApplications/AIGenerationRequestKeyHelper.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/GrantApplications/AIGenerationRequestKeyHelper.cs
index 0492a5d6ad..d478b3af4f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/GrantApplications/AIGenerationRequestKeyHelper.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/GrantApplications/AIGenerationRequestKeyHelper.cs
@@ -19,4 +19,20 @@ public static string BuildRequestKey(Guid? tenantId, Guid applicationId, string
             applicationId.ToString("D"),
             operationType.Trim().ToLowerInvariant());
     }
+
+    /// <summary>
+    /// Maps an operation type key (e.g. "application-analysis") to the canonical operation name
+    /// stored in the AIOperations table (e.g. "ApplicationAnalysis").
+    /// </summary>
+    public static string? ResolveOperationName(string operationType)
+    {
+        return operationType switch
+        {
+            ApplicationAnalysisOperationType => "ApplicationAnalysis",
+            AttachmentSummaryOperationType => "AttachmentSummary",
+            ApplicationScoringOperationType => "ApplicationScoring",
+            PipelineOperationType => "Default",
+            _ => null
+        };
+    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/GrantApplications/GrantApplicationState.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/GrantApplications/GrantApplicationState.cs
index ba64f6e8db..d94da952cb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/GrantApplications/GrantApplicationState.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/GrantApplications/GrantApplicationState.cs
@@ -21,6 +21,7 @@ public enum GrantApplicationState
     GRANT_NOT_APPROVED = 12,
     DEFER = 13,
     ON_HOLD = 14,
+    RESOLVED = 15,
 }
 
 
@@ -31,5 +32,6 @@ public static class GrantApplicationStateGroups
         GrantApplicationState.GRANT_NOT_APPROVED,
         GrantApplicationState.CLOSED,
         GrantApplicationState.WITHDRAWN,
+        GrantApplicationState.RESOLVED
     };
 }
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 35d17e82b6..3f0b387506 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
@@ -15,6 +15,7 @@
     "Menu:Intakes": "Intakes",
     "Menu:ApplicationForms": "Forms",
     "Menu:TenantManagement": "Tenants",
+    "Menu:Onboarding": "Onboarding",
     "Menu:EndpointManagement": "Endpoints",
     "Menu:Applicants": "Applicants",
     "Menu:ConfigurationManagement": "Configuration Management",
@@ -66,6 +67,7 @@
     "Assignee": "Assignee",
     "Probability": "Probability",
     "GrantApplicationStatus": "Status",
+    "ExternalStatusVisibility": "Status Visibility",
     "ProposalDate": "Proposal Date",
     "SubmissionDate": "Submission Date",
     "GrantApplications": "Grant Applications",
@@ -144,6 +146,7 @@
     "Permission:GrantApplicationManagement.Applicants.AssignApplicant": "Assign Applicant to an Application",
     "Permission:GrantApplicationManagement.Applicants.ApplicantInfo": "Applicant Info",
     "Permission:GrantApplicationManagement.Applicants.ApplicantInfo.EditRedStop": "Edit Red-Stop",
+    "Permission:GrantApplicationManagement.Applicants.Delete": "Delete Applicant",
     "Permission:GrantApplicationManagement.Assignments.Default": "Assignment",
     "Permission:GrantApplicationManagement.Assignments.AssignInitial": "Initial Assignment",
     "Permission:GrantApplicationManagement.Reviews.Default": "Reviews",
@@ -161,8 +164,12 @@
     "Permission:GrantApplicationManagement.Organizations.ManageProfiles": "Manage Organization Profiles",
     "Permission:GrantManagerManagement.Intakes.Default": "Manage Intakes",
     "Permission:GrantManagerManagement.ApplicationForms.Default": "Manage Forms",
+    "Permission:GrantManagerManagement.NotificationScheduler.Default": "Notification Scheduler",
+    "Permission:GrantManagerManagement.NotificationScheduler.ManageSchedules": "Manage Notification Schedules",
     "Permission:GrantApplicationManagement.Approvals.BulkApplicationApproval": "Bulk Application Approval",
     "Permission:GrantApplicationManagement.AIReporting.Default": "AI Reporting",
+    "Permission:SettingManagement": "Setting Management",
+    "Permission:BackgroundJobSettings": "Background Job Settings",
 
     "ApplicationForms": "Forms",
     "ApplicationForms:Description": "Description",
@@ -180,7 +187,7 @@
     "ApplicationForms:Payable": "Payable",
     "ApplicationForms:RenderFormIoToHtml": "Render FormIO to HTML",
     "ApplicationForms:ConfigureWorksheets": "Configure Worksheets",
-    "ApplicationForms.Configuration.Notes:BypassAssessmentWorkflow": "Enabling this feature will bypass the Assessment workflow when you approve submissions associated with this form.",
+    "ApplicationForms.Configuration.Notes:BypassAssessmentWorkflow": "Enabling this feature will bypass the Assessment workflow when you approve or deny submissions associated with this form.",
     "ApplicationForms.Configuration.Notes:SelectedApplicantElectoralAddress": "The selected address type will determine which submitted applicant address is used to extract the electoral district.",
     "ApplicationForms.Configuration.Warnings:ApplicantElectoralAddressTypeChange": "Changing the address type will only affect new submissions. Existing applications will retain the electoral district extracted from their original address type.",
 
@@ -239,6 +246,11 @@
     "Unity.GrantManager.ApplicationManagement.Payment.Supplier.Update": "Edit Supplier Info",
     "Unity.GrantManager.ApplicationManagement.Payment.PaymentList": "Payment List",
 
+    "Unity.GrantManager.ApplicationManagement.Application.Status": "External Status Visibility",
+    "Unity.GrantManager.ApplicationManagement.Application.Status.Publish": "Publish Status",
+    "Unity.GrantManager.ApplicationManagement.Application.Status.Unpublish": "Unpublish Status",
+    "Unity.GrantManager.ApplicationManagement.Application.Status.BulkPublish": "Bulk Publish Status",
+
     "Permission:GrantApplicationManagement.ProjectInfo": "Project Info",
     "Permission:GrantApplicationManagement.ProjectInfo.Update": "Project Info Update",
     "Permission:GrantApplicationManagement.ProjectInfo.Update.UpdateFinalStateFields": "Edit Project Info Fields After Approval",
@@ -279,6 +291,17 @@
     "AssessmentResultsView:AssessmentResultsForm.DueDate": "Due Date",
     "AssessmentResultsView:AssessmentResultsForm.NotificationDate": "Notification Date",
     "AssessmentResultsView:AssessmentResultsForm.RiskRanking": "Risk Ranking",
+    "AssessmentResultsView:AssessmentResultsForm.Published": "Published",
+    "DetailsActionBar:PublishButton": "Publish Status",
+    "DetailsActionBar:UnpublishButton": "Unpublish Status",
+    "DetailsActionBar:ConfirmActionTitle": "Confirm Action",
+    "DetailsActionBar:PublishConfirmationText": "Are you sure you want to publish this application status?",
+    "DetailsActionBar:UnpublishConfirmationText": "Are you sure you want to unpublish this application status?",
+    "DetailsActionBar:ConfirmButton": "Confirm",
+    "DetailsActionBar:CancelButton": "Cancel",
+    "DetailsActionBar:PublishStatusUpdatedToast": "Application status has been published.",
+    "DetailsActionBar:UnpublishStatusUpdatedToast": "Application status has been unpublished.",
+    "DetailsActionBar:PublishStatusUpdateFailed": "Failed to update status.",
 
     "GrantApplication:ActionButtonName": "Status Actions",
     "GrantApplication:ActionButton.RedStopWarning": "This application is from an applicant with a Red-Stop. Status actions are not permitted.",
@@ -315,6 +338,7 @@
     "Permission:UnitySettingManagementPermissions.BackgroundJobs": "Background Jobs",
     "Permission:UnitySettingManagementPermissions.UserInterface": "Application Tabs",
     "Permission:UnitySettingManagementPermissions.ConfigurePayments": "Configure Payments",
+    "Permission:UnitySettingManagementPermissions.EditProgramDetails": "Edit Program Details",
 
     "Setting:GrantManager.UI.PageTitle": "Application Tabs Configuration",
     "Setting:GrantManager.UI.Tabs.Applicant.Description": "Toggle visibility of the Applicant Info tab for the tenant",
@@ -353,6 +377,7 @@
     "Summary:Application.OrganizationName": "Registered Organization Name",
     "Summary:Application.OrganizationNumber": "Registered Organization Number",
     "Summary:Application.BusinessNumber": "Business Number",
+    "Summary:Application.ApproxNumberOfEmployees": "Approx. Number of Employees",
     "Summary:Application.NonRegOrgName": "Non-Registered Organization Name",
     "Summary:Application.City": "City",
     "Summary:Application.Community": "Community",
@@ -424,9 +449,11 @@
     "ApplicantInfoView:ApplicantInfo.OrgBookStatus": "Org book status ",
     "ApplicantInfoView:ApplicantInfo.OrganizationType": "Organization Type",
     "ApplicantInfoView:ApplicantInfo.OrganizationSize": "Organization Size",
+    "ApplicantInfoView:ApplicantInfo.ApproxNumberOfEmployees": "Approx. Number of Employees",
     "ApplicantInfoView:ApplicantInfo.UnityApplicant": "Applicant Id",
     "ApplicantInfoView:ApplicantInfo.FiscalMonth": "Fiscal Year End Month",
     "ApplicantInfoView:ApplicantInfo.FiscalDay": "Fiscal Year End Day",
+    "ApplicantInfoView:ApplicantInfo.FiscalYearEnd": "Fiscal Year End",
     "ApplicantInfoView:ApplicantInfo.IndigenousOrgInd": "Indigenous",
     "ApplicantInfoView:ApplicantInfo.Sector": "Sector",
     "ApplicantInfoView:ApplicantInfo.SubSector": "Sub-sector",
@@ -506,6 +533,10 @@
     "ApplicationBatchApprovalRequest:InvalidApprovedAmount": "Invalid Approved Amount, it must be greater than 0.00",
     "ApplicationBatchApprovalRequest:InvalidRecommendedAmount": "Invalid Recommended Amount, it must be greater than 0.00",
 
+    "ApplicationBatchPublishRequest:MaxCountExceeded": "You have exceeded the maximum number of items for bulk status publishing. Please reduce the number to {0} or fewer",
+    "ApplicationBatchPublishRequest:MinCountExceeded": "You have no items selected for bulk status publishing. Please close this prompt to continue",
+    "ApplicationBatchPublishRequest:ConfirmationNote": "By confirming, the selected application statuses will be published and made visible to applicants in the portal.",
+
     "ApplicationLinks:Category": "Category",
     "ApplicationLinks:ID": "ID",
     "ApplicationLinks:Status": "Status",
@@ -513,15 +544,76 @@
 
     "ApplicantPortalSettings:Title": "Applicant Portal Configuration",
     "ApplicantPortalSettings:ManageStatuses": "Manage Statuses",
+    "ApplicantPortalSettings:ProgramDetails": "Program Details",
     "ApplicantPortalSettings:PortalStatusHeading": "Applicant Portal Status",
     "ApplicantPortalSettings:InternalStatus": "Internal Status",
-    "ApplicantPortalSettings:PortalStatusLabel": "Portal Status Label",
+    "ApplicantPortalSettings:PortalStatusLabel": "External Status",
+    "ApplicantPortalSettings:PortalPublishedStatusLabel": "Published Status",
     "ApplicantPortalSettings:SaveChanges": "Save Changes",
     "ApplicantPortalSettings:ResetChanges": "Reset",
     "ApplicantPortalSettings:NoChanges": "No changes to save.",
     "ApplicantPortalSettings:ChangesReset": "Changes have been reset to original values.",
     "ApplicantPortalSettings:SaveSuccess": "Portal status labels updated successfully.",
     "ApplicantPortalSettings:SaveError": "An error occurred while saving portal status labels.",
-    "ApplicantPortalSettings:ValidationRequired": "Portal status label cannot be empty."
+    "ApplicantPortalSettings:ValidationRequired": "Portal status label cannot be empty.",
+
+    "ProgramDetails:Heading": "Program Details",
+    "ProgramDetails:DisplayName": "Display Name",
+    "ProgramDetails:Division": "Division",
+    "ProgramDetails:Branch": "Branch",
+    "ProgramDetails:Description": "Description",
+    "ProgramDetails:SaveChanges": "Save Changes",
+    "ProgramDetails:ResetChanges": "Discard Changes",
+    "ProgramDetails:NoChanges": "No changes to save.",
+    "ProgramDetails:ChangesReset": "Changes have been reset to original values.",
+    "ProgramDetails:SaveSuccess": "Program details updated successfully.",
+    "ProgramDetails:SaveError": "An error occurred while saving program details.",
+
+    "Common:Command:Cancel": "Cancel",
+    "Common:Command:Save": "Save",
+    "Common:Command:Filter": "Filter",
+
+    "OnboardingList:OpenButton": "Open",
+    "OnboardingList:CreateTenantButton": "Create Tenant",
+    "OnboardingList:FilterButton": "Filter",
+    "OnboardingList:CategoryLabel": "Category",
+    "Onboarding:ColumnSubmissionNumber": "Submission #",
+    "Onboarding:ColumnStatus": "Status",
+    "Onboarding:ColumnSubmissionDate": "Submission Date",
+    "Onboarding:ColumnCategory": "Category",
+    "Onboarding:ViewDataGrid": "View data grid",
+    "Onboarding:DataGridModalTitle": "Data Grid",
+    "OnboardingModal:ValidationPassed": "Validation passed. Ready to create tenant.",
+    "OnboardingModal:ValidationFailed": "Validation failed:",
+    "OnboardingModal:ValidateFailed": "Failed to validate request. Please try again.",
+    "OnboardingModal:CreateSuccess": "Tenant created successfully.",
+    "OnboardingModal:CreateFailed": "Failed to create tenant. Please try again.",
+    "CreateTenantModal:Title": "Create Tenant",
+    "CreateTenantModal:Ministry": "Ministry",
+    "CreateTenantModal:Branch": "Branch",
+    "CreateTenantModal:ProgramArea": "Program Area",
+    "CreateTenantModal:Category": "Category",
+    "CreateTenantModal:Features": "Features",
+    "CreateTenantModal:FieldMappingLabel": "Field mapping",
+    "CreateTenantModal:TenantNameFieldLabel": "Tenant name field",
+    "CreateTenantModal:SuperUsersFieldLabel": "Super users field",
+    "CreateTenantModal:MappingPlaceholder": "-- Select a field --",
+    "CreateTenantModal:RevalidateButton": "Re-validate",
+    "CreateTenantModal:Validating": "Validating request…",
+    "CreateTenantModal:CreatingSpinner": "Creating tenant, please wait…",
+    "CreateTenantModal:CreatingWarningTitle": "This may take a moment.",
+    "CreateTenantModal:CreatingWarningBody": "Tenant provisioning is in progress — please do not close this window or navigate away until the process completes.",
+    "CreateTenantModal:ConfirmButton": "Create Tenant",
+    "CreateTenantModal:NoFieldsWarning": "No worksheet data is available for this request. Tenant creation requires at least one submitted worksheet with field data.",
+    "TenantList:ActionsButton": "Actions",
+    "TenantList:ConfigurationAction": "Configuration",
+    "TenantList:LicencePlate": "Licence Plate",
+    "TenantList:CasClientCode": "CAS Client Code",
+    "TenantList:SearchMinChars": "Please enter at least 2 characters to search.",
+
+    "DataTable:ContextMenu:Copy": "Copy",
+    "DataTable:ContextMenu:CopiedToClipboard": "Copied to clipboard",
+    "DataTable:ContextMenu:Filter": "Filter",
+    "DataTable:ContextMenu:ClearFilter": "Clear Filters"
   }
 }
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 73afc90266..da6a031bca 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
@@ -37,6 +37,7 @@ public static class Applicants
             public const string Default              = GroupName + ".Applicants";
             public const string ViewList             = Default + ".ViewList";
             public const string Edit                 = Default + Operation.Update;
+            public const string Delete               = Default + Operation.Delete;
             public const string AssignApplicant      = Default + ".AssignApplicant";
             public const string ApplicantInfoDefault = Default + ".ApplicantInfo";
             public const string EditRedStop          = ApplicantInfoDefault + ".EditRedStop";
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/GrantManagerPermissions.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/GrantManagerPermissions.cs
index 169659b1d9..c38b9205fb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/GrantManagerPermissions.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/GrantManagerPermissions.cs
@@ -23,13 +23,19 @@ public static class ApplicationForms
     {
         public const string Default = GroupName + ".ApplicationForms";
     }
-    
+
     public static class Endpoints
     {
         public const string Default = GroupName + ".Endpoints";
         public const string ManageEndpoints = Default + ".ManageEndpoints";
     }
 
+    public static class NotificationScheduler
+    {
+        public const string Default = GroupName + ".NotificationScheduler";
+        public const string ManageSchedules = Default + ".ManageSchedules";
+    }
+
     /// <summary>
     /// Permission constants for the generic contacts service.
     /// These are pre-wired for future HTTP endpoint exposure.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/UnitySettingManagementPermissions.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/UnitySettingManagementPermissions.cs
index 84a8d195cd..18d1637c55 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/UnitySettingManagementPermissions.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Permissions/UnitySettingManagementPermissions.cs
@@ -7,5 +7,7 @@ public static class UnitySettingManagementPermissions
 
     public const string BackgroundJobSettings = "SettingManagement.GrantManager";
 
-    public const string ConfigurePayments = "SettingManagement.ConfigurePayments";
+    public const string ConfigurePayments = GroupName + ".ConfigurePayments";

+
+    public const string EditProgramDetails = GroupName + ".EditProgramDetails";

 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/SettingManagement/ProgramDetailsConsts.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/SettingManagement/ProgramDetailsConsts.cs
new file mode 100644
index 0000000000..f8d16973f0
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/SettingManagement/ProgramDetailsConsts.cs
@@ -0,0 +1,9 @@
+namespace Unity.GrantManager.SettingManagement;
+
+public static class ProgramDetailsConsts
+{
+    public const int MaxDisplayNameLength = 30;
+    public const int MaxDivisionLength = 50;
+    public const int MaxBranchLength = 50;
+    public const int MaxDescriptionLength = 500;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Settings/SettingsConstants.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Settings/SettingsConstants.cs
index 7104a6f7e2..40182cf5fe 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Settings/SettingsConstants.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Settings/SettingsConstants.cs
@@ -30,7 +30,8 @@ public static class BackgroundJobs
             public const string IntakeResync_Expression = "GrantManager.BackgroundJobs.IntakeResync_Expression";
             public const string IntakeResync_NumDaysToCheck = "GrantManager.BackgroundJobs.IntakeResync_NumDaysToCheck";
             public const string DataHealthCheckMonitor_Expression = "GrantManager.BackgroundJobs.DataHealthCheckMonitor_Expression";
-            public const string ApplicantTenantMapReconciliation_Expression = "GrantManager.BackgroundJobs.ApplicantTenantMapReconciliation_Expression";            
-         }
+            public const string ApplicantTenantMapReconciliation_Expression = "GrantManager.BackgroundJobs.ApplicantTenantMapReconciliation_Expression";
+            public const string DateBasedNotificationSchedule_Expression = "GrantManager.BackgroundJobs.DateBasedNotificationSchedule_Expression";
+        }
     }
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Workflow/UnityWorkflowExtensions.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Workflow/UnityWorkflowExtensions.cs
index e922d73e62..f6572df6f6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Workflow/UnityWorkflowExtensions.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Workflow/UnityWorkflowExtensions.cs
@@ -25,10 +25,10 @@ public static IEnumerable<TTriggers> GetAllActions<TStates, TTriggers>(this Unit
     }
 
     /// <summary>
-    /// Generates a DOT graph from the workflow state machine configuration.
+    /// Generates a Mermaid graph from the workflow state machine configuration.
     /// </summary>
     public static string? GetWorkflowDiagram<TStates, TTriggers>(this UnityWorkflow<TStates, TTriggers> workflow)
     {
-        return UmlDotGraph.Format(workflow._stateMachine.GetInfo());
+        return MermaidGraph.Format(workflow._stateMachine.GetInfo());
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/Applicant.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/Applicant.cs
index b69fac3393..12645d2962 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/Applicant.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/Applicant.cs
@@ -13,7 +13,6 @@ public class Applicant : AuditedAggregateRoot<Guid>, IMultiTenant
     public string? OrgNumber { get; set; }
     public string? OrgStatus { get; set; }
     public string? OrganizationType { get; set; }
-    public string? OrganizationSize { get; set; }
     public string? Sector { get; set; }
     public string? SubSector { get; set; }
     public string? Status { get; set; }
@@ -36,4 +35,13 @@ public class Applicant : AuditedAggregateRoot<Guid>, IMultiTenant
     public string? IssueTrackingComments { get; set; }
     public string? AuditComments { get; set; }
     public string? ReportsComments { get; set; }
+    // Soft-delete fields are declared manually instead of implementing ABP's ISoftDelete.
+    // ISoftDelete would register a global EF Core query filter that applies to Include() joins —
+    // Application.Applicant is a required navigation (OnDelete NoAction), so the filter would
+    // silently drop Application rows whose Applicant is soft-deleted, breaking the application
+    // and payment list pages. Filtering is applied explicitly only where needed (applicant list,
+    // lookup, autocomplete) via .Where(a => !a.IsDeleted).
+    public bool IsDeleted { get; set; }
+    public DateTime? DeletionTime { get; set; }
+    public Guid? DeleterId { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicantListRecord.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicantListRecord.cs
new file mode 100644
index 0000000000..72bccbb077
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicantListRecord.cs
@@ -0,0 +1,30 @@
+using System;
+
+namespace Unity.GrantManager.Applications;
+
+public class ApplicantListRecord
+{
+    public Guid Id { get; set; }
+    public string? ApplicantName { get; set; }
+    public string? UnityApplicantId { get; set; }
+    public string? OrgName { get; set; }
+    public string? OrgNumber { get; set; }
+    public string? OrgStatus { get; set; }
+    public string? OrganizationType { get; set; }
+    public string? Status { get; set; }
+    public bool? RedStop { get; set; }
+    public string? NonRegisteredBusinessName { get; set; }
+    public string? NonRegOrgName { get; set; }
+    public string? Sector { get; set; }
+    public string? SubSector { get; set; }
+    public string? ApproxNumberOfEmployees { get; set; }
+    public string? IndigenousOrgInd { get; set; }
+    public string? SectorSubSectorIndustryDesc { get; set; }
+    public string? FiscalMonth { get; set; }
+    public string? BusinessNumber { get; set; }
+    public int? FiscalDay { get; set; }
+    public DateOnly? StartedOperatingDate { get; set; }
+    public bool IsDuplicated { get; set; }
+    public DateTime CreationTime { get; set; }
+    public DateTime? LastModificationTime { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/Application.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/Application.cs
index d05186bab2..ff5f68410b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/Application.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/Application.cs
@@ -21,7 +21,7 @@ public virtual ApplicationForm ApplicationForm
     {
         set => _applicationForm = value;
         get => _applicationForm
-            ?? throw new InvalidOperationException("Uninitialized property: " + nameof(Applicant));
+            ?? throw new InvalidOperationException("Uninitialized property: " + nameof(ApplicationForm));
     }
 
     private ApplicationForm? _applicationForm;
@@ -84,6 +84,8 @@ public virtual ApplicationStatus ApplicationStatus
 
     public string? SubStatus { get; set; }
 
+    public bool ExternalStatusVisibility { get; set; } = false;
+
     public string? DeclineRational { get; set; }
 
     public string? Notes { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs
index 31ee0d2851..d72db21f77 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Services;
-using Unity.GrantManager.Intakes;
+using Newtonsoft.Json.Linq;
+using System.Threading.Tasks;
 using Unity.GrantManager.Events;
+using Unity.GrantManager.Intakes;
 using Volo.Abp.Domain.Repositories;
-using Newtonsoft.Json.Linq;
+using Volo.Abp.Domain.Services;
 
 namespace Unity.GrantManager.Applications
 {
@@ -58,9 +58,14 @@ public ApplicationForm SynchronizePublishedForm(ApplicationForm applicationForm,
                     JObject formObject = JObject.Parse(form.ToString());
                     var formName = formObject.SelectToken("name");
                     var formDescription = formObject.SelectToken("description");
-                    if(formName != null && formDescription != null)
+                    
+                    if (formName != null)
                     {
                         applicationForm.ApplicationFormName = formName.ToString();
+                    }
+
+                    if (formDescription != null && string.IsNullOrWhiteSpace(applicationForm.ApplicationFormDescription))
+                    {
                         applicationForm.ApplicationFormDescription = formDescription.ToString();
                     }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationListRecord.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationListRecord.cs
index f086d1299e..7b4f4e11ca 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationListRecord.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationListRecord.cs
@@ -57,6 +57,7 @@ public class ApplicationListRecord
     public DateTime? ContractExecutionDate { get; init; }
     public string? RiskRanking { get; init; }
     public string? UnityApplicationId { get; init; }
+    public bool ExternalStatusVisibility { get; init; }
 
     // ApplicationStatus (always joined)
     public string Status { get; init; } = string.Empty;
@@ -76,7 +77,7 @@ public class ApplicationListRecord
     public string? ApplicantOrgNumber { get; init; }
     public string? ApplicantOrgStatus { get; init; }
     public string? ApplicantBusinessNumber { get; init; }
-    public string? ApplicantOrganizationSize { get; init; }
+    public string? ApplicantApproxNumberOfEmployees { get; init; }
     public string? ApplicantSectorSubSectorIndustryDesc { get; init; }
     public bool? ApplicantRedStop { get; init; }
     public string? ApplicantIndigenousOrgInd { get; init; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationManager.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationManager.cs
index b810fed02c..1c92533519 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationManager.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationManager.cs
@@ -22,6 +22,9 @@ public class ApplicationManager : DomainService, IApplicationManager
     private readonly IPersonRepository _personRepository;
     private readonly IPermissionChecker _permissionChecker;
 
+    private const string DirectApprovalDescription = "Direct Approval Bypass";
+    private const string DirectDenialDescription = "Direct Denial Bypass";
+
     public ApplicationManager(
         IApplicationRepository applicationRepository,
         IApplicationStatusRepository applicationStatus,
@@ -40,52 +43,48 @@ public ApplicationManager(
 
     public  void ConfigureWorkflow(StateMachine<GrantApplicationState, GrantApplicationAction> stateMachine, bool isDirectApproval = false)
     {
-        // NOTE: ENSURE APPLICATION STATE MACHINE MATCHES WORKFLOW IN AB#8375
+        #region OPEN STATES
         stateMachine.Configure(GrantApplicationState.OPEN)
             .InitialTransition(GrantApplicationState.SUBMITTED)
-            .Permit(GrantApplicationAction.Withdraw, GrantApplicationState.WITHDRAWN)                             // 2.2 - Withdraw;          Role: Reviewer
-            .Permit(GrantApplicationAction.Close, GrantApplicationState.CLOSED)                                   // 2.4 - Close Application; Role: Reviewer
+            .Permit(GrantApplicationAction.Withdraw, GrantApplicationState.WITHDRAWN)
+            .Permit(GrantApplicationAction.Close, GrantApplicationState.CLOSED)
             .Permit(GrantApplicationAction.Internal_Unasign, GrantApplicationState.SUBMITTED)
-            .PermitIf(GrantApplicationAction.Approve,GrantApplicationState.GRANT_APPROVED,() => isDirectApproval);
+            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => AllowDirectDecision(isDirectApproval, stateMachine, GrantApplicationState.GRANT_APPROVED), DirectApprovalDescription)
+            .PermitIf(GrantApplicationAction.Deny, GrantApplicationState.GRANT_NOT_APPROVED, () => AllowDirectDecision(isDirectApproval, stateMachine, GrantApplicationState.GRANT_NOT_APPROVED), DirectDenialDescription);
 
         stateMachine.Configure(GrantApplicationState.SUBMITTED)
             .SubstateOf(GrantApplicationState.OPEN)
             .Permit(GrantApplicationAction.Defer, GrantApplicationState.DEFER)
             .Permit(GrantApplicationAction.OnHold, GrantApplicationState.ON_HOLD)
-            .Permit(GrantApplicationAction.Internal_Assign, GrantApplicationState.ASSIGNED)                      // 2.1 - Internal_Assign;            Role: Team Lead
-            .Permit(GrantApplicationAction.Internal_StartAssessment, GrantApplicationState.UNDER_ASSESSMENT)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
+            .Permit(GrantApplicationAction.Internal_Assign, GrantApplicationState.ASSIGNED)
+            .Permit(GrantApplicationAction.Internal_StartAssessment, GrantApplicationState.UNDER_ASSESSMENT);
 
         stateMachine.Configure(GrantApplicationState.ASSIGNED)
             .SubstateOf(GrantApplicationState.OPEN)
             .Permit(GrantApplicationAction.Defer, GrantApplicationState.DEFER)
             .Permit(GrantApplicationAction.OnHold, GrantApplicationState.ON_HOLD)
-            .Permit(GrantApplicationAction.StartReview, GrantApplicationState.UNDER_INITIAL_REVIEW)              // 2.3 - Start Review;      Role: Reviewer
-            .Permit(GrantApplicationAction.Internal_StartAssessment, GrantApplicationState.UNDER_ASSESSMENT)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
+            .Permit(GrantApplicationAction.StartReview, GrantApplicationState.UNDER_INITIAL_REVIEW)
+            .Permit(GrantApplicationAction.Internal_StartAssessment, GrantApplicationState.UNDER_ASSESSMENT);
 
         stateMachine.Configure(GrantApplicationState.UNDER_INITIAL_REVIEW)
             .SubstateOf(GrantApplicationState.OPEN)
             .Permit(GrantApplicationAction.Defer, GrantApplicationState.DEFER)
             .Permit(GrantApplicationAction.OnHold, GrantApplicationState.ON_HOLD)
             .Permit(GrantApplicationAction.CompleteReview, GrantApplicationState.INITITAL_REVIEW_COMPLETED)
-            .Permit(GrantApplicationAction.Internal_StartAssessment, GrantApplicationState.UNDER_ASSESSMENT)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
+            .Permit(GrantApplicationAction.Internal_StartAssessment, GrantApplicationState.UNDER_ASSESSMENT);
 
         stateMachine.Configure(GrantApplicationState.INITITAL_REVIEW_COMPLETED)
             .SubstateOf(GrantApplicationState.OPEN)
             .Permit(GrantApplicationAction.Defer, GrantApplicationState.DEFER)
             .Permit(GrantApplicationAction.OnHold, GrantApplicationState.ON_HOLD)
             .Permit(GrantApplicationAction.StartAssessment, GrantApplicationState.UNDER_ASSESSMENT)
-            .Permit(GrantApplicationAction.Internal_StartAssessment, GrantApplicationState.UNDER_ASSESSMENT)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
+            .Permit(GrantApplicationAction.Internal_StartAssessment, GrantApplicationState.UNDER_ASSESSMENT);
 
         stateMachine.Configure(GrantApplicationState.UNDER_ASSESSMENT)
             .SubstateOf(GrantApplicationState.OPEN)
             .Permit(GrantApplicationAction.Defer, GrantApplicationState.DEFER)
             .Permit(GrantApplicationAction.OnHold, GrantApplicationState.ON_HOLD)
-            .Permit(GrantApplicationAction.CompleteAssessment, GrantApplicationState.ASSESSMENT_COMPLETED)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
+            .Permit(GrantApplicationAction.CompleteAssessment, GrantApplicationState.ASSESSMENT_COMPLETED);
 
         stateMachine.Configure(GrantApplicationState.ASSESSMENT_COMPLETED)
             .SubstateOf(GrantApplicationState.OPEN)
@@ -101,8 +100,7 @@ public  void ConfigureWorkflow(StateMachine<GrantApplicationState, GrantApplicat
             .Permit(GrantApplicationAction.CompleteReview, GrantApplicationState.INITITAL_REVIEW_COMPLETED)
             .Permit(GrantApplicationAction.StartAssessment, GrantApplicationState.UNDER_ASSESSMENT)
             .Permit(GrantApplicationAction.CompleteAssessment, GrantApplicationState.ASSESSMENT_COMPLETED)
-            .Permit(GrantApplicationAction.OnHold, GrantApplicationState.ON_HOLD)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
+            .Permit(GrantApplicationAction.OnHold, GrantApplicationState.ON_HOLD);
 
         stateMachine.Configure(GrantApplicationState.ON_HOLD)
             .SubstateOf(GrantApplicationState.OPEN)
@@ -111,35 +109,57 @@ public  void ConfigureWorkflow(StateMachine<GrantApplicationState, GrantApplicat
             .Permit(GrantApplicationAction.CompleteReview, GrantApplicationState.INITITAL_REVIEW_COMPLETED)
             .Permit(GrantApplicationAction.StartAssessment, GrantApplicationState.UNDER_ASSESSMENT)
             .Permit(GrantApplicationAction.CompleteAssessment, GrantApplicationState.ASSESSMENT_COMPLETED)
-            .Permit(GrantApplicationAction.Defer, GrantApplicationState.DEFER)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
+            .Permit(GrantApplicationAction.Defer, GrantApplicationState.DEFER);
+        #endregion OPEN STATES
 
-        // CLOSED STATES
+        #region CLOSED STATES
+        stateMachine.Configure(GrantApplicationState.RESOLVED);
 
         stateMachine.Configure(GrantApplicationState.CLOSED)
+            .SubstateOf(GrantApplicationState.RESOLVED)
             .Permit(GrantApplicationAction.Withdraw, GrantApplicationState.WITHDRAWN)
             .Permit(GrantApplicationAction.Defer, GrantApplicationState.DEFER)
             .Permit(GrantApplicationAction.OnHold, GrantApplicationState.ON_HOLD)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
-
+            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval, DirectApprovalDescription)
+            .PermitIf(GrantApplicationAction.Deny, GrantApplicationState.GRANT_NOT_APPROVED, () => isDirectApproval, DirectDenialDescription);
 
         stateMachine.Configure(GrantApplicationState.WITHDRAWN)
+            .SubstateOf(GrantApplicationState.RESOLVED)
             .Permit(GrantApplicationAction.Close, GrantApplicationState.CLOSED)
             .Permit(GrantApplicationAction.Defer, GrantApplicationState.DEFER)
             .Permit(GrantApplicationAction.OnHold, GrantApplicationState.ON_HOLD)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
+            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval, DirectApprovalDescription)
+            .PermitIf(GrantApplicationAction.Deny, GrantApplicationState.GRANT_NOT_APPROVED, () => isDirectApproval, DirectDenialDescription);
 
         stateMachine.Configure(GrantApplicationState.GRANT_APPROVED)
+            .SubstateOf(GrantApplicationState.RESOLVED)
             .Permit(GrantApplicationAction.Withdraw, GrantApplicationState.WITHDRAWN)
             .Permit(GrantApplicationAction.Close, GrantApplicationState.CLOSED)
-            .PermitIf(GrantApplicationAction.Defer, GrantApplicationState.DEFER, () => HasPermission(GrantApplicationPermissions.Approvals.DeferAfterApproval));
-
-
+            .PermitIf(GrantApplicationAction.Defer, GrantApplicationState.DEFER, () => HasPermission(GrantApplicationPermissions.Approvals.DeferAfterApproval))
+            .PermitIf(GrantApplicationAction.Deny, GrantApplicationState.GRANT_NOT_APPROVED, () => isDirectApproval, DirectDenialDescription);
 
         stateMachine.Configure(GrantApplicationState.GRANT_NOT_APPROVED)
+            .SubstateOf(GrantApplicationState.RESOLVED)
             .Permit(GrantApplicationAction.Close, GrantApplicationState.CLOSED)
-            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval);
+            .PermitIf(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED, () => isDirectApproval, DirectApprovalDescription);
+        #endregion CLOSED STATES
     }
+
+    /// <summary>
+    /// Determines if a direct decision (Approve/Deny) can be made based on the current state and the isDirectApproval flag.
+    /// </summary>
+    /// <param name="isDirectApproval">Indicates if direct approval is allowed.</param>
+    /// <param name="stateMachine">The state machine instance.</param>
+    /// <param name="targetState">The target state for the direct decision to prevent reentrant transitions.</param>
+    /// <returns>True if a direct decision can be made; otherwise, false.</returns>
+    private static bool AllowDirectDecision(
+        bool isDirectApproval,
+        StateMachine<GrantApplicationState, GrantApplicationAction> stateMachine,
+        GrantApplicationState targetState)
+    {
+        return isDirectApproval && stateMachine.State != targetState;
+    }
+
     private bool HasPermission(string permission)
     {
         return _permissionChecker.IsGrantedAsync(permission).Result;
@@ -186,6 +206,22 @@ public bool IsActionAllowed(Application application, GrantApplicationAction trig
         return Workflow.GetPermittedActions().Contains(triggerAction);
     }
 
+    /// <summary>
+    /// Generate a Mermaid graph from the Asssessment workflow.
+    /// </summary>
+    public string? GetWorkflowDiagram(bool isDirectApproval)
+    {
+        var applicationStatus = GrantApplicationState.SUBMITTED;
+        var Workflow = new UnityWorkflow<GrantApplicationState, GrantApplicationAction>(
+            () => GrantApplicationState.SUBMITTED,
+            s => applicationStatus = s, sm =>
+            {
+                ConfigureWorkflow(sm, isDirectApproval);
+            });
+
+        return Workflow.GetWorkflowDiagram();
+    }
+
     public async Task<Application> TriggerAction(Guid applicationId, GrantApplicationAction triggerAction)
     {
         var application = await _applicationRepository.GetAsync(applicationId);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationStatus.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationStatus.cs
index b55665ec5f..c0c9814ae9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationStatus.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationStatus.cs
@@ -13,6 +13,8 @@ public class ApplicationStatus : AuditedAggregateRoot<Guid>, IMultiTenant
 
     public string InternalStatus { get; set; } = string.Empty;
 
+    public string? NotifiedStatus { get; set; }
+
     public GrantApplicationState StatusCode { get; set; }
 
     // Navigation Property
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/FundingHistory.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/FundingHistory.cs
index 5a601ac7c8..ebba8a6390 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/FundingHistory.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/FundingHistory.cs
@@ -14,6 +14,7 @@ public class FundingHistory : AuditedAggregateRoot<Guid>, IMultiTenant
     public decimal? OneTimeConsideration { get; set; }    
     public decimal? ReconsiderationAmount { get; set; }
     public decimal? TotalGrantAmount { get; set; }
+    public DateTime? PaidDate { get; set; }
     public string? FundingNotes { get; set; }
     public Guid? TenantId { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicantRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicantRepository.cs
index 7edda9f14f..6e94d9dd60 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicantRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicantRepository.cs
@@ -13,4 +13,5 @@ public interface IApplicantRepository : IRepository<Applicant, Guid>
     Task<Applicant?> GetByUnityApplicantNameAsync(string unityApplicantName);
     Task<List<Applicant>> GetApplicantsWithUnityApplicantIdAsync();
     Task<JsonDocument> GetApplicantAutocompleteQueryAsync(string? applicantLookUpQuery);
+    Task<List<ApplicantListRecord>> GetApplicantListRecordsAsync(IReadOnlyList<string>? requestedFields = null);
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationFormSubmissionRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationFormSubmissionRepository.cs
index 6dfc2f04e2..bbd335b401 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationFormSubmissionRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationFormSubmissionRepository.cs
@@ -6,6 +6,6 @@ namespace Unity.GrantManager.Applications;
 
 public interface IApplicationFormSubmissionRepository : IRepository<ApplicationFormSubmission, Guid>
 {
-    Task<ApplicationFormSubmission> GetByApplicationAsync(Guid applicationId);
+    Task<ApplicationFormSubmission?> GetByApplicationAsync(Guid applicationId);
     Task<ApplicationFormDetails> GetFormDetailsByApplicationIdAsync(Guid applicationId);
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationManager.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationManager.cs
index 69690764bc..ce61915c33 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationManager.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationManager.cs
@@ -13,4 +13,5 @@ public interface IApplicationManager
     Task<Application> TriggerAction(Guid applicationId, GrantApplicationAction triggerAction);
     Task SetAssigneesAsync(Guid applicationId, List<(Guid? assigneeId, string? fullName)> assigneeSubs);
     bool IsActionAllowed(Application application, GrantApplicationAction triggerAction);
+    string? GetWorkflowDiagram(bool isDirectApproval);
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationRepository.cs
index 62a57ce6de..fe09b4433b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationRepository.cs
@@ -43,5 +43,8 @@ Task<List<ApplicationListRecord>> GetApplicationListRecordsAsync(
 
         // Get applications whose DefaultSiteId matches the given site id
         Task<List<Application>> GetApplicationsBySiteIdAsync(Guid siteId);
+
+        // Check whether any applications exist for the given applicant
+        Task<bool> HasApplicationsByApplicantIdAsync(Guid applicantId);
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/OnboardingApplicationManager.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/OnboardingApplicationManager.cs
new file mode 100644
index 0000000000..aae3a375aa
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/OnboardingApplicationManager.cs
@@ -0,0 +1,91 @@
+using Stateless;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.GrantApplications;
+using Unity.GrantManager.Workflow;
+using Volo.Abp.Domain.Services;
+
+namespace Unity.GrantManager.Applications;
+
+public class OnboardingApplicationManager(
+    IApplicationRepository applicationRepository,
+    IApplicationStatusRepository applicationStatusRepository)
+    : DomainService
+{
+    private static void ConfigureWorkflow(StateMachine<GrantApplicationState, GrantApplicationAction> sm)
+    {
+        sm.Configure(GrantApplicationState.SUBMITTED)
+            .Permit(GrantApplicationAction.Approve, GrantApplicationState.GRANT_APPROVED)
+            .Permit(GrantApplicationAction.Deny, GrantApplicationState.GRANT_NOT_APPROVED);
+
+        sm.Configure(GrantApplicationState.GRANT_APPROVED)
+            .Permit(GrantApplicationAction.Close, GrantApplicationState.CLOSED);
+
+        sm.Configure(GrantApplicationState.GRANT_NOT_APPROVED)
+            .Permit(GrantApplicationAction.Close, GrantApplicationState.CLOSED);
+
+        sm.Configure(GrantApplicationState.CLOSED);
+    }
+
+    public async Task<List<ApplicationActionResultItem>> GetActions(Guid applicationId)
+    {
+        var application = await applicationRepository.GetAsync(applicationId, includeDetails: true);
+        var statusCode = application.ApplicationStatus.StatusCode;
+
+        var workflow = new UnityWorkflow<GrantApplicationState, GrantApplicationAction>(
+            () => statusCode,
+            s => statusCode = s,
+            ConfigureWorkflow);
+
+        var allActions = workflow.GetAllActions().Distinct().ToList();
+        var permittedActions = workflow.GetPermittedActions().ToList();
+
+        return allActions
+            .Select(trigger => new ApplicationActionResultItem
+            {
+                ApplicationAction = trigger,
+                IsPermitted = permittedActions.Contains(trigger),
+                IsInternal = false
+            })
+            .OrderBy(x => (int)x.ApplicationAction)
+            .ToList();
+    }
+
+    public bool IsActionAllowed(Application application, GrantApplicationAction triggerAction)
+    {
+        var statusCode = application.ApplicationStatus.StatusCode;
+        var workflow = new UnityWorkflow<GrantApplicationState, GrantApplicationAction>(
+            () => statusCode,
+            s => statusCode = s,
+            ConfigureWorkflow);
+
+        return workflow.GetPermittedActions().Contains(triggerAction);
+    }
+
+    public async Task<Application> TriggerAction(Guid applicationId, GrantApplicationAction triggerAction)
+    {
+        var application = await applicationRepository.GetAsync(applicationId, includeDetails: true);
+        var statusCode = application.ApplicationStatus.StatusCode;
+
+        var workflow = new UnityWorkflow<GrantApplicationState, GrantApplicationAction>(
+            () => statusCode,
+            s => statusCode = s,
+            ConfigureWorkflow);
+
+        await workflow.ExecuteActionAsync(triggerAction);
+
+        var newStatus = await applicationStatusRepository.GetAsync(x => x.StatusCode.Equals(statusCode));
+        application.ApplicationStatusId = newStatus.Id;
+        application.ApplicationStatus = newStatus;
+        application.LastModificationTime = DateTime.UtcNow;
+
+        if (triggerAction == GrantApplicationAction.Approve || triggerAction == GrantApplicationAction.Deny)
+        {
+            application.FinalDecisionDate = DateTime.UtcNow;
+        }
+
+        return await applicationRepository.UpdateAsync(application);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ReportsHistory.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ReportsHistory.cs
index cd6f4e683a..acaeca82eb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ReportsHistory.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ReportsHistory.cs
@@ -10,6 +10,7 @@ public class ReportsHistory : AuditedAggregateRoot<Guid>, IMultiTenant
     public string? FiscalYear { get; set; }
     public DateTime? ReportDate { get; set; }
     public bool? Outstanding { get; set; }
+    public bool? SignedOff { get; set; }
     public bool? IncompleteReport { get; set; }
     public string? Note { get; set; }
     public Guid? TenantId { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Data/GrantManagerDbMigrationService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Data/GrantManagerDbMigrationService.cs
index 5d46e99d1e..f300cb738c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Data/GrantManagerDbMigrationService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Data/GrantManagerDbMigrationService.cs
@@ -24,17 +24,20 @@ public class GrantManagerDbMigrationService : ITransientDependency
     private readonly IEnumerable<IGrantManagerDbSchemaMigrator> _dbSchemaMigrators;
     private readonly ITenantRepository _tenantRepository;
     private readonly ICurrentTenant _currentTenant;
+    private readonly TenantConnectionStringEncryptionMigrator _connectionStringEncryptionMigrator;
 
     public GrantManagerDbMigrationService(
         IDataSeeder dataSeeder,
         IEnumerable<IGrantManagerDbSchemaMigrator> dbSchemaMigrators,
         ITenantRepository tenantRepository,
-        ICurrentTenant currentTenant)
+        ICurrentTenant currentTenant,
+        TenantConnectionStringEncryptionMigrator connectionStringEncryptionMigrator)
     {
         _dataSeeder = dataSeeder;
         _dbSchemaMigrators = dbSchemaMigrators;
         _tenantRepository = tenantRepository;
         _currentTenant = currentTenant;
+        _connectionStringEncryptionMigrator = connectionStringEncryptionMigrator;
 
         Logger = NullLogger<GrantManagerDbMigrationService>.Instance;
     }
@@ -53,6 +56,8 @@ public async Task MigrateAsync()
         await MigrateDatabaseSchemaAsync();
         await SeedDataAsync();
 
+        await _connectionStringEncryptionMigrator.MigrateAsync();
+
         var tenants = await _tenantRepository.GetListAsync(includeDetails: true);
 
         var migratedDatabaseSchemas = new HashSet<string>();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Data/TenantConnectionStringEncryptionMigrator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Data/TenantConnectionStringEncryptionMigrator.cs
new file mode 100644
index 0000000000..1d7e7ee4ba
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Data/TenantConnectionStringEncryptionMigrator.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Security.Encryption;
+using Volo.Abp.TenantManagement;
+
+namespace Unity.GrantManager.Data;
+
+public partial class TenantConnectionStringEncryptionMigrator(
+    ITenantRepository tenantRepository,
+    IStringEncryptionService encryptionService) : ITransientDependency
+{
+    public async Task MigrateAsync()
+    {
+        var tenants = await tenantRepository.GetListAsync(includeDetails: true);
+
+        foreach (var tenant in tenants)
+        {
+            // IsPlainText returns true only when the value isn't valid base64 (i.e. not yet encrypted)
+            var plainTextStrings = tenant.ConnectionStrings
+                .Where(cs => IsPlainText(cs.Value))
+                .ToList();
+
+            foreach (var cs in plainTextStrings)
+            {
+                tenant.SetConnectionString(cs.Name, encryptionService.Encrypt(cs.Value));
+            }
+
+            if (plainTextStrings.Count > 0)
+            {
+                await tenantRepository.UpdateAsync(tenant);
+            }
+        }
+    }
+
+    // Require at least 2 keyword hits - a single hit (e.g. "Pwd=" or "Uid=") could
+    // coincidentally occur at the tail of valid base64 ciphertext, right before the
+    // padding '='. Real connection strings always carry several key=value pairs.
+    private const int MinKeywordMatches = 2;
+
+    private bool IsPlainText(string value)
+    {
+        if (ConnectionStringKeywordPattern().Matches(value).Count >= MinKeywordMatches) return true;
+
+        try
+        {
+            encryptionService.Decrypt(value);
+            return false;
+        }
+        catch (FormatException)
+        {
+            // Not valid base64, so it can't be ciphertext - it's plain text.
+            return true;
+        }
+        // Valid base64 that failed to decrypt with a CryptographicException (e.g. wrong
+        // passphrase, corrupted ciphertext) is left to throw, so we don't silently overwrite
+        // undecryptable ciphertext as if it were plain text.
+    }
+
+    [GeneratedRegex(@"(Host|Server|Port|Database|Initial Catalog|Username|User Id|Uid|Pwd|Password|Data Source)\s*=",
+        RegexOptions.IgnoreCase)]
+    private static partial Regex ConnectionStringKeywordPattern();
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantApplications/AIGenerationRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantApplications/AIGenerationRequest.cs
index 7ab2d9a8e5..68b30d107e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantApplications/AIGenerationRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantApplications/AIGenerationRequest.cs
@@ -4,12 +4,11 @@
 
 namespace Unity.GrantManager.GrantApplications;
 
-public class AIGenerationRequest : FullAuditedAggregateRoot<Guid>, IMultiTenant
+public class AIGenerationRequest : AuditedAggregateRoot<Guid>, IMultiTenant
 {
     public Guid? TenantId { get; set; }
-    public Guid? ApplicationId { get; set; }
-    public string OperationType { get; set; } = string.Empty;
-    public string RequestKey { get; set; } = string.Empty;
+    public Guid ApplicationId { get; set; }
+    public Guid OperationId { get; set; }
     public AIGenerationRequestStatus Status { get; set; }
     public DateTime? StartedAt { get; set; }
     public DateTime? CompletedAt { get; set; }
@@ -23,15 +22,13 @@ protected AIGenerationRequest()
     public AIGenerationRequest(
         Guid id,
         Guid? tenantId,
-        string operationType,
-        Guid? applicationId,
-        string requestKey)
+        Guid operationId,
+        Guid applicationId)
         : base(id)
     {
         TenantId = tenantId;
-        OperationType = operationType;
+        OperationId = operationId;
         ApplicationId = applicationId;
-        RequestKey = requestKey;
         Status = AIGenerationRequestStatus.Queued;
     }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerConsts.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerConsts.cs
index 21788549cf..8a55c0ca67 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerConsts.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerConsts.cs
@@ -15,6 +15,12 @@ public static class GrantManagerConsts
 
     public const string DefaultTenantConnectionStringName = "Tenant";
 
+    public const string DefaultTenantReadOnlyConnectionStringName = "Tenant_Readonly";
+
+    public const string OnboardingTenantName = "Onboarding";
+    public static string NormalizedOnboardingTenantName => OnboardingTenantName.ToUpper();
+    public const string OnboardingTenantConnectionStringConfigKey = "Onboarding";
+
     public const string DefaultConnectionStringName = "Default";
 
     public const string UnknownValue = "Unknown";
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDataSeederContributor.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDataSeederContributor.cs
index e469c96074..d75788f2ca 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDataSeederContributor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDataSeederContributor.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Assessments;
@@ -62,22 +64,36 @@ private async Task SeedApplicationStatusAsync()
             new() { StatusCode = GrantApplicationState.INITITAL_REVIEW_COMPLETED, ExternalStatus = GrantApplicationStates.UNDER_REVIEW, InternalStatus = GrantApplicationStates.INITITAL_REVIEW_COMPLETED },
             new() { StatusCode = GrantApplicationState.UNDER_ASSESSMENT, ExternalStatus = GrantApplicationStates.UNDER_REVIEW, InternalStatus = GrantApplicationStates.UNDER_ASSESSMENT },
             new() { StatusCode = GrantApplicationState.ASSESSMENT_COMPLETED, ExternalStatus = GrantApplicationStates.UNDER_REVIEW, InternalStatus = GrantApplicationStates.ASSESSMENT_COMPLETED },
-            new() { StatusCode = GrantApplicationState.GRANT_APPROVED, ExternalStatus = GrantApplicationStates.GRANT_APPROVED, InternalStatus = GrantApplicationStates.GRANT_APPROVED },
-            new() { StatusCode = GrantApplicationState.GRANT_NOT_APPROVED, ExternalStatus = GrantApplicationStates.DECLINED, InternalStatus = GrantApplicationStates.DECLINED },
+            new() { StatusCode = GrantApplicationState.GRANT_APPROVED, ExternalStatus = GrantApplicationStates.GRANT_APPROVED, InternalStatus = GrantApplicationStates.GRANT_APPROVED, NotifiedStatus = GrantApplicationStates.GRANT_APPROVED },
+            new() { StatusCode = GrantApplicationState.GRANT_NOT_APPROVED, ExternalStatus = GrantApplicationStates.DECLINED, InternalStatus = GrantApplicationStates.DECLINED, NotifiedStatus = GrantApplicationStates.DECLINED },
             new() { StatusCode = GrantApplicationState.DEFER, ExternalStatus = GrantApplicationStates.DEFER, InternalStatus = GrantApplicationStates.DEFER },
             new() { StatusCode = GrantApplicationState.ON_HOLD, ExternalStatus = GrantApplicationStates.ON_HOLD, InternalStatus = GrantApplicationStates.ON_HOLD },
         };
 
-        foreach (var status in statuses)
+        var existingCodes = (await applicationStatusRepository.GetListAsync())
+            .Select(s => s.StatusCode)
+            .ToHashSet();
+
+        foreach (var status in statuses.Where(s => !existingCodes.Contains(s.StatusCode)))
         {
-            var existing = await applicationStatusRepository.FirstOrDefaultAsync(s => s.StatusCode == status.StatusCode);
-            if (existing == null)
+            try
+            {
+                await applicationStatusRepository.InsertAsync(status, autoSave: true);
+            }
+            catch (Exception ex) when (IsDuplicateStatusCodeException(ex))
             {
-                await applicationStatusRepository.InsertAsync(status);
+                // Another concurrent seeder instance inserted this status first; safe to ignore.
             }
         }
     }
 
+    private static bool IsDuplicateStatusCodeException(Exception ex)
+    {
+        var full = ex.ToString();
+        return full.Contains("IX_ApplicationStatuses_StatusCode")
+            || (full.Contains("23505") && full.Contains("ApplicationStatuses"));
+    }
+
     private async Task SeedAiScoringPersonAsync(System.Guid? tenantId)
     {
         var existing = await personRepository.FirstOrDefaultAsync(p => p.Id == AIScoringConstants.AiPersonId);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDefaultTenantSeederContributor.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDefaultTenantSeederContributor.cs
index d7721894b1..c817bed8ca 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDefaultTenantSeederContributor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDefaultTenantSeederContributor.cs
@@ -1,7 +1,9 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using System.Threading.Tasks;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.FeatureManagement;
+using Volo.Abp.Security.Encryption;
 using Volo.Abp.TenantManagement;
 
 namespace Unity.GrantManager
@@ -11,14 +13,20 @@ public class GrantManagerDefaultTenantSeederContributor : IDataSeedContributor,
         private readonly ITenantManager _tenantManager;
         private readonly ITenantRepository _tenantRepository;
         private readonly IConfiguration _configuration;
+        private readonly IFeatureManager _featureManager;
+        private readonly IStringEncryptionService _encryptionService;
 
         public GrantManagerDefaultTenantSeederContributor(ITenantManager tenantManager,
             ITenantRepository tenantRepository,
-            IConfiguration configuration)
+            IConfiguration configuration,
+            IFeatureManager featureManager,
+            IStringEncryptionService encryptionService)
         {
             _tenantManager = tenantManager;
             _tenantRepository = tenantRepository;
             _configuration = configuration;
+            _featureManager = featureManager;
+            _encryptionService = encryptionService;
         }
 
         public async Task SeedAsync(DataSeedContext context)
@@ -27,33 +35,59 @@ public async Task SeedAsync(DataSeedContext context)
 
             if (context.TenantId == null)
             {
-                // Read the configuration and populate any default tenants
-                var tenant = await _tenantRepository.FindByNameAsync(GrantManagerConsts.NormalizedDefaultTenantName);
+                await SeedDefaultTenantAsync();
+                await SeedOnboardingTenantAsync();
+            }
+        }
 
-                // Legacy check for pre v8 upgrade - we dont want migrations to fail because of this breaking changed
-                if (tenant == null)
+        private async Task SeedDefaultTenantAsync()
+        {
+            var tenant = await _tenantRepository.FindByNameAsync(GrantManagerConsts.NormalizedDefaultTenantName);
+
+            // Legacy check for pre v8 upgrade - we dont want migrations to fail because of this breaking changed
+            if (tenant == null)
+            {
+                var list = await _tenantRepository.GetListAsync();
+                tenant = list.Find(s => s.Name == GrantManagerConsts.DefaultTenantName);
+                if (tenant != null)
                 {
-                    var list = await _tenantRepository.GetListAsync();
-                    tenant = list.Find(s => s.Name ==  GrantManagerConsts.DefaultTenantName);
-                    if (tenant != null)
-                    {
-                        await _tenantManager.ChangeNameAsync(tenant, tenant.Name);
-                    }
+                    await _tenantManager.ChangeNameAsync(tenant, tenant.Name);
                 }
+            }
 
-                if (tenant == null)
+            if (tenant == null)
+            {
+                var tenantConnectionString = _configuration.GetConnectionString(GrantManagerConsts.DefaultTenantConnectionStringName);
+                if (tenantConnectionString != null)
                 {
-                    var tenantConnectionString = _configuration.GetConnectionString(GrantManagerConsts.DefaultTenantConnectionStringName);
-                    if (tenantConnectionString != null)
-                    {
-                        var newTenant = await _tenantManager.CreateAsync(GrantManagerConsts.DefaultTenantName);
-                        newTenant.ConnectionStrings.Add(new TenantConnectionString(newTenant.Id, GrantManagerConsts.DefaultTenantConnectionStringName, tenantConnectionString));
-                        await _tenantRepository.InsertAsync(newTenant, true);
-                    }
+                    var newTenant = await _tenantManager.CreateAsync(GrantManagerConsts.DefaultTenantName);
+                    newTenant.ConnectionStrings.Add(new TenantConnectionString(newTenant.Id, GrantManagerConsts.DefaultTenantConnectionStringName, _encryptionService.Encrypt(tenantConnectionString)));
+                    await _tenantRepository.InsertAsync(newTenant, true);
                 }
             }
         }
-    }
-}
 
+        private async Task SeedOnboardingTenantAsync()
+        {
+            var tenant = await _tenantRepository.FindByNameAsync(GrantManagerConsts.NormalizedOnboardingTenantName);
 
+            if (tenant == null)
+            {
+                var connectionString = _configuration.GetConnectionString(GrantManagerConsts.OnboardingTenantConnectionStringConfigKey);
+                if (connectionString != null)
+                {
+                    var newTenant = await _tenantManager.CreateAsync(GrantManagerConsts.OnboardingTenantName);
+                    newTenant.ConnectionStrings.Add(new TenantConnectionString(newTenant.Id, GrantManagerConsts.DefaultTenantConnectionStringName, _encryptionService.Encrypt(connectionString)));
+                    await _tenantRepository.InsertAsync(newTenant, true);
+
+                    // "Unity.Onboarding" = SpecializationConsts.Onboarding; "T" = TenantFeatureValueProvider.ProviderName
+                    await _featureManager.SetAsync(
+                        "Unity.Onboarding",
+                        "true",
+                        "T",
+                        newTenant.Id.ToString());
+                }
+            }
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Notifications/ApplicationScheduledNotificationTracking.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Notifications/ApplicationScheduledNotificationTracking.cs
new file mode 100644
index 0000000000..065baf8aca
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Notifications/ApplicationScheduledNotificationTracking.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using Volo.Abp.Domain.Entities;
+
+namespace Unity.GrantManager.Notifications
+{
+    /// <summary>
+    /// Tracks which scheduled notifications have been sent for which applications.
+    /// Prevents duplicate notifications from being sent for the same application and notification combination.
+    /// </summary>
+    public class ScheduledNotificationTracking : Entity<Guid>
+    {
+        public Guid ApplicationId { get; set; }
+        public Guid ScheduledNotificationId { get; set; }
+        public required string DateField { get; set; } // "DueDate", "NotificationDate", "ContractNotificationDate"
+        public DateTime NotificationSentDate { get; set; }
+        public DateTime CreationTime { get; set; }
+        public Guid? CreatorId { get; set; }
+
+        protected ScheduledNotificationTracking() { }
+
+        [SetsRequiredMembers]
+        public ScheduledNotificationTracking(
+            Guid id,
+            Guid applicationId,
+            Guid scheduledNotificationId,
+            string dateField,
+            DateTime notificationSentDate) : base(id)
+        {
+            ApplicationId = applicationId;
+            ScheduledNotificationId = scheduledNotificationId;
+            DateField = dateField;
+            NotificationSentDate = notificationSentDate;
+            CreationTime = DateTime.UtcNow;
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Notifications/IApplicationScheduledNotificationTrackingRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Notifications/IApplicationScheduledNotificationTrackingRepository.cs
new file mode 100644
index 0000000000..aea1f143b7
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Notifications/IApplicationScheduledNotificationTrackingRepository.cs
@@ -0,0 +1,9 @@
+using System;
+using Volo.Abp.Domain.Repositories;
+
+namespace Unity.GrantManager.Notifications
+{
+    public interface IScheduledNotificationTrackingRepository : IRepository<ScheduledNotificationTracking, Guid>
+    {
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Notifications/ScheduledNotification.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Notifications/ScheduledNotification.cs
new file mode 100644
index 0000000000..6cd43e72fc
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Notifications/ScheduledNotification.cs
@@ -0,0 +1,32 @@
+using System;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.GrantManager.Notifications
+{
+    public class ScheduledNotification : FullAuditedAggregateRoot<Guid>, IMultiTenant
+    {
+        public Guid? TenantId { get; set; }
+        public Guid FormId { get; set; }
+
+        public Guid EmailTemplateId { get; set; }
+
+        public Guid? ApplicationStatusId { get; set; }
+
+        public string? ApplicationStatus { get; set; }
+
+        public string TriggerType { get; set; } = string.Empty; // Date or Event
+
+        public string? TriggerDetail { get; set; }
+
+        public bool IsActive { get; set; } = true;
+
+        // Event specific
+        public string? EventType { get; set; }
+        public string? RecipientCategory { get; set; }
+        public string? RecipientIdentifier { get; set; }
+
+        // Date specific
+        public string? DateField { get; set; }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
index d92d21a3dd..03e898b420 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
@@ -70,8 +70,15 @@ public PermissionGrantsDataSeeder(IPermissionDataSeeder permissionDataSeeder)
         public readonly List<string> Notifications_CommonPermissions = [
             NotificationsPermissions.Email.Default,
             NotificationsPermissions.Email.Send,
+            NotificationsPermissions.Email.DeleteDraft
         ];
 
+        public readonly List<string> NotificationsScheduling_CommonPermissions = [
+            NotificationsPermissions.Email.CancelScheduled,
+            NotificationsPermissions.Email.ScheduleCreate,
+            NotificationsPermissions.Email.ScheduleCancel
+        ];        
+
         public readonly List<string> Dashboard_CommonPermissions = [
             GrantApplicationPermissions.Dashboard.Default,
             GrantApplicationPermissions.Dashboard.ViewDashboard,
@@ -97,6 +104,13 @@ public PermissionGrantsDataSeeder(IPermissionDataSeeder permissionDataSeeder)
             UnitySelector.Payment.Tags.Delete,
         ];
 
+        public readonly List<string> ExternalStatusVisibility_CommonPermissions = [
+            UnitySelector.Application.Status.Default,
+            UnitySelector.Application.Status.Publish,
+            UnitySelector.Application.Status.Unpublish,
+            UnitySelector.Application.Status.BulkPublish
+        ];
+
         public async Task SeedAsync(DataSeedContext context)
         {
             // Default permission grants based on role
@@ -124,6 +138,8 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     IdentitySeedPermissions.Roles.ManagePermissions,
                     GrantManagerPermissions.Intakes.Default,
                     GrantManagerPermissions.ApplicationForms.Default,
+                    UnitySettingManagementPermissions.UserInterface,
+                    UnitySettingManagementPermissions.EditProgramDetails,
 
                     .. SettingManagement_Tags_CommonPermissions,
                     .. ReviewAndAssessment_CommonPermissions,
@@ -132,8 +148,10 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     .. PaymentInfo_CommonPermissions,
                     UnitySelector.Payment.Supplier.Update,
                     .. Notifications_CommonPermissions,
+                    .. NotificationsScheduling_CommonPermissions,
                     .. Dashboard_CommonPermissions,
                     .. Tags_CommonPermissions,
+                    .. ExternalStatusVisibility_CommonPermissions,
                     AIPermissions.Configuration.ConfigureAI,
                     FlexPermissions.Worksheets.Default,
                     FlexPermissions.Worksheets.Delete
@@ -196,8 +214,10 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     .. PaymentInfo_CommonPermissions,
                     UnitySelector.Payment.Supplier.Update,
                     .. Notifications_CommonPermissions,
+                    .. NotificationsScheduling_CommonPermissions,
                     .. Dashboard_CommonPermissions,
                     .. Tags_CommonPermissions,
+                    .. ExternalStatusVisibility_CommonPermissions,
 
                     // Role Specific Permissions
                     UnitySelector.Project.Summary.Update.UpdateFinalStateFields,
@@ -226,6 +246,7 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                 [
                     GrantManagerPermissions.Default,
                     UnitySettingManagementPermissions.UserInterface,
+                    UnitySettingManagementPermissions.EditProgramDetails,
                     GrantManagerPermissions.Organizations.Default,
                     GrantManagerPermissions.Organizations.ManageProfiles,
                     GrantManagerPermissions.Intakes.Default,
@@ -239,6 +260,7 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     .. PaymentInfo_CommonPermissions,
                     UnitySelector.Payment.Supplier.Update,
                     .. Notifications_CommonPermissions,
+                    .. NotificationsScheduling_CommonPermissions,
                     NotificationsPermissions.Settings,
                     .. Dashboard_CommonPermissions,
                     .. Tags_CommonPermissions,
@@ -334,4 +356,3 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
         }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/BackgroundJobsSettingsDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/BackgroundJobsSettingsDto.cs
deleted file mode 100644
index 2634789cd0..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/BackgroundJobsSettingsDto.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Unity.GrantManager.Settings;
-public class BackgroundJobsSettingsDto
-{
-    public string IntakeResyncExpression { get; set; } = string.Empty;
-    public string IntakeNumberOfDays { get; set; } = string.Empty;
-    public string CasPaymentsReconciliationProducerExpression { get; set; } = string.Empty;
-    public string CasFinancialNotificationSummaryProducerExpression { get; set; } = string.Empty;
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/GrantManagerSettingDefinitionProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/GrantManagerSettingDefinitionProvider.cs
index 9b85810397..9eb1d5451f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/GrantManagerSettingDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/GrantManagerSettingDefinitionProvider.cs
@@ -67,7 +67,9 @@ private static void AddBackgroundJobSettingDefinition(ISettingDefinitionContext
             // Run hourly
             { SettingsConstants.BackgroundJobs.DataHealthCheckMonitor_Expression, "0 0 * 1/1 * ? *" },
             // 2 AM PST = 10 AM UTC
-            { SettingsConstants.BackgroundJobs.ApplicantTenantMapReconciliation_Expression, "0 0 10 1/1 * ? *" }
+            { SettingsConstants.BackgroundJobs.ApplicantTenantMapReconciliation_Expression, "0 0 10 1/1 * ? *" },
+            // 2 AM PST = 10 AM UTC
+            { SettingsConstants.BackgroundJobs.DateBasedNotificationSchedule_Expression, "0 0 10 1/1 * ? *" }
         };
 
         foreach (var setting in backGroundSchedules)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreGrantManagerDbSchemaMigrator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreGrantManagerDbSchemaMigrator.cs
index 78ec9708fd..0c5c6d17e4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreGrantManagerDbSchemaMigrator.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreGrantManagerDbSchemaMigrator.cs
@@ -1,9 +1,16 @@
-using System;
+using System;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Npgsql;
 using Unity.GrantManager.Data;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Security.Encryption;
 using Volo.Abp.TenantManagement;
 
 namespace Unity.GrantManager.EntityFrameworkCore;
@@ -12,36 +19,101 @@ public class EntityFrameworkCoreGrantManagerDbSchemaMigrator
     : IGrantManagerDbSchemaMigrator, ITransientDependency
 {
     private readonly IServiceProvider _serviceProvider;
+    private readonly IStringEncryptionService _encryptionService;
 
-    public EntityFrameworkCoreGrantManagerDbSchemaMigrator(IServiceProvider serviceProvider)
+    public EntityFrameworkCoreGrantManagerDbSchemaMigrator(
+        IServiceProvider serviceProvider,
+        IStringEncryptionService encryptionService)
     {
         _serviceProvider = serviceProvider;
+        _encryptionService = encryptionService;
     }
 
     public async Task MigrateAsync(Tenant? tenant)
     {
-        /* We intentionally resolving the GrantManagerDbContext
-         * from IServiceProvider (instead of directly injecting it)
-         * to properly get the connection string of the current tenant in the
-         * current scope.
+        /* We intentionally resolve GrantManagerDbContext / GrantTenantDbContext
+         * from IServiceProvider (instead of directly injecting) to properly get
+         * the connection string of the current tenant in the current scope.
          */
 
         if (tenant != null)
         {
-            var connectionString = tenant.ConnectionStrings[0];
+            var connectionString = tenant.FindConnectionString(GrantManagerConsts.DefaultTenantConnectionStringName);
             if (connectionString != null)
             {
+                var configuration = _serviceProvider.GetRequiredService<IConfiguration>();
+                var adminConnectionString = configuration.GetConnectionString(GrantManagerConsts.DefaultConnectionStringName)
+                    ?? throw new InvalidOperationException($"Connection string '{GrantManagerConsts.DefaultConnectionStringName}' is not configured.");
+
+                // Parse the stored tenant connection string to get the DB name and role credentials
+                var tenantCsb = new NpgsqlConnectionStringBuilder(TryDecryptConnectionString(connectionString));
+                var dbName = tenantCsb.Database
+                    ?? throw new InvalidOperationException("Tenant connection string is missing the Database value.");
+                var roleName = tenantCsb.Username
+                    ?? throw new InvalidOperationException("Tenant connection string is missing the Username value.");
+                var rolePassword = tenantCsb.Password
+                    ?? throw new InvalidOperationException("Tenant connection string is missing the Password value.");
+
+                // dbName/roleName get interpolated directly into admin DDL below (Postgres
+                // identifiers can't be parameterized) — enforce an allowlist so a connection
+                // string crafted via UpdateConnectionStringsAsync can't break out of an
+                // identifier and inject arbitrary SQL into this admin-privileged migration path.
+                EnsureSafeIdentifier(dbName, "database name");
+                EnsureSafeIdentifier(roleName, "role name");
+
+                // Build an admin-level connection string targeting the tenant database
+                var adminCsb = new NpgsqlConnectionStringBuilder(adminConnectionString) { Database = dbName };
+                var adminTenantConnectionString = adminCsb.ToString();
+
+                // Create the PostgreSQL role (idempotent via DO block)
+                await CreateRoleIfNotExistsAsync(adminConnectionString, roleName, rolePassword);
+
+                // Create the database if it does not exist; use the admin connection so
+                // MigrateAsync connects cleanly and avoids logging a ConnectionError.
                 var tenantDb = _serviceProvider
-                .GetRequiredService<GrantTenantDbContext>()
-                .Database;
+                    .GetRequiredService<GrantTenantDbContext>()
+                    .Database;
+
+                tenantDb.SetConnectionString(adminTenantConnectionString);
 
-                tenantDb.SetConnectionString(connectionString.Value);
+                if (!await tenantDb.CanConnectAsync())
+                {
+                    await tenantDb.GetService<IRelationalDatabaseCreator>().CreateAsync();
+                }
+
+                // Grant database and schema privileges to the role (idempotent)
+                await GrantDatabasePrivilegesAsync(adminConnectionString, dbName, roleName);
+                await GrantSchemaPrivilegesAsync(adminTenantConnectionString, roleName);
+
+                // Ensure __EFMigrationsHistory exists so MigrateAsync does not log a CommandError
+                await tenantDb.ExecuteSqlRawAsync(
+                    tenantDb.GetService<IHistoryRepository>().GetCreateIfNotExistsScript());
+
+                // Run migrations as admin against the tenant database
                 await tenantDb.MigrateAsync();
 
+                // Grant table and sequence privileges after migrations have created all objects
+                await GrantTablePrivilegesAsync(adminTenantConnectionString, roleName);
+
+                // Provision the readonly role/connection (if a readonly connection string was generated for this tenant)
+                var readOnlyConnectionString = tenant.FindConnectionString(GrantManagerConsts.DefaultTenantReadOnlyConnectionStringName);
+                if (readOnlyConnectionString != null)
+                {
+                    var readOnlyCsb = new NpgsqlConnectionStringBuilder(TryDecryptConnectionString(readOnlyConnectionString));
+                    var readOnlyRoleName = readOnlyCsb.Username
+                        ?? throw new InvalidOperationException("Tenant readonly connection string is missing the Username value.");
+                    var readOnlyPassword = readOnlyCsb.Password
+                        ?? throw new InvalidOperationException("Tenant readonly connection string is missing the Password value.");
+                    EnsureSafeIdentifier(readOnlyRoleName, "readonly role name");
+
+                    await CreateRoleIfNotExistsAsync(adminConnectionString, readOnlyRoleName, readOnlyPassword);
+                    await GrantReadOnlyPrivilegesAsync(adminConnectionString, adminTenantConnectionString, dbName, readOnlyRoleName);
+                }
+
                 /* The payments module is also migrated.
-                   Currently the payments module also reference the tenant connection string.
-                   Changes to that, may require an inspection in the connections string here and resolve the correct one.
-                */
+                   Currently the payments module also references the tenant connection string.
+                   Changes to that may require inspecting the connection string here to resolve
+                   the correct one. */
             }
         }
         else
@@ -52,4 +124,144 @@ await _serviceProvider
                 .MigrateAsync();
         }
     }
+
+    // Decrypt the stored value — plain-text rows (pre-encryption) fall back to their original value.
+    // A successful decrypt that produces non-connection-string output (wrong passphrase returning garbage)
+    // is also rejected by the Contains('=') check so we surface a meaningful error rather than a
+    // cryptic NpgsqlConnectionStringBuilder format exception.
+    private string TryDecryptConnectionString(string rawValue)
+    {
+        try
+        {
+            var decrypted = _encryptionService.Decrypt(rawValue);
+            return (decrypted != null && decrypted.Contains('=')) ? decrypted : rawValue;
+        }
+        catch
+        {
+            return rawValue;
+        }
+    }
+
+    // Postgres identifiers (role/database/schema names) can't be parameterized via the wire
+    // protocol, so every call site that interpolates one into DDL must first validate it
+    // against this allowlist rather than relying on escaping alone.
+    private static readonly Regex SafeIdentifierPattern = new("^[A-Za-z0-9_-]+$", RegexOptions.Compiled);
+
+    private static void EnsureSafeIdentifier(string value, string fieldName)
+    {
+        if (!SafeIdentifierPattern.IsMatch(value))
+        {
+            throw new InvalidOperationException(
+                $"Tenant connection string {fieldName} '{value}' contains characters that are not allowed in a PostgreSQL identifier.");
+        }
+    }
+
+    // Passwords are used as quoted string literals (not identifiers), so unlike role/database
+    // names they keep a richer allowed character set — escaped here instead of allowlisted.
+    private static string EscapeSqlLiteral(string value) => value.Replace("'", "''");
+
+    private static async Task CreateRoleIfNotExistsAsync(string adminConnectionString, string roleName, string password)
+    {
+        await using var conn = new NpgsqlConnection(adminConnectionString);
+        await conn.OpenAsync();
+        await using var cmd = conn.CreateCommand();
+        cmd.CommandText = $"""
+            DO $$
+            BEGIN
+              IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = '{roleName}') THEN
+                CREATE ROLE "{roleName}" WITH LOGIN PASSWORD '{EscapeSqlLiteral(password)}';
+              END IF;
+            END
+            $$;
+            """;
+        await cmd.ExecuteNonQueryAsync();
+    }
+
+    private static async Task GrantDatabasePrivilegesAsync(string adminConnectionString, string dbName, string roleName)
+    {
+        await using var conn = new NpgsqlConnection(adminConnectionString);
+        await conn.OpenAsync();
+        await using var cmd = conn.CreateCommand();
+        cmd.CommandText = $"GRANT ALL PRIVILEGES ON DATABASE \"{dbName}\" TO \"{roleName}\"";
+        await cmd.ExecuteNonQueryAsync();
+    }
+
+    private static async Task GrantSchemaPrivilegesAsync(string adminTenantConnectionString, string roleName)
+    {
+        await using var conn = new NpgsqlConnection(adminTenantConnectionString);
+        await conn.OpenAsync();
+        await using var cmd = conn.CreateCommand();
+        cmd.CommandText = $"GRANT ALL PRIVILEGES ON SCHEMA public TO \"{roleName}\"";
+        await cmd.ExecuteNonQueryAsync();
+    }
+
+    private static async Task GrantTablePrivilegesAsync(string adminTenantConnectionString, string roleName)
+    {
+        await using var conn = new NpgsqlConnection(adminTenantConnectionString);
+        await conn.OpenAsync();
+        await using var cmd = conn.CreateCommand();
+
+        // Iterate over every non-system schema so schemas like "Notifications" created
+        // by migrations are covered in addition to the default "public" schema.
+        cmd.CommandText = $"""
+            DO $$
+            DECLARE
+                r RECORD;
+            BEGIN
+                FOR r IN
+                    SELECT nspname FROM pg_namespace
+                    WHERE nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
+                      AND nspname NOT LIKE 'pg_%'
+                LOOP
+                    EXECUTE format('GRANT ALL PRIVILEGES ON SCHEMA %I TO "{roleName}"', r.nspname);
+                    EXECUTE format('GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA %I TO "{roleName}"', r.nspname);
+                    EXECUTE format('GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA %I TO "{roleName}"', r.nspname);
+                    EXECUTE format('ALTER DEFAULT PRIVILEGES IN SCHEMA %I GRANT ALL ON TABLES TO "{roleName}"', r.nspname);
+                    EXECUTE format('ALTER DEFAULT PRIVILEGES IN SCHEMA %I GRANT ALL ON SEQUENCES TO "{roleName}"', r.nspname);
+                END LOOP;
+            END
+            $$;
+            """;
+        await cmd.ExecuteNonQueryAsync();
+    }
+
+    private static async Task GrantReadOnlyPrivilegesAsync(string adminConnectionString, string adminTenantConnectionString, string dbName, string roleName)
+    {
+        await using (var conn = new NpgsqlConnection(adminConnectionString))
+        {
+            await conn.OpenAsync();
+            await using var cmd = conn.CreateCommand();
+            cmd.CommandText = $"GRANT CONNECT ON DATABASE \"{dbName}\" TO \"{roleName}\"";
+            await cmd.ExecuteNonQueryAsync();
+        }
+
+        await using (var conn = new NpgsqlConnection(adminTenantConnectionString))
+        {
+            await conn.OpenAsync();
+            await using var cmd = conn.CreateCommand();
+
+            // Grant read-only access (USAGE/SELECT) on every non-system schema, including
+            // tables and sequences created by future migrations via ALTER DEFAULT PRIVILEGES.
+            cmd.CommandText = $"""
+                DO $$
+                DECLARE
+                    r RECORD;
+                BEGIN
+                    FOR r IN
+                        SELECT nspname FROM pg_namespace
+                        WHERE nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
+                          AND nspname NOT LIKE 'pg_%'
+                    LOOP
+                        EXECUTE format('GRANT USAGE ON SCHEMA %I TO "{roleName}"', r.nspname);
+                        EXECUTE format('GRANT SELECT ON ALL TABLES IN SCHEMA %I TO "{roleName}"', r.nspname);
+                        EXECUTE format('GRANT SELECT ON ALL SEQUENCES IN SCHEMA %I TO "{roleName}"', r.nspname);
+                        EXECUTE format('ALTER DEFAULT PRIVILEGES IN SCHEMA %I GRANT SELECT ON TABLES TO "{roleName}"', r.nspname);
+                        EXECUTE format('ALTER DEFAULT PRIVILEGES IN SCHEMA %I GRANT SELECT ON SEQUENCES TO "{roleName}"', r.nspname);
+                    END LOOP;
+                END
+                $$;
+                """;
+            await cmd.ExecuteNonQueryAsync();
+        }
+    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantManagerDbContext.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantManagerDbContext.cs
index 31dd890f01..9351b3d8e4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantManagerDbContext.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantManagerDbContext.cs
@@ -2,9 +2,9 @@
 using System.Linq;
 using Unity.AI.Domain;
 using Unity.AI.EntityFrameworkCore;
-using Unity.GrantManager.Applicants;
-using Unity.GrantManager.GrantApplications;
-using Unity.GrantManager.Locality;
+using Unity.GrantManager.Applicants;
+using Unity.GrantManager.GrantApplications;
+using Unity.GrantManager.Locality;
 using Unity.GrantManager.Tokens;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
@@ -47,13 +47,14 @@ public class GrantManagerDbContext :
     public DbSet<RegionalDistrict> RegionalDistricts { get; set; }
     public DbSet<TenantToken> TenantTokens { get; set; }
     public DbSet<Community> Communities { get; set; }
-    public DbSet<InboxMessage> InboxMessages { get; set; }
-    public DbSet<OutboxMessage> OutboxMessages { get; set; }
-    public DbSet<AIGenerationRequest> AIGenerationRequests { get; set; }
+    public DbSet<InboxMessage> InboxMessages { get; set; }
+    public DbSet<OutboxMessage> OutboxMessages { get; set; }
+    public DbSet<AIGenerationRequest> AIGenerationRequests { get; set; }
 
     // Unity.AI entities
     public DbSet<AIPrompt> AIPrompts { get; set; }
-    public DbSet<AIPromptVersion> AIPromptVersions { get; set; }
+    public DbSet<AIModel> AIModels { get; set; }
+    public DbSet<AIOperation> AIOperations { get; set; }
 
     #region Entities from the modules
 
@@ -216,8 +217,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             b.HasIndex(x => new { x.Source, x.Status });
         });
 
-        modelBuilder.Entity<OutboxMessage>(b =>
-        {
+        modelBuilder.Entity<OutboxMessage>(b =>
+        {
             b.ToTable(GrantManagerConsts.DbTablePrefix + "OutboxMessages",
                 GrantManagerConsts.DbSchema);
 
@@ -235,20 +236,24 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .IsRequired()
                 .HasConversion(new EnumToStringConverter<MessageStatus>());
 
-            b.HasIndex(x => new { x.Source, x.Status });
-        });
-
+            b.HasIndex(x => new { x.Source, x.Status });
+        });
+
         modelBuilder.Entity<AIGenerationRequest>(b =>
         {
             b.ToTable(GrantManagerConsts.DbTablePrefix + "AIRequests", AIDbProperties.DbSchema);
             b.ConfigureByConvention();
-            b.Property(x => x.OperationType).IsRequired().HasMaxLength(64);
-            b.Property(x => x.RequestKey).IsRequired().HasMaxLength(256);
+            b.Property(x => x.ApplicationId).IsRequired();
+            b.Property(x => x.OperationId).IsRequired();
             b.Property(x => x.FailureReason).HasMaxLength(2000);
             b.Property(x => x.Status).IsRequired();
-            b.HasIndex(x => x.RequestKey);
-            b.HasIndex(x => new { x.TenantId, x.ApplicationId, x.OperationType, x.Status });
-        });
+            b.HasOne<AIOperation>()
+                .WithMany()
+                .HasForeignKey(x => x.OperationId)
+                .OnDelete(DeleteBehavior.Restrict);
+            b.HasIndex(x => x.OperationId);
+            b.HasIndex(x => new { x.TenantId, x.ApplicationId, x.OperationId, x.Status });
+        });
 
 
         var allEntityTypes = modelBuilder.Model.GetEntityTypes();
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 eed60c4bbd..c77da4df0b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
@@ -6,6 +6,7 @@
 using Unity.GrantManager.Assessments;
 using Unity.GrantManager.Comments;
 using Unity.GrantManager.GrantApplications;
+using Unity.GrantManager.Notifications;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
@@ -52,6 +53,8 @@ public class GrantTenantDbContext : AbpDbContext<GrantTenantDbContext>
         public DbSet<IssueTracking> IssueTrackings { get; set; }
         public DbSet<AuditHistory> AuditHistories { get; set; }
         public DbSet<ReportsHistory> ReportsHistories { get; set; }
+        public DbSet<ScheduledNotification> ScheduledNotifications { get; set; }
+        public DbSet<ScheduledNotificationTracking> ScheduledNotificationTrackings { get; set; }
         #endregion
 
         public GrantTenantDbContext(DbContextOptions<GrantTenantDbContext> options) : base(options)
@@ -82,6 +85,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
                 b.HasIndex(x => x.ApplicantName);
                 b.HasIndex(x => x.TenantId);
+                b.HasIndex(x => new { x.TenantId, x.IsDeleted, x.CreationTime }).HasFilter("\"IsDeleted\" = false");
+                b.HasIndex(x => x.UnityApplicantId);
+                b.HasIndex(x => x.OrgName);
+                b.HasIndex(x => x.OrgNumber);
+                b.HasIndex(x => x.Status);
+                b.HasIndex(x => x.SupplierId);
 
                 b.HasMany<ApplicantAddress>()
                     .WithOne(s => s.Applicant)
@@ -409,6 +418,39 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 b.HasOne<Applicant>().WithMany().HasForeignKey(x => x.ApplicantId).IsRequired(false);
             });
 
+            modelBuilder.Entity<ScheduledNotification>(b =>
+            {
+                b.ToTable("ScheduledNotifications", "Notifications");
+                b.ConfigureByConvention();
+                b.HasKey(x => x.Id);
+                b.Property(x => x.FormId).IsRequired();
+                b.Property(x => x.EmailTemplateId).IsRequired();
+                b.Property(x => x.TriggerType).IsRequired().HasMaxLength(64);
+                b.Property(x => x.TriggerDetail).HasMaxLength(1000);
+                b.Property(x => x.EventType).HasMaxLength(128);
+                b.Property(x => x.ApplicationStatus).HasMaxLength(128);
+                b.Property(x => x.DateField).HasMaxLength(128);
+                b.Property(x => x.TenantId).HasColumnName("TenantId");
+                b.HasIndex(x => x.TenantId);
+                b.TryConfigureExtraProperties();    
+            });
+
+            modelBuilder.Entity<ScheduledNotificationTracking>(b =>
+            {
+                b.ToTable("ScheduledNotificationTracking", "Notifications");
+                b.ConfigureByConvention();
+                b.HasKey(x => x.Id);
+                b.Property(x => x.ApplicationId).IsRequired();
+                b.Property(x => x.ScheduledNotificationId).IsRequired();
+                b.Property(x => x.DateField).IsRequired().HasMaxLength(50);
+                b.HasIndex(x => x.ApplicationId);
+                b.HasIndex(x => x.ScheduledNotificationId);
+                b.HasIndex(x => x.CreationTime);
+                b.HasIndex(new[] { nameof(ScheduledNotificationTracking.ApplicationId), nameof(ScheduledNotificationTracking.ScheduledNotificationId), nameof(ScheduledNotificationTracking.DateField) }).IsUnique();
+                b.HasOne<Application>().WithMany().HasForeignKey(x => x.ApplicationId).IsRequired().OnDelete(DeleteBehavior.Cascade);
+                b.HasOne<ScheduledNotification>().WithMany().HasForeignKey(x => x.ScheduledNotificationId).IsRequired().OnDelete(DeleteBehavior.Cascade);
+            });
+
             var allEntityTypes = modelBuilder.Model.GetEntityTypes();
             foreach (var entityType in allEntityTypes.Where(t => t.ClrType != typeof(ExtraPropertyDictionary) && !t.IsOwned()))
             {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260618203824_AddUniqueIndexToAIPromptName.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260618203824_AddUniqueIndexToAIPromptName.Designer.cs
new file mode 100644
index 0000000000..5c005984ea
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260618203824_AddUniqueIndexToAIPromptName.Designer.cs
@@ -0,0 +1,3311 @@
+// <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("20260618203824_AddUniqueIndexToAIPromptName")]
+    partial class AddUniqueIndexToAIPromptName
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("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.AI.Domain.AIPrompt", 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>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("AIPrompts", "AI");
+                });
+
+            modelBuilder.Entity("Unity.AI.Domain.AIPromptVersion", 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>("DeveloperNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeprecated")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<int?>("MaxTokens")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("MetadataJson")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("PromptId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("SystemPrompt")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TargetModel")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("TargetProvider")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<double>("Temperature")
+                        .HasColumnType("double precision");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UserPromptTemplate")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("VersionNumber")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PromptId", "VersionNumber")
+                        .IsUnique();
+
+                    b.ToTable("AIPromptVersions", "AI");
+                });
+
+            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.GrantApplications.AIGenerationRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("CompletedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FailureReason")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    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>("OperationType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("RequestKey")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<DateTime?>("StartedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestKey");
+
+                    b.HasIndex("TenantId", "ApplicationId", "OperationType", "Status");
+
+                    b.ToTable("AIRequests", "AI");
+                });
+
+            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.Messaging.InboxMessage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DataType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Details")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    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>("MessageId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Payload")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("ProcessedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("ReceivedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MessageId")
+                        .IsUnique();
+
+                    b.HasIndex("Source", "Status");
+
+                    b.ToTable("InboxMessages", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Messaging.OutboxMessage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AckStatus")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DataType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Details")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    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>("MessageId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("OriginalMessageId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime?>("PublishedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Source", "Status");
+
+                    b.ToTable("OutboxMessages", (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.AuditLogExcelFile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("FileName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("FileName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AuditLogExcelFiles", (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(512)
+                        .HasColumnType("character varying(512)")
+                        .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(512)
+                        .HasColumnType("character varying(512)")
+                        .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>("ApplicationName")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    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(256)
+                        .HasColumnType("character varying(256)");
+
+                    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<DateTimeOffset?>("LastSignInTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("Leaved")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("Leaved");
+
+                    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.IdentityUserPasskey", b =>
+                {
+                    b.Property<byte[]>("CredentialId")
+                        .HasMaxLength(1024)
+                        .HasColumnType("bytea");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("CredentialId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserPasskeys", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserPasswordHistory", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Password")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("UserId", "Password");
+
+                    b.ToTable("UserPasswordHistories", (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")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ManagementPermissionName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    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>("ResourceName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("StateCheckers")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("ResourceName", "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.PermissionManagement.ResourcePermissionGrant", 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<string>("ResourceKey")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ResourceName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name", "ResourceName", "ResourceKey", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("ResourcePermissionGrants", (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.AI.Domain.AIPromptVersion", b =>
+                {
+                    b.HasOne("Unity.AI.Domain.AIPrompt", "Prompt")
+                        .WithMany("Versions")
+                        .HasForeignKey("PromptId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Prompt");
+                });
+
+            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.IdentityUserPasskey", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Passkeys")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("Volo.Abp.Identity.IdentityPasskeyData", "Data", b1 =>
+                        {
+                            b1.Property<byte[]>("IdentityUserPasskeyCredentialId");
+
+                            b1.Property<byte[]>("AttestationObject");
+
+                            b1.Property<byte[]>("ClientDataJson");
+
+                            b1.Property<DateTimeOffset>("CreatedAt");
+
+                            b1.Property<bool>("IsBackedUp");
+
+                            b1.Property<bool>("IsBackupEligible");
+
+                            b1.Property<bool>("IsUserVerified");
+
+                            b1.Property<string>("Name");
+
+                            b1.Property<byte[]>("PublicKey");
+
+                            b1.Property<long>("SignCount");
+
+                            b1.PrimitiveCollection<string>("Transports");
+
+                            b1.HasKey("IdentityUserPasskeyCredentialId");
+
+                            b1.ToTable("UserPasskeys");
+
+                            b1
+                                .ToJson("Data")
+                                .HasColumnType("jsonb");
+
+                            b1.WithOwner()
+                                .HasForeignKey("IdentityUserPasskeyCredentialId");
+                        });
+
+                    b.Navigation("Data");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserPasswordHistory", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("PasswordHistories")
+                        .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.AI.Domain.AIPrompt", b =>
+                {
+                    b.Navigation("Versions");
+                });
+
+            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("Passkeys");
+
+                    b.Navigation("PasswordHistories");
+
+                    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/20260618203824_AddUniqueIndexToAIPromptName.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260618203824_AddUniqueIndexToAIPromptName.cs
new file mode 100644
index 0000000000..75b13a5f7e
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260618203824_AddUniqueIndexToAIPromptName.cs
@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.HostMigrations
+{
+    /// <inheritdoc />
+    public partial class AddUniqueIndexToAIPromptName : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_AIPrompts_Name",
+                schema: "AI",
+                table: "AIPrompts",
+                column: "Name",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_AIPrompts_Name",
+                schema: "AI",
+                table: "AIPrompts");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260618210000_RefreshBuiltInAIPromptVersions.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260618210000_RefreshBuiltInAIPromptVersions.cs
new file mode 100644
index 0000000000..7efc8de94b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260618210000_RefreshBuiltInAIPromptVersions.cs
@@ -0,0 +1,177 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using Unity.GrantManager.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.HostMigrations
+{
+    [DbContext(typeof(GrantManagerDbContext))]
+    [Migration("20260618210000_RefreshBuiltInAIPromptVersions")]
+    public partial class RefreshBuiltInAIPromptVersions : Migration
+    {
+        private static readonly Guid AnalysisPromptId = new("4a100001-1000-4000-a000-000000000001");
+        private static readonly Guid AttachmentPromptId = new("4a100001-1000-4000-a000-000000000002");
+        private static readonly Guid ScoringPromptId = new("4a100001-1000-4000-a000-000000000003");
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(
+                """
+                UPDATE "AI"."AIPrompts"
+                SET "Name" = 'ApplicationAnalysis',
+                    "Description" = 'Grant application analysis and review',
+                    "Type" = 1,
+                    "IsActive" = TRUE
+                WHERE "Id" = '4a100001-1000-4000-a000-000000000001';
+
+                UPDATE "AI"."AIPrompts"
+                SET "Name" = 'AttachmentSummary',
+                    "Description" = 'Attachment summarization for grant review',
+                    "Type" = 1,
+                    "IsActive" = TRUE
+                WHERE "Id" = '4a100001-1000-4000-a000-000000000002';
+
+                UPDATE "AI"."AIPrompts"
+                SET "Name" = 'ApplicationScoring',
+                    "Description" = 'Scoresheet section answering assistant',
+                    "Type" = 1,
+                    "IsActive" = TRUE
+                WHERE "Id" = '4a100001-1000-4000-a000-000000000003';
+                """);
+
+            UpdatePromptVersion(
+                migrationBuilder,
+                AnalysisPromptId,
+                0,
+                ReadPromptFile("v0", "application-analysis.system.txt"),
+                ReadPromptFile("v0", "application-analysis.user.txt"),
+                "v0 - initial single-file analysis prompt",
+                null);
+
+            UpdatePromptVersion(
+                migrationBuilder,
+                AnalysisPromptId,
+                1,
+                ReadPromptFile("v1", "application-analysis.system.txt"),
+                ReadPromptFile("v1", "application-analysis.user.txt"),
+                "v1 - modular prompt with separate rubric, score, output, and rules sections",
+                BuildSectionsJson(new Dictionary<string, string>
+                {
+                    ["RUBRIC"] = ReadPromptFile("v1", "application-analysis.rubric.txt"),
+                    ["SCORE"] = ReadPromptFile("v1", "application-analysis.score.txt"),
+                    ["OUTPUT"] = ReadPromptFile("v1", "application-analysis.output.txt"),
+                    ["RULES"] = ReadPromptFile("v1", "application-analysis.rules.txt"),
+                    ["COMMON_RULES"] = ReadPromptFile("v1", "common.rules.txt")
+                }));
+
+            UpdatePromptVersion(
+                migrationBuilder,
+                AttachmentPromptId,
+                0,
+                ReadPromptFile("v0", "attachment-summary.system.txt"),
+                ReadPromptFile("v0", "attachment-summary.user.txt"),
+                "v0 - initial single-file attachment prompt",
+                null);
+
+            UpdatePromptVersion(
+                migrationBuilder,
+                AttachmentPromptId,
+                1,
+                ReadPromptFile("v1", "attachment-summary.system.txt"),
+                ReadPromptFile("v1", "attachment-summary.user.txt"),
+                "v1 - modular prompt with separate output and rules sections",
+                BuildSectionsJson(new Dictionary<string, string>
+                {
+                    ["OUTPUT"] = ReadPromptFile("v1", "attachment-summary.output.txt"),
+                    ["RULES"] = ReadPromptFile("v1", "attachment-summary.rules.txt"),
+                    ["COMMON_RULES"] = ReadPromptFile("v1", "common.rules.txt")
+                }));
+
+            UpdatePromptVersion(
+                migrationBuilder,
+                ScoringPromptId,
+                0,
+                ReadPromptFile("v0", "application-scoring.system.txt"),
+                ReadPromptFile("v0", "application-scoring.user.txt"),
+                "v0 - initial single-file scoresheet prompt",
+                null);
+
+            UpdatePromptVersion(
+                migrationBuilder,
+                ScoringPromptId,
+                1,
+                ReadPromptFile("v1", "application-scoring.system.txt"),
+                ReadPromptFile("v1", "application-scoring.user.txt"),
+                "v1 - modular prompt with separate output and rules sections",
+                BuildSectionsJson(new Dictionary<string, string>
+                {
+                    ["OUTPUT"] = ReadPromptFile("v1", "application-scoring.output.txt"),
+                    ["RULES"] = ReadPromptFile("v1", "application-scoring.rules.txt"),
+                    ["COMMON_RULES"] = ReadPromptFile("v1", "common.rules.txt")
+                }));
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // No-op: prompt version content is managed by seeded defaults.
+        }
+
+        private static void UpdatePromptVersion(
+            MigrationBuilder migrationBuilder,
+            Guid promptId,
+            int versionNumber,
+            string systemPrompt,
+            string userPromptTemplate,
+            string developerNotes,
+            string metadataJson)
+        {
+            migrationBuilder.Sql($"""
+                UPDATE "AI"."AIPromptVersions"
+                SET "SystemPrompt" = '{EscapeSqlLiteral(systemPrompt)}',
+                    "UserPromptTemplate" = '{EscapeSqlLiteral(userPromptTemplate)}',
+                    "DeveloperNotes" = '{EscapeSqlLiteral(developerNotes)}',
+                    "IsPublished" = TRUE,
+                    "IsDeprecated" = FALSE,
+                    "MetadataJson" = {FormatNullableSqlString(metadataJson)}
+                WHERE "PromptId" = '{promptId}'
+                  AND "VersionNumber" = {versionNumber};
+                """);
+        }
+
+        private static string ReadPromptFile(string version, string fileName)
+        {
+            var path = Path.Combine(AppContext.BaseDirectory, "AI", "Prompts", "Versions", version, fileName);
+            if (!File.Exists(path))
+            {
+                throw new InvalidOperationException($"Missing prompt asset required by migration: {path}");
+            }
+
+            return File.ReadAllText(path);
+        }
+
+        private static string BuildSectionsJson(Dictionary<string, string> sections)
+        {
+            return JsonSerializer.Serialize(new { sections });
+        }
+
+        private static string EscapeSqlLiteral(string value)
+        {
+            return value.Replace("'", "''", StringComparison.Ordinal);
+        }
+
+        private static string FormatNullableSqlString(string value)
+        {
+            if (value == null)
+            {
+                return "NULL";
+            }
+
+            return $"'{EscapeSqlLiteral(value)}'";
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260624191335_RefreshAiSchema.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260624191335_RefreshAiSchema.Designer.cs
new file mode 100644
index 0000000000..81bf05e418
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260624191335_RefreshAiSchema.Designer.cs
@@ -0,0 +1,3361 @@
+// <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("20260624191335_RefreshAiSchema")]
+    partial class RefreshAiSchema
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("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.AI.Domain.AIModel", 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<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("SettingsJson")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("AIModels", "AI");
+                });
+
+            modelBuilder.Entity("Unity.AI.Domain.AIOperation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AIModelId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AIPromptId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("CompletionTokens")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExecutionMode")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AIModelId");
+
+                    b.HasIndex("AIPromptId");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("AIOperations", "AI");
+                });
+
+            modelBuilder.Entity("Unity.AI.Domain.AIPrompt", 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<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MetadataJson")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("SystemPrompt")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UserPrompt")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("VersionNumber")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .HasDatabaseName("IX_AIPrompts_Name");
+
+                    b.HasIndex("TenantId", "Name", "VersionNumber")
+                        .IsUnique();
+
+                    b.ToTable("AIPrompts", "AI");
+                });
+
+            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.GrantApplications.AIGenerationRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("CompletedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FailureReason")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    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>("OperationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("StartedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OperationId");
+
+                    b.HasIndex("TenantId", "ApplicationId", "OperationId", "Status");
+
+                    b.ToTable("AIRequests", "AI");
+                });
+
+            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.Messaging.InboxMessage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DataType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Details")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    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>("MessageId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Payload")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("ProcessedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("ReceivedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MessageId")
+                        .IsUnique();
+
+                    b.HasIndex("Source", "Status");
+
+                    b.ToTable("InboxMessages", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Messaging.OutboxMessage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AckStatus")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DataType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Details")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    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>("MessageId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("OriginalMessageId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime?>("PublishedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Source", "Status");
+
+                    b.ToTable("OutboxMessages", (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.AuditLogExcelFile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("FileName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("FileName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AuditLogExcelFiles", (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(512)
+                        .HasColumnType("character varying(512)")
+                        .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(512)
+                        .HasColumnType("character varying(512)")
+                        .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>("ApplicationName")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    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(256)
+                        .HasColumnType("character varying(256)");
+
+                    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<DateTimeOffset?>("LastSignInTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("Leaved")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("Leaved");
+
+                    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.IdentityUserPasskey", b =>
+                {
+                    b.Property<byte[]>("CredentialId")
+                        .HasMaxLength(1024)
+                        .HasColumnType("bytea");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("CredentialId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserPasskeys", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserPasswordHistory", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Password")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<DateTimeOffset>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("UserId", "Password");
+
+                    b.ToTable("UserPasswordHistories", (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")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ManagementPermissionName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    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>("ResourceName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("StateCheckers")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("ResourceName", "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.PermissionManagement.ResourcePermissionGrant", 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<string>("ResourceKey")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ResourceName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name", "ResourceName", "ResourceKey", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("ResourcePermissionGrants", (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.AI.Domain.AIOperation", b =>
+                {
+                    b.HasOne("Unity.AI.Domain.AIModel", "AIModel")
+                        .WithMany()
+                        .HasForeignKey("AIModelId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Unity.AI.Domain.AIPrompt", "AIPrompt")
+                        .WithMany()
+                        .HasForeignKey("AIPromptId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("AIModel");
+
+                    b.Navigation("AIPrompt");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GrantApplications.AIGenerationRequest", b =>
+                {
+                    b.HasOne("Unity.AI.Domain.AIOperation", null)
+                        .WithMany()
+                        .HasForeignKey("OperationId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+                });
+
+            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.IdentityUserPasskey", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Passkeys")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsOne("Volo.Abp.Identity.IdentityPasskeyData", "Data", b1 =>
+                        {
+                            b1.Property<byte[]>("IdentityUserPasskeyCredentialId");
+
+                            b1.Property<byte[]>("AttestationObject");
+
+                            b1.Property<byte[]>("ClientDataJson");
+
+                            b1.Property<DateTimeOffset>("CreatedAt");
+
+                            b1.Property<bool>("IsBackedUp");
+
+                            b1.Property<bool>("IsBackupEligible");
+
+                            b1.Property<bool>("IsUserVerified");
+
+                            b1.Property<string>("Name");
+
+                            b1.Property<byte[]>("PublicKey");
+
+                            b1.Property<long>("SignCount");
+
+                            b1.PrimitiveCollection<string>("Transports");
+
+                            b1.HasKey("IdentityUserPasskeyCredentialId");
+
+                            b1.ToTable("UserPasskeys");
+
+                            b1
+                                .ToJson("Data")
+                                .HasColumnType("jsonb");
+
+                            b1.WithOwner()
+                                .HasForeignKey("IdentityUserPasskeyCredentialId");
+                        });
+
+                    b.Navigation("Data");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserPasswordHistory", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("PasswordHistories")
+                        .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("Passkeys");
+
+                    b.Navigation("PasswordHistories");
+
+                    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/20260624191335_RefreshAiSchema.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260624191335_RefreshAiSchema.cs
new file mode 100644
index 0000000000..1706bb14e5
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260624191335_RefreshAiSchema.cs
@@ -0,0 +1,195 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.HostMigrations
+{
+    /// <inheritdoc />
+    public partial class RefreshAiSchema : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(
+                """
+                CREATE SCHEMA IF NOT EXISTS "AI";
+                DROP TABLE IF EXISTS "AI"."AIRequests";
+                DROP TABLE IF EXISTS "AI"."AIOperations";
+                DROP TABLE IF EXISTS "AI"."AIModels";
+                DROP TABLE IF EXISTS "AI"."AIPromptVersions";
+                DROP TABLE IF EXISTS "AI"."AIPrompts";
+                """);
+
+            migrationBuilder.Sql(
+                """
+                CREATE TABLE "AI"."AIModels" (
+                    "Id" uuid NOT NULL,
+                    "Name" character varying(200) NOT NULL,
+                    "IsActive" boolean NOT NULL,
+                    "SettingsJson" jsonb NOT NULL,
+                    "ExtraProperties" text NOT NULL,
+                    "ConcurrencyStamp" character varying(40) NOT NULL,
+                    "CreationTime" timestamp without time zone NOT NULL,
+                    "CreatorId" uuid NULL,
+                    "LastModificationTime" timestamp without time zone NULL,
+                    "LastModifierId" uuid NULL,
+                    PRIMARY KEY ("Id")
+                );
+                """);
+
+            migrationBuilder.Sql(
+                """
+                CREATE UNIQUE INDEX IF NOT EXISTS "IX_AIModels_Name"
+                ON "AI"."AIModels" ("Name");
+                """);
+
+            migrationBuilder.Sql(
+                """
+                CREATE TABLE "AI"."AIPrompts" (
+                    "Id" uuid NOT NULL,
+                    "TenantId" uuid NULL,
+                    "Name" character varying(200) NOT NULL,
+                    "VersionNumber" integer NOT NULL,
+                    "SystemPrompt" text NOT NULL,
+                    "UserPrompt" text NOT NULL,
+                    "MetadataJson" jsonb NOT NULL DEFAULT '{}'::jsonb,
+                    "IsActive" boolean NOT NULL,
+                    "ExtraProperties" text NOT NULL,
+                    "ConcurrencyStamp" character varying(40) NOT NULL,
+                    "CreationTime" timestamp without time zone NOT NULL,
+                    "CreatorId" uuid NULL,
+                    "LastModificationTime" timestamp without time zone NULL,
+                    "LastModifierId" uuid NULL,
+                    PRIMARY KEY ("Id")
+                );
+                """);
+
+            migrationBuilder.Sql(
+                """
+                CREATE UNIQUE INDEX "IX_AIPrompts_Name_VersionNumber"
+                ON "AI"."AIPrompts" ("TenantId", "Name", "VersionNumber");
+                """);
+
+            migrationBuilder.Sql(
+                """
+                CREATE TABLE "AI"."AIOperations" (
+                    "Id" uuid NOT NULL,
+                    "Name" character varying(200) NOT NULL,
+                    "AIModelId" uuid NOT NULL,
+                    "AIPromptId" uuid NOT NULL,
+                    "ExecutionMode" character varying(20) NOT NULL,
+                    "CompletionTokens" integer NOT NULL,
+                    "IsActive" boolean NOT NULL,
+                    "ExtraProperties" text NOT NULL,
+                    "ConcurrencyStamp" character varying(40) NOT NULL,
+                    "CreationTime" timestamp without time zone NOT NULL,
+                    "CreatorId" uuid NULL,
+                    "LastModificationTime" timestamp without time zone NULL,
+                    "LastModifierId" uuid NULL,
+                    PRIMARY KEY ("Id")
+                );
+                """);
+
+            migrationBuilder.Sql(
+                """
+                CREATE UNIQUE INDEX IF NOT EXISTS "IX_AIOperations_Name"
+                ON "AI"."AIOperations" ("Name");
+                """);
+
+            migrationBuilder.Sql(
+                """
+                DO $$
+                BEGIN
+                    IF NOT EXISTS (
+                        SELECT 1
+                        FROM pg_constraint
+                        WHERE conname = 'FK_AIOperations_AIModels_AIModelId'
+                    ) THEN
+                        ALTER TABLE "AI"."AIOperations"
+                        ADD CONSTRAINT "FK_AIOperations_AIModels_AIModelId"
+                        FOREIGN KEY ("AIModelId") REFERENCES "AI"."AIModels" ("Id") ON DELETE RESTRICT;
+                    END IF;
+                END $$;
+                """);
+
+            migrationBuilder.Sql(
+                """
+                DO $$
+                BEGIN
+                    IF NOT EXISTS (
+                        SELECT 1
+                        FROM pg_constraint
+                        WHERE conname = 'FK_AIOperations_AIPrompts_AIPromptId'
+                    ) THEN
+                        ALTER TABLE "AI"."AIOperations"
+                        ADD CONSTRAINT "FK_AIOperations_AIPrompts_AIPromptId"
+                        FOREIGN KEY ("AIPromptId") REFERENCES "AI"."AIPrompts" ("Id") ON DELETE RESTRICT;
+                    END IF;
+                END $$;
+                """);
+
+            migrationBuilder.Sql(
+                """
+                CREATE TABLE "AI"."AIRequests" (
+                    "Id" uuid NOT NULL,
+                    "TenantId" uuid NULL,
+                    "ApplicationId" uuid NOT NULL,
+                    "OperationId" uuid NOT NULL,
+                    "Status" integer NOT NULL,
+                    "StartedAt" timestamp without time zone NULL,
+                    "CompletedAt" timestamp without time zone NULL,
+                    "FailureReason" character varying(2000) NULL,
+                    "ExtraProperties" text NOT NULL,
+                    "ConcurrencyStamp" character varying(40) NOT NULL,
+                    "CreationTime" timestamp without time zone NOT NULL,
+                    "CreatorId" uuid NULL,
+                    "LastModificationTime" timestamp without time zone NULL,
+                    "LastModifierId" uuid NULL,
+                    PRIMARY KEY ("Id")
+                );
+                """);
+
+            migrationBuilder.Sql(
+                """
+                CREATE INDEX IF NOT EXISTS "IX_AIRequests_OperationId"
+                ON "AI"."AIRequests" ("OperationId");
+                """);
+
+            migrationBuilder.Sql(
+                """
+                DO $$
+                BEGIN
+                    IF NOT EXISTS (
+                        SELECT 1
+                        FROM pg_constraint
+                        WHERE conname = 'FK_AIRequests_AIOperations_OperationId'
+                    ) THEN
+                        ALTER TABLE "AI"."AIRequests"
+                        ADD CONSTRAINT "FK_AIRequests_AIOperations_OperationId"
+                        FOREIGN KEY ("OperationId") REFERENCES "AI"."AIOperations" ("Id") ON DELETE RESTRICT;
+                    END IF;
+                END $$;
+                """);
+
+            migrationBuilder.Sql(
+                """
+                CREATE INDEX IF NOT EXISTS "IX_AIRequests_TenantId_ApplicationId_OperationId_Status"
+                ON "AI"."AIRequests" ("TenantId", "ApplicationId", "OperationId", "Status");
+                """);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(
+                """
+                DROP TABLE IF EXISTS "AI"."AIRequests";
+                DROP TABLE IF EXISTS "AI"."AIOperations";
+                DROP TABLE IF EXISTS "AI"."AIModels";
+                DROP TABLE IF EXISTS "AI"."AIPromptVersions";
+                DROP TABLE IF EXISTS "AI"."AIPrompts";
+                """);
+        }
+    }
+}
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 0685bc5805..4f39d395ab 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
@@ -467,7 +467,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("qrtz_triggers", (string)null);
                 });
 
-            modelBuilder.Entity("Unity.AI.Domain.AIPrompt", b =>
+            modelBuilder.Entity("Unity.AI.Domain.AIModel", b =>
                 {
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid");
@@ -487,10 +487,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("CreatorId");
 
-                    b.Property<string>("Description")
-                        .HasMaxLength(2000)
-                        .HasColumnType("character varying(2000)");
-
                     b.Property<string>("ExtraProperties")
                         .IsRequired()
                         .HasColumnType("text")
@@ -512,23 +508,32 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(200)
                         .HasColumnType("character varying(200)");
 
-                    b.Property<Guid?>("TenantId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("TenantId");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("integer");
+                    b.Property<string>("SettingsJson")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
 
                     b.HasKey("Id");
 
-                    b.ToTable("AIPrompts", "AI");
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("AIModels", "AI");
                 });
 
-            modelBuilder.Entity("Unity.AI.Domain.AIPromptVersion", b =>
+            modelBuilder.Entity("Unity.AI.Domain.AIOperation", b =>
                 {
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid");
 
+                    b.Property<Guid>("AIModelId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AIPromptId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("CompletionTokens")
+                        .HasColumnType("integer");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .IsRequired()
@@ -544,18 +549,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("CreatorId");
 
-                    b.Property<string>("DeveloperNotes")
-                        .HasColumnType("text");
+                    b.Property<string>("ExecutionMode")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
 
                     b.Property<string>("ExtraProperties")
                         .IsRequired()
                         .HasColumnType("text")
                         .HasColumnName("ExtraProperties");
 
-                    b.Property<bool>("IsDeprecated")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("IsPublished")
+                    b.Property<bool>("IsActive")
                         .HasColumnType("boolean");
 
                     b.Property<DateTime?>("LastModificationTime")
@@ -566,35 +570,76 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("LastModifierId");
 
-                    b.Property<int?>("MaxTokens")
-                        .HasColumnType("integer");
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
 
-                    b.Property<string>("MetadataJson")
-                        .HasColumnType("jsonb");
+                    b.HasKey("Id");
+
+                    b.HasIndex("AIModelId");
+
+                    b.HasIndex("AIPromptId");
 
-                    b.Property<Guid>("PromptId")
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("AIOperations", "AI");
+                });
+
+            modelBuilder.Entity("Unity.AI.Domain.AIPrompt", b =>
+                {
+                    b.Property<Guid>("Id")
                         .HasColumnType("uuid");
 
-                    b.Property<string>("SystemPrompt")
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
                         .IsRequired()
-                        .HasColumnType("text");
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
 
-                    b.Property<string>("TargetModel")
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
 
-                    b.Property<string>("TargetProvider")
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
 
-                    b.Property<double>("Temperature")
-                        .HasColumnType("double precision");
+                    b.Property<string>("MetadataJson")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("SystemPrompt")
+                        .IsRequired()
+                        .HasColumnType("text");
 
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uuid")
                         .HasColumnName("TenantId");
 
-                    b.Property<string>("UserPromptTemplate")
+                    b.Property<string>("UserPrompt")
                         .IsRequired()
                         .HasColumnType("text");
 
@@ -603,10 +648,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
-                    b.HasIndex("PromptId", "VersionNumber")
-                        .IsUnique();
+                    b.HasIndex("TenantId", "Name", "VersionNumber")
+                        .IsUnique();
 
-                    b.ToTable("AIPromptVersions", "AI");
+                    b.ToTable("AIPrompts", "AI");
                 });
 
             modelBuilder.Entity("Unity.GrantManager.Applicants.ApplicantTenantMap", b =>
@@ -663,8 +708,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("Id")
                         .HasColumnType("uuid");
 
-                    b.Property<Guid?>("ApplicationId")
-                        .HasColumnType("uuid");
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
 
                     b.Property<DateTime?>("CompletedAt")
                         .HasColumnType("timestamp without time zone");
@@ -684,49 +729,28 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("CreatorId");
 
-                    b.Property<Guid?>("DeleterId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("DeleterId");
-
-                    b.Property<DateTime?>("DeletionTime")
-                        .HasColumnType("timestamp without time zone")
-                        .HasColumnName("DeletionTime");
-
-                    b.Property<string>("ExtraProperties")
-                        .IsRequired()
-                        .HasColumnType("text")
-                        .HasColumnName("ExtraProperties");
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
 
                     b.Property<string>("FailureReason")
                         .HasMaxLength(2000)
                         .HasColumnType("character varying(2000)");
 
-                    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>("OperationType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("character varying(64)");
-
-                    b.Property<string>("RequestKey")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("character varying(256)");
-
-                    b.Property<DateTime?>("StartedAt")
-                        .HasColumnType("timestamp without time zone");
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("OperationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("StartedAt")
+                        .HasColumnType("timestamp without time zone");
 
                     b.Property<int>("Status")
                         .HasColumnType("integer");
@@ -737,9 +761,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
-                    b.HasIndex("RequestKey");
+                    b.HasIndex("OperationId");
 
-                    b.HasIndex("TenantId", "ApplicationId", "OperationType", "Status");
+                    b.HasIndex("TenantId", "ApplicationId", "OperationId", "Status");
 
                     b.ToTable("AIRequests", "AI");
                 });
@@ -3028,15 +3052,32 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("JobDetail");
                 });
 
-            modelBuilder.Entity("Unity.AI.Domain.AIPromptVersion", b =>
+            modelBuilder.Entity("Unity.AI.Domain.AIOperation", b =>
                 {
-                    b.HasOne("Unity.AI.Domain.AIPrompt", "Prompt")
-                        .WithMany("Versions")
-                        .HasForeignKey("PromptId")
-                        .OnDelete(DeleteBehavior.Cascade)
+                    b.HasOne("Unity.AI.Domain.AIModel", "AIModel")
+                        .WithMany()
+                        .HasForeignKey("AIModelId")
+                        .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
-                    b.Navigation("Prompt");
+                    b.HasOne("Unity.AI.Domain.AIPrompt", "AIPrompt")
+                        .WithMany()
+                        .HasForeignKey("AIPromptId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("AIModel");
+
+                    b.Navigation("AIPrompt");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GrantApplications.AIGenerationRequest", b =>
+                {
+                    b.HasOne("Unity.AI.Domain.AIOperation", null)
+                        .WithMany()
+                        .HasForeignKey("OperationId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
                 });
 
             modelBuilder.Entity("Unity.GrantManager.Locality.SubSector", b =>
@@ -3246,11 +3287,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("SimpleTriggers");
                 });
 
-            modelBuilder.Entity("Unity.AI.Domain.AIPrompt", b =>
-                {
-                    b.Navigation("Versions");
-                });
-
             modelBuilder.Entity("Unity.GrantManager.Locality.Sector", b =>
                 {
                     b.Navigation("SubSectors");
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260529215129_ScheduledNotifications.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260529215129_ScheduledNotifications.Designer.cs
new file mode 100644
index 0000000000..5eb5da2cbb
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260529215129_ScheduledNotifications.Designer.cs
@@ -0,0 +1,5037 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260529215129_ScheduledNotifications")]
+    partial class ScheduledNotifications
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+                    
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260529215129_ScheduledNotifications.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260529215129_ScheduledNotifications.cs
new file mode 100644
index 0000000000..401bf2259d
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260529215129_ScheduledNotifications.cs
@@ -0,0 +1,70 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class ScheduledNotifications : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.EnsureSchema(
+                name: "Notifications");
+
+            migrationBuilder.CreateTable(
+                name: "ScheduledNotifications",
+                schema: "Notifications",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uuid", nullable: false),
+                    FormId = table.Column<Guid>(type: "uuid", nullable: false),
+                    EmailTemplateId = table.Column<Guid>(type: "uuid", nullable: false),
+                    TriggerType = table.Column<string>(type: "text", maxLength: 64, nullable: false),
+                    TriggerDetail = table.Column<string>(type: "text", maxLength: 1000, nullable: true),
+                    IsActive = table.Column<bool>(type: "boolean", nullable: false),
+                    EventType = table.Column<string>(type: "text", maxLength: 128, nullable: true),
+                    ApplicationStatusId = table.Column<Guid>(type: "uuid", nullable: true),
+                    ApplicationStatus = table.Column<string>(type: "text", maxLength: 128, nullable: true),
+                    RecipientCategory = table.Column<string>(type: "text", nullable: true),
+                    RecipientIdentifier = table.Column<string>(type: "text", nullable: true),
+                    DateField = table.Column<string>(type: "text", maxLength: 128, nullable: true),
+                    TenantId = table.Column<Guid>(type: "uuid", nullable: false),
+                    IsDeleted = table.Column<bool>(type: "boolean", nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(type: "uuid", nullable: true),
+                    DeletionTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    ConcurrencyStamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uuid", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uuid", nullable: true),
+                    ExtraProperties = table.Column<string>(type: "text", nullable: false, defaultValue: "{}")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ScheduledNotifications", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ScheduledNotifications_EmailTemplates_EmailTemplateId",
+                        column: x => x.EmailTemplateId,
+                        principalSchema: "Notifications",
+                        principalTable: "EmailTemplates",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ScheduledNotifications_EmailTemplateId",
+                schema: "Notifications",
+                table: "ScheduledNotifications",
+                column: "EmailTemplateId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(name: "ScheduledNotifications", schema: "Notifications");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260604200305_AddIsArchivedToScoresheets.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260604200305_AddIsArchivedToScoresheets.Designer.cs
new file mode 100644
index 0000000000..64d647d7e9
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260604200305_AddIsArchivedToScoresheets.Designer.cs
@@ -0,0 +1,5040 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260604200305_AddIsArchivedToScoresheets")]
+    partial class AddIsArchivedToScoresheets
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260604200305_AddIsArchivedToScoresheets.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260604200305_AddIsArchivedToScoresheets.cs
new file mode 100644
index 0000000000..0704b9e28c
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260604200305_AddIsArchivedToScoresheets.cs
@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddIsArchivedToScoresheets : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsArchived",
+                schema: "Flex",
+                table: "Scoresheets",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsArchived",
+                schema: "Flex",
+                table: "Scoresheets");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260606000444_AddApplicantSoftDelete.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260606000444_AddApplicantSoftDelete.Designer.cs
new file mode 100644
index 0000000000..99e71a03a2
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260606000444_AddApplicantSoftDelete.Designer.cs
@@ -0,0 +1,5046 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260606000444_AddApplicantSoftDelete")]
+    partial class AddApplicantSoftDelete
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260606000444_AddApplicantSoftDelete.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260606000444_AddApplicantSoftDelete.cs
new file mode 100644
index 0000000000..c568581f32
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260606000444_AddApplicantSoftDelete.cs
@@ -0,0 +1,50 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddApplicantSoftDelete : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "DeleterId",
+                table: "Applicants",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "DeletionTime",
+                table: "Applicants",
+                type: "timestamp without time zone",
+                nullable: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsDeleted",
+                table: "Applicants",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DeleterId",
+                table: "Applicants");
+
+            migrationBuilder.DropColumn(
+                name: "DeletionTime",
+                table: "Applicants");
+
+            migrationBuilder.DropColumn(
+                name: "IsDeleted",
+                table: "Applicants");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260608222844_AddPaidDateToFundingHistory.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260608222844_AddPaidDateToFundingHistory.Designer.cs
new file mode 100644
index 0000000000..ad77bee640
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260608222844_AddPaidDateToFundingHistory.Designer.cs
@@ -0,0 +1,5043 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260608222844_AddPaidDateToFundingHistory")]
+    partial class AddPaidDateToFundingHistory
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260608222844_AddPaidDateToFundingHistory.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260608222844_AddPaidDateToFundingHistory.cs
new file mode 100644
index 0000000000..35a7d7704e
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260608222844_AddPaidDateToFundingHistory.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddPaidDateToFundingHistory : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "PaidDate",
+                table: "FundingHistories",
+                type: "timestamp without time zone",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PaidDate",
+                table: "FundingHistories");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddApplicationScheduledNotificationTracking.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddApplicationScheduledNotificationTracking.Designer.cs
new file mode 100644
index 0000000000..d50f76a44b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddApplicationScheduledNotificationTracking.Designer.cs
@@ -0,0 +1,74 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260609220000_AddScheduledNotificationTracking")]
+    partial class AddScheduledNotificationTracking
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            // Snapshot of ScheduledNotificationTracking table
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DateField")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("NotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+                    b.HasIndex("ScheduledNotificationId");
+                    b.HasIndex("CreationTime");
+                    b.HasIndex(new[] { "ApplicationId", "ScheduledNotificationId", "DateField" })
+                        .IsUnique();
+
+                    b.ToTable("ScheduledNotificationTracking", (string)null);
+                });
+
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddApplicationScheduledNotificationTracking.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddApplicationScheduledNotificationTracking.cs
new file mode 100644
index 0000000000..a9fcc80c30
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddApplicationScheduledNotificationTracking.cs
@@ -0,0 +1,150 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddScheduledNotificationTracking : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ScheduledNotificationTracking",
+                schema: "Notifications",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uuid", nullable: false),
+                    ApplicationId = table.Column<Guid>(type: "uuid", nullable: false),
+                    ScheduledNotificationId = table.Column<Guid>(type: "uuid", nullable: false),
+                    DateField = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
+                    NotificationSentDate = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uuid", nullable: true),
+                    TenantId = table.Column<Guid>(type: "uuid", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ScheduledNotificationTracking", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ScheduledNotificationTracking_Applications_ApplicationId",
+                        column: x => x.ApplicationId,
+                        principalTable: "Applications",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ScheduledNotificationTracking_ScheduledNotifications_ScheduledNotificationId",
+                        column: x => x.ScheduledNotificationId,
+                        principalSchema: "Notifications",
+                        principalTable: "ScheduledNotifications",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            // Create indexes for efficient lookups
+            migrationBuilder.CreateIndex(
+                name: "IX_ScheduledNotificationTracking_ApplicationId_ScheduledNotificationId_DateField",
+                schema: "Notifications",
+                table: "ScheduledNotificationTracking",
+                columns: new[] { "ApplicationId", "ScheduledNotificationId", "DateField" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ScheduledNotificationTracking_ScheduledNotificationId",
+                schema: "Notifications",
+                table: "ScheduledNotificationTracking",
+                column: "ScheduledNotificationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ScheduledNotificationTracking_CreationTime",
+                schema: "Notifications",
+                table: "ScheduledNotificationTracking",
+                column: "CreationTime");
+
+            // Fix ChesMsgId column type: convert from text to uuid (Guid)
+            // Drop the existing ChesMsgId column (defined as text in the original migration)
+            migrationBuilder.DropColumn(
+                name: "ChesMsgId",
+                schema: "Notifications",
+                table: "EmailLogs");
+
+            // Recreate it as a uuid column (nullable Guid)
+            migrationBuilder.AddColumn<Guid>(
+                name: "ChesMsgId",
+                schema: "Notifications",
+                table: "EmailLogs",
+                type: "uuid",
+                nullable: true);
+
+            // OPTIMIZATION: Add indexes for DateBasedScheduledNotificationJob performance
+            // These indexes support batch queries and reduce N+1 query patterns
+            
+            // Index for ScheduledNotification queries filtering by IsActive and DateField
+            migrationBuilder.CreateIndex(
+                name: "idx_scheduled_notifications_active_datefield",
+                schema: "Notifications",
+                table: "ScheduledNotifications",
+                columns: new[] { "IsActive", "DateField" });
+
+            // Index for Application queries filtering by ApplicationFormId (primary filter in job)
+            migrationBuilder.CreateIndex(
+                name: "idx_applications_formid",
+                table: "Applications",
+                column: "ApplicationFormId");
+
+            // Composite index for Application queries with DueDate filtering
+            migrationBuilder.CreateIndex(
+                name: "idx_applications_formid_duedate",
+                table: "Applications",
+                columns: new[] { "ApplicationFormId", "DueDate" });
+
+            // Index for ApplicantAgent queries filtering by ApplicationId
+            migrationBuilder.CreateIndex(
+                name: "idx_applicant_agents_applicationid",
+                table: "ApplicantAgents",
+                column: "ApplicationId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // Revert ChesMsgId column type: convert from uuid back to text
+            migrationBuilder.DropColumn(
+                name: "ChesMsgId",
+                schema: "Notifications",
+                table: "EmailLogs");
+
+            migrationBuilder.AddColumn<string>(
+                name: "ChesMsgId",
+                schema: "Notifications",
+                table: "EmailLogs",
+                type: "text",
+                nullable: true);
+
+            // Drop optimized indexes
+            migrationBuilder.DropIndex(
+                name: "idx_scheduled_notifications_active_datefield",
+                schema: "Notifications",
+                table: "ScheduledNotifications");
+
+            migrationBuilder.DropIndex(
+                name: "idx_applications_formid",
+                table: "Applications");
+
+            migrationBuilder.DropIndex(
+                name: "idx_applications_formid_duedate",
+                table: "Applications");
+
+            migrationBuilder.DropIndex(
+                name: "idx_applicant_agents_applicationid",
+                table: "ApplicantAgents");
+
+            // Drop tracking table
+            migrationBuilder.DropTable(
+                name: "ScheduledNotificationTracking",
+                schema: "Notifications");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddMissingColumnsToEmailLogs.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddMissingColumnsToEmailLogs.Designer.cs
new file mode 100644
index 0000000000..602c4d4a60
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddMissingColumnsToEmailLogs.Designer.cs
@@ -0,0 +1,34 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260609220000_AddMissingColumnsToEmailLogs")]
+    partial class AddMissingColumnsToEmailLogs
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "8.0.2")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            // This is a simplified snapshot - the full snapshot should be generated by EF Core
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddMissingColumnsToEmailLogs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddMissingColumnsToEmailLogs.cs
new file mode 100644
index 0000000000..de46b4135f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260609220000_AddMissingColumnsToEmailLogs.cs
@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddMissingColumnsToEmailLogs : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Only add ScheduledNotificationId - other columns were added in previous migrations:
+            // - Status: migration 20241220224908_EmailStatus
+            // - TemplateName: migration 20250424174914_add_email_template_name  
+            // - PaymentRequestIds: migration 20260110002908_AddFsbApNotificationTracking
+            migrationBuilder.AddColumn<Guid>(
+                name: "ScheduledNotificationId",
+                schema: "Notifications",
+                table: "EmailLogs",
+                type: "uuid",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ScheduledNotificationId",
+                schema: "Notifications",
+                table: "EmailLogs");
+        }
+    }
+}
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260611212809_ApplicantListPerformanceIndexes.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260611212809_ApplicantListPerformanceIndexes.Designer.cs
new file mode 100644
index 0000000000..e31e0e7713
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260611212809_ApplicantListPerformanceIndexes.Designer.cs
@@ -0,0 +1,5065 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260611212809_ApplicantListPerformanceIndexes")]
+    partial class ApplicantListPerformanceIndexes
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260611212809_ApplicantListPerformanceIndexes.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260611212809_ApplicantListPerformanceIndexes.cs
new file mode 100644
index 0000000000..2cc2263037
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260611212809_ApplicantListPerformanceIndexes.cs
@@ -0,0 +1,73 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class ApplicantListPerformanceIndexes : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_Applicants_OrgName",
+                table: "Applicants",
+                column: "OrgName");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Applicants_OrgNumber",
+                table: "Applicants",
+                column: "OrgNumber");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Applicants_Status",
+                table: "Applicants",
+                column: "Status");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Applicants_SupplierId",
+                table: "Applicants",
+                column: "SupplierId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Applicants_TenantId_IsDeleted_CreationTime",
+                table: "Applicants",
+                columns: new[] { "TenantId", "IsDeleted", "CreationTime" },
+                filter: "\"IsDeleted\" = false");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Applicants_UnityApplicantId",
+                table: "Applicants",
+                column: "UnityApplicantId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_Applicants_OrgName",
+                table: "Applicants");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Applicants_OrgNumber",
+                table: "Applicants");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Applicants_Status",
+                table: "Applicants");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Applicants_SupplierId",
+                table: "Applicants");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Applicants_TenantId_IsDeleted_CreationTime",
+                table: "Applicants");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Applicants_UnityApplicantId",
+                table: "Applicants");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260612182840_AB32438_NotifiedStatusVisibility.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260612182840_AB32438_NotifiedStatusVisibility.Designer.cs
new file mode 100644
index 0000000000..5d730fadd4
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260612182840_AB32438_NotifiedStatusVisibility.Designer.cs
@@ -0,0 +1,5055 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260612182840_AB32438_NotifiedStatusVisibility")]
+    partial class AB32438_NotifiedStatusVisibility
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260612182840_AB32438_NotifiedStatusVisibility.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260612182840_AB32438_NotifiedStatusVisibility.cs
new file mode 100644
index 0000000000..fb9087fc5f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260612182840_AB32438_NotifiedStatusVisibility.cs
@@ -0,0 +1,41 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AB32438_NotifiedStatusVisibility : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "NotifiedStatus",
+                table: "ApplicationStatuses",
+                type: "text",
+                nullable: true);
+
+            // Seed NotifiedStatus for existing records
+            migrationBuilder.Sql(@"
+                UPDATE ""ApplicationStatuses""
+                SET ""NotifiedStatus"" = 'Approved'
+                WHERE ""StatusCode"" = 'GRANT_APPROVED';
+            ");
+
+            migrationBuilder.Sql(@"
+                UPDATE ""ApplicationStatuses""
+                SET ""NotifiedStatus"" = 'Declined'
+                WHERE ""StatusCode"" = 'GRANT_NOT_APPROVED';
+            ");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "NotifiedStatus",
+                table: "ApplicationStatuses");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617185103_AB33225_EmailSentDate_Datafix.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617185103_AB33225_EmailSentDate_Datafix.Designer.cs
new file mode 100644
index 0000000000..0b730ce66f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617185103_AB33225_EmailSentDate_Datafix.Designer.cs
@@ -0,0 +1,5068 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260617185103_AB33225_EmailSentDate_Datafix")]
+    partial class AB33225_EmailSentDate_Datafix
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617185103_AB33225_EmailSentDate_Datafix.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617185103_AB33225_EmailSentDate_Datafix.cs
new file mode 100644
index 0000000000..10950d2b16
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617185103_AB33225_EmailSentDate_Datafix.cs
@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AB33225_EmailSentDate_Datafix : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(@"
+                UPDATE ""Notifications"".""EmailLogs""
+                SET ""SentDateTime"" = COALESCE(""LastModificationTime"", ""CreationTime"")
+                WHERE ""Status"" = 'Sent' AND ""SentDateTime"" IS NULL
+            ");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // Data backfill migration; no safe automatic rollback.
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617215037_AddEmailLogRecipientAndEmailType.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617215037_AddEmailLogRecipientAndEmailType.Designer.cs
new file mode 100644
index 0000000000..7fa6f0b1c8
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617215037_AddEmailLogRecipientAndEmailType.Designer.cs
@@ -0,0 +1,5076 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260617215037_AddEmailLogRecipientAndEmailType")]
+    partial class AddEmailLogRecipientAndEmailType
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617215037_AddEmailLogRecipientAndEmailType.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617215037_AddEmailLogRecipientAndEmailType.cs
new file mode 100644
index 0000000000..e77894471e
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260617215037_AddEmailLogRecipientAndEmailType.cs
@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddEmailLogRecipientAndEmailType : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "EmailType",
+                schema: "Notifications",
+                table: "EmailLogs",
+                type: "character varying(32)",
+                maxLength: 32,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Recipient",
+                schema: "Notifications",
+                table: "EmailLogs",
+                type: "character varying(32)",
+                maxLength: 32,
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EmailType",
+                schema: "Notifications",
+                table: "EmailLogs");
+
+            migrationBuilder.DropColumn(
+                name: "Recipient",
+                schema: "Notifications",
+                table: "EmailLogs");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260619213505_DropApplicantOrganizationSize.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260619213505_DropApplicantOrganizationSize.Designer.cs
new file mode 100644
index 0000000000..8b32d2a684
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260619213505_DropApplicantOrganizationSize.Designer.cs
@@ -0,0 +1,5073 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260619213505_DropApplicantOrganizationSize")]
+    partial class DropApplicantOrganizationSize
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260619213505_DropApplicantOrganizationSize.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260619213505_DropApplicantOrganizationSize.cs
new file mode 100644
index 0000000000..75a4fcd7ce
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260619213505_DropApplicantOrganizationSize.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class DropApplicantOrganizationSize : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "OrganizationSize",
+                table: "Applicants");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "OrganizationSize",
+                table: "Applicants",
+                type: "text",
+                nullable: true);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.Designer.cs
new file mode 100644
index 0000000000..d913a3b6f2
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.Designer.cs
@@ -0,0 +1,5227 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260624175515_AlterEmailAttachments")]
+    partial class AlterEmailAttachments
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationStatus")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DateField")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<Guid>("EmailTemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EventType")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("FormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TriggerDetail")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ScheduledNotifications", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DateField")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("NotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("ScheduledNotificationId");
+
+                    b.HasIndex("ApplicationId", "ScheduledNotificationId", "DateField")
+                        .IsUnique();
+
+                    b.ToTable("ScheduledNotificationTracking", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Notifications.ScheduledNotification", null)
+                        .WithMany()
+                        .HasForeignKey("ScheduledNotificationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.cs
new file mode 100644
index 0000000000..edcfb69943
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260624175515_AlterEmailAttachments.cs
@@ -0,0 +1,98 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AlterEmailAttachments : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Make EmailLogId nullable
+            migrationBuilder.AlterColumn<Guid>(
+                name: "EmailLogId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                type: "uuid",
+                nullable: true,
+                oldClrType: typeof(Guid),
+                oldType: "uuid");
+
+            // Add TemplateId
+            migrationBuilder.AddColumn<Guid>(
+                name: "TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                type: "uuid",
+                nullable: true);
+
+            // Optional FK - adjust schema/table as needed
+            migrationBuilder.AddForeignKey(
+                name: "FK_EmailLogAttachments_EmailTemplates_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                column: "TemplateId",
+                principalSchema: "Notifications",
+                principalTable: "EmailTemplates",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EmailLogAttachments_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                column: "TemplateId");
+
+            // ARC constraint:
+            // Exactly one of EmailLogId or TemplateId must be populated.
+            migrationBuilder.AddCheckConstraint(
+                name: "CK_EmailLogAttachments_EmailLogId_XOR_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                sql: @"
+                    (
+                        (""EmailLogId"" IS NOT NULL AND ""TemplateId"" IS NULL)
+                        OR
+                        (""EmailLogId"" IS NULL AND ""TemplateId"" IS NOT NULL)
+                    )");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropCheckConstraint(
+                name: "CK_EmailLogAttachments_EmailLogId_XOR_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_EmailLogAttachments_EmailTemplates_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+
+            migrationBuilder.DropIndex(
+                name: "IX_EmailLogAttachments_TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+
+            migrationBuilder.DropColumn(
+                name: "TemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "EmailLogId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                type: "uuid",
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uuid",
+                oldNullable: true);
+
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260625194120_Add_PaymentRequests_Performance_Indexes.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260625194120_Add_PaymentRequests_Performance_Indexes.Designer.cs
new file mode 100644
index 0000000000..ff211430f6
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260625194120_Add_PaymentRequests_Performance_Indexes.Designer.cs
@@ -0,0 +1,5077 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260625194120_Add_PaymentRequests_Performance_Indexes")]
+    partial class Add_PaymentRequests_Performance_Indexes
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("CorrelationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260625194120_Add_PaymentRequests_Performance_Indexes.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260625194120_Add_PaymentRequests_Performance_Indexes.cs
new file mode 100644
index 0000000000..cbb149a700
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260625194120_Add_PaymentRequests_Performance_Indexes.cs
@@ -0,0 +1,63 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class Add_PaymentRequests_Performance_Indexes : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_CorrelationId",
+                schema: "Payments",
+                table: "PaymentRequests",
+                column: "CorrelationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_CreationTime",
+                schema: "Payments",
+                table: "PaymentRequests",
+                column: "CreationTime");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_Status",
+                schema: "Payments",
+                table: "PaymentRequests",
+                column: "Status");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PaymentRequests_TenantId_CreationTime",
+                schema: "Payments",
+                table: "PaymentRequests",
+                columns: new[] { "TenantId", "CreationTime" },
+                filter: "\"IsDeleted\" = false");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_PaymentRequests_CorrelationId",
+                schema: "Payments",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PaymentRequests_CreationTime",
+                schema: "Payments",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PaymentRequests_Status",
+                schema: "Payments",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropIndex(
+                name: "IX_PaymentRequests_TenantId_CreationTime",
+                schema: "Payments",
+                table: "PaymentRequests");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260630211933_AddCancellationToPaymentRequests.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260630211933_AddCancellationToPaymentRequests.Designer.cs
new file mode 100644
index 0000000000..fadcbc3a93
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260630211933_AddCancellationToPaymentRequests.Designer.cs
@@ -0,0 +1,5249 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260630211933_AddCancellationToPaymentRequests")]
+    partial class AddCancellationToPaymentRequests
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationStatus")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DateField")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<Guid>("EmailTemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EventType")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("FormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TriggerDetail")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ScheduledNotifications", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DateField")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("NotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("ScheduledNotificationId");
+
+                    b.HasIndex("ApplicationId", "ScheduledNotificationId", "DateField")
+                        .IsUnique();
+
+                    b.ToTable("ScheduledNotificationTracking", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("CancelledBy")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("CancelledBy");
+
+                    b.Property<Guid?>("CancelledById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CancelledById");
+
+                    b.Property<DateTime?>("CancelledOn")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CancelledOn");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("CorrelationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Notifications.ScheduledNotification", null)
+                        .WithMany()
+                        .HasForeignKey("ScheduledNotificationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260630211933_AddCancellationToPaymentRequests.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260630211933_AddCancellationToPaymentRequests.cs
new file mode 100644
index 0000000000..f9388a1860
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260630211933_AddCancellationToPaymentRequests.cs
@@ -0,0 +1,57 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddCancellationToPaymentRequests : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "CancelledBy",
+                schema: "Payments",
+                table: "PaymentRequests",
+                type: "character varying(256)",
+                maxLength: 256,
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "CancelledById",
+                schema: "Payments",
+                table: "PaymentRequests",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "CancelledOn",
+                schema: "Payments",
+                table: "PaymentRequests",
+                type: "timestamp without time zone",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {          
+
+            migrationBuilder.DropColumn(
+                name: "CancelledBy",
+                schema: "Payments",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "CancelledById",
+                schema: "Payments",
+                table: "PaymentRequests");
+
+            migrationBuilder.DropColumn(
+                name: "CancelledOn",
+                schema: "Payments",
+                table: "PaymentRequests");     
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.Designer.cs
new file mode 100644
index 0000000000..f1867ee49b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.Designer.cs
@@ -0,0 +1,118 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260703230000_AddRecipientColumnsToEmailTemplates")]
+    partial class AddRecipientColumnsToEmailTemplates
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.cs
new file mode 100644
index 0000000000..2c2a241785
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260703230000_AddRecipientColumnsToEmailTemplates.cs
@@ -0,0 +1,55 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddRecipientColumnsToEmailTemplates : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "RecipientCategory",
+                schema: "Notifications",
+                table: "EmailTemplates",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RecipientIdentifier",
+                schema: "Notifications",
+                table: "EmailTemplates",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "OriginTemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments",
+                type: "uuid",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "RecipientCategory",
+                schema: "Notifications",
+                table: "EmailTemplates");
+
+            migrationBuilder.DropColumn(
+                name: "RecipientIdentifier",
+                schema: "Notifications",
+                table: "EmailTemplates");
+
+            migrationBuilder.DropColumn(
+                name: "OriginTemplateId",
+                schema: "Notifications",
+                table: "EmailLogAttachments");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260706165030_AB33555_AddExternalStatusVisibilityToApplication.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260706165030_AB33555_AddExternalStatusVisibilityToApplication.Designer.cs
new file mode 100644
index 0000000000..f44f779522
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260706165030_AB33555_AddExternalStatusVisibilityToApplication.Designer.cs
@@ -0,0 +1,5252 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260706165030_AB33555_AddExternalStatusVisibilityToApplication")]
+    partial class AB33555_AddExternalStatusVisibilityToApplication
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("ExternalStatusVisibility")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationStatus")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DateField")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<Guid>("EmailTemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EventType")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("FormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TriggerDetail")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ScheduledNotifications", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DateField")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("NotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("ScheduledNotificationId");
+
+                    b.HasIndex("ApplicationId", "ScheduledNotificationId", "DateField")
+                        .IsUnique();
+
+                    b.ToTable("ScheduledNotificationTracking", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("CancelledBy")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("CancelledBy");
+
+                    b.Property<Guid?>("CancelledById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CancelledById");
+
+                    b.Property<DateTime?>("CancelledOn")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CancelledOn");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("CorrelationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Notifications.ScheduledNotification", null)
+                        .WithMany()
+                        .HasForeignKey("ScheduledNotificationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260706165030_AB33555_AddExternalStatusVisibilityToApplication.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260706165030_AB33555_AddExternalStatusVisibilityToApplication.cs
new file mode 100644
index 0000000000..dde7768fba
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260706165030_AB33555_AddExternalStatusVisibilityToApplication.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AB33555_AddExternalStatusVisibilityToApplication : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "ExternalStatusVisibility",
+                table: "Applications",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ExternalStatusVisibility",
+                table: "Applications");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.Designer.cs
new file mode 100644
index 0000000000..35db150b2b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.Designer.cs
@@ -0,0 +1,5255 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260708192703_AddReportsHistorySignedOff")]
+    partial class AddReportsHistorySignedOff
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "10.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportsComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ApplicantAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DefaultSiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("ExternalStatusVisibility")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("ReferenceNo");
+
+                    b.HasIndex("TenantId", "SubmissionDate")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("AutomaticallyGenerateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("ManuallyInitiateAIAnalysis")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.HasIndex("TenantId", "IsDeleted")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TenantId", "ApplicationId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditorName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingYear")
+                        .HasColumnType("text");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("OneTimeConsideration")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Year")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FiscalYear")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("IncompleteReport")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Outstanding")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ReportDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool?>("SignedOff")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("ReportsHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicantComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationStatus")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DateField")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<Guid>("EmailTemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EventType")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("FormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TriggerDetail")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ScheduledNotifications", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DateField")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("NotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("ScheduledNotificationId");
+
+                    b.HasIndex("ApplicationId", "ScheduledNotificationId", "DateField")
+                        .IsUnique();
+
+                    b.ToTable("ScheduledNotificationTracking", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("CancelledBy")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("CancelledBy");
+
+                    b.Property<Guid?>("CancelledById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CancelledById");
+
+                    b.Property<DateTime?>("CancelledOn")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CancelledOn");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("CorrelationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ReportsHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicantComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Notifications.ScheduledNotification", null)
+                        .WithMany()
+                        .HasForeignKey("ScheduledNotificationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.cs
new file mode 100644
index 0000000000..e0f62fc3c8
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260708192703_AddReportsHistorySignedOff.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class AddReportsHistorySignedOff : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "SignedOff",
+                table: "ReportsHistories",
+                type: "boolean",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SignedOff",
+                table: "ReportsHistories");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
index 62fbafaadd..a34c1645a8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs
@@ -270,6 +270,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("text")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("boolean")
@@ -825,6 +828,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("CreatorId");
 
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone");
+
                     b.Property<string>("ExtraProperties")
                         .IsRequired()
                         .HasColumnType("text")
@@ -842,6 +851,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("IndigenousOrgInd")
                         .HasColumnType("text");
 
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
                     b.Property<bool>("IsDuplicated")
                         .HasColumnType("boolean");
 
@@ -874,9 +886,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("OrgStatus")
                         .HasColumnType("text");
 
-                    b.Property<string>("OrganizationSize")
-                        .HasColumnType("text");
-
                     b.Property<string>("OrganizationType")
                         .HasColumnType("text");
 
@@ -915,8 +924,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("ApplicantName");
 
+                    b.HasIndex("OrgName");
+
+                    b.HasIndex("OrgNumber");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("SupplierId");
+
                     b.HasIndex("TenantId");
 
+                    b.HasIndex("UnityApplicantId");
+
+                    b.HasIndex("TenantId", "IsDeleted", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
                     b.ToTable("Applicants", (string)null);
                 });
 
@@ -1268,6 +1290,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("ElectoralDistrict")
                         .HasColumnType("text");
 
+                    b.Property<bool>("ExternalStatusVisibility")
+                        .HasColumnType("boolean");
+
                     b.Property<string>("ExtraProperties")
                         .IsRequired()
                         .HasColumnType("text")
@@ -2053,6 +2078,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<string>("NotifiedStatus")
+                        .HasColumnType("text");
+
                     b.Property<string>("StatusCode")
                         .IsRequired()
                         .HasMaxLength(250)
@@ -2301,6 +2329,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<decimal?>("OneTimeConsideration")
                         .HasColumnType("numeric");
 
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp without time zone");
+
                     b.Property<decimal?>("ReconsiderationAmount")
                         .HasColumnType("numeric");
 
@@ -2434,6 +2465,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("ReportDate")
                         .HasColumnType("timestamp without time zone");
 
+                    b.Property<bool?>("SignedOff")
+                        .HasColumnType("boolean");
+
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uuid")
                         .HasColumnName("TenantId");
@@ -3019,6 +3053,142 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("Intakes", (string)null);
                 });
 
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationStatus")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DateField")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<Guid>("EmailTemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EventType")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("FormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RecipientCategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RecipientIdentifier")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TriggerDetail")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ScheduledNotifications", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DateField")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime>("NotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("ScheduledNotificationId");
+
+                    b.HasIndex("ApplicationId", "ScheduledNotificationId", "DateField")
+                        .IsUnique();
+
+                    b.ToTable("ScheduledNotificationTracking", "Notifications");
+                });
+
             modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
                 {
                     b.Property<Guid>("Id")
@@ -3185,6 +3355,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("CreatorId");
 
+                    b.Property<string>("EmailType")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
                     b.Property<string>("ExtraProperties")
                         .IsRequired()
                         .HasColumnType("text")
@@ -3210,9 +3384,16 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<string>("Recipient")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
                     b.Property<int>("RetryAttempts")
                         .HasColumnType("integer");
 
+                    b.Property<Guid?>("ScheduledNotificationId")
+                        .HasColumnType("uuid");
+
                     b.Property<DateTime?>("SendOnDateTime")
                         .HasColumnType("timestamp without time zone");
 
@@ -3280,6 +3461,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid>("EmailLogId")
                         .HasColumnType("uuid");
 
+                    b.Property<Guid?>("TemplateId")
+                        .HasColumnType("uuid");                        
+
                     b.Property<string>("ExtraProperties")
                         .IsRequired()
                         .HasColumnType("text")
@@ -3937,6 +4121,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<decimal>("BatchNumber")
                         .HasColumnType("numeric");
 
+                    b.Property<string>("CancelledBy")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("CancelledBy");
+
+                    b.Property<Guid?>("CancelledById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CancelledById");
+
+                    b.Property<DateTime?>("CancelledOn")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CancelledOn");
+
                     b.Property<int?>("CasHttpStatusCode")
                         .HasColumnType("integer");
 
@@ -4068,6 +4265,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("AccountCodingId");
 
+                    b.HasIndex("CorrelationId");
+
+                    b.HasIndex("CreationTime");
+
                     b.HasIndex("FsbNotificationEmailLogId");
 
                     b.HasIndex("ReferenceNumber")
@@ -4075,6 +4276,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("SiteId");
 
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId", "CreationTime")
+                        .HasFilter("\"IsDeleted\" = false");
+
                     b.ToTable("PaymentRequests", "Payments");
                 });
 
@@ -4837,6 +5043,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired();
                 });
 
+            modelBuilder.Entity("Unity.GrantManager.Notifications.ScheduledNotificationTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Notifications.ScheduledNotification", null)
+                        .WithMany()
+                        .HasForeignKey("ScheduledNotificationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
             modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
                 {
                     b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicantRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicantRepository.cs
index 7f16fec56a..fe9dd193a3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicantRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicantRepository.cs
@@ -21,21 +21,21 @@ public class ApplicantRepository : EfCoreRepository<GrantTenantDbContext, Applic
 #pragma warning restore CS8613 // Nullability of reference types in return type doesn't match implicitly implemented member.
     {
         public ApplicantRepository(IDbContextProvider<GrantTenantDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-        }
+            {
+            }
 
         public async Task<List<Applicant>> GetUnmatchedApplicantsAsync()
         {
             var dbContext = await GetDbContextAsync();
             return await dbContext.Applicants
-                .Where(x => x.MatchPercentage == null)
+                .Where(x => x.MatchPercentage == null && !x.IsDeleted)
                 .ToListAsync();
         }
 
         public async Task<Applicant?> GetByUnityApplicantIdAsync(string unityApplicantId)
         {
             var dbContext = await GetDbContextAsync();
-            return await dbContext.Applicants.FirstOrDefaultAsync(x => x.UnityApplicantId == unityApplicantId);
+            return await dbContext.Applicants.FirstOrDefaultAsync(x => x.UnityApplicantId == unityApplicantId && !x.IsDeleted);
         }
 
         public async Task<Applicant?> GetByUnityApplicantNameAsync(string unityApplicantName)
@@ -47,7 +47,8 @@ public async Task<List<Applicant>> GetUnmatchedApplicantsAsync()
             // EF Core cannot translate StringComparison overloads to SQL, so we use ToLower() for database compatibility
             return await dbContext.Applicants
                 .FirstOrDefaultAsync(a => a.ApplicantName != null &&
-                                          a.ApplicantName.ToLower() == unityApplicantNameNormalized);
+                                          a.ApplicantName.ToLower() == unityApplicantNameNormalized &&
+                                          !a.IsDeleted);
 #pragma warning restore CA1862 // Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
 
         }
@@ -55,7 +56,7 @@ public async Task<List<Applicant>> GetApplicantsWithUnityApplicantIdAsync()
         {
             var dbContext = await GetDbContextAsync();
             return await dbContext.Applicants
-                .Where(x => x.UnityApplicantId != null)
+                .Where(x => x.UnityApplicantId != null && !x.IsDeleted)
                 .ToListAsync();
         }
 
@@ -72,6 +73,7 @@ public async Task<JsonDocument> GetApplicantAutocompleteQueryAsync(string? appli
 
             var applicants = await dbContext.Applicants
             .AsNoTracking()
+            .Where(a => !a.IsDeleted)
             .ToListAsync();
 
             var filtered = applicants
@@ -111,7 +113,6 @@ public async Task<JsonDocument> GetApplicantAutocompleteQueryAsync(string? appli
                     a.OrgNumber,
                     a.NonRegOrgName,
                     a.OrganizationType,
-                    a.OrganizationSize,
                     a.ApproxNumberOfEmployees,
                     a.OrgStatus,
                     a.BusinessNumber,
@@ -133,5 +134,40 @@ public async Task<JsonDocument> GetApplicantAutocompleteQueryAsync(string? appli
             var json = JsonSerializer.Serialize(filteredApplicants);
             return JsonDocument.Parse(json);
         }
+
+        public async Task<List<ApplicantListRecord>> GetApplicantListRecordsAsync(IReadOnlyList<string>? requestedFields = null)
+        {
+            return await (await GetQueryableAsync())
+                .AsNoTracking()
+                .Where(a => !a.IsDeleted)
+                .OrderByDescending(a => a.CreationTime)
+                .Select(a => new ApplicantListRecord
+                {
+                    Id = a.Id,
+                    ApplicantName = a.ApplicantName,
+                    UnityApplicantId = a.UnityApplicantId,
+                    OrgName = a.OrgName,
+                    OrgNumber = a.OrgNumber,
+                    OrgStatus = a.OrgStatus,
+                    OrganizationType = a.OrganizationType,
+                    Status = a.Status,
+                    RedStop = a.RedStop,
+                    NonRegisteredBusinessName = a.NonRegisteredBusinessName,
+                    NonRegOrgName = a.NonRegOrgName,
+                    Sector = a.Sector,
+                    SubSector = a.SubSector,
+                    ApproxNumberOfEmployees = a.ApproxNumberOfEmployees,
+                    IndigenousOrgInd = a.IndigenousOrgInd,
+                    SectorSubSectorIndustryDesc = a.SectorSubSectorIndustryDesc,
+                    FiscalMonth = a.FiscalMonth,
+                    BusinessNumber = a.BusinessNumber,
+                    FiscalDay = a.FiscalDay,
+                    StartedOperatingDate = a.StartedOperatingDate,
+                    IsDuplicated = a.IsDuplicated,
+                    CreationTime = a.CreationTime,
+                    LastModificationTime = a.LastModificationTime
+                })
+                .ToListAsync();
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicationFormSubmissionRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicationFormSubmissionRepository.cs
index 34dcbe6ed8..35c589cb81 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicationFormSubmissionRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicationFormSubmissionRepository.cs
@@ -18,11 +18,11 @@ public ApplicationFormSubmissionRepository(IDbContextProvider<GrantTenantDbConte
         {
         }
 
-        public async Task<ApplicationFormSubmission> GetByApplicationAsync(Guid applicationId)
+        public async Task<ApplicationFormSubmission?> GetByApplicationAsync(Guid applicationId)
         {
             var dbContext = await GetDbContextAsync();
             return await dbContext.ApplicationFormSubmissions
-                .FirstAsync(s => s.ApplicationId == applicationId);
+                .FirstOrDefaultAsync(s => s.ApplicationId == applicationId);
         }
 
         public async Task<ApplicationFormDetails> GetFormDetailsByApplicationIdAsync(Guid applicationId)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicationRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicationRepository.cs
index 4133f618b6..80432f764a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicationRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/ApplicationRepository.cs
@@ -223,6 +223,12 @@ public async Task<List<Application>> GetByApplicantIdAsync(Guid applicantId)
             .ToListAsync();
     }
 
+    public async Task<bool> HasApplicationsByApplicantIdAsync(Guid applicantId)
+    {
+        var query = await GetQueryableAsync();
+        return await query.AnyAsync(a => a.ApplicantId == applicantId);
+    }
+
     public async Task<List<ApplicationListRecord>> GetApplicationListRecordsAsync(
         int skipCount,
         int maxResultCount,
@@ -316,6 +322,7 @@ public async Task<List<ApplicationListRecord>> GetApplicationListRecordsAsync(
                 a.RiskRanking,
                 a.UnityApplicationId,
                 Status = a.ApplicationStatus.InternalStatus, // ApplicationStatus (always joined)
+                a.ExternalStatusVisibility,
                 Category = a.ApplicationForm.Category ?? string.Empty, // ApplicationForm (always joined)          
                 a.ApplicantId,
                 ApplicantName = a.Applicant.ApplicantName, // Applicant (always joined)
@@ -328,7 +335,7 @@ public async Task<List<ApplicationListRecord>> GetApplicationListRecordsAsync(
                 ApplicantOrgNumber = a.Applicant.OrgNumber,
                 ApplicantOrgStatus = a.Applicant.OrgStatus,
                 ApplicantBusinessNumber = a.Applicant.BusinessNumber,
-                ApplicantOrganizationSize = a.Applicant.OrganizationSize,
+                ApplicantApproxNumberOfEmployees = a.Applicant.ApproxNumberOfEmployees,
                 ApplicantSectorSubSectorIndustryDesc = a.Applicant.SectorSubSectorIndustryDesc,
                 ApplicantRedStop = a.Applicant.RedStop,
                 ApplicantIndigenousOrgInd = a.Applicant.IndigenousOrgInd,
@@ -500,6 +507,7 @@ public async Task<List<ApplicationListRecord>> GetApplicationListRecordsAsync(
                     RiskRanking = a.RiskRanking,
                     UnityApplicationId = a.UnityApplicationId,
                     Status = a.Status,
+                    ExternalStatusVisibility = a.ExternalStatusVisibility,
                     Category = a.Category,
                     ApplicantId = a.ApplicantId,
                     ApplicantName = a.ApplicantName,
@@ -512,7 +520,7 @@ public async Task<List<ApplicationListRecord>> GetApplicationListRecordsAsync(
                     ApplicantOrgNumber = a.ApplicantOrgNumber,
                     ApplicantOrgStatus = a.ApplicantOrgStatus,
                     ApplicantBusinessNumber = a.ApplicantBusinessNumber,
-                    ApplicantOrganizationSize = a.ApplicantOrganizationSize,
+                    ApplicantApproxNumberOfEmployees = a.ApplicantApproxNumberOfEmployees,
                     ApplicantSectorSubSectorIndustryDesc = a.ApplicantSectorSubSectorIndustryDesc,
                     ApplicantRedStop = a.ApplicantRedStop,
                     ApplicantIndigenousOrgInd = a.ApplicantIndigenousOrgInd,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
index ff51136204..59104a0bb1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
@@ -69,11 +69,110 @@ private static int CalculatePermissionDepth(string permissionName, List<Permissi
         // Recursively calculate the depth of the parent permission
         return 1 + CalculatePermissionDepth(parentPermission, permissions);
     }
+
+    public async Task<PermissionUserMatrixResult> GetPermissionUserMatrixAsync()
+    {
+        var dbContext = await GetDbContextAsync();
+
+        var permissions = await dbContext.Set<PermissionDefinitionRecord>()
+            .Where(p => p.IsEnabled && p.MultiTenancySide != MultiTenancySides.Host)
+            .ToListAsync();
+
+        var permissionGrants = await dbContext.Set<PermissionGrant>()
+            .Where(pg => pg.TenantId == CurrentTenant.Id)
+            .ToListAsync();
+
+        var users = await dbContext.Set<IdentityUser>()
+            .Where(u => u.IsActive && !u.IsDeleted && u.TenantId == CurrentTenant.Id)
+            .OrderBy(u => u.Surname ?? u.UserName)
+            .ToListAsync();
+
+        var userIds = users.Select(u => u.Id).ToHashSet();
+
+        var userRoles = await dbContext.Set<IdentityUserRole>()
+            .Where(ur => userIds.Contains(ur.UserId))
+            .ToListAsync();
+
+        var roleIds = userRoles.Select(ur => ur.RoleId).ToHashSet();
+        var roles = await dbContext.Set<IdentityRole>()
+            .Where(r => roleIds.Contains(r.Id))
+            .ToListAsync();
+
+        var roleIdToName = roles.ToDictionary(r => r.Id, r => r.Name);
+
+        // Build a lookup: userId to set of role names
+        var userRoleNames = userRoles
+            .GroupBy(ur => ur.UserId)
+            .ToDictionary(
+                g => g.Key,
+                g => g.Select(ur => roleIdToName.TryGetValue(ur.RoleId, out var name) ? name : null)
+                       .Where(n => n != null)
+                       .ToHashSet()
+            );
+
+        var userInfos = users.Select(u => new UserInfoDto
+        {
+            UserId = u.Id.ToString(),
+            UserName = u.UserName,
+            DisplayLabel = string.IsNullOrWhiteSpace(u.Surname) && string.IsNullOrWhiteSpace(u.Name)
+                 ? u.UserName
+                 : $"{u.Surname}, {u.Name}".Trim(' ', ',')
+        }).ToList();
+
+        var rows = permissions
+            .Select(permission => new PermissionUserMatrixRowDto
+            {
+                GroupName = permission.GroupName,
+                PermissionName = permission.Name,
+                PermissionDisplayName = permission.DisplayName,
+                Depth = CalculatePermissionDepth(permission.Name, permissions),
+                UserPermissions = users.ToDictionary(
+                    user => user.Id.ToString(),
+                    user =>
+                    {
+                        var sources = new List<string>();
+
+                        var hasDirectGrant = permissionGrants.Any(pg =>
+                            pg.Name == permission.Name &&
+                            pg.ProviderName == "U" &&
+                            pg.ProviderKey == user.Id.ToString());
+
+                        if (hasDirectGrant)
+                        {
+                            sources.Add("DIRECT");
+                        }
+
+                        if (userRoleNames.TryGetValue(user.Id, out var roleNamesForUser))
+                        {
+                            sources.AddRange(roleNamesForUser.Where(rn => rn != null).Where(roleName => permissionGrants.Any(pg =>
+                                    pg.Name == permission.Name &&
+                                    pg.ProviderName == "R" &&
+                                    pg.ProviderKey.Equals(roleName, StringComparison.OrdinalIgnoreCase))).Select(roleName => roleName!));
+                        }
+
+                        return new PermissionGrantSummary
+                        {
+                            HasPermission = sources.Count > 0,
+                            GrantSources = string.Join(", ", sources)
+                        };
+                    })
+            })
+            .OrderBy(p => p.GroupName)
+            .ThenBy(p => p.PermissionName)
+            .ToList();
+
+        return new PermissionUserMatrixResult
+        {
+            Rows = rows,
+            Users = userInfos
+        };
+    }
 }
 
 public interface IPermissionRoleMatrixRepository
 {
     Task<IList<PermissionRoleMatrixDto>> GetPermissionRoleMatrixAsync();
+    Task<PermissionUserMatrixResult> GetPermissionUserMatrixAsync();
 }
 
 public class PermissionRoleMatrixDto
@@ -84,4 +183,33 @@ public class PermissionRoleMatrixDto
     public int Depth { get; set; }
     public required Dictionary<string, bool> RolePermissions { get; set; }
     public bool IsDefined { get; set; } = false;
+}
+
+public class PermissionUserMatrixResult
+{
+    public IList<PermissionUserMatrixRowDto> Rows { get; set; } = [];
+    public IList<UserInfoDto> Users { get; set; } = [];
+}
+
+public class PermissionUserMatrixRowDto
+{
+    public required string GroupName { get; set; }
+    public required string PermissionName { get; set; }
+    public required string PermissionDisplayName { get; set; }
+    public int Depth { get; set; }
+    public required Dictionary<string, PermissionGrantSummary> UserPermissions { get; set; }
+    public bool IsDefined { get; set; } = false;
+}
+
+public class PermissionGrantSummary
+{
+    public bool HasPermission { get; set; }
+    public string GrantSources { get; set; } = string.Empty;
+}
+
+public class UserInfoDto
+{
+    public required string UserId { get; set; }
+    public required string UserName { get; set; }
+    public required string DisplayLabel { get; set; }
 }
\ No newline at end of file
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 40700cd5bb..e8383a75d5 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
@@ -94,7 +94,5 @@
 		<PackageReference Include="System.IO.Packaging" Version="10.0.7" />
 		<ProjectReference Include="..\..\modules\Unity.Notifications\src\Unity.Notifications.EntityFrameworkCore\Unity.Notifications.EntityFrameworkCore.csproj" /></ItemGroup>
 
-	<ItemGroup>
-		<Folder Include="Migrations\HostMigrations\" />
-	</ItemGroup>
+
 </Project>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi/Controllers/AttachmentController.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi/Controllers/AttachmentController.cs
index e0825c7dc2..54c5a6ebc8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi/Controllers/AttachmentController.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi/Controllers/AttachmentController.cs
@@ -1,23 +1,23 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Unity.GrantManager.Attachments;
 using Unity.GrantManager.Intakes;
+using Unity.GrantManager.Models;
 using Unity.Notifications.Emails;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Validation;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Unity.GrantManager.Models;
-using System.Threading;
 
 namespace Unity.GrantManager.Controllers
 {
@@ -57,7 +57,7 @@ public class AttachmentController : AbpController
         private readonly ICurrentTenant _currentTenant;
         private readonly ILibreOfficeConversionService _libreOfficeConversionService;
         private readonly IAttachmentPreviewAppService _attachmentPreviewAppService;
-        private ILogger logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance);
+        private ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance);
         private const string badRequestFileMsg = "File name must be provided.";
         private const string NotFoundFileMsg = "File not found.";
         private const string errorFileMsg = "An error occurred while downloading the file.";
@@ -127,7 +127,7 @@ public async Task<IActionResult> DownloadApplicantAttachment(string applicantId,
             catch (Exception ex)
             {
                 string ExceptionMessage = ex.Message;
-                logger.LogError(ex, "AttachmentController->DownloadApplicantAttachment: {ExceptionMessage}", ExceptionMessage);
+                Logger.LogError(ex, "AttachmentController->DownloadApplicantAttachment: {ExceptionMessage}", ExceptionMessage);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -174,7 +174,7 @@ public async Task<IActionResult> DownloadApplicationAttachment(string applicatio
             catch (Exception ex)
             {
                 string ExceptionMessage = ex.Message;
-                logger.LogError(ex, "AttachmentController->DownloadApplicationAttachment: {ExceptionMessage}", ExceptionMessage);
+                Logger.LogError(ex, "AttachmentController->DownloadApplicationAttachment: {ExceptionMessage}", ExceptionMessage);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -221,7 +221,7 @@ public async Task<IActionResult> DownloadAssessmentAttachment(string assessmentI
             catch (Exception ex)
             {
                 string ExceptionMessage = ex.Message;
-                logger.LogError(ex, "AttachmentController->DownloadAssessmentAttachment: {ExceptionMessage}", ExceptionMessage);
+                Logger.LogError(ex, "AttachmentController->DownloadAssessmentAttachment: {ExceptionMessage}", ExceptionMessage);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -253,7 +253,7 @@ public async Task<IActionResult> DownloadChefsAttachment(Guid formSubmissionId,
             catch (Exception ex)
             {
                 string ExceptionMessage = ex.Message;
-                logger.LogError(ex, "AttachmentController->DownloadChefsAttachment: {ExceptionMessage}", ExceptionMessage);
+                Logger.LogError(ex, "AttachmentController->DownloadChefsAttachment: {ExceptionMessage}", ExceptionMessage);
                 var errorCode = ex.Data.Contains(ErrorCodeKey) ? Convert.ToInt32(ex.Data[ErrorCodeKey]) : 500;
                 return StatusCode(errorCode, ExceptionMessage);
             }
@@ -297,7 +297,7 @@ public async Task<IActionResult> DownloadAllChefsAttachment([FromBody] List<Atta
                 catch (Exception ex)
                 {
                     string ExceptionMessage = ex.Message;
-                    logger.LogError(ex, "AttachmentController->DownloadAllChefsAttachment: {ExceptionMessage}", ExceptionMessage);
+                    Logger.LogError(ex, "AttachmentController->DownloadAllChefsAttachment: {ExceptionMessage}", ExceptionMessage);
                     if (ExceptionMessage.Contains(chefsApiAccessError))
                     {                        
                         return StatusCode(403, chefsApiAccessError);
@@ -325,7 +325,7 @@ public async Task<IActionResult> PreviewApplicationAttachment(string application
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "AttachmentController->PreviewApplicationAttachment: {Message}", ex.Message);
+                Logger.LogError(ex, "AttachmentController->PreviewApplicationAttachment: {Message}", ex.Message);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -346,7 +346,7 @@ public async Task<IActionResult> PreviewAssessmentAttachment(string assessmentId
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "AttachmentController->PreviewAssessmentAttachment: {Message}", ex.Message);
+                Logger.LogError(ex, "AttachmentController->PreviewAssessmentAttachment: {Message}", ex.Message);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -366,7 +366,7 @@ public async Task<IActionResult> PreviewApplicantAttachment(string applicantId,
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "AttachmentController->PreviewApplicantAttachment: {Message}", ex.Message);
+                Logger.LogError(ex, "AttachmentController->PreviewApplicantAttachment: {Message}", ex.Message);
                 return StatusCode(500, errorFileMsg);
             }
         }
@@ -387,7 +387,7 @@ public async Task<IActionResult> PreviewChefsAttachment(Guid formSubmissionId, G
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "AttachmentController->PreviewChefsAttachment: {Message}", ex.Message);
+                Logger.LogError(ex, "AttachmentController->PreviewChefsAttachment: {Message}", ex.Message);
                 var errorCode = ex.Data.Contains(ErrorCodeKey) ? Convert.ToInt32(ex.Data[ErrorCodeKey]) : 500;
                 return StatusCode(errorCode, errorFileMsg);
             }
@@ -447,9 +447,21 @@ public async Task<IActionResult> UploadApplicationAttachments(Guid applicationId
             return await UploadFiles(files);
         }
 
+        [HttpPost("template/{templateId}/upload")]
+        public async Task<IActionResult> UploadTemplateAttachments(Guid templateId, IList<IFormFile> files)
+        {
+            return await UploadEmailAttachments(null, templateId, files);
+        }
+
         [HttpPost("email/{emailLogId}/upload")]
         public async Task<IActionResult> UploadEmailAttachments(Guid emailLogId, IList<IFormFile> files)
         {
+            return await UploadEmailAttachments(emailLogId, null, files);
+        }
+
+        [NonAction]
+        public async Task<IActionResult> UploadEmailAttachments(Guid? emailLogId, Guid? templateId, IList<IFormFile> files)
+        { 
             if (!ModelState.IsValid)
             {
                 return BadRequest(ModelState);
@@ -481,9 +493,9 @@ public async Task<IActionResult> UploadEmailAttachments(Guid emailLogId, IList<I
 
             var totalMaxFileSizeConfig = _configuration["S3:EmailAttachmentsTotalMaxFileSize"] ?? "25";
             if (double.TryParse(totalMaxFileSizeConfig, out double totalMaxSizeMB))
-            {
+            {                
                 long existingTotalBytes = await _emailLogAttachmentUploadService
-                    .GetTotalFileSizeByEmailLogIdAsync(emailLogId);
+                    .GetTotalFileSizeByEmailLogIdAsync(emailLogId, templateId);
                 long newFilesBytes = files.Sum(f => f.Length);
                 double combinedMB = (existingTotalBytes + newFilesBytes) * 0.000001;
 
@@ -504,6 +516,7 @@ public async Task<IActionResult> UploadEmailAttachments(Guid emailLogId, IList<I
                     await file.CopyToAsync(ms);
                     var dto = await _emailLogAttachmentUploadService.UploadAsync(
                         emailLogId,
+                        templateId,
                         _currentTenant.Id,
                         file.FileName,
                         ms.ToArray(),
@@ -512,7 +525,7 @@ public async Task<IActionResult> UploadEmailAttachments(Guid emailLogId, IList<I
                 }
                 catch (Exception ex)
                 {
-                    logger.LogError(ex, "AttachmentController->UploadEmailAttachments: Failed to upload {FileName}", file.FileName);
+                    Logger.LogError(ex, "AttachmentController->UploadEmailAttachments: Failed to upload {FileName}", file.FileName);
                     return StatusCode(500, $"Failed to upload {file.FileName}: {ex.Message}");
                 }
             }
@@ -527,7 +540,7 @@ private async Task<IActionResult> UploadFiles(IList<IFormFile> files)
             {
                 throw new AbpValidationException(message: "ERROR: Invalid File Type.", validationErrors: InvalidFileTypes);
             }
-            List<string> ErrorList = new();
+            List<string> ErrorList = [];
             foreach (IFormFile source in files)
             {
                 try
@@ -558,7 +571,7 @@ await _fileAppService.SaveBlobAsync(
 
         private List<ValidationResult> GetInvalidFileTypes(IList<IFormFile> files)
         {
-            List<ValidationResult> ErrorList = new();
+            List<ValidationResult> ErrorList = [];
             var InvalidFileTypes = _configuration["S3:DisallowedFileTypes"] ?? "";
             var DisallowedFileTypes = JsonConvert.DeserializeObject<string[]>(InvalidFileTypes);
             if (DisallowedFileTypes == null)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs
new file mode 100644
index 0000000000..1850dcb94e
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Controllers/FormNotificationsApiController.cs
@@ -0,0 +1,461 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Unity.GrantManager.GrantApplications;
+using Unity.Notifications.EmailGroups;
+using System.Threading.Tasks;
+using Unity.Notifications.Emails;
+using Volo.Abp.Users;
+using Unity.GrantManager.Events;
+using Volo.Abp.Identity.Integration;
+
+namespace Unity.GrantManager.Web.Controllers
+{
+    [Route("api/form-notifications")]
+    [ApiController]
+    public class FormNotificationsApiController : ControllerBase
+    {
+        private readonly IApplicationStatusService _statusService;
+        private readonly IEmailGroupsAppService _emailGroupsAppService;
+        private readonly Unity.Notifications.Templates.ITemplateService _templateService;
+        private readonly Notifications.IAutomatedNotificationAppService _automatedNotificationAppService;
+        private readonly IEmailLogAttachmentRepository _emailLogAttachmentRepository;
+        private readonly ICurrentUser _currentUser;
+        private readonly IEmailGroupUsersAppService _emailGroupUsersAppService;
+        private readonly IIdentityUserIntegrationService _identityUserIntegrationService;
+        private readonly IGrantApplicationAppService _grantApplicationAppService;
+        private readonly ScheduledNotificationHelper _scheduledNotificationHelper;
+
+        public FormNotificationsApiController(IApplicationStatusService statusService, IEmailGroupsAppService emailGroupsAppService, Unity.Notifications.Templates.ITemplateService templateService, Unity.GrantManager.Notifications.IAutomatedNotificationAppService automatedNotificationAppService, IEmailLogAttachmentRepository emailLogAttachmentRepository, ICurrentUser currentUser, IEmailGroupUsersAppService emailGroupUsersAppService, IIdentityUserIntegrationService identityUserIntegrationService, IGrantApplicationAppService grantApplicationAppService, ScheduledNotificationHelper scheduledNotificationHelper)
+        {
+            _statusService = statusService;
+            _emailGroupsAppService = emailGroupsAppService;
+            _templateService = templateService;
+            _automatedNotificationAppService = automatedNotificationAppService;
+            _emailLogAttachmentRepository = emailLogAttachmentRepository;
+            _currentUser = currentUser;
+            _emailGroupUsersAppService = emailGroupUsersAppService;
+            _identityUserIntegrationService = identityUserIntegrationService;
+            _grantApplicationAppService = grantApplicationAppService;
+            _scheduledNotificationHelper = scheduledNotificationHelper;
+        }
+        // In-memory storage removed; persisting to ScheduledNotifications table via IAutomatedNotificationAppService
+
+
+        [HttpGet("templates")]
+        public async Task<ActionResult<List<EmailTemplateDto>>> GetTemplates()
+        {
+            var templates = await _templateService.GetTemplatesByTenant();
+            var list = templates.Select(t => new EmailTemplateDto
+            {
+                Id = t.Id,
+                Name = t.Name,
+                Subject = t.Subject,
+                Body = t.BodyHTML,
+                SendFrom = t.SendFrom,
+                RecipientCategory = t.RecipientCategory,
+                RecipientIdentifier = t.RecipientIdentifier
+            }).ToList();
+
+            return Ok(list);
+        }
+
+        [HttpGet("templates/{templateId:guid}/resolved-recipients")]
+        public async Task<ActionResult<ResolvedRecipientsDto>> GetResolvedTemplateRecipients(Guid templateId, [FromQuery] Guid? applicationId = null)
+        {
+            var template = await _templateService.GetTemplateById(templateId);
+            if (template == null)
+            {
+                return NotFound();
+            }
+
+            var recipientCategory = template.RecipientCategory?.Trim();
+            var recipientIdentifier = template.RecipientIdentifier?.Trim();
+            if (string.IsNullOrWhiteSpace(recipientCategory) || string.IsNullOrWhiteSpace(recipientIdentifier))
+            {
+                return Ok(new ResolvedRecipientsDto { EmailTo = string.Empty });
+            }
+
+            if (string.Equals(recipientCategory, "Internal", StringComparison.OrdinalIgnoreCase))
+            {
+                var notification = new Notifications.ScheduledNotification
+                {
+                    RecipientCategory = recipientCategory,
+                    RecipientIdentifier = recipientIdentifier
+                };
+
+                var emailTo = await _scheduledNotificationHelper.GetInternalRecipientEmailAddressesAsync(
+                    notification,
+                    _emailGroupsAppService,
+                    _emailGroupUsersAppService,
+                    _identityUserIntegrationService);
+
+                return Ok(new ResolvedRecipientsDto { EmailTo = emailTo });
+            }
+
+            if (string.Equals(recipientCategory, "External", StringComparison.OrdinalIgnoreCase))
+            {
+                if (!applicationId.HasValue || applicationId.Value == Guid.Empty)
+                {
+                    return Ok(new ResolvedRecipientsDto { EmailTo = string.Empty });
+                }
+
+                var application = await _grantApplicationAppService.GetAsync(applicationId.Value);
+                var identifiers = recipientIdentifier
+                    .Split(',')
+                    .Select(r => r.Trim())
+                    .Where(r => !string.IsNullOrWhiteSpace(r))
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToList();
+
+                var emailAddresses = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+                foreach (var identifier in identifiers)
+                {
+                    if (identifier.Contains('@'))
+                    {
+                        emailAddresses.Add(identifier);
+                        continue;
+                    }
+
+                    if (string.Equals(identifier, "ApplicationContact", StringComparison.OrdinalIgnoreCase) &&
+                        !string.IsNullOrWhiteSpace(application.ContactEmail))
+                    {
+                        emailAddresses.Add(application.ContactEmail);
+                        continue;
+                    }
+
+                    if (string.Equals(identifier, "SigningAuthority", StringComparison.OrdinalIgnoreCase) &&
+                        !string.IsNullOrWhiteSpace(application.SigningAuthorityEmail))
+                    {
+                        emailAddresses.Add(application.SigningAuthorityEmail);
+                    }
+                }
+
+                return Ok(new ResolvedRecipientsDto { EmailTo = string.Join("; ", emailAddresses) });
+            }
+
+            return Ok(new ResolvedRecipientsDto { EmailTo = string.Empty });
+        }
+
+        [HttpPost("email-template/{templateId}/copy-attachments")]
+        public async Task<ActionResult<CopyAttachmentsResponseDto>> CopyTemplateAttachments(Guid templateId, [FromBody] CopyAttachmentsInput input)
+        {
+            if (input.EmailLogId == Guid.Empty)
+                return BadRequest("EmailLogId is required");
+
+            // Get all attachments for the template
+            var templateAttachments = await _emailLogAttachmentRepository.GetByTemplateIdAsync(templateId);
+
+            if (templateAttachments.Count == 0)
+            {
+                return Ok(new CopyAttachmentsResponseDto { AttachmentCount = 0 });
+            }
+
+            // Copy attachments to the email log
+            int copiedCount = 0;
+            foreach (var templateAttachment in templateAttachments)
+            {
+                var newAttachment = new EmailLogAttachment
+                {
+                    EmailLogId = input.EmailLogId,
+                    TemplateId = null,
+                    OriginTemplateId = templateId,
+                    S3ObjectKey = templateAttachment.S3ObjectKey,
+                    FileName = templateAttachment.FileName,
+                    DisplayName = templateAttachment.DisplayName,
+                    ContentType = templateAttachment.ContentType,
+                    FileSize = templateAttachment.FileSize,
+                    Time = DateTime.UtcNow,
+                    UserId = _currentUser.Id ?? Guid.Empty,
+                    TenantId = _currentUser.TenantId ?? Guid.Empty
+                };
+
+                await _emailLogAttachmentRepository.InsertAsync(newAttachment);
+                copiedCount++;
+            }
+
+            return Ok(new CopyAttachmentsResponseDto { AttachmentCount = copiedCount });
+        }
+
+        [HttpDelete("email-log/{emailLogId}/origin-attachments")]
+        public async Task<ActionResult<CopyAttachmentsResponseDto>> DeleteOriginAttachments(Guid emailLogId)
+        {
+            var attachments = await _emailLogAttachmentRepository.GetOriginAttachmentsByEmailLogIdAsync(emailLogId);
+            foreach (var attachment in attachments)
+            {
+                await _emailLogAttachmentRepository.DeleteAsync(attachment.Id);
+            }
+            return Ok(new CopyAttachmentsResponseDto { AttachmentCount = attachments.Count });
+        }
+
+        [HttpGet("statuses")]
+        public async Task<ActionResult<List<object>>> GetApplicationStatuses()
+        {
+            var statuses = await _statusService.GetListAsync();
+            var list = statuses.Select(s => new { id = s.Id, internalStatus = s.InternalStatus }).ToList<object>();
+            return Ok(list);
+        }
+
+        [HttpGet("recipients")]
+        public async Task<ActionResult<List<RecipientDto>>> GetRecipients([FromQuery] string category)
+        {
+            // For internal recipients, load EmailGroups from the notifications module and expose their Name
+            if (string.Equals(category, "Internal", StringComparison.OrdinalIgnoreCase))
+            {
+                var groups = await _emailGroupsAppService.GetListAsync();
+                var list = groups.Select(g => new RecipientDto { Id = g.Name, DisplayName = g.Name }).ToList();
+                return Ok(list);
+            }
+
+            // For external recipients we expose the two choices required by the UI
+            var externalContacts = new List<RecipientDto>
+            {
+                new() { Id = "ApplicationContact", DisplayName = "Application Contact" },
+                new() { Id = "SigningAuthority", DisplayName = "Signing Authority" }
+            };
+
+            if (string.Equals(category, "External", StringComparison.OrdinalIgnoreCase)) return Ok(externalContacts);
+
+            return Ok(new List<RecipientDto>());
+        }
+
+        [HttpGet("{formId}")]
+        public async Task<ActionResult<List<ScheduledNotificationDto>>> GetForForm(string formId)
+        {
+            if (!Guid.TryParse(formId, out var parsedFormId)) return BadRequest("Invalid form id");
+
+            var listResult = await _automatedNotificationAppService.GetListAsync(new Unity.GrantManager.Notifications.GetNotificationsInput { FormId = parsedFormId, MaxResultCount = 1000 });
+
+            // Resolve template names and status labels
+            var templateIds = listResult.Items.Select(x => x.EmailTemplateId).Where(id => id != Guid.Empty).Distinct().ToList();
+            var templateMap = new Dictionary<Guid, Unity.Notifications.Templates.EmailTemplate?>();
+            foreach (var id in templateIds)
+            {
+                templateMap[id] = await _templateService.GetTemplateById(id);
+            }
+
+            var statuses = await _statusService.GetListAsync();
+            var statusMap = statuses.ToDictionary(s => s.Id, s => s.InternalStatus);
+
+            var items = listResult.Items.Select(e => new ScheduledNotificationDto
+            {
+                Id = e.Id,
+                TemplateId = e.EmailTemplateId,
+                TemplateName = templateMap.TryGetValue(e.EmailTemplateId, out var t) && t != null ? t.Name : string.Empty,
+                TriggerType = e.TriggerType,
+                DateType = e.DateField,
+                EventStatus = e.ApplicationStatus,
+                ApplicationStatusId = e.ApplicationStatusId,
+                RecipientCategory = e.RecipientCategory,
+                RecipientIdentifier = e.RecipientIdentifier,
+                CreatedAt = DateTime.UtcNow,
+                IsActive = e.IsActive
+            }).ToList();
+
+            return Ok(items);
+        }
+
+        [HttpPost("{formId}")]
+        public async Task<ActionResult<ScheduledNotificationDto>> CreateForForm(string formId, [FromBody] CreateScheduledNotificationInput input)
+        {
+            if (input.TemplateId == Guid.Empty) return BadRequest("TemplateId required");
+
+            if (string.Equals(input.TriggerType, "Event", StringComparison.OrdinalIgnoreCase) && string.IsNullOrWhiteSpace(input.RecipientIdentifier))
+            {
+                return BadRequest("RecipientIdentifier required for Event trigger");
+            }
+
+            var template = await _templateService.GetTemplateById(input.TemplateId);
+            if (template == null) return BadRequest("Template not found");
+            if (!Guid.TryParse(formId, out var parsedFormId)) return BadRequest("Invalid form id");
+
+            // Resolve status label if an ApplicationStatusId was provided
+            string? statusLabel = null;
+            if (input.ApplicationStatusId.HasValue)
+            {
+                var statuses = await _statusService.GetListAsync();
+                var match = statuses.FirstOrDefault(s => s.Id == input.ApplicationStatusId.Value);
+                if (match != null) statusLabel = match.InternalStatus;
+            }
+
+            var createDto = new Notifications.CreateUpdateNotificationDto
+            {
+                FormId = parsedFormId,
+                EmailTemplateId = template.Id,
+                TriggerType = input.TriggerType,
+                TriggerDetail = input.TriggerType == "Date" ? input.DateType : statusLabel,
+                IsActive = true,
+                EventType = null,
+                ApplicationStatusId = input.ApplicationStatusId,
+                ApplicationStatus = statusLabel,
+                DateField = input.DateType,
+                RecipientCategory = input.RecipientCategory,
+                RecipientIdentifier = input.RecipientIdentifier
+            };
+
+            var created = await _automatedNotificationAppService.CreateAsync(createDto);
+
+            var dto = new ScheduledNotificationDto
+            {
+                Id = created.Id,
+                TemplateId = input.TemplateId,
+                TemplateName = template.Name,
+                TriggerType = created.TriggerType,
+                DateType = created.DateField,
+                EventStatus = created.ApplicationStatus,
+                ApplicationStatusId = created.ApplicationStatusId,
+                RecipientCategory = created.RecipientCategory,
+                RecipientIdentifier = created.RecipientIdentifier,
+                CreatedAt = DateTime.UtcNow
+            };
+
+            return CreatedAtAction(nameof(GetForForm), new { formId }, dto);
+        }
+
+        [HttpDelete("{formId}/{id:guid}")]
+        public async Task<IActionResult> Delete(string formId, Guid id)
+        {
+            await _automatedNotificationAppService.DeleteAsync(id);
+            return NoContent();
+        }
+
+        [HttpPatch("{formId}/{id:guid}/cancel")]
+        public async Task<IActionResult> CancelNotification(string formId, Guid id)
+        {
+            if (!Guid.TryParse(formId, out _)) return BadRequest("Invalid form id");
+            await _automatedNotificationAppService.CancelAsync(id);
+            return NoContent();
+        }
+
+        [HttpGet("can-delete-template/{templateId:guid}")]
+        public async Task<ActionResult<object>> CanDeleteTemplate(Guid templateId)
+        {
+            var result = await _automatedNotificationAppService.GetListAsync(
+                new Notifications.GetNotificationsInput { MaxResultCount = 1000 });
+
+            var inUse = result.Items.Any(n => n.EmailTemplateId == templateId);
+
+            if (inUse)
+            {
+                return Ok(new
+                {
+                    canDelete = false,
+                    errorMessage = "This template cannot be deleted because it is assigned to one or more Scheduled Notifications. Please remove the template from all Scheduled Notifications before deleting."
+                });
+            }
+
+            return Ok(new { canDelete = true, errorMessage = (string?)null });
+        }
+
+        [HttpPut("{formId}/{id:guid}")]
+        public async Task<ActionResult<ScheduledNotificationDto>> UpdateForForm(string formId, Guid id, [FromBody] CreateScheduledNotificationInput input)
+        {
+            if (!Guid.TryParse(formId, out var parsedFormId)) return BadRequest("Invalid form id");
+            if (input.TemplateId == Guid.Empty) return BadRequest("TemplateId required");
+
+            var template = await _templateService.GetTemplateById(input.TemplateId);
+            if (template == null) return BadRequest("Template not found");
+
+            string? statusLabel = null;
+            if (input.ApplicationStatusId.HasValue)
+            {
+                var statuses = await _statusService.GetListAsync();
+                var match = statuses.FirstOrDefault(s => s.Id == input.ApplicationStatusId.Value);
+                if (match != null) statusLabel = match.InternalStatus;
+            }
+
+            var updateDto = new Notifications.CreateUpdateNotificationDto
+            {
+                FormId = parsedFormId,
+                EmailTemplateId = template.Id,
+                TriggerType = input.TriggerType,
+                TriggerDetail = input.TriggerType == "Date" ? input.DateType : statusLabel,
+                IsActive = true,
+                EventType = null,
+                ApplicationStatusId = input.ApplicationStatusId,
+                ApplicationStatus = statusLabel,
+                DateField = input.DateType,
+                RecipientCategory = input.RecipientCategory,
+                RecipientIdentifier = input.RecipientIdentifier
+            };
+
+            var updated = await _automatedNotificationAppService.UpdateAsync(id, updateDto);
+
+            var dto = new ScheduledNotificationDto
+            {
+                Id = updated.Id,
+                TemplateId = input.TemplateId,
+                TemplateName = template.Name,
+                TriggerType = updated.TriggerType,
+                DateType = updated.DateField,
+                EventStatus = updated.ApplicationStatus,
+                ApplicationStatusId = updated.ApplicationStatusId,
+                RecipientCategory = updated.RecipientCategory,
+                RecipientIdentifier = updated.RecipientIdentifier,
+                CreatedAt = DateTime.UtcNow
+            };
+
+            return Ok(dto);
+        }
+    }
+
+    public record EmailTemplateDto
+    {
+        public Guid Id { get; init; }
+        public string Name { get; init; } = string.Empty;
+        public string Subject { get; init; } = string.Empty;
+        public string Body { get; init; } = string.Empty;
+        public string SendFrom { get; init; } = string.Empty;
+        public string? RecipientCategory { get; init; }
+        public string? RecipientIdentifier { get; init; }
+    }
+
+    public record ScheduledNotificationDto
+    {
+        public Guid Id { get; init; }
+        public Guid TemplateId { get; init; }
+        public string TemplateName { get; init; } = string.Empty;
+        public string TriggerType { get; init; } = string.Empty;
+        public string? DateType { get; init; }
+        public string? EventStatus { get; init; }
+        public Guid? ApplicationStatusId { get; init; }
+        public string? RecipientCategory { get; init; }
+        public string? RecipientIdentifier { get; init; }
+        public DateTime CreatedAt { get; init; }
+        public bool IsActive { get; init; }
+    }
+
+    public record CreateScheduledNotificationInput
+    {
+        public Guid TemplateId { get; init; }
+        public string TriggerType { get; init; } = "Date";
+        public string? DateType { get; init; }
+        public Guid? ApplicationStatusId { get; init; }
+        public string? EventStatus { get; init; }
+        public string? RecipientCategory { get; init; }
+        public string? RecipientIdentifier { get; init; }
+    }
+
+    public record RecipientDto
+    {
+        public string Id { get; init; } = string.Empty;
+        public string DisplayName { get; init; } = string.Empty;
+    }
+
+    public record CopyAttachmentsInput
+    {
+        public Guid EmailLogId { get; init; }
+    }
+
+    public record CopyAttachmentsResponseDto
+    {
+        public int AttachmentCount { get; init; }
+    }
+
+    public record ResolvedRecipientsDto
+    {
+        public string EmailTo { get; init; } = string.Empty;
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/GrantManagerWebModule.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/GrantManagerWebModule.cs
index 21f6b26270..ddd33139d5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/GrantManagerWebModule.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/GrantManagerWebModule.cs
@@ -62,6 +62,7 @@
 using Volo.Abp.Modularity;
 using Volo.Abp.OpenIddict.Tokens;
 using Volo.Abp.SecurityLog;
+using Volo.Abp.Security.Claims;
 using Volo.Abp.SettingManagement.Web;
 using Volo.Abp.SettingManagement.Web.Pages.SettingManagement;
 using Volo.Abp.Swashbuckle;
@@ -220,8 +221,8 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
         Configure<SettingManagementPageOptions>(options =>
         {
-            options.Contributors.Add(new BackgroundJobsPageContributor());
             options.Contributors.Add(new TagManagementPageContributor());
+            options.Contributors.Add(new ApplicationUiSettingPageContributor());
         });
 
         context.Services.AddHealthChecks()
@@ -232,11 +233,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
         context.Services.AddHealthChecks()
             .AddCheck<StartupHealthCheck>("startup", tags: _startupHealthCheckTags);
-
-        Configure<SettingManagementPageOptions>(options =>
-        {
-            options.Contributors.Add(new ApplicationUiSettingPageContributor());
-        });
     }
 
     private static void ConfigureDataProtection(ServiceConfigurationContext context, IConfiguration configuration)
@@ -282,10 +278,24 @@ private static void ConfgureFormsApiAuhentication(ServiceConfigurationContext co
     private static void ConfigurePolicies(ServiceConfigurationContext context)
     {
         PolicyRegistrant.Register(context);
+        PermissionOrPolicyRegistrant.Register(context);
     }
 
     private static void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
     {
+        context.Services.Configure<AbpClaimsPrincipalFactoryOptions>(options =>
+        {
+            options.IsDynamicClaimsEnabled = true; //set it "true" to enable "Dynamic Claims" or "false" to disable it.
+        });
+
+        // NOTE: AbpClaimTypes.Role must stay a DISTINCT claim type from UnityClaimsTypes.Role
+        // ("client_roles"). ABP's dynamic claims refresh (AbpDynamicClaimsPrincipalContributorBase)
+        // recomputes AbpClaimTypes.Role claims purely from the user's real DB IdentityUserRole
+        // assignments and REPLACES (RemoveAll + re-add) whatever was there. Keycloak-only roles
+        // (ITAdministrator/ITOperations) are never DB roles, so if the two claim types were unified,
+        // every dynamic-claims refresh would wipe them out. Unifying them was tried as a cookie-size
+        // optimization (one claim per role instead of two) but reverted for this reason.
+
         context.Services.AddAuthentication(options =>
         {
             options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;
@@ -594,7 +604,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         app.UseStaticFiles();
         app.UseMiddleware<TimezoneMiddleware>();
         app.UseRouting();
-        app.UseAuthentication();
+        app.UseAuthentication();        
 
         if (MultiTenancyConsts.IsEnabled)
         {
@@ -602,6 +612,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseUnitOfWork();
+        app.UseDynamicClaims();
         app.UseAuthorization();
         if (IsProfilingAllowed(env, configuration))
         {
@@ -614,6 +625,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         });
         app.UseAuditing();
         app.UseAbpSerilogEnrichers();
+        app.UseMiddleware<OnboardingRedirectMiddleware>();
         app.UseConfiguredEndpoints();
 
         var supportedCultures = new[]
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/Authorization/PermissionOrAuthorizationHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/Authorization/PermissionOrAuthorizationHandler.cs
new file mode 100644
index 0000000000..90f1034f54
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/Authorization/PermissionOrAuthorizationHandler.cs
@@ -0,0 +1,39 @@
+using System.Linq;
+using Microsoft.AspNetCore.Authorization;
+using System.Threading.Tasks;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.GrantManager.Web.Identity.Authorization;
+
+public class PermissionOrRequirement : IAuthorizationRequirement
+{
+    public string[] Permissions { get; }
+
+    public PermissionOrRequirement(params string[] permissions)
+    {
+        Permissions = permissions;
+    }
+}
+
+public class PermissionOrAuthorizationHandler : AuthorizationHandler<PermissionOrRequirement>, ITransientDependency
+{
+    private readonly IPermissionChecker _permissionChecker;
+
+    public PermissionOrAuthorizationHandler(IPermissionChecker permissionChecker)
+    {
+        _permissionChecker = permissionChecker;
+    }
+
+    protected override async Task HandleRequirementAsync(
+        AuthorizationHandlerContext context,
+        PermissionOrRequirement requirement)
+    {
+        var result = await _permissionChecker.IsGrantedAsync(context.User, requirement.Permissions);
+
+        if (result.Result.Any(r => r.Value == PermissionGrantResult.Granted))
+        {
+            context.Succeed(requirement);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/Authorization/RoleOrPermissionAuthorizationHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/Authorization/RoleOrPermissionAuthorizationHandler.cs
new file mode 100644
index 0000000000..cbb607da22
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/Authorization/RoleOrPermissionAuthorizationHandler.cs
@@ -0,0 +1,45 @@
+using System.Linq;
+using Microsoft.AspNetCore.Authorization;
+using System.Threading.Tasks;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.GrantManager.Web.Identity.Authorization;
+
+public class RoleOrPermissionRequirement : IAuthorizationRequirement
+{
+    public string[] RoleNames { get; }
+    public string PermissionName { get; }
+
+    public RoleOrPermissionRequirement(string[] roleNames, string permissionName)
+    {
+        RoleNames = roleNames;
+        PermissionName = permissionName;
+    }
+}
+
+public class RoleOrPermissionAuthorizationHandler : AuthorizationHandler<RoleOrPermissionRequirement>, ITransientDependency
+{
+    private readonly IPermissionChecker _permissionChecker;
+
+    public RoleOrPermissionAuthorizationHandler(IPermissionChecker permissionChecker)
+    {
+        _permissionChecker = permissionChecker;
+    }
+
+    protected override async Task HandleRequirementAsync(
+        AuthorizationHandlerContext context,
+        RoleOrPermissionRequirement requirement)
+    {
+        if (requirement.RoleNames.Any(context.User.IsInRole))
+        {
+            context.Succeed(requirement);
+            return;
+        }
+
+        if (await _permissionChecker.IsGrantedAsync(context.User, requirement.PermissionName))
+        {
+            context.Succeed(requirement);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/CurrentUser.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/CurrentUser.cs
index ab17dea528..5e67687d08 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/CurrentUser.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/CurrentUser.cs
@@ -75,10 +75,18 @@ public virtual bool IsInRole(string roleName)
             var userClaims = _principalAccessor.Principal?.Claims;
             if (userClaims != null && userClaims.Any())
             {
-                var userId = userClaims.FirstOrDefault(s => s.Type == "UserId");
+                // UnityClaimsTypes.IDirUserGuid ("idir_user_guid") is Keycloak's IDIR-specific
+                // identifier, used only to derive the OIDC subject for account matching on login
+                // (see UserImportAppService) - it is NOT the database user id and must not be used
+                // here, even though it happens to also be GUID-formatted.
+                var userId = userClaims.FirstOrDefault(s => s.Type == AbpClaimTypes.UserId);
                 if (userId != null)
                 {
-                    return Guid.Parse(userId.Value);
+                    var value = userId.Value.Split('@')[0]; // Remove @azureidir suffix
+                    if (Guid.TryParse(value, out var guid))
+                    {
+                        return guid;
+                    }
                 }
             }
             return null;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/IdentityExtensionMethods.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/IdentityExtensionMethods.cs
deleted file mode 100644
index 3eb02c46cb..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/IdentityExtensionMethods.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using OpenIddict.Abstractions;
-using System.Collections.Immutable;
-using System.Security.Claims;
-
-namespace Unity.GrantManager.Web.Identity
-{
-    public static class IdentityExtensionMethods
-    {
-        public static ClaimsPrincipal AddPermission(this ClaimsPrincipal principal, string value) 
-        {
-            return principal.AddClaim(UnityClaimsTypes.Permission, value);            
-        }
-
-        public static ClaimsPrincipal AddPermissions(this ClaimsPrincipal principal, ImmutableArray<string> values)
-        {
-            return principal.AddClaims(UnityClaimsTypes.Permission, values);
-        }
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/IdentityProfileLoginHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/IdentityProfileLoginHandler.cs
index bf5cf48de0..b54a3f5f6b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/IdentityProfileLoginHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/IdentityProfileLoginHandler.cs
@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.Extensions.DependencyInjection;
 using OpenIddict.Abstractions;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
+using System.Security.Principal;
 using System.Threading.Tasks;
 using Unity.GrantManager.Identity;
 using Unity.GrantManager.Web.Identity.LoginHandlers;
@@ -45,6 +45,7 @@ internal async Task HandleAsync(TokenValidatedContext validatedTokenContext)
                 }
 
                 AddTenantClaims(validatedTokenContext.Principal!, userTenantAccounts);
+                RemoveRawJwtMetadataClaims(validatedTokenContext.Principal!);
 
                 // Create security log
                 await securityLogManager.SaveAsync(securityLog =>
@@ -66,5 +67,22 @@ private static void AddTenantClaims(ClaimsPrincipal claimsPrincipal, IList<UserT
                 claimsPrincipal.AddClaim(UnityClaimsTypes.HasMultipleTenants, "true");
             }
         }
+
+        // Raw OIDC/JWT protocol claims that ASP.NET Core attaches to the principal when it parses
+        // the ID token, unrelated to app-level identity/authorization and unused anywhere in this
+        // codebase (verified via repo-wide search) - stripped before sign-in to shrink the auth cookie.
+        private static readonly string[] RawJwtMetadataClaimTypes =
+        [
+            "jti", "sid", "session_state", "at_hash", "iss", "aud", "azp", "exp", "iat", "typ"
+        ];
+
+        private static void RemoveRawJwtMetadataClaims(ClaimsPrincipal claimsPrincipal)
+        {
+            var identity = claimsPrincipal.Identity as ClaimsIdentity;
+            foreach (var claimType in RawJwtMetadataClaimTypes)
+            {
+                identity?.RemoveAll(claimType);
+            }
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginAdminHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginAdminHandler.cs
index c80469dbd5..4d6250ebf3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginAdminHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginAdminHandler.cs
@@ -1,13 +1,10 @@
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
-using System.Security.Claims;
 using System.Threading.Tasks;
 using Unity.GrantManager.Identity;
 using Unity.Modules.Shared.Permissions;
-using Unity.TenantManagement;
 using Volo.Abp;
 using Volo.Abp.Data;
 using Volo.Abp.Identity;
@@ -16,18 +13,6 @@ namespace Unity.GrantManager.Web.Identity.LoginHandlers
 {
     internal class IdentityProfileLoginAdminHandler : IdentityProfileLoginBase
     {
-        internal readonly ImmutableArray<string> _adminPermissions = ImmutableArray.Create(
-            TenantManagementPermissions.Tenants.Default,
-            TenantManagementPermissions.Tenants.Create,
-            TenantManagementPermissions.Tenants.Update,
-            TenantManagementPermissions.Tenants.Delete,
-            TenantManagementPermissions.Tenants.ManageFeatures,
-            TenantManagementPermissions.Tenants.ManageConnectionStrings,
-            IdentityPermissions.Users.Create,
-            IdentityPermissions.UserLookup.Default,
-            IdentityConsts.ITAdminPermissionName
-        );
-     
         internal async Task<UserTenantAccountDto> Handle(TokenValidatedContext validatedTokenContext,
            IList<UserTenantAccountDto> userTenantAccounts,
            string? idp)
@@ -43,8 +28,11 @@ internal async Task<UserTenantAccountDto> Handle(TokenValidatedContext validated
                 userTenantAccount = userTenantAccounts.First(s => s.TenantId == null);
             }
 
-            AssignAdminHostPermissions(validatedTokenContext.Principal!);
             AssignDefaultClaims(validatedTokenContext.Principal!, userTenantAccount.DisplayName ?? string.Empty, userTenantAccount.Id);
+            // No explicit role claim stamped here - ITAdministrator/ITOperations role recognition
+            // relies entirely on the client_roles claim Keycloak already sends natively (the routing
+            // check at the top of IdentityProfileLoginHandler.HandleAsync depends on that being true
+            // before this handler even runs).
             return userTenantAccount;
         }
 
@@ -63,11 +51,6 @@ private static bool AdminHasUserAccount(IList<UserTenantAccountDto>? userTenantA
             return false;
         }
 
-        private void AssignAdminHostPermissions(ClaimsPrincipal claimsPrincipal)
-        {
-            claimsPrincipal.AddPermissions(_adminPermissions);
-        }
-
         private async Task<UserTenantAccountDto> CreateAdminAccountAsync(TokenValidatedContext validatedTokenContext, string? idp)
         {
             var token = validatedTokenContext.SecurityToken;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginBase.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginBase.cs
index 0810de9d47..59c76fa0ec 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginBase.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginBase.cs
@@ -1,5 +1,6 @@
 using System.Security.Claims;
 using System;
+using System.Security.Principal;
 using Unity.GrantManager.Identity;
 using OpenIddict.Abstractions;
 using System.IdentityModel.Tokens.Jwt;
@@ -7,7 +8,7 @@
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Identity;
-using Volo.Abp.PermissionManagement;
+using Volo.Abp.Security.Claims;
 using Microsoft.Extensions.Configuration;
 using Volo.Abp.TenantManagement;
 
@@ -19,7 +20,6 @@ internal abstract class IdentityProfileLoginBase : ITransientDependency
         protected ICurrentTenant CurrentTenant => LazyServiceProvider.LazyGetRequiredService<ICurrentTenant>();
         protected IdentityUserManager IdentityUserManager => LazyServiceProvider.LazyGetRequiredService<IdentityUserManager>();
         protected IdentityRoleManager IdentityRoleManager => LazyServiceProvider.LazyGetRequiredService<IdentityRoleManager>();
-        protected PermissionManager PermissionManager => LazyServiceProvider.LazyGetRequiredService<PermissionManager>();
         protected IIdentityUserRepository IdentityUserRepository => LazyServiceProvider.LazyGetRequiredService<IIdentityUserRepository>();
         protected IConfiguration Configuration => LazyServiceProvider.LazyGetRequiredService<IConfiguration>();
         protected IUserImportAppService UserImportAppService => LazyServiceProvider.LazyGetRequiredService<IUserImportAppService>();
@@ -28,8 +28,15 @@ internal abstract class IdentityProfileLoginBase : ITransientDependency
 
         protected static void AssignDefaultClaims(ClaimsPrincipal claimsPrinicipal, string displayName, Guid userId)
         {
+            // AbpClaimTypes.UserId is the same claim type URI as ClaimTypes.NameIdentifier, which the
+            // OIDC/JWT handler already populates from the token's "sub" claim before this runs. Without
+            // clearing it first, the principal ends up with two UserId claims (Keycloak's sub, then ours),
+            // and CurrentUser.FindUserId()'s FirstOrDefault picks the wrong (sub) one.
+            var identity = claimsPrinicipal.Identity as ClaimsIdentity;
+            identity?.RemoveAll(AbpClaimTypes.UserId);
+
             claimsPrinicipal.AddClaim("DisplayName", displayName);
-            claimsPrinicipal.AddClaim("UserId", userId.ToString());
+            claimsPrinicipal.AddClaim(AbpClaimTypes.UserId, userId.ToString());
             claimsPrinicipal.AddClaim("Badge", Utils.CreateUserBadge(displayName));
         }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginUserHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginUserHandler.cs
index a13314a84e..57f773dac1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginUserHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/LoginHandlers/IdentityProfileLoginUserHandler.cs
@@ -4,32 +4,17 @@
 using OpenIddict.Abstractions;
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Unity.GrantManager.Identity;
-using Unity.GrantManager.Permissions;
 using Unity.GrantManager.Web.Exceptions;
-using Unity.Modules.Shared.Permissions;
-using Volo.Abp.Identity;
-using Volo.Abp.PermissionManagement;
 using Volo.Abp.Security.Claims;
 
 namespace Unity.GrantManager.Web.Identity.LoginHandlers
 {
     internal class IdentityProfileLoginUserHandler : IdentityProfileLoginBase
     {
-        internal readonly ImmutableArray<string> _userPermissions = [
-            GrantManagerPermissions.Default,
-            IdentityPermissions.UserLookup.Default
-        ];
-
-        internal readonly ImmutableArray<string> _itOperationsPermissions = [
-            GrantManagerPermissions.Endpoints.ManageEndpoints,
-            IdentityConsts.ITOperationsPermissionName
-        ];
-
         internal async Task<UserTenantAccountDto> Handle(TokenValidatedContext validatedTokenContext,
           IList<UserTenantAccountDto>? userTenantAccounts,
           string? idp)
@@ -57,11 +42,6 @@ internal async Task<UserTenantAccountDto> Handle(TokenValidatedContext validated
                 }
             }
             
-            if (validatedTokenContext.Principal != null && validatedTokenContext.Principal.IsInRole(IdentityConsts.ITOperationsRoleName))
-            { 
-                AssignITOperationsPermissions(validatedTokenContext.Principal);
-            }
-
             UserTenantAccountDto? userTenantAccount = null;
             var setTenant = validatedTokenContext.Request.Cookies["set_tenant"];
             if (setTenant != null && setTenant != Guid.Empty.ToString())
@@ -72,32 +52,12 @@ internal async Task<UserTenantAccountDto> Handle(TokenValidatedContext validated
             }
 
             userTenantAccount ??= userTenantAccounts[0];
-            var principal = validatedTokenContext.Principal!;
-
-            using (CurrentTenant.Change(userTenantAccount.TenantId))
-            {
-                var userRoles = await IdentityUserRepository.GetRolesAsync(userTenantAccount.Id);
-
-                if (userRoles != null)
-                {
-                    foreach (var role in userRoles)
-                    {
-                        var dbRole = await IdentityRoleManager.GetByIdAsync(role.Id);
-                        principal.AddClaim(UnityClaimsTypes.Role, dbRole.Name);
-                    }
-                }
-
-                var userPermissions = (await PermissionManager.GetAllForUserAsync(userTenantAccount.Id)).Where(s => s.IsGranted);
 
-                foreach (var permissionName in userPermissions
-                    .Select(s => s.Name)
-                    .Where(permissionName => !principal.HasClaim(UnityClaimsTypes.Permission, permissionName)))
-                {
-                    principal.AddClaim(UnityClaimsTypes.Permission, permissionName);
-                }
-            }
-
-            AssignDefaultPermissions(validatedTokenContext.Principal!);
+            // DB-managed roles (approver, assessor, program_manager, etc.) are no longer stamped
+            // onto the principal here - ABP's dynamic claims refresh recomputes AbpClaimTypes.Role
+            // from the DB on every request, so the cookie doesn't need to carry them. The
+            // UnityClaimsTypes.Role ("client_roles") claim now only ever holds what Keycloak sends
+            // natively (ITAdministrator/ITOperations), which ABP can't recompute.
             AssignDefaultClaims(validatedTokenContext.Principal!, userTenantAccount.DisplayName ?? string.Empty, userTenantAccount.Id);
 
             validatedTokenContext.Principal!.AddClaim(AbpClaimTypes.TenantId, userTenantAccount.TenantId?.ToString() ?? Guid.Empty.ToString());
@@ -105,11 +65,6 @@ internal async Task<UserTenantAccountDto> Handle(TokenValidatedContext validated
             return userTenantAccount;
         }
 
-        private void AssignITOperationsPermissions(ClaimsPrincipal claimsPrincipal)
-        {
-            claimsPrincipal.AddPermissions(_itOperationsPermissions);
-        }
-
         private async Task<IList<UserTenantAccountDto>> AutoRegisterUserWithDefaultAsync(string userIdentifier,
             string username,
             string firstName,
@@ -151,10 +106,5 @@ private bool IsAutoRegisterFlagSet()
         {
             return Configuration.GetValue<bool>("IdentityProfileLogin:AutoCreateUser");
         }
-
-        private void AssignDefaultPermissions(ClaimsPrincipal claimsPrincipal)
-        {
-            claimsPrincipal.AddPermissions(_userPermissions);
-        }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PermissionChecker.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PermissionChecker.cs
deleted file mode 100644
index 53ff40213a..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PermissionChecker.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using System.Security.Principal;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.Security.Claims;
-using Volo.Abp.SimpleStateChecking;
-
-namespace Unity.GrantManager.Web.Identity
-{
-    [Dependency(ReplaceServices = true)]
-    [ExposeServices(typeof(PermissionChecker), typeof(IPermissionChecker))]
-    public class PermissionChecker : IPermissionChecker, ITransientDependency
-    {
-        protected IPermissionDefinitionManager PermissionDefinitionManager { get; }
-        protected ICurrentPrincipalAccessor PrincipalAccessor { get; }
-        protected ICurrentTenant CurrentTenant { get; }
-        protected IPermissionValueProviderManager PermissionValueProviderManager { get; }
-        protected ISimpleStateCheckerManager<PermissionDefinition> StateCheckerManager { get; }
-
-        public PermissionChecker(
-            ICurrentPrincipalAccessor principalAccessor,
-            IPermissionDefinitionManager permissionDefinitionManager,
-            ICurrentTenant currentTenant,
-            IPermissionValueProviderManager permissionValueProviderManager,
-            ISimpleStateCheckerManager<PermissionDefinition> stateCheckerManager)
-        {
-            PrincipalAccessor = principalAccessor;
-            PermissionDefinitionManager = permissionDefinitionManager;
-            CurrentTenant = currentTenant;
-            PermissionValueProviderManager = permissionValueProviderManager;
-            StateCheckerManager = stateCheckerManager;
-        }
-
-        public virtual async Task<bool> IsGrantedAsync(string name)
-        {
-            return await IsGrantedAsync(PrincipalAccessor.Principal, name);
-        }
-
-        public virtual async Task<bool> IsGrantedAsync(
-            ClaimsPrincipal? claimsPrincipal,
-            string name)
-        {
-            Check.NotNull(name, nameof(name));
-
-            var permission = await PermissionDefinitionManager.GetOrNullAsync(name);
-            if (permission == null)
-            {
-                return false;
-            }
-
-            if (!permission.IsEnabled)
-            {
-                return false;
-            }
-
-            if (!await StateCheckerManager.IsEnabledAsync(permission))
-            {
-                return false;
-            }
-
-            var multiTenancySide = claimsPrincipal?.GetMultiTenancySide()
-                                   ?? CurrentTenant.GetMultiTenancySide();
-
-            if (!permission.MultiTenancySide.HasFlag(multiTenancySide))
-            {
-                return false;
-            }
-
-            var isGranted = false;
-
-            if (claimsPrincipal != null
-                && claimsPrincipal.Claims.Any(s => s.Type == "Permission" && s.Value == name))
-            {
-                isGranted = true;
-            }
-
-            return isGranted;
-        }
-
-        public async Task<MultiplePermissionGrantResult> IsGrantedAsync(string[] names)
-        {
-            return await IsGrantedAsync(PrincipalAccessor.Principal, names);
-        }
-
-        public async Task<MultiplePermissionGrantResult> IsGrantedAsync(ClaimsPrincipal? claimsPrincipal, string[] names)
-        {
-            Check.NotNull(names, nameof(names));
-
-            var result = new MultiplePermissionGrantResult();
-            if (names.Length == 0)
-            {
-                return result;
-            }
-
-            if (claimsPrincipal != null)
-            {
-                var permissions = claimsPrincipal.Claims.Where(s => s.Type == "Permission");
-                foreach (var name in names)
-                {
-                    if (permissions.Select(s => s.Value).Contains(name))
-                    {
-                        result.Result.Add(name, PermissionGrantResult.Granted);
-                    } 
-                    else
-                    {
-                        result.Result.Add(name, PermissionGrantResult.Prohibited);
-                    }
-                }
-            }       
-
-            return await Task.FromResult(result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PermissionOrPolicyRegistrant.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PermissionOrPolicyRegistrant.cs
new file mode 100644
index 0000000000..89bc5d623d
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PermissionOrPolicyRegistrant.cs
@@ -0,0 +1,38 @@
+using Microsoft.Extensions.DependencyInjection;
+using Unity.GrantManager.Web.Identity.Authorization;
+using Unity.Modules.Shared;
+using Volo.Abp.Modularity;
+
+namespace Unity.GrantManager.Web.Identity.Policy;
+
+// Composite "any of these permissions" policies - no Keycloak role involved.
+// TODO: remove once the underlying permissions are consolidated so a single
+// real permission can be checked directly instead of an OR across several.
+internal static class PermissionOrPolicyRegistrant
+{
+    internal static void Register(ServiceConfigurationContext context)
+    {
+        var authorizationBuilder = context.Services.AddAuthorizationBuilder();
+
+        // Applicant Info Logical OR policy
+        authorizationBuilder.AddPolicy(UnitySelector.Applicant.UpdatePolicy,
+            policy => policy.AddRequirements(new PermissionOrRequirement(
+                UnitySelector.Applicant.Summary.Update,
+                UnitySelector.Applicant.Contact.Update,
+                UnitySelector.Applicant.Authority.Update,
+                UnitySelector.Applicant.Location.Update,
+                UnitySelector.Applicant.AdditionalContact.Update,
+
+                // NOTE: This will be replaced when Worksheets are normalized with UnitySelector.Applicant.Worksheet.Update
+                UnitySelector.Applicant.Default)));
+
+        // Project Info Logical OR policy
+        authorizationBuilder.AddPolicy(UnitySelector.Project.UpdatePolicy,
+            policy => policy.AddRequirements(new PermissionOrRequirement(
+                UnitySelector.Project.Location.Update.Default,
+                UnitySelector.Project.Summary.Update.Default,
+
+                // NOTE: This will be replaced when Worksheets are normalized with UnitySelector.Project.Worksheet.Update
+                UnitySelector.Project.Default)));
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PolicyRegistrant.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PolicyRegistrant.cs
index 10e9446c70..39831cd806 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PolicyRegistrant.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Identity/PolicyRegistrant.cs
@@ -1,8 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
-using Unity.GrantManager.Permissions;
-using Unity.Modules.Shared;
+using Unity.GrantManager.Web.Identity.Authorization;
 using Unity.Modules.Shared.Permissions;
-using Unity.Reporting.Permissions;
 using Unity.TenantManagement;
 using Volo.Abp.Identity;
 using Volo.Abp.Modularity;
@@ -11,234 +9,73 @@ namespace Unity.GrantManager.Web.Identity.Policy;
 
 internal static class PolicyRegistrant
 {
-    internal const string PermissionConstant = "Permission";
+    // IT Administrator is the "host" superuser login (see IdentityProfileLoginAdminHandler) -
+    // it must retain at least the host/tenant-admin access ITOperations has, plus a few
+    // admin-only permissions (user creation/lookup, tenant delete/connection strings) that
+    // used to be granted via a hardcoded claim stamp at login (_adminPermissions, removed
+    // when cookie-stamped permission claims were dropped in favour of IPermissionChecker).
+    private static readonly string[] ITAdminOrITOperationsRoles =
+        [IdentityConsts.ITAdminRoleName, IdentityConsts.ITOperationsRoleName];
 
     internal static void Register(ServiceConfigurationContext context)
     {
-        // Using AddAuthorizationBuilder to register authorization services and construct policies
+        // All permission-based policies (single permission or otherwise) are resolved
+        // dynamically by ABP's AbpAuthorizationPolicyProvider via IPermissionChecker
+        // (Redis-cached). Only policies that need to check a Keycloak-issued role claim
+        // (IsInRole) need explicit registration here.
         var authorizationBuilder = context.Services.AddAuthorizationBuilder();
 
-        // Identity Role Policies
-        authorizationBuilder.AddPolicy(IdentityPermissions.Roles.Default,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Roles.Default));
-        authorizationBuilder.AddPolicy(IdentityPermissions.Roles.Create,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Roles.Create));
-        authorizationBuilder.AddPolicy(IdentityPermissions.Roles.Update,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Roles.Update));
-        authorizationBuilder.AddPolicy(IdentityPermissions.Roles.Delete,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Roles.Delete));
-        authorizationBuilder.AddPolicy(IdentityPermissions.Roles.ManagePermissions,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Roles.ManagePermissions));
-
-        // Identity User Policies
-        authorizationBuilder.AddPolicy(IdentityPermissions.Users.Default,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Users.Default));
-        authorizationBuilder.AddPolicy(IdentityPermissions.Users.Create,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Users.Create));
-        authorizationBuilder.AddPolicy(IdentityPermissions.Users.Update,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Users.Update));
-        authorizationBuilder.AddPolicy(IdentityPermissions.Users.Delete,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Users.Delete));
-        authorizationBuilder.AddPolicy(IdentityPermissions.Users.ManagePermissions,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.Users.ManagePermissions));
-
-        // User Lookup Policies
-        authorizationBuilder.AddPolicy(IdentityPermissions.UserLookup.Default,
-            policy => policy.RequireClaim(PermissionConstant, IdentityPermissions.UserLookup.Default));
-
-        // Grant Manager Policies
-        authorizationBuilder.AddPolicy(GrantManagerPermissions.Default,
-            policy => policy.RequireClaim(PermissionConstant, GrantManagerPermissions.Default));
-        authorizationBuilder.AddPolicy(GrantManagerPermissions.Intakes.Default,
-            policy => policy.RequireClaim(PermissionConstant, GrantManagerPermissions.Intakes.Default));
-        authorizationBuilder.AddPolicy(GrantManagerPermissions.ApplicationForms.Default,
-            policy => policy.RequireClaim(PermissionConstant, GrantManagerPermissions.ApplicationForms.Default));
-
-        // Grant Application Policies
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Applications.Default,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Applications.Default));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Applicants.Default,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Applicants.Default));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Applicants.Edit,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Applicants.Edit));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Applicants.AssignApplicant,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Applicants.AssignApplicant));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Assignments.Default,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Assignments.Default));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Assignments.AssignInitial,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Assignments.AssignInitial));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Reviews.Default,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Reviews.Default));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Reviews.StartInitial,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Reviews.StartInitial));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Reviews.CompleteInitial,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Reviews.CompleteInitial));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Approvals.Default,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Approvals.Default));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Approvals.Complete,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Approvals.Complete));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Comments.Default,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Comments.Default));
-        authorizationBuilder.AddPolicy(GrantApplicationPermissions.Comments.Add,
-            policy => policy.RequireClaim(PermissionConstant, GrantApplicationPermissions.Comments.Add));
-
-        // R&A Policies
-        authorizationBuilder.AddPolicy(UnitySelector.Review.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.Default));
-
-        // R&A - Approval Policies
-        authorizationBuilder.AddPolicy(UnitySelector.Review.Approval.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.Approval.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Review.Approval.Update.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.Approval.Update.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Review.Approval.Update.UpdateFinalStateFields,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.Approval.Update.UpdateFinalStateFields));
-
-        // R&A - Assessment Results Policies
-        authorizationBuilder.AddPolicy(UnitySelector.Review.AssessmentResults.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.AssessmentResults.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Review.AssessmentResults.Update.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.AssessmentResults.Update.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Review.AssessmentResults.Update.UpdateFinalStateFields,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.AssessmentResults.Update.UpdateFinalStateFields));
-
-        // R&A - Assessment Review List Policies
-        authorizationBuilder.AddPolicy(UnitySelector.Review.AssessmentReviewList.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.AssessmentReviewList.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Review.AssessmentReviewList.Create,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.AssessmentReviewList.Create));
-        authorizationBuilder.AddPolicy(UnitySelector.Review.AssessmentReviewList.Update.SendBack,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.AssessmentReviewList.Update.SendBack));
-        authorizationBuilder.AddPolicy(UnitySelector.Review.AssessmentReviewList.Update.Complete,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Review.AssessmentReviewList.Update.Complete));
-
-        //-- APPLICANT INFO
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.Authority.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.Authority.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.Authority.Update,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.Authority.Update));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.Contact.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.Contact.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.Contact.Update,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.Contact.Update));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.Location.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.Location.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.Location.Update,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.Location.Update));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.Summary.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.Summary.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.Summary.Update,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.Summary.Update));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.AdditionalContact.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.AdditionalContact.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.AdditionalContact.Create,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.AdditionalContact.Create));
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.AdditionalContact.Update,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Applicant.AdditionalContact.Update));
-
-        // Applicant Info Logical OR policy
-        authorizationBuilder.AddPolicy(UnitySelector.Applicant.UpdatePolicy,
-            policy => policy.RequireAssertion(context =>
-            context.User.HasClaim(PermissionConstant, UnitySelector.Applicant.Summary.Update) ||
-            context.User.HasClaim(PermissionConstant, UnitySelector.Applicant.Contact.Update) ||
-            context.User.HasClaim(PermissionConstant, UnitySelector.Applicant.Authority.Update) ||
-            context.User.HasClaim(PermissionConstant, UnitySelector.Applicant.Location.Update) ||
-            context.User.HasClaim(PermissionConstant, UnitySelector.Applicant.AdditionalContact.Update) ||
-
-            // NOTE: This will be replaced when Worksheets are normalized with UnitySelector.Applicant.Worksheet.Update
-            context.User.HasClaim(PermissionConstant, UnitySelector.Applicant.Default)
-        ));
-
-        //-- PAYMENT INFO
-        authorizationBuilder.AddPolicy(UnitySelector.Payment.Default,
-           policy => policy.RequireClaim(PermissionConstant, UnitySelector.Payment.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Payment.Supplier.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Payment.Summary.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Payment.Supplier.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Payment.Supplier.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Payment.Supplier.Update,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Payment.Supplier.Update));
-        authorizationBuilder.AddPolicy(UnitySelector.Payment.Supplier.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Payment.PaymentList.Default));
-
-        // Tenancy Policies
+        // IT Administrator / IT Operations role policies
+        authorizationBuilder.AddPolicy(IdentityConsts.ITAdminPolicyName,
+            policy => policy.RequireRole(IdentityConsts.ITAdminRoleName));
+        authorizationBuilder.AddPolicy(IdentityConsts.ITOperationsPolicyName,
+            policy => policy.RequireRole(IdentityConsts.ITOperationsRoleName));
+        authorizationBuilder.AddPolicy(IdentityConsts.ITAdminOrITOperationsPolicyName,
+            policy => policy.RequireRole(ITAdminOrITOperationsRoles));
+
+        // Tenant management combined: Tenants.<X> OR ITAdmin/ITOperations
+        // NOTE: TenantManagementPermissions.Tenants.Default/Create/Update/Delete/ManageConnectionStrings
+        // are not real ABP permissions (only ManageFeatures/ManageEndpoints come from the base ABP
+        // TenantManagement module - see UnityTenantManagementPermissionDefinitionProvider). They're
+        // referenced directly (not via the TenantsXOrITOps composite names) by some Razor Pages/
+        // toolbar conventions in UnityTenantManagementWebModule, so both the raw name and its
+        // composite-policy equivalent must be registered with the same effective check.
+        authorizationBuilder.AddPolicy(TenantManagementPermissions.Tenants.ManageFeatures,
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                ITAdminOrITOperationsRoles, TenantManagementPermissions.Tenants.ManageFeatures)));
         authorizationBuilder.AddPolicy(TenantManagementPermissions.Tenants.Default,
-            policy => policy.RequireClaim(PermissionConstant, TenantManagementPermissions.Tenants.Default));
-        authorizationBuilder.AddPolicy(TenantManagementPermissions.Tenants.Create,
-            policy => policy.RequireClaim(PermissionConstant, TenantManagementPermissions.Tenants.Create));
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                ITAdminOrITOperationsRoles, TenantManagementPermissions.Tenants.Default)));
+        authorizationBuilder.AddPolicy(TenantManagementPermissions.Policies.TenantsOrITOps,
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                ITAdminOrITOperationsRoles, TenantManagementPermissions.Tenants.Default)));
         authorizationBuilder.AddPolicy(TenantManagementPermissions.Tenants.Update,
-            policy => policy.RequireClaim(PermissionConstant, TenantManagementPermissions.Tenants.Update));
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                ITAdminOrITOperationsRoles, TenantManagementPermissions.Tenants.Update)));
+        authorizationBuilder.AddPolicy(TenantManagementPermissions.Policies.TenantsUpdateOrITOps,
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                ITAdminOrITOperationsRoles, TenantManagementPermissions.Tenants.Update)));
+        authorizationBuilder.AddPolicy(TenantManagementPermissions.Tenants.Create,
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                ITAdminOrITOperationsRoles, TenantManagementPermissions.Tenants.Create)));
+        authorizationBuilder.AddPolicy(TenantManagementPermissions.Policies.TenantsCreateOrITOps,
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                ITAdminOrITOperationsRoles, TenantManagementPermissions.Tenants.Create)));
+
+        // ITAdmin-only: Tenant delete/connection-string management and Identity user
+        // creation/lookup - previously covered by the removed admin claim stamp.
         authorizationBuilder.AddPolicy(TenantManagementPermissions.Tenants.Delete,
-            policy => policy.RequireClaim(PermissionConstant, TenantManagementPermissions.Tenants.Delete));
-        authorizationBuilder.AddPolicy(TenantManagementPermissions.Tenants.ManageFeatures,
-            policy => policy.RequireClaim(PermissionConstant, TenantManagementPermissions.Tenants.ManageFeatures));
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                [IdentityConsts.ITAdminRoleName], TenantManagementPermissions.Tenants.Delete)));
         authorizationBuilder.AddPolicy(TenantManagementPermissions.Tenants.ManageConnectionStrings,
-            policy => policy.RequireClaim(PermissionConstant, TenantManagementPermissions.Tenants.ManageConnectionStrings));
-
-        // Setting Management - Tag Management
-        authorizationBuilder.AddPolicy(UnitySelector.SettingManagement.Tags.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.SettingManagement.Tags.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.SettingManagement.Tags.Create,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.SettingManagement.Tags.Create));
-        authorizationBuilder.AddPolicy(UnitySelector.SettingManagement.Tags.Update,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.SettingManagement.Tags.Update));
-        authorizationBuilder.AddPolicy(UnitySelector.SettingManagement.Tags.Delete,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.SettingManagement.Tags.Delete));
-
-        // IT Administrator Policies
-        authorizationBuilder.AddPolicy(IdentityConsts.ITAdminPolicyName,
-        policy => policy.RequireAssertion(context =>
-            context.User.IsInRole(IdentityConsts.ITAdminRoleName) ||
-            context.User.HasClaim(c => c.Type == PermissionConstant && c.Value == IdentityConsts.ITAdminPermissionName)
-        ));
-
-        // IT Operations Policies
-        authorizationBuilder.AddPolicy(IdentityConsts.ITOperationsPolicyName,
-        policy => policy.RequireAssertion(context =>
-            context.User.IsInRole(IdentityConsts.ITOperationsRoleName) ||
-            context.User.HasClaim(c => c.Type == PermissionConstant && c.Value == IdentityConsts.ITOperationsPermissionName)
-        ));
-
-        // Project Info Policies
-        authorizationBuilder.AddPolicy(UnitySelector.Project.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Project.Default));
-
-        // Project Info Logical OR policy
-        authorizationBuilder.AddPolicy(UnitySelector.Project.UpdatePolicy,
-            policy => policy.RequireAssertion(context =>
-            context.User.HasClaim(PermissionConstant, UnitySelector.Project.Location.Update.Default) ||
-            context.User.HasClaim(PermissionConstant, UnitySelector.Project.Summary.Update.Default) ||
-
-            // NOTE: This will be replaced when Worksheets are normalized with UnitySelector.Project.Worksheet.Update
-            context.User.HasClaim(PermissionConstant, UnitySelector.Project.Default)
-        ));
-
-        // Project Info - Summary Policies
-        authorizationBuilder.AddPolicy(UnitySelector.Project.Summary.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Project.Summary.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Project.Summary.Update.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Project.Summary.Update.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Project.Summary.Update.UpdateFinalStateFields,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Project.Summary.Update.UpdateFinalStateFields));
-
-        // Project Info - Location Policies
-        authorizationBuilder.AddPolicy(UnitySelector.Project.Location.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Project.Location.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Project.Location.Update.Default,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Project.Location.Update.Default));
-        authorizationBuilder.AddPolicy(UnitySelector.Project.Location.Update.UpdateFinalStateFields,
-            policy => policy.RequireClaim(PermissionConstant, UnitySelector.Project.Location.Update.UpdateFinalStateFields));
-
-
-        // Reporting Configuration
-        authorizationBuilder.AddPolicy(ReportingPermissions.Configuration.Default,
-            policy => policy.RequireClaim(PermissionConstant, ReportingPermissions.Configuration.Default));
-        authorizationBuilder.AddPolicy(ReportingPermissions.Configuration.Update,
-            policy => policy.RequireClaim(PermissionConstant, ReportingPermissions.Configuration.Update));
-        authorizationBuilder.AddPolicy(ReportingPermissions.Configuration.Delete,
-            policy => policy.RequireClaim(PermissionConstant, ReportingPermissions.Configuration.Delete));        
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                [IdentityConsts.ITAdminRoleName], TenantManagementPermissions.Tenants.ManageConnectionStrings)));
+        authorizationBuilder.AddPolicy(IdentityPermissions.Users.Create,
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                [IdentityConsts.ITAdminRoleName], IdentityPermissions.Users.Create)));
+        authorizationBuilder.AddPolicy(IdentityPermissions.UserLookup.Default,
+            policy => policy.AddRequirements(new RoleOrPermissionRequirement(
+                [IdentityConsts.ITAdminRoleName], IdentityPermissions.UserLookup.Default)));
     }
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Mapping/GrantManagerWebMapperlyProfile.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Mapping/GrantManagerWebMapperlyProfile.cs
index 220e1026f7..18a72ebc69 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Mapping/GrantManagerWebMapperlyProfile.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Mapping/GrantManagerWebMapperlyProfile.cs
@@ -1,5 +1,5 @@
-using System;
 using Riok.Mapperly.Abstractions;
+using System;
 using Unity.GrantManager.ApplicantProfile;
 using Unity.GrantManager.ApplicantProfile.ProfileData;
 using Unity.GrantManager.ApplicationForms;
@@ -13,6 +13,7 @@
 using Unity.GrantManager.Web.Pages.ApplicantContact;
 using Unity.GrantManager.Web.Pages.ApplicationContact;
 using Unity.GrantManager.Web.Pages.ApplicationForms.ViewModels;
+using Unity.GrantManager.Web.Pages.BulkActions;
 using Unity.GrantManager.Web.Pages.Sites.ViewModels;
 using Unity.GrantManager.Web.Views.Shared.Components.ApplicantInfo;
 using Unity.GrantManager.Web.Views.Shared.Components.SummaryWidget;
@@ -76,7 +77,7 @@ public partial class ApplicationToGrantApplicationDtoWebMapper : MapperBase<Appl
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrganizationType))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrgStatus))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.BusinessNumber))]
-    [MapperIgnoreTarget(nameof(GrantApplicationDto.OrganizationSize))]
+    [MapperIgnoreTarget(nameof(GrantApplicationDto.ApproxNumberOfEmployees))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrgNumber))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.SectorSubSectorIndustryDesc))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.PaymentInfo))]
@@ -105,7 +106,7 @@ public partial class ApplicationToGrantApplicationDtoWebMapper : MapperBase<Appl
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrganizationType))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrgStatus))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.BusinessNumber))]
-    [MapperIgnoreTarget(nameof(GrantApplicationDto.OrganizationSize))]
+    [MapperIgnoreTarget(nameof(GrantApplicationDto.ApproxNumberOfEmployees))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.OrgNumber))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.SectorSubSectorIndustryDesc))]
     [MapperIgnoreTarget(nameof(GrantApplicationDto.PaymentInfo))]
@@ -320,3 +321,13 @@ public partial class ApplicantContactModalViewModelToUpdateApplicantContactDtoMa
     [MapperIgnoreTarget(nameof(UpdateApplicantContactDto.WorkPhoneExtension))]
     public override partial void Map(ApplicantContactModalViewModel source, UpdateApplicantContactDto destination);
 }
+
+[Mapper]
+public partial class BulkPublishDtoToViewModelMapper : MapperBase<BulkPublishDto, BulkPublishApplicationViewModel>
+{
+    [MapperIgnoreTarget(nameof(BulkPublishApplicationViewModel.IsValid))]
+    public override partial BulkPublishApplicationViewModel Map(BulkPublishDto source);
+
+    [MapperIgnoreTarget(nameof(BulkPublishApplicationViewModel.IsValid))]
+    public override partial void Map(BulkPublishDto source, BulkPublishApplicationViewModel destination);
+}
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 620938fe68..dd06155606 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Menus/GrantManagerMenuContributor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Menus/GrantManagerMenuContributor.cs
@@ -2,8 +2,9 @@
 using Unity.GrantManager.Localization;
 using Unity.GrantManager.Permissions;
 using Unity.Identity.Web.Navigation;
+using Unity.Modules.Shared.Navigation;
+using Unity.Modules.Shared.Specializations;
 using Unity.Modules.Shared.Permissions;
-using Unity.TenantManagement;
 using Unity.TenantManagement.Web.Navigation;
 using Volo.Abp.Identity;
 using Volo.Abp.UI.Navigation;
@@ -27,7 +28,18 @@ private async static Task ConfigureMainMenuAsync(MenuConfigurationContext contex
     {
         var l = context.GetLocalizer<GrantManagerResource>();
 
-        context.Menu.AddItem(
+        await context.AddItemAsync(
+            new ApplicationMenuItem(
+                TenantManagementMenuNames.Onboarding,
+                l["Menu:Onboarding"],
+                "~/TenantManagement/Onboarding",
+                icon: "fl fl-other-user",
+                order: 1
+            ).OnlyWhenSpecializations(SpecializationConsts.Onboarding)
+            .OnlyWhenInRole(IdentityConsts.ITOperationsRoleName)
+        );
+
+        await context.AddItemAsync(
             new ApplicationMenuItem(
                 GrantManagerMenus.Applications,
                 l["Menu:Applications"],
@@ -35,10 +47,10 @@ private async static Task ConfigureMainMenuAsync(MenuConfigurationContext contex
                 icon: "fl fl-other-user",
                 order: 1,
                 requiredPermissionName: GrantManagerPermissions.Default
-            )
+            ).ExcludeWhenSpecializations(SpecializationConsts.Onboarding)
         );
 
-        context.Menu.AddItem(
+        await context.AddItemAsync(
             new ApplicationMenuItem(
                 GrantManagerMenus.Applicants,
                 l["Menu:Applicants"],
@@ -46,21 +58,21 @@ private async static Task ConfigureMainMenuAsync(MenuConfigurationContext contex
                 icon: "fl fl-other-user",
                 order: 2,
                 requiredPermissionName: GrantApplicationPermissions.Applicants.ViewList
+            ).ExcludeWhenSpecializations(SpecializationConsts.Onboarding)
+        );
+
+        await context.AddItemAsync(
+            new ApplicationMenuItem(
+                UnityIdentityMenuNames.Roles,
+                l["Menu:Roles"],
+                "~/Identity/Roles",
+                icon: "fl fl-settings",
+                order: 3,
+                requiredPermissionName: IdentityPermissions.Roles.Default
             )
         );
 
-        context.Menu.AddItem(
-               new ApplicationMenuItem(
-                   UnityIdentityMenuNames.Roles,
-                   l["Menu:Roles"],
-                   "~/Identity/Roles",
-                   icon: "fl fl-settings",
-                   order: 3,
-                   requiredPermissionName: IdentityPermissions.Roles.Default
-               )
-           );
-
-        context.Menu.AddItem(
+        await context.AddItemAsync(
             new ApplicationMenuItem(
                 UnityIdentityMenuNames.Users,
                 l["Menu:Users"],
@@ -71,7 +83,7 @@ private async static Task ConfigureMainMenuAsync(MenuConfigurationContext contex
             )
         );
 
-        context.Menu.AddItem(
+        await context.AddItemAsync(
             new ApplicationMenuItem(
                 GrantManagerMenus.Intakes,
                 l["Menu:Intakes"],
@@ -82,7 +94,7 @@ private async static Task ConfigureMainMenuAsync(MenuConfigurationContext contex
             )
         );
 
-        context.Menu.AddItem(
+        await context.AddItemAsync(
             new ApplicationMenuItem(
                 GrantManagerMenus.ApplicationForms,
                 l["Menu:ApplicationForms"],
@@ -93,7 +105,7 @@ private async static Task ConfigureMainMenuAsync(MenuConfigurationContext contex
             )
         );
 
-        context.Menu.AddItem(
+        await context.AddItemAsync(
             new ApplicationMenuItem(
                 GrantManagerMenus.Dashboard,
                 l["Menu:Dashboard"],
@@ -101,41 +113,44 @@ private async static Task ConfigureMainMenuAsync(MenuConfigurationContext contex
                 icon: "fl fl-view-dashboard",
                 order: 7,
                 requiredPermissionName: GrantApplicationPermissions.Dashboard.Default
-            )
+            ).ExcludeWhenSpecializations(SpecializationConsts.Onboarding)
         );
-        // Displayed in the Grant Manager - Used at Tenant Level if the user in the IT Operations role
-        context.Menu.AddItem(
+
+        // Displayed in the Grant Manager - Used at Tenant Level for ITAdmin/ITOperations users
+        await context.AddItemAsync(
             new ApplicationMenuItem(
                 GrantManagerMenus.EndpointManagement,
                 displayName: "Endpoints",
-                "~/EndpointManagement/Endpoints",
-                requiredPermissionName: IdentityConsts.ITOperationsPermissionName
-            )
+                "~/EndpointManagement/Endpoints"
+            ).ExcludeWhenSpecializations(SpecializationConsts.Onboarding)
+            .OnlyWhenInRole(IdentityConsts.ITAdminRoleName, IdentityConsts.ITOperationsRoleName)
         );
 
         // ********************
-        // Admin - Tenant Management 
-        context.Menu.AddItem(
-          new ApplicationMenuItem(
-              TenantManagementMenuNames.Tenants,
-              l["Menu:TenantManagement"],
-              "~/TenantManagement/Tenants",
-              icon: "fl fl-view-dashboard",
-              order: 8,
-              requiredPermissionName: TenantManagementPermissions.Tenants.Default
-          )
+        // Admin - Tenant Management
+        await context.AddItemAsync(
+            new ApplicationMenuItem(
+                TenantManagementMenuNames.Tenants,
+                l["Menu:TenantManagement"],
+                "~/TenantManagement/Tenants",
+                icon: "fl fl-view-dashboard",
+                order: 8
+            ).ExcludeWhenSpecializations(SpecializationConsts.Onboarding)
+            .OnlyWhenInRole(IdentityConsts.ITAdminRoleName, IdentityConsts.ITOperationsRoleName)
         );
 
-        // Displayed on the Tenant Managment area if the user has the ITAdministrator Role
-        context.Menu.AddItem(
+        // Tenants list for ITOperations users on the Onboarding tenant
+        await context.AddItemAsync(
             new ApplicationMenuItem(
-                GrantManagerMenus.EndpointManagement,
-                displayName: "Endpoints",
-                "~/EndpointManagement/Endpoints",
-                requiredPermissionName: TenantManagementPermissions.Tenants.Default
-            )
+                TenantManagementMenuNames.Tenants,
+                l["Menu:TenantManagement"],
+                "~/TenantManagement/Tenants",
+                icon: "fl fl-view-dashboard",
+                order: 8
+            ).OnlyWhenSpecializations(SpecializationConsts.Onboarding)
+            .OnlyWhenInRole(IdentityConsts.ITOperationsRoleName)
         );
-    
+
         // End Admin ********************
 #pragma warning disable S125 // Sections of code should not be commented out
         /* - will complete later after fixing ui sub menu issue */
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Middleware/OnboardingRedirectMiddleware.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Middleware/OnboardingRedirectMiddleware.cs
new file mode 100644
index 0000000000..2541657153
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Middleware/OnboardingRedirectMiddleware.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Unity.Modules.Shared.Specializations;
+
+namespace Unity.GrantManager.Web.Middleware;
+
+public class OnboardingRedirectMiddleware(RequestDelegate next)
+{
+    public async Task InvokeAsync(HttpContext context)
+    {
+        if (IsGrantApplicationsList(context))
+        {
+            var checker = context.RequestServices.GetService<ISpecializationChecker>();
+            if (checker != null && await checker.IsEnabledAsync(SpecializationConsts.Onboarding))
+            {
+                context.Response.Redirect("/TenantManagement/Onboarding");
+                return;
+            }
+        }
+
+        await next(context);
+    }
+
+    private static bool IsGrantApplicationsList(HttpContext context)
+    {
+        var path = context.Request.Path;
+        return context.Request.Method == HttpMethods.Get
+            && (path.Equals("/GrantApplications", StringComparison.OrdinalIgnoreCase)
+                || path.Equals("/GrantApplications/", StringComparison.OrdinalIgnoreCase));
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateFundingHistoryModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateFundingHistoryModal.cshtml
index 6db3da1854..69619d4e34 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateFundingHistoryModal.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateFundingHistoryModal.cshtml
@@ -76,6 +76,13 @@
                 </div>
             </div>
 
+            <div class="mb-3">
+                <label class="form-label" for="FundingHistoryForm_PaidDate">Paid Date</label>
+                <input type="date" id="FundingHistoryForm_PaidDate" name="FundingHistoryForm.PaidDate"
+                       class="form-control" data-datepicker="false"
+                       value="@(Model.FundingHistoryForm?.PaidDate?.ToString("yyyy-MM-dd"))" />
+            </div>
+
             <div class="mb-3">
                 <label class="form-label" for="FundingHistoryForm_FundingNotes">Funding Notes</label>
                 <input type="text" id="FundingHistoryForm_FundingNotes" name="FundingHistoryForm.FundingNotes"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateFundingHistoryModal.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateFundingHistoryModal.cshtml.cs
index 80100f2fd0..2a02bc6f80 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateFundingHistoryModal.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateFundingHistoryModal.cshtml.cs
@@ -38,6 +38,7 @@ public async Task<IActionResult> OnPostAsync()
             ReconsiderationAmount = FundingHistoryForm.ReconsiderationAmount,
             OneTimeConsideration = FundingHistoryForm.OneTimeConsideration,
             TotalGrantAmount = FundingHistoryForm.TotalGrantAmount,
+            PaidDate = FundingHistoryForm.PaidDate,
             FundingNotes = FundingHistoryForm.FundingNotes
         };
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml
index c2edb12200..a3056c8958 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml
@@ -37,6 +37,17 @@
                 </div>
             </div>
 
+            <div class="mb-3">
+                <div class="switch-container">
+                    <div class="form-check unt-form-switch form-switch">
+                        <input class="form-check-input" type="checkbox" id="ReportsHistoryForm_SignedOff"
+                               name="ReportsHistoryForm.SignedOff" value="true"
+                               @(Model.ReportsHistoryForm?.SignedOff == true ? "checked" : "") />
+                        <label class="form-check-label" for="ReportsHistoryForm_SignedOff">Signed-Off</label>
+                    </div>
+                </div>
+            </div>
+
             <div class="mb-3">
                 <div class="switch-container">
                     <div class="form-check unt-form-switch form-switch">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml.cs
index bd6e691cb5..52c01e1be1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/CreateReportsHistoryModal.cshtml.cs
@@ -34,6 +34,7 @@ public async Task<IActionResult> OnPostAsync()
             FiscalYear = ReportsHistoryForm.FiscalYear,
             ReportDate = ReportsHistoryForm.ReportDate,
             Outstanding = ReportsHistoryForm.Outstanding,
+            SignedOff = ReportsHistoryForm.SignedOff,
             IncompleteReport = ReportsHistoryForm.IncompleteReport,
             Note = ReportsHistoryForm.Note
         };
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditFundingHistoryModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditFundingHistoryModal.cshtml
index 983d0d4cef..da0a314b23 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditFundingHistoryModal.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditFundingHistoryModal.cshtml
@@ -77,6 +77,13 @@
                 </div>
             </div>
 
+            <div class="mb-3">
+                <label class="form-label" for="FundingHistoryForm_PaidDate">Paid Date</label>
+                <input type="date" id="FundingHistoryForm_PaidDate" name="FundingHistoryForm.PaidDate"
+                       class="form-control" data-datepicker="false"
+                       value="@(Model.FundingHistoryForm?.PaidDate?.ToString("yyyy-MM-dd"))" />
+            </div>
+
             <div class="mb-3">
                 <label class="form-label" for="FundingHistoryForm_FundingNotes">Funding Notes</label>
                 <input type="text" id="FundingHistoryForm_FundingNotes" name="FundingHistoryForm.FundingNotes"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditFundingHistoryModal.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditFundingHistoryModal.cshtml.cs
index 6abe31a19c..90ccae7e0d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditFundingHistoryModal.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditFundingHistoryModal.cshtml.cs
@@ -35,6 +35,7 @@ public async Task OnGetAsync(Guid id)
             OneTimeConsideration = record.OneTimeConsideration,            
             ReconsiderationAmount = record.ReconsiderationAmount,            
             TotalGrantAmount = record.TotalGrantAmount,
+            PaidDate = record.PaidDate,
             FundingNotes = record.FundingNotes
         };
     }
@@ -51,6 +52,7 @@ public async Task<IActionResult> OnPostAsync()
             OneTimeConsideration = FundingHistoryForm.OneTimeConsideration,            
             ReconsiderationAmount = FundingHistoryForm.ReconsiderationAmount,
             TotalGrantAmount = FundingHistoryForm.TotalGrantAmount,
+            PaidDate = FundingHistoryForm.PaidDate,
             FundingNotes = FundingHistoryForm.FundingNotes
         };
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml
index 904aa84d71..63a69c597b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml
@@ -38,6 +38,17 @@
                 </div>
             </div>
 
+            <div class="mb-3">
+                <div class="switch-container">
+                    <div class="form-check unt-form-switch form-switch">
+                        <input class="form-check-input" type="checkbox" id="ReportsHistoryForm_SignedOff"
+                               name="ReportsHistoryForm.SignedOff" value="true"
+                               @(Model.ReportsHistoryForm?.SignedOff == true ? "checked" : "") />
+                        <label class="form-check-label" for="ReportsHistoryForm_SignedOff">Signed-Off</label>
+                    </div>
+                </div>
+            </div>
+
             <div class="mb-3">
                 <div class="switch-container">
                     <div class="form-check unt-form-switch form-switch">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml.cs
index de58139700..f7eeaf2932 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/EditReportsHistoryModal.cshtml.cs
@@ -31,6 +31,7 @@ public async Task OnGetAsync(Guid id)
             FiscalYear = record.FiscalYear,
             ReportDate = record.ReportDate,
             Outstanding = record.Outstanding,
+            SignedOff = record.SignedOff,
             IncompleteReport = record.IncompleteReport,
             Note = record.Note
         };
@@ -44,6 +45,7 @@ public async Task<IActionResult> OnPostAsync()
             FiscalYear = ReportsHistoryForm.FiscalYear,
             ReportDate = ReportsHistoryForm.ReportDate,
             Outstanding = ReportsHistoryForm.Outstanding,
+            SignedOff = ReportsHistoryForm.SignedOff,
             IncompleteReport = ReportsHistoryForm.IncompleteReport,
             Note = ReportsHistoryForm.Note
         };
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/FundingHistoryModalViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/FundingHistoryModalViewModel.cs
index 814b9ed8f5..f24e59c644 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/FundingHistoryModalViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/FundingHistoryModalViewModel.cs
@@ -35,6 +35,10 @@ public class FundingHistoryModalViewModel
     [DataType(DataType.Currency)]
     public decimal? TotalGrantAmount { get; set; }
 
+    [DisplayName("Paid Date")]
+    [DataType(DataType.Date)]
+    public DateTime? PaidDate { get; set; }
+
     [DisplayName("Funding Notes")]
     public string? FundingNotes { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/ReportsHistoryModalViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/ReportsHistoryModalViewModel.cs
index c7cf9b8522..5c23d0e27d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/ReportsHistoryModalViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/ReportsHistoryModalViewModel.cs
@@ -20,6 +20,9 @@ public class ReportsHistoryModalViewModel
     [DisplayName("Outstanding")]
     public bool? Outstanding { get; set; }
 
+    [DisplayName("Signed-Off")]
+    public bool? SignedOff { get; set; }
+
     [DisplayName("Incomplete Report")]
     public bool? IncompleteReport { get; set; }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.cshtml
index 8f8b093fd2..1bb47de3d3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.cshtml
@@ -33,18 +33,19 @@
         </ul>
     </aside>
     <main class="col-12 col-md d-flex justify-content-center">
-        <div id="portal-status-div" class="input-area card mb-3 p-5 pt-3 portal-settings-config">
+        <div id="portal-status-div" class="input-area card mb-3 portal-settings-config">
             <div class="container-fluid px-0">
-                <div class="px-5 pt-4 pb-2">
+                <div class="px-3 pt-1 pb-2">
                     <h5 class="fw-bold">@L["ApplicantPortalSettings:PortalStatusHeading"]</h5>
                 </div>
                 <form id="PortalStatusForm">
-                    <div class="px-5 py-0">
+                    <div class="px-3 py-0">
                         <table id="PortalStatusTable" class="table table-striped portal-status-table">
                             <thead>
                                 <tr>
                                     <th>@L["ApplicantPortalSettings:InternalStatus"]</th>
                                     <th>@L["ApplicantPortalSettings:PortalStatusLabel"]</th>
+                                    <th>@L["ApplicantPortalSettings:PortalPublishedStatusLabel"]</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -65,14 +66,23 @@
                                                    name="Statuses[@i].ExternalStatus"
                                                    value="@status.ExternalStatus"
                                                    required
-                                                   maxlength="@ApplicationStatusConsts.MaxNameLength" />
+                                                   maxlength="250" />
+                                        </td>
+                                        <td>
+                                            <input type="text"
+                                                   class="form-control"
+                                                   id="Statuses[@i].NotifiedStatus"
+                                                   name="Statuses[@i].NotifiedStatus"
+                                                   value="@status.NotifiedStatus"
+                                                   maxlength="250"
+                                                   placeholder="-" />
                                         </td>
                                     </tr>
                                 }
                             </tbody>
                         </table>
                     </div>
-                    <div class="d-flex gap-2 px-5 pt-3 portal-settings-actions">
+                    <div class="d-flex gap-2 px-3 pt-3 portal-settings-actions">
                         <abp-button id="SaveButton"
                                     button-type="Primary"
                                     type="submit"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.cshtml.cs
index 41c12d5819..e51c79beb1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.cshtml.cs
@@ -8,10 +8,10 @@ namespace Unity.GrantManager.Web.Pages.ApplicantPortalSettings;
 [Authorize]
 public class IndexModel(IApplicationStatusService applicationStatusService) : GrantManagerPageModel
 {
-    public IList<ApplicationStatusDto> Statuses { get; set; } = [];
+    public IList<ApplicantPortalStatusDto> Statuses { get; set; } = [];
 
     public async Task OnGetAsync()
     {
-        Statuses = await applicationStatusService.GetListAsync();
+        Statuses = await applicationStatusService.GetApplicantPortalStatusListAsync();
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.css
index 113b93d7f2..4800e83354 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.css
@@ -28,9 +28,9 @@
 
 .portal-settings-config {
     overflow: auto;
-    max-width: 750px;
     max-height: calc(100vh - 180px);
-    width: 100%;
+    width: 95%;
+    padding: 1rem;
 }
 
 .portal-settings-actions {
@@ -51,10 +51,6 @@
     font-weight: 400;
 }
 
-.portal-status-table .form-control {
-    max-width: 300px;
-}
-
 #PortalStatusForm .dt-container {
     max-height: none !important;
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.js
index 4db55eda37..38be4cbc7b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantPortalSettings/Index.js
@@ -12,10 +12,11 @@
     let portalStatusTable = new DataTable("#PortalStatusTable", {
         paging: false,
         info: false,
-        order: {
-            idx: 0,
-            dir: 'asc'
-        }
+        order: [[0, 'asc']],
+        "columnDefs": [{
+            targets: [1, 2],
+            orderable: false,
+        }]
     });
 
     // Capture original values after DataTable initialization
@@ -23,8 +24,9 @@
     portalStatusTable.rows().every(function () {
         const $row = $(this.node());
         const id = $row.find('input[type="hidden"]').val();
-        const externalStatus = $row.find('input[type="text"]').val().trim();
-        originalValues.set(id, externalStatus);
+        const externalStatus = $row.find('input[id$=".ExternalStatus"]').val().trim();
+        const notifiedStatus = $row.find('input[id$=".NotifiedStatus"]').val().trim();
+        originalValues.set(id, { externalStatus, notifiedStatus });
     });
 
     // Check if any values have changed
@@ -33,8 +35,10 @@
         portalStatusTable.$('tbody tr').each(function () {
             const $row = $(this);
             const id = $row.find('input[type="hidden"]').val();
-            const currentValue = $row.find('input[type="text"]').val().trim();
-            if (originalValues.get(id) !== currentValue) {
+            const externalStatus = $row.find('input[id$=".ExternalStatus"]').val().trim();
+            const notifiedStatus = $row.find('input[id$=".NotifiedStatus"]').val().trim();
+            const originalValue = originalValues.get(id);
+            if (!originalValue || originalValue.externalStatus !== externalStatus || originalValue.notifiedStatus !== notifiedStatus) {
                 changed = true;
                 return false;
             }
@@ -74,7 +78,8 @@
             const $row = $(this);
             const id = $row.find('input[type="hidden"]').val();
             const originalValue = originalValues.get(id);
-            $row.find('input[type="text"]').val(originalValue);
+            $row.find('input[id$=".ExternalStatus"]').val(originalValue.externalStatus);
+            $row.find('input[id$=".NotifiedStatus"]').val(originalValue.notifiedStatus);
         });
 
         updateButtonStates();
@@ -102,10 +107,13 @@
             }
 
             // Only include if value has changed
-            if (originalValues.get(id) !== externalStatus) {
+            const notifiedStatus = $row.find('input[id$=".NotifiedStatus"]').val().trim();
+            const originalValue = originalValues.get(id);
+            if (originalValue.externalStatus !== externalStatus || originalValue.notifiedStatus !== notifiedStatus) {
                 statuses.push({
                     id: id,
-                    externalStatus: externalStatus
+                    externalStatus: externalStatus,
+                    notifiedStatus: notifiedStatus
                 });
             }
         });
@@ -129,7 +137,7 @@
 
                 // Update original values after successful save
                 statuses.forEach(function(status) {
-                    originalValues.set(status.id, status.externalStatus);
+                    originalValues.set(status.id, { externalStatus: status.externalStatus, notifiedStatus: status.notifiedStatus });
                 });
 
                 // Update button states after save
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml
index c15d87e43f..5f8a17be6c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml
@@ -31,7 +31,7 @@
     @await Component.InvokeAsync("ApplicantBreadcrumbWidget", new { applicantId = @Model.ApplicantId })
 </div>
 
-@if (await PermissionChecker.IsGrantedAsync(GrantApplicationPermissions.Applicants.Edit))
+@if (!Model.ApplicantIsDeleted && await PermissionChecker.IsGrantedAsync(GrantApplicationPermissions.Applicants.Edit))
 {
     <div class="action-bar p-2 fade-in-load" id="applicantActionBar">
         <div id="ApplicantActionBarStart" class="d-flex align-items-stretch justify-content-start gap-2">
@@ -68,6 +68,19 @@
 <input type="hidden" id="Extensions" value="@Model.Extensions" />
 <input type="hidden" id="MaxFileSize" value="@Model.MaxFileSize" />
 
+@if (Model.ApplicantIsDeleted)
+{
+    <div class="container mt-4">
+        <div class="alert alert-warning" role="alert">
+            <h5 class="alert-heading">Applicant No Longer Available</h5>
+            <p>This applicant has been deleted and is no longer available.</p>
+            <a href="/GrantApplicants" class="btn btn-secondary btn-sm">Return to Applicant List</a>
+        </div>
+    </div>
+}
+else
+{
+
 <div id="main-loading">
     <div class="d-flex justify-content-center">
         <img src="/images/homepage/unity.svg" alt="unity-applicant-loading">
@@ -234,3 +247,5 @@
         </abp-card>
     </div>
 </div>
+
+} @* end else (applicant not deleted) *@
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs
index 261fac752d..998b75cc1c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.cshtml.cs
@@ -22,6 +22,7 @@ public class DetailsModel : GrantManagerPageModel
         public Guid? ApplicationId { get; set; } = null;
 
         public Applicant? Applicant { get; set; }
+        public bool ApplicantIsDeleted { get; set; }
         public string ApplicantDisplayName { get; set; } = string.Empty;
         public string UnityApplicantId { get; set; } = string.Empty;
         public string Status { get; set; } = string.Empty;
@@ -69,11 +70,16 @@ public async Task<IActionResult> OnGetAsync()
             {
                 Applicant = await _applicantRepository.GetAsync(ApplicantId);
 
-                // Set properties for breadcrumb and display
                 ApplicantDisplayName = !string.IsNullOrEmpty(Applicant.ApplicantName)
                     ? Applicant.ApplicantName
                     : "Applicant Name";
 
+                if (Applicant.IsDeleted)
+                {
+                    ApplicantIsDeleted = true;
+                    return Page();
+                }
+
                 UnityApplicantId = Applicant.UnityApplicantId ?? "N/A";
                 Status = Applicant.Status ?? string.Empty;
 
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 b305b80ba5..01349a8888 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
@@ -76,6 +76,7 @@
 
 #main-divider {
     width: 10px;
+    min-width: 10px;
     flex: 0 0 10px;
     background-color: #ccc;
     cursor: col-resize;
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 38438044c3..da939d3d9a 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
@@ -27,7 +27,8 @@ $(document).ready(function () {
     // Handle tab switching animations
     $('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');
+        const targetEl = targetTab ? document.querySelector(targetTab) : null;
+        if (targetEl) $(targetEl).addClass('fade-in-load visible');
         if ($(e.target).closest('#detailsTab').length) {
             syncLeftTabScrollPosition(targetTab);
             scheduleLeftTabScrollReset(targetTab);
@@ -371,7 +372,7 @@ function updateCommentsCounters() {
     setTimeout(() => {
         $('.comments-container')
             .map(function () {
-                $('#' + $(this).data('counttag')).html($(this).data('count'));
+                $('#' + $(this).data('counttag')).text($(this).data('count'));
             })
             .get();
     }, 500);
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 06ffa13a60..041ac4eaff 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
@@ -2,6 +2,9 @@ $(function () {
     let dt = $('#ApplicantsTable');
     let dataTable;
     const guidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    const requestedFieldsStorageKey = 'Applicants_RequestedFields';
+    const dtTextRenderer = $.fn.dataTable.render.text();
+    const currentCultureName = abp.localization.currentCulture.name;
 
     // Default visible columns as per requirements
     const defaultVisibleColumns = [
@@ -27,13 +30,10 @@ $(function () {
 
     // Format items with rowCount for selection
     let formatItems = function (items) {
-        const newData = items.map((item, index) => {
-            return {
-                ...item,
-                rowCount: index
-            };
+        items.forEach((item, index) => {
+            item.rowCount = index;
         });
-        return newData;
+        return items;
     };
 
     // Complete column definitions following GrantApplications pattern
@@ -56,7 +56,6 @@ $(function () {
             getRedStopColumn(columnIndex++),
             getNonRegisteredBusinessNameColumn(columnIndex++),
             getNonRegOrgNameColumn(columnIndex++),
-            getOrganizationSizeColumn(columnIndex++),
             getSectorColumn(columnIndex++),
             getSubSectorColumn(columnIndex++),
             getApproxNumberOfEmployeesColumn(columnIndex++),
@@ -90,26 +89,21 @@ $(function () {
             className: 'data-table-header',
             index: columnIndex,
             render: function (data, type, row) {
-                let applicantName = (typeof data !== 'string' || data.trim() === '') ? 'Applicant Name' : data;
+                const applicantName = (typeof data !== 'string' || data.trim() === '') ? 'Applicant Name' : data;
 
-                if (type === 'sort' || type === 'filter') {
+                if (type !== 'display') {
                     return applicantName;
                 }
 
-                const safeApplicantName = $.fn.dataTable.render.text().display(applicantName);
-
-                if (type === 'display') {
-                    const applicantId = row?.id;
-                    const isGuid = applicantId && guidPattern.test(applicantId);
+                const safeApplicantName = dtTextRenderer.display(applicantName);
+                const applicantId = row?.id;
+                const isGuid = applicantId && guidPattern.test(applicantId);
 
-                    if (isGuid) {
-                        return `<a href="/GrantApplicants/Details?ApplicantId=${encodeURIComponent(applicantId)}">${safeApplicantName}</a>`;
-                    }
-
-                    return safeApplicantName;
+                if (isGuid) {
+                    return `<a href="/GrantApplicants/Details?ApplicantId=${encodeURIComponent(applicantId)}">${safeApplicantName}</a>`;
                 }
 
-                return applicantName;
+                return safeApplicantName;
             }
         }
     }
@@ -121,8 +115,11 @@ $(function () {
             name: 'unityApplicantId',
             className: 'data-table-header text-nowrap',
             render: function (data, type, row) {
+                if (type !== 'display') {
+                    return (data && String(data).trim() !== '') ? data : '';
+                }
                 const displayValue = (data && String(data).trim() !== '') ? data : 'blank';
-                return `<a href="/GrantApplicants/Details?ApplicantId=${row.id}">${displayValue}</a>`;
+                return `<a href="/GrantApplicants/Details?ApplicantId=${row.id}">${dtTextRenderer.display(displayValue)}</a>`;
             },
             index: columnIndex
         }
@@ -161,13 +158,9 @@ $(function () {
             name: 'orgStatus',
             className: 'data-table-header',
             render: function (data) {
-                if (data != null && data == 'ACTIVE') {
-                    return 'Active';
-                } else if (data != null && data == 'HISTORICAL') {
-                    return 'Historical';
-                } else {
-                    return data ?? '';
-                }
+                if (data === 'ACTIVE') return 'Active';
+                if (data === 'HISTORICAL') return 'Historical';
+                return data ?? '';
             },
             index: columnIndex
         }
@@ -237,20 +230,6 @@ $(function () {
         }
     }
 
-    function getOrganizationSizeColumn(columnIndex) {
-        return {
-            title: 'Organization Size',
-            data: 'organizationSize',
-            name: 'organizationSize',
-            className: 'data-table-header',
-            visible: false,
-            render: function (data) {
-                return data ?? '';
-            },
-            index: columnIndex
-        }
-    }
-
     function getSectorColumn(columnIndex) {
         return {
             title: 'Sector',
@@ -376,7 +355,7 @@ $(function () {
             visible: false,
             render: function (data) {
                 return data != null ? luxon.DateTime.fromISO(data, {
-                    locale: abp.localization.currentCulture.name,
+                    locale: currentCultureName,
                 }).toUTC().toLocaleString() : '';
             },
             index: columnIndex
@@ -404,7 +383,7 @@ $(function () {
             name: 'creationTime',
             className: 'data-table-header',
             visible: false,
-            render: DataTable.render.date('YYYY-MM-DD', abp.localization.currentCulture.name),
+            render: DataTable.render.date('YYYY-MM-DD', currentCultureName),
             index: columnIndex
         }
     }
@@ -416,7 +395,7 @@ $(function () {
             name: 'lastModificationTime',
             className: 'data-table-header',
             visible: false,
-            render: DataTable.render.date('YYYY-MM-DD', abp.localization.currentCulture.name),
+            render: DataTable.render.date('YYYY-MM-DD', currentCultureName),
             index: columnIndex
         }
     }
@@ -536,6 +515,43 @@ $(function () {
         };
     };    
 
+    function getRequestedFields() {
+        let requestedFields;
+
+        if (dataTable) {
+            try {
+                const cols = dataTable.settings()[0].aoColumns;
+                requestedFields = cols
+                    .filter(function (col, idx) { return dataTable.column(idx).visible(); })
+                    .map(function (col) { return col.sName; })
+                    .filter(function (name) { return !!name; });
+
+                if (requestedFields.length > 0) {
+                    localStorage.setItem(requestedFieldsStorageKey, JSON.stringify(requestedFields));
+                }
+            } catch {
+                // DataTable may not be fully initialized yet.
+            }
+        }
+
+        if (!requestedFields || requestedFields.length === 0) {
+            try {
+                const saved = localStorage.getItem(requestedFieldsStorageKey);
+                if (saved) {
+                    requestedFields = JSON.parse(saved);
+                }
+            } catch {
+                // Ignore invalid localStorage values.
+            }
+        }
+
+        if (!requestedFields || requestedFields.length === 0) {
+            requestedFields = defaultVisibleColumns;
+        }
+
+        return requestedFields;
+    }
+
     // Initialize DataTable with server-side processing
     dataTable = initializeDataTable({
         dt,
@@ -544,9 +560,14 @@ $(function () {
         maxRowsPerPage: 10,
         defaultSortColumn: defaultSortOrderColumn,
         dataEndpoint: unity.grantManager.applicants.applicant.getList,
-        data: {},
+        data: function () {
+            return {
+                requestedFields: getRequestedFields()
+            };
+        },
         responseCallback,
         actionButtons,
+        deferRender: true,
         serverSideEnabled: false, // Switch to client-side processing to enable filter functionality
         pagingEnabled: true,
         reorderEnabled: true,
@@ -586,10 +607,11 @@ $(function () {
                 }
             }
             return null;
-        }
+        },
+        enableContextMenu: true,
+        contextMenuActionsSelector: '[data-selector="applicants-table-actions"]'
     });
 
-
     // Handle row selection and publish events for ActionBar
     dataTable.on('select', function (e, dt, type, indexes) {
         if (type === 'row' && indexes?.length) {
@@ -617,6 +639,11 @@ $(function () {
         }
     });
 
+
+    dataTable.on('column-visibility.dt', function () {
+        getRequestedFields();
+    });
+
     // Handle search from ActionBar
     $('#search').on('input', function () {
         dataTable.search($(this).val()).draw();
@@ -664,44 +691,44 @@ $(function () {
         }
     }
 
+    const COMPANY_TYPE_MAP = new Map([
+        ["BC", "BC Company"],
+        ["CP", "Cooperative"],
+        ["GP", "General Partnership"],
+        ["S", "Society"],
+        ["SP", "Sole Proprietorship"],
+        ["A", "Extraprovincial Company"],
+        ["B", "Extraprovincial"],
+        ["BEN", "Benefit Company"],
+        ["C", "Continuation In"],
+        ["CC", "BC Community Contribution Company"],
+        ["CS", "Continued In Society"],
+        ["CUL", "Continuation In as a BC ULC"],
+        ["EPR", "Extraprovincial Registration"],
+        ["FI", "Financial Institution"],
+        ["FOR", "Foreign Registration"],
+        ["LIB", "Public Library Association"],
+        ["LIC", "Licensed (Extra-Pro)"],
+        ["LL", "Limited Liability Partnership"],
+        ["LLC", "Limited Liability Company"],
+        ["LP", "Limited Partnership"],
+        ["MF", "Miscellaneous Firm"],
+        ["PA", "Private Act"],
+        ["PAR", "Parish"],
+        ["QA", "CO 1860"],
+        ["QB", "CO 1862"],
+        ["QC", "CO 1878"],
+        ["QD", "CO 1890"],
+        ["QE", "CO 1897"],
+        ["REG", "Registration (Extra-pro)"],
+        ["ULC", "BC Unlimited Liability Company"],
+        ["XCP", "Extraprovincial Cooperative"],
+        ["XL", "Extrapro Limited Liability Partnership"],
+        ["XP", "Extraprovincial Limited Partnership"],
+        ["XS", "Extraprovincial Society"]
+    ]);
+
     function getFullType(code) {
-        const companyTypes = [
-            { code: "BC", name: "BC Company" },
-            { code: "CP", name: "Cooperative" },
-            { code: "GP", name: "General Partnership" },
-            { code: "S", name: "Society" },
-            { code: "SP", name: "Sole Proprietorship" },
-            { code: "A", name: "Extraprovincial Company" },
-            { code: "B", name: "Extraprovincial" },
-            { code: "BEN", name: "Benefit Company" },
-            { code: "C", name: "Continuation In" },
-            { code: "CC", name: "BC Community Contribution Company" },
-            { code: "CS", name: "Continued In Society" },
-            { code: "CUL", name: "Continuation In as a BC ULC" },
-            { code: "EPR", name: "Extraprovincial Registration" },
-            { code: "FI", name: "Financial Institution" },
-            { code: "FOR", name: "Foreign Registration" },
-            { code: "LIB", name: "Public Library Association" },
-            { code: "LIC", name: "Licensed (Extra-Pro)" },
-            { code: "LL", name: "Limited Liability Partnership" },
-            { code: "LLC", name: "Limited Liability Company" },
-            { code: "LP", name: "Limited Partnership" },
-            { code: "MF", name: "Miscellaneous Firm" },
-            { code: "PA", name: "Private Act" },
-            { code: "PAR", name: "Parish" },
-            { code: "QA", name: "CO 1860" },
-            { code: "QB", name: "CO 1862" },
-            { code: "QC", name: "CO 1878" },
-            { code: "QD", name: "CO 1890" },
-            { code: "QE", name: "CO 1897" },
-            { code: "REG", name: "Registraton (Extra-pro)" },
-            { code: "ULC", name: "BC Unlimited Liability Company" },
-            { code: "XCP", name: "Extraprovincial Cooperative" },
-            { code: "XL", name: "Extrapro Limited Liability Partnership" },
-            { code: "XP", name: "Extraprovincial Limited Partnership" },
-            { code: "XS", name: "Extraprovincial Society" }
-        ];
-        const match = companyTypes.find(entry => entry.code === code);
-        return match ? match.name : "Unknown";
+        return COMPANY_TYPE_MAP.get(code) ?? 'Unknown';
     }
 });
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.js
index 05cd641f8d..c9ce2c65c0 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.js
@@ -128,7 +128,9 @@
         dynamicButtonContainerId: 'dynamicButtonContainerId',
         useNullPlaceholder: true,
         externalSearchId: 'search-forms',
-        fixedHeaders: true
+        fixedHeaders: true,
+        enableContextMenu: true,
+        contextMenuActionsSelector: '[data-selector="forms-table-actions"]'
     });
 
     createModal.onResult(function () {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
index e79ea92c37..c27118c845 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
@@ -4,8 +4,10 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout;
 @using Unity.GrantManager.Web.Pages.ApplicationForms;
 @using Unity.GrantManager.Permissions;
-@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal;
+@using Unity.Notifications.Permissions;
+
 @using Volo.Abp.Authorization.Permissions;
+@using Unity.GrantManager.Web.Views.Shared.Components.Notifications;
 @using Unity.GrantManager.Web.Views.Shared.Components.ApplicationFormConfigWidget;
 @using Volo.Abp.Features
 
@@ -21,6 +23,8 @@
 }
 @section scripts
 {
+    <abp-script src="/Views/Shared/Components/_Shared/string-utils.js" />
+    <abp-script src="/Pages/ApplicationForms/mapping-utils.js" />
     <abp-script src="/Pages/ApplicationForms/Mapping.js" />
     <abp-script src="/Pages/SettingManagement/zone-management.js" />
 }
@@ -73,6 +77,11 @@
             }
             <button class="nav-link" id="nav-other-configuration-tab" data-bs-toggle="tab"
                 data-bs-target="#nav-other-configuration" type="button" role="tab">Other Configuration</button>
+                
+            @if (await PermissionChecker.IsGrantedAsync(NotificationsPermissions.Email.NotificationsTab))
+            {    
+            <button class="nav-link" id="nav-notifications-tab" data-bs-toggle="tab" data-bs-target="#nav-notifications" type="button" role="tab">Notifications</button>
+            }
             @if (Model?.ShowAITab == true)
             {
                 <button class="nav-link" id="nav-ai-configuration-tab" data-bs-toggle="tab"
@@ -82,10 +91,32 @@
     </nav>
     <div class="tab-content unt-tab-content" id="nav-tabContent">
         <!--Tab Content: Mapping-->
-        <div class="tab-pane fade show active" id="nav-mapping" role="tabpanel" aria-labelledby="nav-mapping-tab">
+        <div id="nav-mapping" class="tab-pane fade show active container-fluid" role="tabpanel" aria-labelledby="nav-mapping-tab">
             <input type="hidden" id="refresh_available_worksheets" value="" />
+            <div class="configuration-action-bar row">
+                <div class="col-12 col-md-8">
+                    <h5>Mapping Configuration</h5>
+                </div>
+                <div class="col-12 col-md-4 btn-wrapper">
+                    <abp-button id="btn-save" text="Save" icon-type="Other" icon="fl fl-save"
+                                class="btn unt-btn-primary btn-primary"
+                                style="pointer-events: all;"
+                                abp-tooltip="Save the Scoresheet and the Mapping of CHEFS fields to Unity Fields"
+                                button-type="Primary" />
+                    <abp-button id="btn-edit" text="Edit Mapping" icon-type="Other" data-target="#editMappingModal"
+                                icon="fl fl-edit" class="btn unt-btn-primary btn-primary" data-toggle="modal"
+                                style="pointer-events: all;" abp-tooltip="Edit the Mapping JSON Manually"
+                                button-type="Primary" />
+                    <abp-button id="btn-reset" text="Reset Mapping" icon-type="Other" icon="fl fl-undo"
+                                class="btn unt-btn-outline-primary btn-outline-primary"
+                                abp-tooltip="This button resets the mapping to the last saved state" />
+                    <abp-button id="btn-back" text="Back"
+                                class="btn unt-btn-outline-primary btn-outline-primary"
+                                abp-tooltip="Navigate back to the Forms" />
+                </div>
+            </div>
             <div class="row">
-                <div class="col-4 p-3">
+                <div class="col-6 p-3">
                     <label for="applicationFormVersion" class="form-label">Version:</label>
                     <div class="select-icon-wrapper">
                         <select class="form-select form-control" id="applicationFormVersion" name="Version">
@@ -113,7 +144,7 @@
                         }
                     </div>
                 </div>
-                <div class="col-4 p-3">
+                <div class="col-6 p-3">
                     <label for="chefsFormVersionId" class="form-label">Form Version ID:</label>
                     <div class="input-button-wrapper ">
                         <input id="chefsFormVersionId" class="form-control input-width" type="text"
@@ -159,7 +190,7 @@
                         </div>
                     </div>
                     <div class="col-4">
-                        <div class="tab-content unt-tab-content" id="nav-tabContent">
+                        <div class="tab-content unt-tab-content" id="nav-tabContent-2">
                             <!--Tab Content: Mapping-->
                             <div class="tab-pane fade show active" id="nav-intake-fields" role="tabpanel"
                                 aria-labelledby="nav-intake-fields-tab">
@@ -182,38 +213,16 @@
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-12">
-                    <div class="buttons">
-                        <div class="buttons-div">
-                            <abp-button id="btn-save" text="Save" icon-type="Other"
-                                class="btn unt-btn-primary btn-primary mx-1" style="pointer-events: all;"
-                                abp-tooltip="Save the Scoresheet and the Mapping of CHEFS fields to Unity Fields"
-                                button-type="Primary" />
-                            <abp-button id="btn-edit" text="Edit Mapping" icon-type="Other" data-target="#editMappingModal"
-                                icon="fl fl-edit" class="btn unt-btn-primary btn-primary mx-1" data-toggle="modal"
-                                style="pointer-events: all;" abp-tooltip="Edit the Mapping JSON Manually"
-                                button-type="Primary" />
-                            <abp-button id="btn-reset" text="Reset Mapping" icon-type="Other" icon="fl fl-undo"
-                                class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                                abp-tooltip="This button resets the mapping to the last saved state" />
-                            <abp-button id="btn-back" text="Back"
-                                class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                                abp-tooltip="Navigate back to the Forms" />
-                        </div>
-                    </div>
-                </div>
-            </div>        
-        </div>      
+        </div>
 
         <!--Tab Content: Worksheets-->
         @if (Model?.FlexEnabled == true)
         {
-            <div class="tab-pane fade" id="nav-custom-fields" role="tabpanel" aria-labelledby="nav-custom-fields-tab">
+            <div id="nav-custom-fields" class="tab-pane fade container-fluid" role="tabpanel" aria-labelledby="nav-custom-fields-tab">
                 <div id="customFieldsWidget">
                     @await Component.InvokeAsync("CustomFields", 
-                        new {   formVersionId = @Model?.ApplicationFormVersionDto?.ChefsFormVersionGuid, 
-                                formName = @Model?.ApplicationFormDto?.ApplicationFormName 
+                        new {   formVersionId = Model?.ApplicationFormVersionDto?.ChefsFormVersionGuid?.ToString(), 
+                                formName = Model?.ApplicationFormDto?.ApplicationFormName 
                             }
                     )
                 </div>
@@ -226,7 +235,7 @@
         @if (await FeatureChecker.IsEnabledAsync("Unity.Payments"))
         {
         <!--Tab Content: Payment Configuration-->
-        <div class="tab-pane fade" id="nav-payment-configuration" role="tabpanel" aria-labelledby="nav-payment-configuration-tab">
+        <div id="nav-payment-configuration" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-payment-configuration-tab">
             <div id="paymentConfigurationWidget">
                 @await Component.InvokeAsync("PaymentConfiguration", new { formid = @Model?.ApplicationFormDto?.Id})
             </div>
@@ -252,22 +261,50 @@
             applicationForm = Model?.ApplicationFormDto })
         </div>
 
+
+        <!--Tab Content: Notifications -->
+         @if (await FeatureChecker.IsEnabledAsync("Unity.Notifications")) {
+        <div class="tab-pane fade" id="nav-notifications" role="tabpanel"
+            aria-labelledby="nav-notifications-tab">
+            @await Component.InvokeAsync(typeof(Notifications), new { formid = Model?.ApplicationFormDto?.Id.ToString() })
+        </div>
+        }
+
         @if (Model?.ShowAITab == true)
         {
             <!--Tab Content: AI Configuration-->
-            <div class="tab-pane fade" id="nav-ai-configuration" role="tabpanel"
-                aria-labelledby="nav-ai-configuration-tab">
-                <div class="p-3">
-                    <h6 class="mb-3"><b>AI Configuration</b></h6>
-
+            <div id="nav-ai-configuration" class="tab-pane fade container-fluid" role="tabpanel" aria-labelledby="nav-ai-configuration-tab">
+                <div class="configuration-action-bar row px-0">
+                    <div class="col-12 col-md-8">
+                        <h5>AI Configuration</h5>
+                    </div>
+                    <div class="col-12 col-md-4 btn-wrapper">
+                        <abp-button id="btn-save-ai-config"
+                                    text="Save"
+                                    icon-type="Other"
+                                    icon="fl fl-save"
+                                    class="btn unt-btn-primary btn-primary"
+                                    button-type="Primary" />
+                        <abp-button id="btn-cancel-ai-config"
+                                    class="btn unt-btn-outline-primary btn-outline-primary mx-1"
+                                    icon-type="Other" icon="fl fl-undo"
+                                    text="Cancel"
+                                    abp-tooltip="Cancel changes"></abp-button>
+                        <abp-button id="btn-back-ai-config" text="Back"
+                                    class="btn unt-btn-outline-primary btn-outline-primary"
+                                    abp-tooltip="Navigate back to the Forms" />
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-12 p-3">
                     @if (Model?.ShowAutomatic == true)
                     {
                         <div class="form-check form-switch mb-3">
                             <input class="form-check-input"
-                                   type="checkbox"
-                                   id="AutomaticallyGenerateAIAnalysis"
-                                   name="AutomaticallyGenerateAIAnalysis"
-                                   @(Model.ApplicationFormDto?.AutomaticallyGenerateAIAnalysis == true ? "checked" : "") />
+                                    type="checkbox"
+                                    id="AutomaticallyGenerateAIAnalysis"
+                                    name="AutomaticallyGenerateAIAnalysis"
+                                    @(Model.ApplicationFormDto?.AutomaticallyGenerateAIAnalysis == true ? "checked" : "") />
                             <label class="form-check-label fw-bold" for="AutomaticallyGenerateAIAnalysis">
                                 Automatically Generate AI Analysis
                             </label>
@@ -282,10 +319,10 @@
                     {
                         <div class="form-check form-switch mb-3">
                             <input class="form-check-input"
-                                   type="checkbox"
-                                   id="ManuallyInitiateAIAnalysis"
-                                   name="ManuallyInitiateAIAnalysis"
-                                   @(Model.ApplicationFormDto?.ManuallyInitiateAIAnalysis == true ? "checked" : "") />
+                                    type="checkbox"
+                                    id="ManuallyInitiateAIAnalysis"
+                                    name="ManuallyInitiateAIAnalysis"
+                                    @(Model.ApplicationFormDto?.ManuallyInitiateAIAnalysis == true ? "checked" : "") />
                             <label class="form-check-label fw-bold" for="ManuallyInitiateAIAnalysis">
                                 Manually Initiate AI Analysis
                             </label>
@@ -295,17 +332,6 @@
                             </div>
                         </div>
                     }
-
-                    <div class="d-flex justify-content-start mt-3">
-                        <abp-button id="btn-save-ai-config"
-                                    text="Save"
-                                    icon-type="Other"
-                                    icon="fl fl-save"
-                                    class="btn unt-btn-primary btn-primary"
-                                    button-type="Primary" />
-                        <abp-button id="btn-cancel-ai-config"
-                                    class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                                    abp-tooltip="Cancel changes">Cancel</abp-button>
                     </div>
                 </div>
             </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
index c0f6c98742..f6d49826d5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
@@ -6,10 +6,42 @@
     background-color: white;
 }
 
-.column {
-    float: left;
-    width: 40%;
-  }
+.unt-tab-content .form-select {
+    width: auto;
+}
+
+.configuration-action-bar {
+    align-items: center;
+    border-bottom: 1px solid #dee2e6;
+    padding-bottom: 0.5rem;
+    margin-bottom: 0.5rem;
+}
+
+    .configuration-action-bar h5 {
+        font-weight: 700;
+    }
+
+    .configuration-action-bar .btn, .configuration-action-bar .btn-group {
+        flex: none;
+        min-width: 100px;
+        padding: 0.375rem 0.75rem;
+        font-weight: 500;
+        transition: all 0.15s ease-in-out;
+        justify-content: center !important;
+    }
+
+    .configuration-action-bar .btn-wrapper {
+        gap: 0.5rem;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end !important;
+        padding-right: 0;
+    }
+
+    .column {
+        float: left;
+        width: 40%;
+    }
   
   /* Clear floats after the columns */
   .row:after {
@@ -78,7 +110,7 @@ table.dataTable thead th {
 table.dataTable td {
     word-wrap: break-word;
     max-width: 250px;
-    font-size: 15px;
+    font-size: 15px !important;
 }
 
 .odd {
@@ -122,10 +154,6 @@ tr:nth-child(even) {background-color: #f2f2f2;}
     color: var(--bc-colors-blue-background, #38598A);
 }
 
-.form-select {
-    width: 400px !important;
-}
-
 .toast-top-center { 
     top: 220px;
     margin: 0 auto;
@@ -286,10 +314,16 @@ textarea {
 .unt-mapping-container {
     height: calc(97vh - 400px);
     overflow: scroll;
-    overflow-x:hidden;
+    overflow-x: hidden;
     border: 1px solid black;
 }
 
+.custom-fields-container {
+    height: calc(97vh - 400px);
+    overflow: scroll;
+    overflow-x: hidden;
+}
+
 .nav-tabs .nav-link.active {
     color: #003366;
     border-bottom: 3px solid #003366;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js
index a698cbf33e..6798dc0caf 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js
@@ -6,11 +6,11 @@
     let formVersionId = document.getElementById('formVersionId').value;
     let intakeMapColumn = document.querySelector('#intake-map-available-fields-column');
     let worksheetMapColumn = document.querySelector('#worksheet-map-available-fields-column');
-    let excludedIntakeMappings = ['ConfirmationId', 'SubmissionId', 'SubmissionDate'];
+    let excludedIntakeMappings = new Set(['ConfirmationId', 'SubmissionId', 'SubmissionDate']);
     let dataTable;
     if (globalThis.toastr) { toastr.options.positionClass = 'toast-top-center'; }
 
-    let allowableTypes = ['textarea',
+    let allowableTypes = new Set(['textarea',
         'orgbook',
         'textfield',
         'currency',
@@ -51,7 +51,7 @@
         'simpletextarea',
         'simpletextareaadvanced',
         'bcaddress',
-        'datagrid'];
+        'datagrid']);
 
     const UIElements = {
         btnBack: $('#btn-back'),
@@ -65,7 +65,7 @@
         inputSearchBar: $('#search-bar'),
         selectVersionList: $('#applicationFormVersion'),
         editMappingModal: $('#editMappingModal'),
-        uiConfigurationTab: $('#nav-ui-configuration'),        
+        uiConfigurationTab: $('#nav-ui-configuration'),
         mappingTab: $('#nav-mapping-tab'),
         customFieldsTab: $('#nav-worksheet-fields-tab'),
         intakeFieldsTab: $('#nav-intake-fields-tab'),
@@ -76,7 +76,8 @@
 
     function init() {
         bindUIEvents();
-        dataTable = initializeDataTable();
+        restoreActiveTab();
+        dataTable = initializeApplicationFormsTable();
         let availableChefsFields = availableChefFieldsString ? JSON.parse(availableChefFieldsString) : []
         initializeIntakeMap(availableChefsFields);
         bindExistingMaps();
@@ -100,8 +101,27 @@
         UIElements.btnCancel.on('click', handleCancelMapping);
         UIElements.btnClose.on('click', handleCancelMapping);
         UIElements.inputSearchBar.on('keyup', handleSeearchBar);
-        UIElements.selectVersionList.on('change', handleSelectVersion);  
+        UIElements.selectVersionList.on('change', handleSelectVersion);
         UIElements.mappingTab.on('click', handleMappingTabClick);
+
+        // Persist active tab to localStorage on switch
+        $('#nav-tab').on('shown.bs.tab', 'button[data-bs-toggle="tab"]', function () {
+            const formId = document.getElementById('applicationFormId')?.value;
+            if (formId) {
+                localStorage.setItem('mapping-active-tab:' + formId, this.id);
+            }
+        });
+    }
+
+    function restoreActiveTab() {
+        const formId = document.getElementById('applicationFormId')?.value;
+        if (!formId) return;
+        const savedTabId = localStorage.getItem('mapping-active-tab:' + formId);
+        if (!savedTabId) return;
+        const tabEl = document.getElementById(savedTabId);
+        if (tabEl) {
+            bootstrap.Tab.getOrCreateInstance(tabEl).show();
+        }
     }
 
     function initializeUIConfiguration() {
@@ -219,22 +239,7 @@
         }
     }
 
-    function initializeDataTable() {
-        return new DataTable('#ApplicationFormsTable', {
-            info: false,
-            ordering: false,
-            fixedHeader: false,
-            paging: false,
-            columnDefs: [
-                {
-                    render: function (data) {
-                        return '<div id="' + data + '" class="col map-div non-drag" draggable="false"></div>';
-                    },
-                    targets: 3
-                }
-            ]
-        });
-    }
+
 
     function handleSync() {
         let chefsFormVersionId = document.getElementById('chefsFormVersionId').value;
@@ -262,7 +267,7 @@
                         let updatedApplicationFormName = data.updatedFormName;
                         let updatedNameMessage = updatedApplicationFormName ? 'Form name updated to ' + updatedApplicationFormName : 'Form name is unchanged';
                         if (updatedApplicationFormName) {
-                            document.getElementById('applicationFormName').textContent = updatedApplicationFormName;                            
+                            document.getElementById('applicationFormName').textContent = updatedApplicationFormName;
                         }
 
                         let availableChefsFields = JSON.parse(formVersion.availableChefsFields)
@@ -271,7 +276,7 @@
 
                         abp.notify.success(
                             '',
-                            'Synchronized Successful' + updatedNameMessage 
+                            'Synchronized Successful' + updatedNameMessage
                         );
                         navigateToVersion(formVersion.chefsFormVersionGuid);
                     },
@@ -286,9 +291,7 @@
         }
     }
 
-    function validateGuid(textString) {
-        return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(textString);
-    }
+
 
     function handleSave() {
         let mappingDivs = $('.map-div');
@@ -351,9 +354,6 @@
         bindExistingMaps();
     }
 
-    function handleBack() {
-        location.href = '/ApplicationForms';
-    }
 
     function initializeIntakeMap(availableChefsFields) {
         try {
@@ -362,12 +362,22 @@
 
             for (let intakeField of intakeFields) {
                 let intakeFieldJson = intakeField;
-                if (!excludedIntakeMappings.includes(intakeFieldJson.Name)) {
+                if (!excludedIntakeMappings.has(intakeFieldJson.Name)) {
                     let dragableDiv = document.createElement('div');
                     dragableDiv.id = 'unity_' + intakeFieldJson.Name;
                     dragableDiv.className = 'card mapping-field';
                     dragableDiv.setAttribute("draggable", "true");
-                    dragableDiv.innerHTML = `${setTypeIndicator(intakeField)}` + intakeFieldJson.Label + (intakeFieldJson.IsCustom ? " *" : "");
+
+                    // Set icon HTML (internal code, safe)
+                    dragableDiv.innerHTML = `${setTypeIndicator(intakeField)}`;
+
+                    // Append label as text node to prevent HTML injection
+                    dragableDiv.appendChild(document.createTextNode(intakeFieldJson.Label));
+
+                    // Append asterisk if custom
+                    if (intakeFieldJson.IsCustom) {
+                        dragableDiv.appendChild(document.createTextNode(" *"));
+                    }
                     if (intakeFieldJson.IsCustom) {
                         worksheetMapColumn.appendChild(dragableDiv);
                         dragableDiv.className += ' custom-field';
@@ -383,7 +393,7 @@
             let rowsToAdd = [];
             for (let key of keys) {
                 let jsonObj = JSON.parse(availableChefsFields[key]);
-                if (allowableTypes.includes(jsonObj.type.trim())) {
+                if (allowableTypes.has(jsonObj.type.trim())) {
                     rowsToAdd.push([stripHtml(jsonObj.label), key, jsonObj.type, key]);
                 }
             }
@@ -398,69 +408,6 @@
         }
     }
 
-    function setTypeIndicator(intakeField) {
-        switch (intakeField.Type) {
-            case 'String':
-            case 'Phone':
-            case 'Date':
-            case 'Email':
-            case 'Radio':
-            case 'Checkbox':
-            case 'CheckboxGroup':
-            case 'SelectList':
-            case 'BCAddress':
-            case 'TextArea':
-            case 'DataGrid':
-                return `<i class="${setTypeIcon(intakeField)}"></i> `;
-            case 'Number':
-                return setTypeIndicatorText('123');
-            case 'Currency':
-                return setTypeIndicatorText('$');
-            case 'YesNo':
-                return setTypeIndicatorText('Y/N');
-            default:
-                return '';
-        }
-    }
-
-    function setTypeIcon(intakeField) {
-        switch (intakeField.Type) {
-            case 'String':
-                return 'fl fl-font';
-            case 'Phone':
-                return 'fl fl-phone';
-            case 'Date':
-                return 'fl fl-datetime';
-            case 'Email':
-                return 'fl fl-mail';
-            case 'Radio':
-                return 'fl fl-radio';
-            case 'Checkbox':
-                return 'fl fl-checkbox-checked';
-            case 'CheckboxGroup':
-                return 'fl fl-multi-select';
-            case 'SelectList':
-                return 'fl fl-list';
-            case 'BCAddress':
-                return 'fl fl-globe';
-            case 'TextArea':
-                return 'fl fl-text-area';
-            case 'DataGrid':
-                return 'fl fl-datagrid';
-            default:
-                return '';
-        }
-    }
-
-    function setTypeIndicatorText(text) {
-        return `<span class="mapping-indicator-text">${text}</span>`;
-    }
-
-    function stripHtml(html) {
-        let tmp = document.createElement("DIV");
-        tmp.innerHTML = html;
-        return tmp.textContent || tmp.innerText || "";
-    }
 
     document.addEventListener('dragstart', function (ev) {
         if (ev.target.classList.contains('non-drag')) {
@@ -499,19 +446,7 @@
         }
     });
 
-    function beingDragged(ev) {
-        let draggedEl = ev.target;
-        if (draggedEl.classList + "" !== "undefined") {
-            draggedEl.classList.add('dragging');
-        }
-    }
 
-    function dragEnd(ev) {
-        let draggedEl = ev.target;
-        if (draggedEl.classList + "" !== "undefined") {
-            draggedEl.classList.remove('dragging');
-        }
-    }
 
     function allowDrop(ev) {
         ev.preventDefault();
@@ -526,15 +461,12 @@
 
         if (draggedParent === dragOverParent) {
             if (draggedIndex < dragOverIndex) {
-                draggedParent.insertBefore(dragOver, beingDragged);
-            }
-
-            if (draggedIndex > dragOverIndex) {
-                draggedParent.insertBefore(dragOver, beingDragged.nextSibling);
+                beingDragged.before(dragOver);
+            } else if (draggedIndex > dragOverIndex) {
+                beingDragged.after(dragOver);
             }
-        }
-        if (draggedParent !== dragOverParent) {
-            dragOverParent.insertBefore(beingDragged, dragOver);
+        } else {
+            dragOver.before(beingDragged);
         }
     }
 
@@ -553,73 +485,15 @@
         }
     }
 
-    function whichChild(el) {
-        let i = 0;
-        while ((el = el.previousSibling) != null) ++i;
-        return i;
-    }
 
-    function prettyJson(jsonText) {
-        if (!jsonText) {
-            return jsonText;
-        }
 
-        let prettyJson = new Array();
-        let depth = 0;
-        let currChar;
-        let prevChar;
-        let doubleQuoteIn = false;
 
-        for (let i = 0; i < jsonText.length; i++) {
-            currChar = jsonText.charAt(i);
-
-            if (currChar === '"' && prevChar !== '\\') {
-                doubleQuoteIn = !doubleQuoteIn;
-            }
-
-            switch (currChar) {
-                case '{':
-                    prettyJson.push(currChar);
-                    if (!doubleQuoteIn) {
-                        prettyJson.push('\n');
-                        insertTab(prettyJson, ++depth);
-                    }
-                    break;
-                case '}':
-                    if (!doubleQuoteIn) {
-                        prettyJson.push('\n');
-                        insertTab(prettyJson, --depth);
-                    }
-                    prettyJson.push(currChar);
-                    break;
-                case ',':
-                    prettyJson.push(currChar);
-                    if (!doubleQuoteIn) {
-                        prettyJson.push('\n');
-                        insertTab(prettyJson, depth);
-                    }
-                    break;
-                default:
-                    prettyJson.push(currChar);
-                    break;
-            }
 
-            prevChar = currChar;
-        }
-        return prettyJson.join('');
-    }
 
-    function insertTab(prettyJson, depth) {
-        const TAB = '    ';
-        for (let i = 0; i < depth; i++) {
-            prettyJson.push(TAB);
-        }
-    }
-    
     function handleMappingTabClick() {
         // Refresh the hidden field with the latest form version ID
         let refreshAvailableWorkSheets = UIElements.refreshAvailableWorksheetsHidden.val();
-        if(refreshAvailableWorkSheets && refreshAvailableWorkSheets !== "undefined" ) {
+        if (refreshAvailableWorkSheets && refreshAvailableWorkSheets !== "undefined") {
             navigateToVersion(refreshAvailableWorkSheets);
         }
     }
@@ -656,19 +530,19 @@
                 }),
                 contentType: 'application/json'
             })
-            .done(function () {
-                lastSavedAIValues = {
-                    automaticallyGenerateAIAnalysis: automaticCheckbox ? automaticCheckbox.checked : false,
-                    manuallyInitiateAIAnalysis: manualCheckbox ? manualCheckbox.checked : false
-                };
-                abp.notify.success('AI configuration saved successfully.');
-            })
-            .fail(function () {
-                abp.notify.error('Failed to save AI configuration.');
-            })
-            .always(function () {
-                btnSaveAIConfig.disabled = false;
-            });
+                .done(function () {
+                    lastSavedAIValues = {
+                        automaticallyGenerateAIAnalysis: automaticCheckbox ? automaticCheckbox.checked : false,
+                        manuallyInitiateAIAnalysis: manualCheckbox ? manualCheckbox.checked : false
+                    };
+                    abp.notify.success('AI configuration saved successfully.');
+                })
+                .fail(function () {
+                    abp.notify.error('Failed to save AI configuration.');
+                })
+                .always(function () {
+                    btnSaveAIConfig.disabled = false;
+                });
         });
 
         if (btnCancelAIConfig) {
@@ -679,3 +553,22 @@
         }
     }
 });
+
+
+function handleBack() {
+    location.href = '/ApplicationForms';
+}
+
+function beingDragged(ev) {
+    let draggedEl = ev.target;
+    if (draggedEl.classList + "" !== "undefined") {
+        draggedEl.classList.add('dragging');
+    }
+}
+
+function dragEnd(ev) {
+    let draggedEl = ev.target;
+    if (draggedEl.classList + "" !== "undefined") {
+        draggedEl.classList.remove('dragging');
+    }
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/mapping-utils.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/mapping-utils.js
new file mode 100644
index 0000000000..9f11cc7599
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/mapping-utils.js
@@ -0,0 +1,203 @@
+// Mapping Utilities - Reusable functions for form mapping and utilities
+
+/**
+ * Initializes DataTable for Application Forms mapping
+ * Destroys existing instance if present
+ * @returns {DataTable} Configured DataTable instance
+ */
+function initializeApplicationFormsTable() {
+    const tableSelector = '#ApplicationFormsTable';
+    
+    // Destroy existing DataTable instance if it exists
+    if ($.fn.DataTable.isDataTable(tableSelector)) {
+        $(tableSelector).DataTable().destroy();
+    }
+    
+    return new DataTable(tableSelector, {
+        info: false,
+        ordering: false,
+        fixedHeader: false,
+        paging: false,
+        columnDefs: [
+            {
+                render: function (data) {
+                    const safeId = escapeHtmlAttribute(data);
+                    return '<div id="' + safeId + '" class="col map-div non-drag" draggable="false"></div>';
+                },
+                targets: 3
+            }
+        ]
+    });
+}
+
+/**
+ * Maps intake field types to icon classes
+ * @param {object} intakeField - Field object with Type property
+ * @returns {string} Icon class name
+ */
+function setTypeIcon(intakeField) {
+    switch (intakeField.Type) {
+        case 'String':
+            return 'fl fl-font';
+        case 'Phone':
+            return 'fl fl-phone';
+        case 'Date':
+            return 'fl fl-datetime';
+        case 'Email':
+            return 'fl fl-mail';
+        case 'Radio':
+            return 'fl fl-radio';
+        case 'Checkbox':
+            return 'fl fl-checkbox-checked';
+        case 'CheckboxGroup':
+            return 'fl fl-multi-select';
+        case 'SelectList':
+            return 'fl fl-list';
+        case 'BCAddress':
+            return 'fl fl-globe';
+        case 'TextArea':
+            return 'fl fl-text-area';
+        case 'DataGrid':
+            return 'fl fl-datagrid';
+        default:
+            return '';
+    }
+}
+
+/**
+ * Creates HTML span for type indicator text
+ * @param {string} text - Indicator text (e.g., "123", "$", "Y/N")
+ * @returns {string} HTML span element
+ */
+function setTypeIndicatorText(text) {
+    return `<span class="mapping-indicator-text">${text}</span>`;
+}
+
+/**
+ * Creates visual indicator for intake field type
+ * @param {object} intakeField - Field object with Type property
+ * @returns {string} HTML for field type indicator (icon or text)
+ */
+function setTypeIndicator(intakeField) {
+    switch (intakeField.Type) {
+        case 'String':
+        case 'Phone':
+        case 'Date':
+        case 'Email':
+        case 'Radio':
+        case 'Checkbox':
+        case 'CheckboxGroup':
+        case 'SelectList':
+        case 'BCAddress':
+        case 'TextArea':
+        case 'DataGrid':
+            return `<i class="${setTypeIcon(intakeField)}"></i> `;
+        case 'Number':
+            return setTypeIndicatorText('123');
+        case 'Currency':
+            return setTypeIndicatorText('$');
+        case 'YesNo':
+            return setTypeIndicatorText('Y/N');
+        default:
+            return '';
+    }
+}
+
+/**
+ * Finds the position of element among its siblings
+ * @param {Element} el - DOM element
+ * @returns {number} Index of element among siblings
+ */
+function whichChild(el) {
+    let i = 0;
+    while ((el = el.previousSibling) != null) ++i;
+    return i;
+}
+
+/**
+ * Inserts indentation tabs into output array
+ * @param {array} output - Array to push tabs into
+ * @param {number} depth - Number of tab levels
+ */
+function insertTab(output, depth) {
+    const TAB = '    ';
+    for (let i = 0; i < depth; i++) {
+        output.push(TAB);
+    }
+}
+
+/**
+ * Formats JSON with proper indentation and line breaks
+ * @param {string} jsonText - JSON string to format
+ * @returns {string} Formatted JSON string
+ */
+function prettyJson(jsonText) {
+    if (!jsonText) return jsonText;
+    
+    const state = { output: [], depth: 0, inQuotes: false, prevChar: '' };
+
+    for (let i = 0; i < jsonText.length; i++) {
+        processJsonChar(jsonText.charAt(i), state);
+    }
+
+    return state.output.join('');
+}
+
+/**
+ * Processes a single JSON character for formatting
+ * @param {string} char - Character to process
+ * @param {object} state - Formatting state (output, depth, inQuotes, prevChar)
+ */
+function processJsonChar(char, state) {
+    if (char === '"' && state.prevChar !== '\\') {
+        state.inQuotes = !state.inQuotes;
+    }
+
+    if (char === '{') {
+        handleOpenBrace(state);
+    } else if (char === '}') {
+        handleCloseBrace(state);
+    } else if (char === ',') {
+        handleComma(state);
+    } else {
+        state.output.push(char);
+    }
+
+    state.prevChar = char;
+}
+
+/**
+ * Handles opening brace in JSON formatting
+ * @param {object} state - Formatting state
+ */
+function handleOpenBrace(state) {
+    state.output.push('{');
+    if (!state.inQuotes) {
+        state.output.push('\n');
+        insertTab(state.output, ++state.depth);
+    }
+}
+
+/**
+ * Handles closing brace in JSON formatting
+ * @param {object} state - Formatting state
+ */
+function handleCloseBrace(state) {
+    if (!state.inQuotes) {
+        state.output.push('\n');
+        insertTab(state.output, --state.depth);
+    }
+    state.output.push('}');
+}
+
+/**
+ * Handles comma in JSON formatting
+ * @param {object} state - Formatting state
+ */
+function handleComma(state) {
+    state.output.push(',');
+    if (!state.inQuotes) {
+        state.output.push('\n');
+        insertTab(state.output, state.depth);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplicationViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplicationViewModel.cs
new file mode 100644
index 0000000000..b7f6ab6e48
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplicationViewModel.cs
@@ -0,0 +1,24 @@
+using System;
+using System.ComponentModel;
+
+namespace Unity.GrantManager.Web.Pages.BulkActions;
+
+public class BulkPublishApplicationViewModel
+{
+    public Guid ApplicationId { get; set; }
+    public string? ApplicantName { get; set; } = string.Empty;
+    public string ReferenceNo { get; set; } = string.Empty;
+    public bool ExternalStatusVisibility { get; set; }
+    public string ApplicationStatus { get; set; } = string.Empty;
+    public string FormName { get; set; } = string.Empty;
+
+    [DisplayName("External Status (Current)")]
+    public string ExternalStatus { get; set; } = string.Empty;
+    
+    [DisplayName("Published Status (Future)")]
+    public string PublishedStatus { get; set; } = string.Empty;
+
+    [DisplayName("Decision Date")]
+    public DateTime? FinalDecisionDate { get; set; }
+    public bool IsValid { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.cshtml
new file mode 100644
index 0000000000..4167de2eb8
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.cshtml
@@ -0,0 +1,123 @@
+@page
+@model Unity.GrantManager.Web.Pages.BulkActions.BulkPublishApplicationsModel
+@using Microsoft.Extensions.Localization
+@using Unity.GrantManager.Localization
+
+@inject IStringLocalizer<GrantManagerResource> L
+@{
+    Layout = null;
+}
+
+<form method="post" asp-page-handler="OnPostAsync" id="bulkPublishForm">
+<abp-modal id="bulkPublishApplicationsModal" size="ExtraLarge">
+    <abp-modal-header title="Publish Status"></abp-modal-header>
+    <abp-modal-body>
+        @if (ViewData["Error"] != null)
+        {
+            <div class="alert alert-warning" role="alert">
+                <i class="fa fa-exclamation-triangle"></i> @ViewData["Error"]
+            </div>
+        }
+        else
+        {
+            <abp-card class="batch-action-card">
+                <abp-card-body>
+                    <abp-input id="ApplicationsCount" type="hidden" asp-for="@Model.ApplicationsCount" />
+                    <abp-input id="MaxBatchCount" type="hidden" asp-for="@Model.MaxBatchCount" />
+                    @for (var i = 0; i < Model.BulkApplications?.Count; i++)
+                    {
+                        <div id="@($"{Model.BulkApplications[i].ApplicationId}_container")" class="batch-action-container">
+                            <abp-row class="m-0 p-2 bulk-action-row-header d-flex flex-nowrap">
+                                <abp-column size="_9" class="px-1 flex-grow-1">
+                                    <div class="action-details-header">
+                                        <div class="header-data reference-no">@Model.BulkApplications[i].ReferenceNo</div>
+                                        <div class="header-data applicant-name nowrap">
+                                                @(string.IsNullOrWhiteSpace(Model.BulkApplications[i].ApplicantName) ? "Applicant Name" : @Model.BulkApplications[i].ApplicantName)
+                                        </div>
+                                        <div class="header-data form-name pr-1">
+                                                @(string.IsNullOrWhiteSpace(Model.BulkApplications[i].FormName) ? "(Form Name)" : string.Format("({0})", @Model.BulkApplications[i].FormName))
+                                        </div>
+                                        <div class="application-status">@Model.BulkApplications[i].ApplicationStatus</div>
+                                    </div>
+                                </abp-column>
+                                <abp-column size="_3" class="bulk-action-remove-row d-flex justify-content-end col-3 gap-1 align-items-center">
+                                    <abp-button onclick='removeApplicationRow("@Model.BulkApplications[i].ApplicationId" + "_container")'
+                                                onkeydown='if(event.key === "Enter" || event.key === " ") { removeApplicationRow("@Model.BulkApplications[i].ApplicationId" + "_container"); event.preventDefault(); }'
+                                                size="Small"
+                                                icon-type="Other"
+                                                icon="fa fa-times"
+                                                class="removeRow m-0 p-0"
+                                                data-parameter="@Model.BulkApplications[i].ApplicationId" />
+                                </abp-column>
+                            </abp-row>
+
+                            <input name="BulkApplications.Index" type="hidden" value="@i" />
+                            <abp-input type="hidden" asp-for="@Model.BulkApplications[i].IsValid" />
+                            <abp-input type="hidden" asp-for="@Model.BulkApplications[i].ApplicationId" />
+                            <abp-input type="hidden" asp-for="@Model.BulkApplications[i].ApplicantName" />
+                            <abp-input type="hidden" asp-for="@Model.BulkApplications[i].ReferenceNo" />
+
+                            <abp-row class="m-0 p-3">
+                                <abp-column size="_4" class="px-3">
+                                    <abp-input asp-for="@Model.BulkApplications[i].ExternalStatus" disabled=true />
+                                    <input type="hidden" asp-for="@Model.BulkApplications[i].ExternalStatus" />
+                                </abp-column>
+                                <abp-column size="_4" class="px-3">
+                                    <abp-input asp-for="@Model.BulkApplications[i].PublishedStatus" disabled=true />
+                                    <input type="hidden" asp-for="@Model.BulkApplications[i].PublishedStatus" />
+                                </abp-column>
+                                <abp-column size="_4">
+                                    @if (Model.BulkApplications[i].FinalDecisionDate.HasValue)
+                                    {
+                                        <abp-input asp-for="@Model.BulkApplications[i].FinalDecisionDate" disabled="true" type="date" />
+                                    }
+                                    else
+                                    {
+                                        <div class="mb-3">
+                                            <label class="form-label" for="BulkApplications_@(i)__FinalDecisionDate">Decision Date</label>
+                                            <input asp-for="@Model.BulkApplications[i].FinalDecisionDate" type="date" class="form-control" disabled readonly />
+                                        </div>
+                                    }
+                                </abp-column>
+                            </abp-row>
+                        </div>
+                    }
+                    </abp-card-body>
+            </abp-card>
+            <abp-row id="batch-action-summary" class="m-0 batch-action-summary d-none">
+                <abp-column size="_12" class="px-3">
+                    <p id="maxCountWarning" class="alert alert-light border-0 border-4 border-start rounded-0 text-body d-none">
+                        <span class="action-note-prefix action-note-error">Error</span> @Model.MaxBatchCountExceededError
+                    </p>
+                    <p id="minCountWarning" class="alert alert-light border-0 border-4 border-start rounded-0 text-body d-none">
+                            <span class="action-note-prefix action-note-error">Error</span> @L["ApplicationBatchPublishRequest:MinCountExceeded"]
+                    </p>
+                </abp-column>
+            </abp-row>
+            <abp-row class="m-0">
+                <abp-column size="_12" class="px-3">
+                    <p class="alert alert-light border-0 border-4 border-start rounded-0 text-body">
+                        <strong>Note:</strong> @L["ApplicationBatchPublishRequest:ConfirmationNote"]
+                    </p>
+                </abp-column>
+            </abp-row>
+        }
+    </abp-modal-body>
+    <abp-modal-footer>
+        <abp-button id="btnSubmitBatchPublish"
+                    data-busy-text="Saving..."
+                    class="btn btn-primary"
+                    disabled="@Model.Invalid"
+                    text="Confirm"
+                    type="submit">
+        </abp-button>
+        <abp-button id="btnCancelBatchPublish"
+                    class="btn btn-secondary"
+                    aria-label="Cancel"
+                    data-bs-dismiss="modal"
+                    data-dismiss="modal" 
+                    text="@L["ApplicationBatchApprovalRequest:CancelButtonText"].Value">
+        </abp-button>
+    </abp-modal-footer>
+</abp-modal>
+</form>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.cshtml.cs
new file mode 100644
index 0000000000..1525ffbac1
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.cshtml.cs
@@ -0,0 +1,121 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.GrantApplications;
+using Unity.Modules.Shared;
+using Unity.Modules.Shared.Utils;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.GrantManager.Web.Pages.BulkActions;
+
+[Authorize(UnitySelector.Application.Status.BulkPublish)]
+public class BulkPublishApplicationsModel(
+    ApplicationIdsCacheService cacheService,
+    IApplicationBulkActionsAppService bulkActionsAppService) : AbpPageModel
+{
+    [BindProperty]
+    public List<BulkPublishApplicationViewModel>? BulkApplications { get; set; }
+
+    [BindProperty]
+    public string SelectedApplicationIds { get; set; } = string.Empty;
+
+    [TempData]
+    public int ApplicationsCount { get; set; }
+
+    [TempData]
+    public bool Invalid { get; set; }
+
+    [TempData]
+    public int MaxBatchCount { get; set; }
+
+    [TempData]
+    public string? MaxBatchCountExceededError { get; set; }
+
+    [TempData]
+    public bool MaxBatchCountExceeded { get; set; }
+
+    public async Task OnGetAsync(string cacheKey)
+    {
+        if (!await AuthorizationService.IsGrantedAsync(UnitySelector.Application.Status.BulkPublish))
+        {
+            return;
+        }
+
+        MaxBatchCount = BatchApprovalConsts.MaxBatchCount;
+        BulkApplications = [];
+        MaxBatchCountExceededError = L["ApplicationBatchPublishRequest:MaxCountExceeded", BatchApprovalConsts.MaxBatchCount.ToString()].Value;
+
+        try
+        {
+            // Retrieve application IDs from distributed cache
+            var selectedApplicationIds = await cacheService.GetApplicationIdsAsync(cacheKey);
+
+            if (selectedApplicationIds == null || selectedApplicationIds.Count == 0)
+            {
+                Logger.LogWarning("Cache key expired or invalid: {CacheKey}", cacheKey.SanitizeField());
+                ViewData["Error"] = "The session has expired. Please try selecting applications again.";
+                Invalid = true;
+                return;
+            }
+
+            // Convert List<Guid> to Guid[] for existing code compatibility
+            Guid[] applicationGuids = [.. selectedApplicationIds];
+
+            // Clean up cache after retrieval (one-time use)
+            await cacheService.RemoveAsync(cacheKey);
+
+            if (applicationGuids.Length > MaxBatchCount)
+            {
+                MaxBatchCountExceeded = true;
+            }
+
+            if (applicationGuids.Length == 0)
+            {
+                Invalid = true;
+                return;
+            }
+
+            // Fetch application details for the selected IDs
+            var bulkApplications = await bulkActionsAppService.GetApplicationsForBulkPublish(applicationGuids);
+
+            BulkApplications = ObjectMapper.Map<List<BulkPublishDto>, List<BulkPublishApplicationViewModel>>(bulkApplications);
+            ApplicationsCount = BulkApplications.Count;
+            Invalid = MaxBatchCountExceeded || ApplicationsCount == 0;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error loading bulk publish applications modal");
+            ViewData["Error"] = "An error occurred while loading the applications. Please try again.";
+            Invalid = true;
+            return;
+        }
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        try
+        {
+            if (BulkApplications == null) return NoContent();
+            if (BulkApplications.Count == 0 || BulkApplications.Count > BatchApprovalConsts.MaxBatchCount)
+            {
+                return BadRequest();
+            }
+
+            var applicationsToPublish = BulkApplications.Select(y => y.ApplicationId).ToArray();
+            await bulkActionsAppService.BulkPublishApplications(applicationsToPublish);
+
+            return new OkResult();
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error updating application status");
+        }
+
+        return NoContent();
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.css
new file mode 100644
index 0000000000..fe7b184776
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.css
@@ -0,0 +1,110 @@
+.batch-action-card {
+    max-height: 65vh;
+    overflow: auto;
+}
+
+.batch-action-container {
+    border: var(--bs-border-width) solid;
+    border-color: var(--bs-border-color);
+}
+
+.bulk-action-row-header {
+    padding-bottom: 0 !important;
+}
+
+.bulk-action-remove-row {
+    min-width: 55px
+}
+
+
+/* This is for the summary modal*/
+
+.table-container {
+    max-height: 65vh;
+    overflow-y: auto;
+}
+
+.batch-action-container input.form-control:disabled {
+    color: var(--bs-body-color);
+}
+
+.custom-table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.centered-icon {
+    text-align: center;
+    padding-bottom: 0.85rem;
+}
+
+.custom-table thead th {
+    position: sticky;
+    top: 0;
+    background-color: white;
+    z-index: 1;
+    font-size: 1rem;
+    padding-bottom: 1rem;
+}
+
+.custom-table .col-5 {
+    width: 5%;
+}
+
+.custom-table .col-20 {
+    width: 20%;
+}
+
+.custom-table .col-75 {
+    width: 75%;
+}
+
+.action-details-header {
+    display: flex;
+    align-items: center;
+    gap: 0.75em;
+}
+
+    .action-details-header
+    .header-data {
+        color: var(--bs-body-color);
+        -webkit-font-smoothing: antialiased;
+    }
+
+    .action-details-header
+    .reference-no {
+        font-weight: 700;
+    }
+
+    .action-details-header
+    .application-status {
+        font-weight: 700;
+        color: var(--bc-colors-blue-text-links);
+        text-transform: uppercase;
+        border: 3px solid var(--bc-colors-blue-text-links);
+        border-radius: 1rem;
+        font-size: 0.8rem;
+        padding: 0.125rem 0.5rem;
+        margin-top: 2px;
+    }
+
+
+.action-note-prefix {
+    font-weight: 700;
+    color: var(--bc-colors-blue-text-links);
+    text-transform: uppercase;
+    border: 3px solid var(--bc-colors-blue-text-links);
+    border-radius: 1rem;
+    font-size: 0.8rem;
+    padding: 0.025rem 0.5rem;
+    line-height: 1.75rem;
+}
+
+.action-note-error {
+    color: var(--lpx-danger);
+    border-color: var(--lpx-danger);
+}
+
+.batch-direct-action-indicator {
+    padding-left: 1rem;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.js
new file mode 100644
index 0000000000..685d121930
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkActions/BulkPublishApplications.js
@@ -0,0 +1,59 @@
+function removeApplicationRow(applicationId) {
+    $('#' + applicationId).remove();
+    let applicationsCount = $('#ApplicationsCount').val();
+    $('#ApplicationsCount').val(applicationsCount - 1);
+    runValidations();
+}
+
+function setMaxCountError(visible) {
+    const summary = $('#batch-action-summary');
+    if (visible) {
+        summary.css('display', 'block');
+    } else {
+        summary.css('display', 'none');
+    }
+}
+
+function closePublish() {
+    $('#bulkPublishApplicationsModal').modal('hide');
+}
+
+function runValidations() {
+    const isValid = validBatchCount();
+    $('#batch-action-summary').toggleClass('d-none', isValid);
+    $("#bulkPublishApplicationsModal").find('#btnSubmitBatchPublish').prop("disabled", !isValid);
+}
+
+function validBatchCount() {
+    const applicationsCount = Number.parseInt(String($('#ApplicationsCount').val() ?? ''), 10);
+    const maxBatchCount = Number.parseInt(String($('#MaxBatchCount').val() ?? ''), 10);
+    let validationMaxValid = true;
+    let validationMinValid = true;
+
+    const hasInvalidNumber = Number.isNaN(applicationsCount) || Number.isNaN(maxBatchCount);
+    if (hasInvalidNumber) {
+        return false;
+    }
+
+    if (applicationsCount > maxBatchCount) {
+        validationMaxValid = false;
+    } else if (applicationsCount === 0) {
+        validationMinValid = false;
+    }
+
+    $('#maxCountWarning').toggleClass('d-none', validationMaxValid);
+    $('#minCountWarning').toggleClass('d-none', validationMinValid);
+    $('.batch-action-card').toggleClass('d-none', !validationMinValid);
+
+    return validationMaxValid && validationMinValid;
+}
+
+$(function () {
+    class BulkPublishModal {
+        initModal(publicApi, args) {
+            runValidations();
+        }
+    }
+
+    abp.modals.BulkPublishModal = BulkPublishModal;
+});
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
index d2a07c68fc..93cc895573 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
@@ -16,41 +16,45 @@
 }
 
 @section styles {
-    <abp-style-bundle name="@typeof(IndexModel).FullName">
-        <abp-style src="/Pages/ConfigurationManagement/Index.css" />
-        @if (Model.ShowPayments)
-        {
-            <abp-style src="/Pages/ConfigurationManagement/PaymentConfigurations.css" />
-        }
-        @if (Model.ShowNotifications)
-        {
-            <abp-style src="/Views/Settings/NotificationsSettingGroup/Default.css" />
-        }
-    </abp-style-bundle>
+    <abp-style src="/Pages/ConfigurationManagement/Index.css" />
+    @if (Model.ShowPayments)
+    {
+        <abp-style src="/Pages/ConfigurationManagement/PaymentConfigurations.css" />
+    }
+    @if (Model.ShowNotifications)
+    {
+        <abp-style src="/Views/Settings/NotificationsSettingGroup/Default.css" />
+    }
+    @if (Model.ShowProgramDetails)
+    {
+        <abp-style src="/Views/Settings/ProgramDetails/ProgramDetails.css" />
+    }
 }
 
 @section scripts {
-    <abp-script-bundle name="@typeof(IndexModel).FullName">
-        <abp-script src="/Pages/ConfigurationManagement/Index.js" />
-        @if (Model.ShowPayments)
-        {
-            <abp-script src="/Pages/ConfigurationManagement/PaymentConfigurations.js" />
-        }
-        <abp-script src="/libs/sortablejs/Sortable.js" />
-        @if (Model.ShowNotifications)
-        {
-            <abp-script src="/Views/Settings/NotificationsSettingGroup/Default.js" />
-            <abp-script src="/Views/Settings/NotificationsSettingGroup/InternalEmailGroups.js" />
-        }
-        @if (Model.ShowTags)
-        {
-            <abp-script src="/Views/Settings/TagManagement/TagManagement.js" />
-        }
-        @if (Model.ShowAI)
-        {
-            <abp-script src="/Views/Settings/AISettingGroup/Default.js" />
-        }
-    </abp-script-bundle>
+    <abp-script src="/Pages/ConfigurationManagement/Index.js" />
+    @if (Model.ShowPayments)
+    {
+        <abp-script src="/Pages/ConfigurationManagement/PaymentConfigurations.js" />
+    }
+    @if (Model.ShowNotifications)
+    {
+        <abp-script src="/Views/Settings/NotificationsSettingGroup/Default.js" />
+        <abp-script src="/Views/Settings/NotificationsSettingGroup/InternalEmailGroups.js" />
+    }
+    @if (Model.ShowTags)
+    {
+        <abp-script src="/Views/Settings/TagManagement/TagManagement.js" />
+    }
+    @if (Model.ShowAI)
+    {
+        <abp-script src="/Views/Settings/AISettingGroup/Default.js" />
+    }
+    @if (Model.ShowProgramDetails)
+    {
+        <abp-script src="/Views/Settings/ProgramDetails/CharacterCounter.js" />
+        <abp-script src="/Views/Settings/ProgramDetails/ProgramDetails.js" />
+    }
 }
 
 <div class="config-page-layout">
@@ -93,6 +97,12 @@
                     AI
                 </li>
             }
+            @if (Model.ShowProgramDetails)
+            {
+                <li id="program-details-menu-item" class="nav-item btn btn-nav" data-target="program-details-div">
+                    Program Details
+                </li>
+            }
         </ul>
     </div>
     <!-- Main Content -->
@@ -112,10 +122,6 @@
                 <input type="hidden" id="AccountCodingId" value="@Model.AccountCodingId" />
 
                 <div class="container-fluid px-0">
-                    <div class="unity-page-titlebar">
-                        <h4 class="m-0">Payments</h4>
-                    </div>
-
                     <nav aria-label="Payment Tabs">
                         <div class="nav nav-tabs" id="payments-nav-tab" role="tablist">
                             @if (Model.ShowPaymentAccountCoding)
@@ -215,7 +221,7 @@
         <!-- Scoresheets -->
         @if (Model.ShowScoresheets)
         {
-            <div id="scoresheets-div" class="config-section input-area card mb-3 config-management hide">
+            <div id="scoresheets-div" class="config-section input-area card mb-3 config-management hide">                
                 @await Component.InvokeAsync(typeof(ScoresheetConfigurationViewComponent))
             </div>
         }
@@ -235,5 +241,13 @@
                 @await Component.InvokeAsync(typeof(Unity.AI.Web.Views.Settings.AISettingGroup.AISettingViewComponent))
             </div>
         }
+
+        <!-- Program Details -->
+        @if (Model.ShowProgramDetails)
+        {
+            <div id="program-details-div" class="config-section input-area card mb-3 config-management hide">
+                @await Component.InvokeAsync(typeof(Unity.GrantManager.Web.Views.Settings.ProgramDetails.ProgramDetailsViewComponent))
+            </div>
+        }
     </div>
 </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml.cs
index b60b82d183..52fc1d3282 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml.cs
@@ -36,6 +36,7 @@ public class IndexModel(
     public bool ShowScoresheets { get; set; }
     public bool ShowTags { get; set; }
     public bool ShowAI { get; set; }
+    public bool ShowProgramDetails { get; set; }
 
     public async Task OnGetAsync()
     {
@@ -62,6 +63,8 @@ public async Task OnGetAsync()
         ShowAI = await featureChecker.IsEnabledAsync("Unity.AI.Scoring")
             && await permissionChecker.IsGrantedAsync(AIPermissions.Configuration.ConfigureAI);
 
+        ShowProgramDetails = await permissionChecker.IsGrantedAsync(UnitySettingManagementPermissions.EditProgramDetails);
+
         // Load payment data only if visible
         if (ShowPayments)
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.css
index 401a5713e3..7b5cb6e6b2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.css
@@ -40,9 +40,8 @@
 
 .config-management {
     padding: 1rem;
-    max-height: calc(100vh - 140px);
     overflow: hidden;
-    margin-top: 20px;
+    margin-top: 10px;
     width: 95%;
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js
index f17597dc1a..a37c0568ee 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.js
@@ -2,15 +2,25 @@
     const menuItems = $('#ConfigurationManagementSideMenu .nav-item');
     const configSections = $('.config-section');
     const ACTIVE_MENU_KEY = 'ConfigurationManagement_ActiveMenu';
+    const ACTIVE_PAYMENTS_TAB_KEY = 'payments-active-tab';
+    const ACTIVE_NOTIFICATIONS_TAB_KEY = 'notifications-active-tab';
 
     init();
 
     function init() {
         menuItems.on('click', menuItemClick);
 
-        // Adjust DataTables when Payments internal tabs are shown
+        // Adjust DataTables when tabs are shown
         $('button[data-bs-toggle="tab"]').on('shown.bs.tab', function () {
             adjustDataTables();
+            // Save active payments tab
+            if ($(this).closest('#payments-nav-tab').length) {
+                localStorage.setItem(ACTIVE_PAYMENTS_TAB_KEY, this.id);
+            }
+            // Save active notifications tab
+            if ($(this).closest('#nav-tab').length) {
+                localStorage.setItem(ACTIVE_NOTIFICATIONS_TAB_KEY, this.id);
+            }
         });
 
         // Restore the last active menu item from localStorage, fallback to first
@@ -23,14 +33,32 @@
             $('#' + targetId).removeClass('hide');
         }
 
-        // Auto-activate the first Payment tab (if rendered)
-        const firstPaymentTab = $('#payments-nav-tab .nav-link').first();
-        if (firstPaymentTab.length) {
-            firstPaymentTab.addClass('active');
-            const targetPane = $(firstPaymentTab.data('bs-target'));
-            if (targetPane.length) {
-                targetPane.addClass('show active');
-            }
+        // Auto-activate saved Payment tab or first tab
+        const savedPaymentTabId = localStorage.getItem(ACTIVE_PAYMENTS_TAB_KEY);
+        const paymentTabContainer = $('#payments-nav-tab');
+        let paymentTabToActivate = paymentTabContainer.find(`#${savedPaymentTabId}`);
+        
+        if (!paymentTabToActivate.length) {
+            paymentTabToActivate = paymentTabContainer.find('.nav-link').first();
+        }
+        
+        if (paymentTabToActivate.length) {
+            const tab = new bootstrap.Tab(paymentTabToActivate[0]);
+            tab.show();
+        }
+
+        // Auto-activate saved Notifications tab or first tab
+        const savedNotificationsTabId = localStorage.getItem(ACTIVE_NOTIFICATIONS_TAB_KEY);
+        const notificationsTabContainer = $('#nav-tab');
+        let notificationsTabToActivate = notificationsTabContainer.find('#' + savedNotificationsTabId);
+        
+        if (!notificationsTabToActivate.length) {
+            notificationsTabToActivate = notificationsTabContainer.find('.nav-link').first();
+        }
+        
+        if (notificationsTabToActivate.length) {
+            const tab = new bootstrap.Tab(notificationsTabToActivate[0]);
+            tab.show();
         }
     }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/ScoresheetConfiguration.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/ScoresheetConfiguration.js
index 059e0513d7..dd7f36ec8c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/ScoresheetConfiguration.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/ScoresheetConfiguration.js
@@ -137,4 +137,4 @@ globalThis.importScoresheetFile = function (inputId) {
             refreshScoresheetInfoWidget(data.scoresheetId);
         }
     );
-})(jQuery);
+})(jQuery);
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Dashboard/Index.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Dashboard/Index.css
index a810f8a95c..a6efc06f1b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Dashboard/Index.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Dashboard/Index.css
@@ -33,4 +33,18 @@
     margin-top: 10px;
     font-size: 14px;
     font-weight: bold;
+}
+
+.bs-actionsbox {
+    margin-top: 4px;
+}
+
+.bs-actionsbox .btn-group {
+    display: flex;
+    justify-content: space-between;
+    gap: 8px;
+}
+
+.bs-actionsbox .btn-group button {
+    width: auto;
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Dashboard/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Dashboard/Index.js
index 7118f4796c..270eafe0f8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Dashboard/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Dashboard/Index.js
@@ -416,7 +416,7 @@ function highlightSelected(dropdownId,title) {
 }
 
 function initDropdown(dropdownId, title) {
-    $('#' + dropdownId).selectpicker();
+    $('#' + dropdownId).selectpicker({ actionsBox: true });
     $('#' + dropdownId).closest('.bootstrap-select').find('.btn .filter-option-inner-inner').html(title);
     $('#' + dropdownId).closest('.bootstrap-select').find('.btn .filter-option').addClass('button-align-center');
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml
new file mode 100644
index 0000000000..15e47c29f1
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml
@@ -0,0 +1,142 @@
+@page
+@model Unity.GrantManager.Web.Pages.FormConfiguration.NotificationsModel
+@{
+    ViewData["Title"] = "Form Configuration";
+}
+@section Scripts {
+    <script src="/libs/select2/js/select2.min.js"></script>
+    <script src="/js/formConfiguration/NotificationsPreview.js"></script>
+    <script src="/js/formConfiguration/Notifications.js"></script>
+}
+
+
+<div class="container-fluid">
+    <input type="hidden" id="applicationFormId" value="@Model.FormId" />
+    <div class="row mb-3">
+        <div class="col-8">
+            <h3>Form Configuration</h3>
+        </div>
+    </div>
+
+    <ul class="nav nav-tabs mb-3">
+        <li class="nav-item"><a class="nav-link" href="#">Details</a></li>
+        <li class="nav-item"><a class="nav-link" href="#">Workflow</a></li>
+        <li class="nav-item"><a class="nav-link" href="#">Other Configuration</a></li>
+        <li class="nav-item"><a class="nav-link active" href="#">Notifications</a></li>
+    </ul>
+
+    <div class="row">
+        <div class="col-lg-8">
+            <div class="card mb-4">
+                <div class="card-body">
+                    <div class="d-flex justify-content-between align-items-center mb-3">
+                        <h5 class="mb-0">Scheduled Notifications</h5>
+                        <button id="btn-open-create" class="btn btn-primary btn-sm">+ Create Automated Notification</button>
+                    </div>
+
+                    <table id="NotificationsTable" class="table table-striped table-bordered" style="width:100%">
+                        <thead>
+                            <tr>
+                                <th>Template</th>
+                                <th>Trigger Type</th>
+                                <th>Trigger Detail</th>
+                                <th>Status</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="card mb-4 p-3">
+                <h5>Create Automated Email Notification</h5>
+                <div class="row g-3">
+                    <div class="col-md-8">
+                        <div class="mb-3">
+                            <label for="cf_template" class="form-label">Select Template</label>
+                            <select id="cf_template" class="form-select"></select>
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="triggerType" class="form-label">Trigger Type</label>
+                            <div>
+                                <div class="form-check form-check-inline">
+                                    <input class="form-check-input" type="radio" name="triggerType" id="triggerEvent" value="Event" checked>
+                                    <label class="form-check-label" for="triggerEvent">Event</label>
+                                </div>
+                                <div class="form-check form-check-inline">
+                                    <input class="form-check-input" type="radio" name="triggerType" id="triggerDate" value="Date">
+                                    <label class="form-check-label" for="triggerDate">Date</label>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div id="dateSection" style="display:none">
+                            <div class="row">
+                                <div class="col-md-6 mb-3">
+                                    <label for="cf_dateField" class="form-label">Date Field</label>
+                                    <select id="cf_dateField" class="form-select">
+                                        <option value="DueDate">Due Date</option>
+                                        <option value="NotificationDate">Notification Date</option>
+                                        <option value="ProjectStartDate">Project Start Date</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div id="eventSection">
+                            <div class="mb-3">
+                                <label for="cf_eventType" class="form-label">Event Type</label>
+                                <select id="cf_eventType" class="form-select">
+                                    <option value="ApplicationStatusChange">Application Status Change</option>
+                                    <option value="SubmissionCreated">Submission Created</option>
+                                    <option value="AssignmentCompleted">Assignment Completed</option>
+                                </select>
+                            </div>
+
+                            <div class="mb-3">
+                                <label for="cf_appStatus" class="form-label">Application Status</label>
+                                <select id="cf_appStatus" class="form-select"></select>
+                            </div>
+
+                            <div class="mb-3">
+                                <label for="cf_recipientCategory" class="form-label">Recipient Category</label>
+                                <select id="cf_recipientCategory" class="form-select">
+                                    <option value="Internal">Internal</option>
+                                    <option value="External">External</option>
+                                </select>
+                            </div>
+
+                            <div class="mb-3">
+                                <label for="cf_recipient" class="form-label">Recipient</label>
+                                <select id="cf_recipient" class="form-select" multiple></select>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="col-md-4">
+                        <div class="card">
+                            <div class="card-body">
+                                <label for="previewCard" class="form-label">Template Preview</label>
+                                <div id="previewCard" class="border p-2" style="min-height:200px; background:#fff"></div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="col-12 d-flex justify-content-end">
+                        <button id="btn-cancel" class="btn btn-outline-secondary me-2">Cancel</button>
+                        <button id="btn-save" class="btn btn-primary">Save Notification</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="col-lg-4">
+            @* Placeholder for any extra widgets *@
+            @await Component.InvokeAsync("Notifications", new { formid = Model.FormId })
+        </div>
+    </div>
+</div>
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml.cs
new file mode 100644
index 0000000000..8c9075af26
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
+
+namespace Unity.GrantManager.Web.Pages.FormConfiguration
+{
+    public class NotificationsModel(ILogger<NotificationsModel> logger) : PageModel
+    {
+        private readonly ILogger<NotificationsModel> _logger = logger;
+        public required string FormId { get; set; }
+
+        public void OnGet(string formId)
+        {
+            FormId = formId;
+        }
+    }
+}
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 b0c7e6c2c9..a0814ebba0 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
@@ -55,11 +55,12 @@
     <abp-style src="/libs/formiojs/formio.form.css" />
     <abp-style src="/Pages/GrantApplications/Details.css" />
 }
-@section scripts
-{
-    <abp-script src="/Pages/GrantApplications/ai-generation-button-state.js" />
-    <abp-script src="/Pages/GrantApplications/ai-rate-limit.js" />
-    <abp-script src="/Pages/GrantApplications/Details.js" />
+@section scripts
+{
+    <abp-script src="/Pages/GrantApplications/ai-generation-api.js" />
+    <abp-script src="/Pages/GrantApplications/ai-generation-button-state.js" />
+    <abp-script src="/Pages/GrantApplications/ai-rate-limit.js" />
+    <abp-script src="/Pages/GrantApplications/Details.js" />
     <abp-script src="/libs/formiojs/formio.form.min.js" />
     <abp-script src="/Pages/GrantApplications/ai-analysis.js" />
 }
@@ -366,8 +367,7 @@
                 @if (notificationsFeatureEnabled && readEmailGranted)
                 {
                 <div class="tab-pane" id="emails" role="tabpanel" aria-labelledby="emails-tab">
-                    <h6 class="fw-bold px-3 pt-4 pb-2 m-0">Emails</h6>
-                    <div class="px-3 pb-2" id="applicationEmailsWidget">
+                    <div class="px-2 pb-2" id="applicationEmailsWidget">
                         @await Component.InvokeAsync("EmailsWidget", new { applicationId = Model.ApplicationId, currentUserId = Model.CurrentUserId })
                     </div>
                     <h6 class="fw-bold px-3 pt-4 pb-2 m-0">Email History</h6>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
index f7264249c6..9181e20437 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
@@ -18,6 +18,7 @@
 using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.Zones;
 using Unity.Modules.Shared.Correlation;
+using Unity.Modules.Shared.Specializations;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 using Volo.Abp.Features;
 using Volo.Abp.Users;
@@ -114,6 +115,11 @@ public DetailsModel(
 
         public async Task OnGetAsync()
         {
+            if (await _featureChecker.IsEnabledAsync(SpecializationConsts.Onboarding))
+            {
+                ViewData["ActiveNavHref"] = "/TenantManagement/Onboarding";
+            }
+
             ApplicationFormSubmission applicationFormSubmission = await _grantApplicationAppService.GetFormSubmissionByApplicationId(ApplicationId);
             ZoneStateSet = await _zoneManagementAppService.GetZoneStateSetAsync(applicationFormSubmission.ApplicationFormId);
             
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 9adb01aaff..eecf30ac21 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
@@ -272,9 +272,18 @@ select.selected {
     margin-top: 0.8rem;
 }
 
-.details-nav .nav-link {
-    display: flex;
-}
+.details-nav .nav-link {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    height: 42px;
+    line-height: 1.5;
+}
+
+.details-nav .nav-link i {
+    line-height: 1;
+}
 
 .details-nav .nav-link .fl {
     margin-right: 4px;
@@ -338,15 +347,15 @@ select.selected {
     z-index: 999;
 }
 
-#detailsTab .nav-item .nav-link {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.action-bar {
-    display: flex !important;
-}
+#detailsTab .nav-item .nav-link {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.action-bar {
+    display: flex !important;
+}
 
 #DetailsActionBarStart {
     margin-right: 0.5rem;
@@ -388,6 +397,7 @@ form label.error {
 
 #main-divider {
     width: 10px;
+    min-width: 10px;
     background-color: #ccc;
     cursor: col-resize;
     border-radius: 10px;
@@ -677,36 +687,7 @@ form label.error {
     border-color: #f5c2c7;
 }
 
-#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: #dc3545;
-}
-
-.ai-analysis-action-btn {
+.ai-analysis-action-btn {
     background: #ffffff;
     border: 1px solid #d1d5db;
     padding: 4px 10px;
@@ -728,4 +709,4 @@ form label.error {
 
 .worksheet_AssessmentInfo {
     padding-left: 0.5rem;
-}
\ No newline at end of file
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
index 7c10cc14d3..442ec9b777 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
@@ -462,7 +462,9 @@ $(function () {
                     dtApi.ajax.reload(null, false);
                 }
                 initialLoad = false; // Reset flag after use
-            }
+            },
+            enableContextMenu: true,
+            contextMenuActionsSelector: '[data-selector="applications-table-actions"]'
         });
 
         dataTable.on('select', function (e, dt, type, indexes) {
@@ -567,6 +569,7 @@ $(function () {
             getTotalProjectBudgetColumn(columnIndex++),
             getAssigneesColumn(columnIndex++),
             getStatusColumn(columnIndex++),
+            getExternalStatusVisibilityColumn(columnIndex++),
             getRequestedAmountColumn(columnIndex++),
             getApprovedAmountColumn(columnIndex++),
             getEconomicRegionColumn(columnIndex++),
@@ -599,6 +602,7 @@ $(function () {
             getOrganizationTypeColumn(columnIndex++),
             getOrganizationNameColumn(columnIndex++),
             getBusinessNumberColumn(columnIndex++),
+            getApproxNumberOfEmployeesColumn(columnIndex++),
             getDueDiligenceStatusColumn(columnIndex++),
             getDeclineRationaleColumn(columnIndex++),
             getContactFullNameColumn(columnIndex++),
@@ -786,6 +790,19 @@ $(function () {
         }
     }
 
+    function getExternalStatusVisibilityColumn(columnIndex) {
+        return {
+            title: l('ExternalStatusVisibility'),
+            data: 'externalStatusVisibility',
+            name: 'externalStatusVisibility',
+            className: 'data-table-header',
+            render: function (data) {
+                return data ? 'Published' : 'Unpublished';
+            },
+            index: columnIndex
+        }
+    }
+
     function getRequestedAmountColumn(columnIndex) {
         return {
             title: l('RequestedAmount'),
@@ -891,7 +908,7 @@ $(function () {
             data: 'projectStartDate',
             className: 'data-table-header',
             render: function (data, type) {
-                return DateUtils.formatUtcDateToLocal(data, type);
+                return DateUtils.formatDate(data, type);
             },
             index: columnIndex
         }
@@ -904,7 +921,7 @@ $(function () {
             data: 'projectEndDate',
             className: 'data-table-header',
             render: function (data, type) {
-                return DateUtils.formatUtcDateToLocal(data, type);
+                return DateUtils.formatDate(data, type);
             },
             index: columnIndex
         }
@@ -1169,7 +1186,7 @@ $(function () {
             data: 'dueDate',
             className: 'data-table-header',
             render: function (data, type) {
-                return DateUtils.formatUtcDateToLocal(data, type);
+                return DateUtils.formatDate(data, type);
             },
             index: columnIndex
         }
@@ -1196,7 +1213,7 @@ $(function () {
             data: 'finalDecisionDate',
             className: 'data-table-header',
             render: function (data, type) {
-                return DateUtils.formatUtcDateToLocal(data, type);
+                return DateUtils.formatDate(data, type);
             },
             index: columnIndex
         }
@@ -1254,6 +1271,19 @@ $(function () {
         }
     }
 
+    function getApproxNumberOfEmployeesColumn(columnIndex) {
+        return {
+            title: l('Summary:Application.ApproxNumberOfEmployees'),
+            name: 'approxNumberOfEmployees',
+            data: 'applicant.approxNumberOfEmployees',
+            className: 'data-table-header',
+            render: function (data) {
+                return data ?? '';
+            },
+            index: columnIndex
+        }
+    }
+
     function getNonRegisteredOrganizationNameColumn(columnIndex) {
         return {
             title: l('Summary:Application.NonRegOrgName'),
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 c608d0f2ce..84cfa847d8 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
@@ -10,8 +10,14 @@ const dismissedSectionVisibility = {
     recommendation: false
 };
 
-const aiAnalysisPollIntervalMs = 15000;
-const aiAnalysisMaxPollFailures = 3;
+// Preserve the user's collapse choice across analysis rerenders.
+const sectionCollapseState = {
+    error: false,
+    warning: false,
+    summary: false,
+    recommendation: false
+};
+
 let aiAnalysisMonitor = null;
 
 function getAnalysisLabels() {
@@ -170,7 +176,25 @@ function configureSectionStatus($status, text, statusClass) {
         .show();
 }
 
-function setSectionCollapsed($section, $collapseToggle, isCollapsed) {
+function setSectionCollapsed($section, $collapseToggle, isCollapsed, itemType) {
+    const labels = getAnalysisLabels();
+    const $icon = $collapseToggle.find('i');
+
+    if (itemType) {
+        sectionCollapseState[itemType] = isCollapsed;
+    }
+
+    $section.toggleClass('collapsed', isCollapsed);
+    $collapseToggle
+        .attr('aria-expanded', (!isCollapsed).toString())
+        .attr('title', isCollapsed ? labels.expandTitle : labels.collapseTitle);
+
+    $icon
+        .toggleClass('fa-chevron-down', !isCollapsed)
+        .toggleClass('fa-chevron-up', isCollapsed);
+}
+
+function setSectionAutoCollapsed($section, $collapseToggle, isCollapsed) {
     const labels = getAnalysisLabels();
     const $icon = $collapseToggle.find('i');
 
@@ -184,14 +208,19 @@ function setSectionCollapsed($section, $collapseToggle, isCollapsed) {
         .toggleClass('fa-chevron-up', isCollapsed);
 }
 
-function syncSectionCollapseWithVisibleItems($section, $items, $collapseToggle) {
+function applySectionCollapseState($section, $items, $collapseToggle, itemType) {
     const hasVisibleItems = getVisibleAnalysisItems($items).length > 0;
+    const isCollapsed = hasVisibleItems ? sectionCollapseState[itemType] === true : true;
 
     $collapseToggle.prop('disabled', !hasVisibleItems);
-    setSectionCollapsed($section, $collapseToggle, !hasVisibleItems);
+    if (hasVisibleItems) {
+        setSectionCollapsed($section, $collapseToggle, isCollapsed, itemType);
+    } else {
+        setSectionAutoCollapsed($section, $collapseToggle, true);
+    }
 }
 
-function configureCollapseToggle($section, $collapseToggle) {
+function configureCollapseToggle($section, $collapseToggle, itemType) {
     $collapseToggle
         .off('click')
         .on('click', function() {
@@ -200,7 +229,7 @@ function configureCollapseToggle($section, $collapseToggle) {
             }
 
             const isCollapsed = $section.toggleClass('collapsed').hasClass('collapsed');
-            setSectionCollapsed($section, $(this), isCollapsed);
+            setSectionCollapsed($section, $(this), isCollapsed, itemType);
         });
 }
 
@@ -261,7 +290,11 @@ function configureDismissedItemsToggle($section, $items, $toggle, $collapseToggl
             dismissedSectionVisibility[section.itemType] = shouldShow;
             $items.find('.dismissed-item').toggle(shouldShow);
             updateVisibleItemLayout($items);
-            syncSectionCollapseWithVisibleItems($section, $items, $collapseToggle);
+            if (shouldShow) {
+                // Showing dismissed items should reveal the section body.
+                setSectionCollapsed($section, $collapseToggle, false, section.itemType);
+            }
+            applySectionCollapseState($section, $items, $collapseToggle, section.itemType);
             $toggle.text(shouldShow ? labels.hideDismissed : labels.showDismissed);
         });
 }
@@ -282,12 +315,12 @@ function renderSection(section) {
     const isDismissedVisible = dismissedSectionVisibility[section.itemType] === true;
 
     configureSectionStatus($status, section.statusText, section.statusClass);
-    configureCollapseToggle($section, $collapseToggle);
+    configureCollapseToggle($section, $collapseToggle, section.itemType);
     $collapseToggle.toggle(section.hasItems);
 
     appendSectionItems($items, section, isDismissedVisible);
     configureDismissedItemsToggle($section, $items, $toggle, $collapseToggle, section, isDismissedVisible);
-    syncSectionCollapseWithVisibleItems($section, $items, $collapseToggle);
+    applySectionCollapseState($section, $items, $collapseToggle, section.itemType);
 
     return $section;
 }
@@ -449,15 +482,15 @@ globalThis.queueApplicationAnalysis = function(triggerButton = null) {
 
     globalThis.AIGenerationButtonState?.setGenerating($button);
 
-    unity.grantManager.grantApplications.grantApplication
-        .queueApplicationAnalysis(applicationId)
-        .done(function(request) {
-            const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
+    globalThis.AIGenerationApi.queueApplicationAnalysis(applicationId)
+        .done(function(generationStatus) {
+            const request = generationStatus?.generationRequest;
+            const status = String(request?.status ?? '').trim();
 
             if (status === 'Completed') {
                 globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
+                globalThis.AIGenerationButtonState?.applyStatusState(generationStatus);
                 loadAIAnalysis();
-                globalThis.syncAIRateLimitButtons?.();
                 return;
             }
 
@@ -478,10 +511,7 @@ function monitorAIAnalysisGeneration(applicationId, $button, existingHtml) {
     aiAnalysisMonitor = globalThis.AIGenerationButtonState.monitor({
         $button,
         originalHtml: existingHtml,
-        intervalMs: aiAnalysisPollIntervalMs,
-        maxFailures: aiAnalysisMaxPollFailures,
-        getStatus: () => unity.grantManager.grantApplications.grantApplication
-            .getAIGenerationStatus(applicationId, 'application-analysis'),
+        getStatus: () => globalThis.AIGenerationApi.getStatus(applicationId, 'application-analysis'),
         onComplete: loadAIAnalysis,
         onFailed: (request) => {
             loadAIAnalysis();
@@ -538,16 +568,13 @@ $(function() {
             return;
         }
 
-        unity.grantManager.grantApplications.grantApplication
-            .getAIGenerationStatus(applicationId, 'application-analysis')
-            .done(function(request) {
-                if (request?.isActive !== true) {
-                    return;
-                }
-
-                const existingHtml = $regenerateButton.html();
-                globalThis.AIGenerationButtonState?.setGenerating($regenerateButton);
-                monitorAIAnalysisGeneration(applicationId, $regenerateButton, existingHtml);
-            });
+        globalThis.AIGenerationApi.getStatus(applicationId, 'application-analysis').done(function(generationStatus) {
+            if (generationStatus?.generationRequest?.isActive !== true) {
+                return;
+            }
+            const existingHtml = $regenerateButton.html();
+            globalThis.AIGenerationButtonState?.setGenerating($regenerateButton);
+            monitorAIAnalysisGeneration(applicationId, $regenerateButton, existingHtml);
+        });
     }
 });
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-api.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-api.js
new file mode 100644
index 0000000000..e9ea11feae
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-api.js
@@ -0,0 +1,42 @@
+(function (global) {
+    function request(url, type, data = null, contentType = null) {
+        const options = { url, type };
+        if (data !== null) {
+            options.data = data;
+        }
+        if (contentType) {
+            options.contentType = contentType;
+        }
+
+        return abp.ajax(options);
+    }
+
+    global.AIGenerationApi = {
+        queueApplicationAnalysis(applicationId) {
+            return request(
+                `/api/app/ai/generation/application-analysis?applicationId=${encodeURIComponent(applicationId)}`,
+                'POST'
+            );
+        },
+        queueApplicationScoring(applicationId) {
+            return request(
+                `/api/app/ai/generation/application-scoring?applicationId=${encodeURIComponent(applicationId)}`,
+                'POST'
+            );
+        },
+        queueAttachmentSummary(input) {
+            return request(
+                '/api/app/ai/generation/attachment-summary',
+                'POST',
+                JSON.stringify(input),
+                'application/json'
+            );
+        },
+        getStatus(applicationId, operationType) {
+            return request(
+                `/api/app/ai/generation/status?applicationId=${encodeURIComponent(applicationId)}&operationType=${encodeURIComponent(operationType)}`,
+                'GET'
+            );
+        },
+    };
+})(globalThis);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button-state.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button-state.js
index 7424d1591a..dd9bf0bef6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button-state.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button-state.js
@@ -13,23 +13,19 @@
             .prop('disabled', true);
     }
 
+    function applyRateLimitState(generationStatus, options = {}) {
+        global.applyAIRateLimitState?.(
+            {
+                isGenerating: generationStatus?.isGenerating === true,
+                retryAfterSeconds: Number(generationStatus?.retryAfterSeconds) || 0
+            },
+            { pollWhenGenerating: options.pollWhenGenerating === true }
+        );
+    }
+
     global.AIGenerationButtonState = {
-        resolveStatus(status) {
-            switch (Number(status)) {
-                case 0:
-                    return 'Queued';
-                case 1:
-                    return 'Running';
-                case 2:
-                    return 'Completed';
-                case 3:
-                    return 'Failed';
-                default:
-                    return '';
-            }
-        },
         setGenerating($button) {
-            global.setAIGenerationButtonsGenerating?.();
+            global.setAIGenerationButtonsGenerating?.({ poll: false });
         },
         restore($button) {
             $button.removeClass('disabled');
@@ -37,11 +33,17 @@
         restoreForCooldownCheck($button, html) {
             restoreButtonForCooldownCheck($button, html);
         },
+        applyStatusState(generationStatus) {
+            applyRateLimitState(generationStatus, { pollWhenGenerating: true });
+        },
         monitor(options) {
-            const intervalMs = options.intervalMs || 15000;
+            const intervalMs = options.intervalMs || 5000;
+            const activeIntervalMs = options.activeIntervalMs || 1000;
+            const activePollCount = options.activePollCount || 30;
             const maxFailures = options.maxFailures || 3;
             let timeoutId = null;
             let failures = 0;
+            let pollCount = 0;
 
             const stop = () => {
                 if (timeoutId) {
@@ -50,28 +52,48 @@
                 }
             };
 
+            const scheduleNextPoll = () => {
+                pollCount += 1;
+                const nextIntervalMs = pollCount <= activePollCount
+                    ? activeIntervalMs
+                    : intervalMs;
+
+                timeoutId = setTimeout(poll, nextIntervalMs);
+            };
+
             const poll = () => {
                 options.getStatus()
-                    .done((request) => {
+                    .done((generationStatus) => {
                         failures = 0;
-                        const status = this.resolveStatus(request?.status);
+                        const request = generationStatus?.generationRequest;
+                        const status = String(request?.status ?? '').trim();
 
                         if (status === 'Failed') {
                             stop();
                             restoreButton(options.$button, options.originalHtml);
+                            applyRateLimitState(generationStatus, { pollWhenGenerating: true });
+                            options.onPollFailed?.(new Error(generationStatus?.failureReason || 'AI generation failed.'));
                             options.onFailed?.(request);
                             return;
                         }
+                        if (!request) {
+                            stop();
+                            restoreButton(options.$button, options.originalHtml);
+                            global.refreshAIRateLimitState?.();
+                            options.onMissing?.();
+                            return;
+                        }
 
-                        if (!request || request.isActive === false || status === 'Completed') {
+                        if (request.isActive !== true) {
                             stop();
                             restoreButtonForCooldownCheck(options.$button, options.originalHtml);
+                            applyRateLimitState(generationStatus, { pollWhenGenerating: true });
                             options.onComplete?.(request);
-                            global.syncAIRateLimitButtons?.();
                             return;
                         }
 
-                        timeoutId = setTimeout(poll, intervalMs);
+                        applyRateLimitState(generationStatus);
+                        scheduleNextPoll();
                     })
                     .fail((error) => {
                         failures += 1;
@@ -82,7 +104,7 @@
                             return;
                         }
 
-                        timeoutId = setTimeout(poll, intervalMs);
+                        scheduleNextPoll();
                     });
             };
 
@@ -91,4 +113,5 @@
             return { stop };
         },
     };
+
 })(globalThis);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js
index 6ee671727d..6f0faeec84 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js
@@ -8,6 +8,7 @@
     const ATTR_COOLDOWN = 'data-ai-cooldown-active';
     const ATTR_CHECKING = 'data-ai-cooldown-checking';
     const ATTR_OWNED_DISABLED = 'data-ai-rate-limit-disabled';
+    const ATTR_LOCAL_DISABLED = 'data-ai-local-disabled';
     const ATTR_SHARED_GENERATING = 'data-ai-shared-generating';
 
     let countdownTimer = null;
@@ -60,7 +61,9 @@
         btn.removeAttribute(ATTR_SHARED_GENERATING);
         if (btn.getAttribute(ATTR_OWNED_DISABLED) === '1') {
             btn.removeAttribute(ATTR_OWNED_DISABLED);
-            btn.removeAttribute('disabled');
+            if (btn.getAttribute(ATTR_LOCAL_DISABLED) !== '1') {
+                btn.removeAttribute('disabled');
+            }
         }
         btn.classList.remove('disabled');
         const original = btn.getAttribute(ATTR_LABEL);
@@ -87,7 +90,9 @@
         btn.removeAttribute(ATTR_CHECKING);
         if (btn.getAttribute(ATTR_OWNED_DISABLED) === '1') {
             btn.removeAttribute(ATTR_OWNED_DISABLED);
-            btn.removeAttribute('disabled');
+            if (btn.getAttribute(ATTR_LOCAL_DISABLED) !== '1') {
+                btn.removeAttribute('disabled');
+            }
         }
     }
 
@@ -121,12 +126,14 @@
         }
     }
 
-    function applyGenerating() {
+    function applyGenerating(options = {}) {
         currentState = { mode: 'generating' };
         renderState();
 
         clearStatePollTimer();
-        statePollTimer = setTimeout(() => fetchState(true), 2000);
+        if (options.poll !== false) {
+            statePollTimer = setTimeout(() => fetchState(true), 2000);
+        }
     }
 
     function renderGenerating() {
@@ -223,29 +230,34 @@
                 return;
             }
             const data = await res.json();
-            if (data.isGenerating === true) {
-                applyGenerating();
-                return;
-            }
-
-            applyCooldown(Number(data.retryAfterSeconds) || 0);
+            applyRateLimitState(data);
         } catch (_) {
             // Best-effort; the server is the source of truth.
             handleStateFetchFailure();
         }
     }
 
+    function applyRateLimitState(data, options = {}) {
+        if (data?.isGenerating === true) {
+            applyGenerating({ poll: options.pollWhenGenerating !== false });
+            return;
+        }
+
+        applyCooldown(Number(data?.retryAfterSeconds) || 0);
+    }
+
     globalThis.syncAIRateLimitButtons = () => {
         renderState();
         fetchState(true);
     };
     globalThis.setAIGenerationButtonsGenerating = applyGenerating;
+    globalThis.applyAIRateLimitState = applyRateLimitState;
     globalThis.refreshAIRateLimitState = globalThis.syncAIRateLimitButtons;
 
     document.addEventListener('click', (e) => {
         const btn = e.target.closest(BUTTON_SELECTOR);
         if (!btn) return;
-        applyGenerating();
+        applyGenerating({ poll: false });
     });
 
     document.addEventListener('DOMContentLoaded', () => {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml.cs
index 7e062d57dc..03f99656b3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml.cs
@@ -5,6 +5,8 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Threading.Tasks;
+using Unity.Modules.Shared.Specializations;
+using Volo.Abp.Features;
 using Volo.Abp.Security.Claims;
 
 namespace Unity.GrantManager.Web.Pages.GrantPrograms
@@ -16,12 +18,15 @@ public class IndexModel : GrantManagerPageModel
 
         private readonly ICurrentPrincipalAccessor _currentPrincipalAccessor;
         private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IFeatureChecker _featureChecker;
 
         public IndexModel(ICurrentPrincipalAccessor currentPrincipalAccessor,
-            IHttpContextAccessor httpContextAccessor)
+            IHttpContextAccessor httpContextAccessor,
+            IFeatureChecker featureChecker)
         {
             _currentPrincipalAccessor = currentPrincipalAccessor;
             _httpContextAccessor = httpContextAccessor;
+            _featureChecker = featureChecker;
         }
 
         public void OnGet()
@@ -31,20 +36,33 @@ public void OnGet()
 
         public async Task<IActionResult> OnPostAsync()
         {
-            // Try update claims principal on the fly? - seems to cause some issues, so far only reliable way to do this is signout and go through the auth process again            
-            if (_httpContextAccessor != null && _httpContextAccessor.HttpContext != null)
+            // Determine landing page for the target tenant before signing out
+            var redirectUrl = "/GrantApplications";
+            if (SwapTenantId.HasValue)
+            {
+                using (CurrentTenant.Change(SwapTenantId))
+                {
+                    if (await _featureChecker.IsEnabledAsync(SpecializationConsts.Onboarding))
+                    {
+                        redirectUrl = "/TenantManagement/Onboarding";
+                    }
+                }
+            }
+
+            // Signout and re-auth is the only reliable way to swap tenant claims
+            if (_httpContextAccessor?.HttpContext != null)
             {
                 await _httpContextAccessor.HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
                 await _httpContextAccessor.HttpContext.SignOutAsync(OpenIdConnectDefaults.AuthenticationScheme);
             }
 
-            if (_currentPrincipalAccessor != null && _currentPrincipalAccessor.Principal != null)
+            if (_currentPrincipalAccessor?.Principal != null)
             {
                 Response.Cookies.Append("set_tenant", SwapTenantId?.ToString() ?? Guid.Empty.ToString(), new CookieOptions()
-                { Secure = true, SameSite = SameSiteMode.None, HttpOnly = true });                
-            }            
+                { Secure = true, SameSite = SameSiteMode.None, HttpOnly = true });
+            }
 
-            return Redirect("/GrantApplications");
+            return Redirect(redirectUrl);
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.js
index 1def43a2f3..6296adff43 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.js
@@ -61,7 +61,9 @@
         dataTableName: 'UserGrantProgramsTable',
         dynamicButtonContainerId: 'dynamicButtonContainerId',
         externalSearchId: 'search-grant-programs',
-        disableColumnSelect: true
+        disableColumnSelect: true,
+        enableContextMenu: true,
+        contextMenuActionsSelector: '[data-selector="programs-table-actions"]'
     });
 });
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.js
index 18b6f5f0fd..3ca3264525 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.js
@@ -108,7 +108,9 @@
         dynamicButtonContainerId: 'dynamicButtonContainerId',
         useNullPlaceholder: true,
         externalSearchId: 'search-intakes',
-        fixedHeaders: true
+        fixedHeaders: true,
+        enableContextMenu: true,
+        contextMenuActionsSelector: '[data-selector="intakes-table-actions"]'
     });
 
     createModal.onResult(function () {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.js
index 890582ea83..fea0af5c6d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.js
@@ -42,6 +42,8 @@
         dataTableName: 'AuditHistoryTable',
         dynamicButtonContainerId: 'dynamicButtonContainerId',
         externalSearchId: 'search-payment-history',
+        enableContextMenu: true,
+        contextMenuActionsSelector: '[data-selector="paymenthistory-table-actions"]'
     });
 
     function getColumns() {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
index 7a1e3dad87..e749facf27 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
@@ -12,6 +12,20 @@
 
 <form id="ZoneManagementForm" method="post" asp-page="/SettingManagement/ZoneManagement" data-script-class="abp.modals.ZoneManagement">
     <div class="container-fluid">
+        <div class="configuration-action-bar row">
+            <div class="col-12 col-md-8">
+                <h5>User Interface Configuration</h5>
+            </div>
+            <div class="col-12 col-md-4 btn-wrapper">
+                <abp-button button-type="Primary" 
+                            text="Save" icon-type="Other" icon="fl fl-save"
+                            class="btn unt-btn-primary btn-primary"
+                            type="submit"></abp-button>
+                <abp-button id="btn-cancel" 
+                            class="btn unt-btn-outline-primary btn-outline-primary"
+                            abp-tooltip="Navigate back to the Forms">Back</abp-button>
+            </div>
+        </div>
         <div class="row">
             <div class="col-12">
                 <input asp-for="@Model.ProviderKey" />
@@ -55,20 +69,6 @@
                                 </div>
                             </div>
                         </div>
-
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-12">
-                <div class="d-flex justify-content-start">
-                    <abp-button button-type="Primary" 
-                                text="Save"
-                                icon-type="Other"
-                                icon="fl fl-save"
-                                class="btn unt-btn-primary btn-primary"
-                                type="submit"></abp-button>
-                    <abp-button id="btn-cancel" class="btn unt-btn-outline-primary btn-outline-primary mx-1" abp-tooltip="Navigate back to the Forms">Back</abp-button>
-                </div>
             </div>
         </div>
     </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.cshtml
index 7e5f6dd9fd..25f57c64a1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.cshtml
@@ -30,6 +30,9 @@
         <li id="reconciliation-report-menu-item" class="nav-item btn btn-nav active">
             Reconciliation Report
         </li>
+        <li id="background-jobs-menu-item" class="nav-item btn btn-nav">
+            Background Jobs
+        </li>
     </ul>
 </div>
 
@@ -85,3 +88,7 @@
         </div>
     </div>
 </div>
+
+<div id="background-jobs-div" class="input-area card mb-3 background-jobs hide">
+    @await Component.InvokeAsync("BackgroundJobs")
+</div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.css
index 7763e74cad..d161beabb7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.css
@@ -11,6 +11,15 @@
     flex: none;
 }
 
+#background-jobs-div {
+    width:70%;
+    min-width:700px;
+}
+
+.background-jobs {
+    flex: none;
+}
+
 .card {
     padding: 1rem;
     max-height: 80vh;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.js
index f8ac6a2f21..782380d2a5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.js
@@ -8,6 +8,8 @@ $(function () {
     const UIElements = {
         reconciliationReportMenu: $('#reconciliation-report-menu-item'),
         reconciliationReportDiv: $('#reconciliation-report-div'),
+        backgroundJobsMenu: $('#background-jobs-menu-item'),
+        backgroundJobsDiv: $('#background-jobs-div'),
         reconciliationTable: $('#ReconciliationTable'),
         tenantFilter: $('#ReconciliationTenantFilter'),
         quickDateRange: $('#quickDateRange'),
@@ -26,6 +28,7 @@ $(function () {
 
     function bindUIElements() {
         UIElements.reconciliationReportMenu.on('click', menuItemClick);
+        UIElements.backgroundJobsMenu.on('click', menuItemClick);
         UIElements.tenantFilter.on('change', handleTenantChange);
         UIElements.quickDateRange.on('change', handleQuickDateRangeChange);
         UIElements.submittedFromDate.on('change', handleCustomDateChange);
@@ -35,17 +38,26 @@ $(function () {
     // ── Side menu ──
     function removeActiveClassFromMenuItems() {
         UIElements.reconciliationReportMenu.removeClass('active');
+        UIElements.backgroundJobsMenu.removeClass('active');
+    }
+
+    function hideAllContentSections() {
+        UIElements.reconciliationReportDiv.addClass('hide');
+        UIElements.backgroundJobsDiv.addClass('hide');
     }
 
     function menuItemClick(e) {
         removeActiveClassFromMenuItems();
+        hideAllContentSections();
         $(e.currentTarget).addClass('active');
 
-        UIElements.reconciliationReportDiv.addClass('hide');
-        UIElements.reconciliationReportDiv.removeClass('hide');
-
-        if (recDt) {
-            recDt.columns.adjust().draw();
+        if ($(e.currentTarget).attr('id') === 'reconciliation-report-menu-item') {
+            UIElements.reconciliationReportDiv.removeClass('hide');
+            if (recDt) {
+                recDt.columns.adjust().draw();
+            }
+        } else if ($(e.currentTarget).attr('id') === 'background-jobs-menu-item') {
+            UIElements.backgroundJobsDiv.removeClass('hide');
         }
     }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Utilities/HtmlHelperExtensions.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Utilities/HtmlHelperExtensions.cs
new file mode 100644
index 0000000000..b7cfad3c89
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Utilities/HtmlHelperExtensions.cs
@@ -0,0 +1,39 @@
+using Ganss.Xss;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Unity.GrantManager.Web.Utilities;
+
+public static class HtmlHelperExtensions
+{
+    private static readonly HtmlSanitizer _sanitizer = BuildSanitizer();
+
+    public static IHtmlContent SanitizeRaw(this IHtmlHelper _, string? value)
+    {
+        if (string.IsNullOrEmpty(value)) return HtmlString.Empty;
+        return new HtmlString(_sanitizer.Sanitize(value));
+    }
+
+    private static HtmlSanitizer BuildSanitizer()
+    {
+        var sanitizer = new HtmlSanitizer();
+
+        sanitizer.AllowedTags.Clear();
+        sanitizer.AllowedTags.UnionWith(
+        [
+            "a", "b", "blockquote", "br", "code", "del", "em",
+            "h1", "h2", "h3", "h4", "h5", "h6", "hr", "i",
+            "li", "ol", "p", "pre", "s", "span", "strong", "u", "ul"
+        ]);
+
+        sanitizer.AllowedAttributes.Clear();
+        sanitizer.AllowedAttributes.UnionWith(["href", "rel", "target", "title"]);
+
+        sanitizer.AllowedSchemes.Clear();
+        sanitizer.AllowedSchemes.UnionWith(["http", "https", "mailto"]);
+
+        sanitizer.AllowedCssProperties.Clear();
+
+        return sanitizer;
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobScriptBundleContributor.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobScriptBundleContributor.cs
index e4cd420b85..d435f7735e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobScriptBundleContributor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobScriptBundleContributor.cs
@@ -7,6 +7,6 @@ public class BackgroundJobsScriptBundleContributor : BundleContributor
 {
     public override void ConfigureBundle(BundleConfigurationContext context)
     {
-        context.Files.AddIfNotContains("/Views/Settings/BackgroundJobsGroup/Default.js");
+
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobsSettingViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobsSettingViewModel.cs
index e877cf1185..e4db9eef73 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobsSettingViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobsSettingViewModel.cs
@@ -12,6 +12,12 @@ public class BackgroundJobsViewModel
     [Display(Name="Intake Resynch Schedule")]
     public string IntakeResyncExpression { get; set; } = string.Empty;
 
+    [ReadOnlyInput]
+    [DisabledInput]
+    [ReadOnly(true)]
+    [Display(Name="Intake Resynch Schedule Description", Description="English description of when intake resyncing occurs")]
+    public string IntakeResyncExpressionDescription { get; set; } = string.Empty;
+
     [ReadOnlyInput]
     [DisabledInput]
     [ReadOnly(true)]
@@ -23,10 +29,34 @@ public class BackgroundJobsViewModel
     [ReadOnly(true)]
     [Display(Name="CAS Payments Reconciliation Schedule")]
     public string CasPaymentsReconciliationProducerExpression { get; set; } = string.Empty;
+
+    [ReadOnlyInput]
+    [DisabledInput]
+    [ReadOnly(true)]
+    [Display(Name="CAS Payments Reconciliation Schedule Description", Description="English description of when payment reconciliation occurs")]
+    public string CasPaymentsReconciliationProducerExpressionDescription { get; set; } = string.Empty;
     
     [ReadOnlyInput]
     [DisabledInput]
     [ReadOnly(true)]
     [Display(Name="CAS Payments Financial Notification Schedule")]
     public string CasFinancialNotificationSummaryProducerExpression { get; set; } = string.Empty;
+
+    [ReadOnlyInput]
+    [DisabledInput]
+    [ReadOnly(true)]
+    [Display(Name="CAS Payments Financial Notification Schedule Description", Description="English description of when financial notifications are sent")]
+    public string CasFinancialNotificationSummaryProducerExpressionDescription { get; set; } = string.Empty;
+
+    [ReadOnlyInput]
+    [DisabledInput]
+    [ReadOnly(true)]
+    [Display(Name="Date-Based Notification Schedule")]
+    public string DateBasedNotificationScheduleExpression { get; set; } = "0 0 2 * * ?";
+
+    [ReadOnlyInput]
+    [DisabledInput]
+    [ReadOnly(true)]
+    [Display(Name="Date-Based Notification Schedule Description", Description="English description of when date-based scheduled notifications are processed")]
+    public string DateBasedNotificationScheduleExpressionDescription { get; set; } = "Every day at 2:00 AM";
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobsViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobsViewComponent.cs
index c4e4cc6d5e..7902001a81 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobsViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/BackgroundJobsViewComponent.cs
@@ -6,6 +6,7 @@
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 using Volo.Abp.SettingManagement;
+using System.Linq;
 
 namespace Unity.GrantManager.Web.Views.Settings.BackgroundJobsSettingGroup;
 
@@ -17,14 +18,101 @@ public class BackgroundJobsViewComponent(ISettingManager settingsManager) : AbpV
 {
     public virtual async Task<IViewComponentResult> InvokeAsync()
     {
+        var intakeResyncExpr = await Task.Run(() => SettingDefinitions.GetSettingsValue(settingsManager, SettingsConstants.BackgroundJobs.IntakeResync_Expression));
+        var casPaymentsReconciliationExpr = await Task.Run(() => SettingDefinitions.GetSettingsValue(settingsManager, PaymentSettingsConstants.BackgroundJobs.CasPaymentsReconciliation_ProducerExpression));
+        var casFinancialNotificationExpr = await Task.Run(() => SettingDefinitions.GetSettingsValue(settingsManager, PaymentSettingsConstants.BackgroundJobs.CasFinancialNotificationSummary_ProducerExpression));
+        var dateBasedNotificationExpr = await Task.Run(() => SettingDefinitions.GetSettingsValue(settingsManager, SettingsConstants.BackgroundJobs.DateBasedNotificationSchedule_Expression));
+
         var model = new BackgroundJobsViewModel
         {
-            IntakeResyncExpression = await Task.Run(() => SettingDefinitions.GetSettingsValue(settingsManager, SettingsConstants.BackgroundJobs.IntakeResync_Expression)),
+            IntakeResyncExpression = intakeResyncExpr,
+            IntakeResyncExpressionDescription = ConvertCronToEnglish(intakeResyncExpr),
             IntakeNumberOfDays =  await Task.Run(() => SettingDefinitions.GetSettingsValue(settingsManager, SettingsConstants.BackgroundJobs.IntakeResync_NumDaysToCheck)),
-            CasPaymentsReconciliationProducerExpression =  await Task.Run(() => SettingDefinitions.GetSettingsValue(settingsManager, PaymentSettingsConstants.BackgroundJobs.CasFinancialNotificationSummary_ProducerExpression)),
-            CasFinancialNotificationSummaryProducerExpression =  await Task.Run(() => SettingDefinitions.GetSettingsValue(settingsManager, PaymentSettingsConstants.BackgroundJobs.CasFinancialNotificationSummary_ProducerExpression))
+            CasPaymentsReconciliationProducerExpression = casPaymentsReconciliationExpr,
+            CasPaymentsReconciliationProducerExpressionDescription = ConvertCronToEnglish(casPaymentsReconciliationExpr),
+            CasFinancialNotificationSummaryProducerExpression = casFinancialNotificationExpr,
+            CasFinancialNotificationSummaryProducerExpressionDescription = ConvertCronToEnglish(casFinancialNotificationExpr),
+            DateBasedNotificationScheduleExpression = dateBasedNotificationExpr,
+            DateBasedNotificationScheduleExpressionDescription = ConvertCronToEnglish(dateBasedNotificationExpr)
         };
 
         return View("~/Views/Settings/BackgroundJobsSettingGroup/Default.cshtml", model);
     }
+
+    private static string ConvertCronToEnglish(string cronExpression)
+    {
+        if (string.IsNullOrEmpty(cronExpression))
+            return "Not configured";
+
+        // Parse CRON expression and convert to English description
+        // Format: second minute hour day month dayOfWeek [year]
+        var parts = cronExpression.Split(' ');
+        if (parts.Length < 6)
+            return cronExpression; // Return as-is if invalid format
+
+        var minute = parts[1];
+        var hour = parts[2];
+        var day = parts[3];
+        var month = parts[4];
+        var dayOfWeek = parts[5];
+
+        // Build English description based on pattern
+        // Daily schedule: hour and minute specified, day/month/dayOfWeek are wildcards
+        if (hour != "*" && minute != "*" && (day == "*" || day == "1/1") && month == "*" && dayOfWeek == "?")
+        {
+            // Handle multiple hours (e.g., "7,19" = 7 AM and 7 PM)
+            if (hour.Contains(","))
+            {
+                var hours = hour.Split(',');
+                var times = hours.Select(h => FormatTime(h, minute)).ToList();
+                return $"Every day at {string.Join(" and ", times)}";
+            }
+            else
+            {
+                var timeStr = FormatTime(hour, minute);
+                return $"Every day at {timeStr}";
+            }
+        }
+        else if ((day != "*" && day != "1/1") && month == "*" && dayOfWeek == "?")
+        {
+            // Monthly at specific date
+            var timeStr = FormatTime(hour, minute);
+            return $"On day {day} of each month at {timeStr}";
+        }
+        else if (dayOfWeek != "?" && dayOfWeek != "*" && hour != "*" && minute != "*")
+        {
+            // Weekly at specific day and time
+            var dayName = GetDayName(dayOfWeek);
+            var timeStr = FormatTime(hour, minute);
+            return $"Every {dayName} at {timeStr}";
+        }
+
+        return cronExpression; // Return as-is if pattern not recognized
+    }
+
+    private static string FormatTime(string hour, string minute)
+    {
+        if (!int.TryParse(hour, out var hourInt) || !int.TryParse(minute, out var minuteInt))
+            return $"{hour}:{minute.PadLeft(2, '0')}";
+
+        var ampm = hourInt >= 12 ? "PM" : "AM";
+        var displayHour = hourInt == 0 ? 12 : (hourInt > 12 ? hourInt - 12 : hourInt);
+        
+        return $"{displayHour}:{minuteInt:D2} {ampm}";
+    }
+
+    private static string GetDayName(string dayOfWeek)
+    {
+        return dayOfWeek switch
+        {
+            "0" or "7" => "Sunday",
+            "1" => "Monday",
+            "2" => "Tuesday",
+            "3" => "Wednesday",
+            "4" => "Thursday",
+            "5" => "Friday",
+            "6" => "Saturday",
+            _ => dayOfWeek
+        };
+    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/Default.cshtml
index 77e2cc979a..600119c8fd 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/Default.cshtml
@@ -6,26 +6,60 @@
     </div>
     <div class="p-3">
         <form id="BackgroundJobsSettingsForm">
+            <!-- Intake Resync Schedule -->
             <abp-row>
                 <abp-column size-md="_12" class="mx-2 fw-bold">
                     <abp-input asp-for="@Model.IntakeResyncExpression" />
                 </abp-column>
             </abp-row>
+            <abp-row>
+                <abp-column size-md="_12" class="mx-2 mb-3">
+                    <small class="form-text text-muted">@Model.IntakeResyncExpressionDescription</small>
+                </abp-column>
+            </abp-row>
+
+            <!-- Intake Resync Number of Days -->
             <abp-row>
                 <abp-column size-md="_12" class="mx-2 fw-bold">
                     <abp-input asp-for="@Model.IntakeNumberOfDays" />
                 </abp-column>
             </abp-row>
+
+            <!-- CAS Payments Reconciliation Schedule -->
             <abp-row>
                 <abp-column size-md="_12" class="mx-2 fw-bold">
                     <abp-input asp-for="@Model.CasPaymentsReconciliationProducerExpression" />
                 </abp-column>
             </abp-row>
+            <abp-row>
+                <abp-column size-md="_12" class="mx-2 mb-3">
+                    <small class="form-text text-muted">@Model.CasPaymentsReconciliationProducerExpressionDescription</small>
+                </abp-column>
+            </abp-row>
+
+            <!-- CAS Financial Notification Schedule -->
             <abp-row>
                 <abp-column size-md="_12" class="mx-2 fw-bold">
                     <abp-input asp-for="@Model.CasFinancialNotificationSummaryProducerExpression" />
                 </abp-column>
             </abp-row>
+            <abp-row>
+                <abp-column size-md="_12" class="mx-2 mb-3">
+                    <small class="form-text text-muted">@Model.CasFinancialNotificationSummaryProducerExpressionDescription</small>
+                </abp-column>
+            </abp-row>
+
+            <!-- Date-Based Notification Schedule -->
+            <abp-row>
+                <abp-column size-md="_12" class="mx-2 fw-bold">
+                    <abp-input asp-for="@Model.DateBasedNotificationScheduleExpression" />
+                </abp-column>
+            </abp-row>
+            <abp-row>
+                <abp-column size-md="_12" class="mx-2 mb-3">
+                    <small class="form-text text-muted">@Model.DateBasedNotificationScheduleExpressionDescription</small>
+                </abp-column>
+            </abp-row>
         </form>
     </div>
 </div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/Default.js
deleted file mode 100644
index 436c3baea4..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/BackgroundJobsSettingGroup/Default.js
+++ /dev/null
@@ -1 +0,0 @@
-abp.log.debug('BackgroundJobs initialized!');
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/CharacterCounter.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/CharacterCounter.js
new file mode 100644
index 0000000000..b12554690d
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/CharacterCounter.js
@@ -0,0 +1,42 @@
+(function ($) {
+    window.UnityCharacterCounter = {
+        init: function (containerSelector) {
+            const $container = $(containerSelector || document);
+
+            $container.find('[data-char-count]').each(function () {
+                const $input = $(this);
+                const maxLength = Number.parseInt($input.attr('data-char-count'), 10);
+
+                if (Number.isNaN(maxLength)) {
+                    return;
+                }
+
+                // Create wrapper with relative positioning (idempotent)
+                if ($input.data('unityCharCounterInitialized')) {
+                    return;
+                }
+                $input.data('unityCharCounterInitialized', true);
+
+                if (!$input.parent().hasClass('char-counter-wrapper')) {
+                    $input.wrap('<div class="char-counter-wrapper"></div>');
+                }
+
+                let $counter = $input.siblings('.char-counter');
+                if (!$counter.length) {
+                    $counter = $('<div class="char-counter"></div>').insertAfter($input);
+                }
+                const updateCounter = () => {
+                    const currentLength = $input.val().length;
+                    $counter.text(currentLength + '/' + maxLength);
+
+                    const percentageUsed = (currentLength / maxLength) * 100;
+                    $counter.toggleClass('char-counter-critical', percentageUsed >= 95);
+                    $counter.toggleClass('char-counter-warning', percentageUsed >= 80 && percentageUsed < 95);
+                };
+
+                $input.on('input', updateCounter);
+                updateCounter();
+            });
+        }
+    };
+})(jQuery);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetails.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetails.css
new file mode 100644
index 0000000000..d6e9ad6991
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetails.css
@@ -0,0 +1,26 @@
+.char-counter-wrapper {
+    position: relative;
+    display: block;
+}
+
+.char-counter {
+    position: absolute;
+    top: 0;
+    right: 8px;
+    font-size: 0.65rem;
+    font-style: italic;
+    color: #6c757d;
+    white-space: nowrap;
+    padding: 4px 0;
+    pointer-events: none;
+}
+
+.char-counter-warning {
+    color: #ffc107;
+    font-weight: 500;
+}
+
+.char-counter-critical {
+    color: #dc3545;
+    font-weight: 500;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetails.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetails.js
new file mode 100644
index 0000000000..44b721d4a5
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetails.js
@@ -0,0 +1,114 @@
+(function ($) {
+    const l = abp.localization.getResource('GrantManager');
+
+    function debounce(func, wait) {
+        let timeout;
+        return function () {
+            clearTimeout(timeout);
+            timeout = setTimeout(func, wait);
+        };
+    }
+
+    const $programDetailsForm = $('#ProgramDetailsForm');
+    if (!$programDetailsForm.length) {
+        return;
+    }
+
+    UnityCharacterCounter.init('#ProgramDetailsForm');
+
+    const $programDetailsSaveButton = $('#ProgramDetailsSaveButton');
+    const $programDetailsResetButton = $('#ProgramDetailsResetButton');
+    const $displayNameInput = $('#ProgramDetailsDisplayName');
+    const $divisionInput = $('#ProgramDetailsDivision');
+    const $branchInput = $('#ProgramDetailsBranch');
+    const $descriptionInput = $('#ProgramDetailsDescription');
+
+    const originalProgramDetailsValues = {
+        displayName: $displayNameInput.val().trim(),
+        division: $divisionInput.val().trim(),
+        branch: $branchInput.val().trim(),
+        description: $descriptionInput.val().trim()
+    };
+
+    const getProgramDetailsValues = () => {
+        return {
+            displayName: $displayNameInput.val().trim(),
+            division: $divisionInput.val().trim(),
+            branch: $branchInput.val().trim(),
+            description: $descriptionInput.val().trim()
+        };
+    };
+
+    const hasProgramDetailsChanges = () => {
+        const currentValues = getProgramDetailsValues();
+        return currentValues.displayName !== originalProgramDetailsValues.displayName
+            || currentValues.division !== originalProgramDetailsValues.division
+            || currentValues.branch !== originalProgramDetailsValues.branch
+            || currentValues.description !== originalProgramDetailsValues.description;
+    };
+
+    const updateProgramDetailsButtonStates = () => {
+        const changed = hasProgramDetailsChanges();
+        $programDetailsSaveButton.prop('disabled', !changed);
+        $programDetailsResetButton.prop('disabled', !changed);
+    };
+
+    const debouncedProgramDetailsButtonUpdate = debounce(updateProgramDetailsButtonStates, 150);
+
+    $programDetailsForm.on('input', 'input, textarea', function () {
+        debouncedProgramDetailsButtonUpdate();
+    });
+
+    $programDetailsResetButton.on('click', function (e) {
+        e.preventDefault();
+        $displayNameInput.val(originalProgramDetailsValues.displayName);
+        $divisionInput.val(originalProgramDetailsValues.division);
+        $branchInput.val(originalProgramDetailsValues.branch);
+        $descriptionInput.val(originalProgramDetailsValues.description);
+
+        // Trigger input events to update character counters
+        $displayNameInput.trigger('input');
+        $divisionInput.trigger('input');
+        $branchInput.trigger('input');
+        $descriptionInput.trigger('input');
+
+        updateProgramDetailsButtonStates();
+        abp.notify.info(l('ProgramDetails:ChangesReset'));
+    });
+
+    updateProgramDetailsButtonStates();
+
+    $programDetailsForm.on('submit', function (e) {
+        e.preventDefault();
+
+        if (!hasProgramDetailsChanges()) {
+            abp.notify.info(l('ProgramDetails:NoChanges'));
+            return;
+        }
+
+        const currentValues = getProgramDetailsValues();
+
+        abp.ui.setBusy($programDetailsForm);
+        unity.grantManager.settingManagement.programDetails
+            .updateProgramDetails({
+                displayName: currentValues.displayName,
+                division: currentValues.division,
+                branch: currentValues.branch,
+                description: currentValues.description
+            })
+            .then(function () {
+                originalProgramDetailsValues.displayName = currentValues.displayName;
+                originalProgramDetailsValues.division = currentValues.division;
+                originalProgramDetailsValues.branch = currentValues.branch;
+                originalProgramDetailsValues.description = currentValues.description;
+                updateProgramDetailsButtonStates();
+                abp.notify.success(l('ProgramDetails:SaveSuccess'));
+            })
+            .catch(function (error) {
+                abp.notify.error(error.message || l('ProgramDetails:SaveError'));
+            })
+            .always(function () {
+                abp.ui.clearBusy($programDetailsForm);
+            });
+    });
+})(jQuery);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetailsViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetailsViewComponent.cs
new file mode 100644
index 0000000000..54f16500cf
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetailsViewComponent.cs
@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Unity.GrantManager.SettingManagement;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
+
+namespace Unity.GrantManager.Web.Views.Settings.ProgramDetails;
+
+[Widget(AutoInitialize = true)]
+public class ProgramDetailsViewComponent(IProgramDetailsAppService programDetailsAppService) : AbpViewComponent
+{
+    public virtual async Task<IViewComponentResult> InvokeAsync()
+    {
+        var model = await programDetailsAppService.GetProgramDetailsAsync();
+        return View("~/Views/Settings/ProgramDetails/ProgramDetailsViewComponent.cshtml", model);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetailsViewComponent.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetailsViewComponent.cshtml
new file mode 100644
index 0000000000..f87ad8c49f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Settings/ProgramDetails/ProgramDetailsViewComponent.cshtml
@@ -0,0 +1,66 @@
+@using Microsoft.Extensions.Localization
+@using Unity.GrantManager.SettingManagement
+@using Unity.GrantManager.Localization
+@model Unity.GrantManager.SettingManagement.ProgramDetailsDto
+
+@inject IStringLocalizer<GrantManagerResource> L
+
+<div class="container-fluid px-0">
+    <div class="unity-page-titlebar">
+        <h4 class="m-0">@L["ProgramDetails:Heading"]</h4>
+    </div>
+    <form id="ProgramDetailsForm">
+        <div class="p-3">
+            <div class="mb-3">
+                <label class="form-label" for="ProgramDetailsDisplayName">@L["ProgramDetails:DisplayName"]</label>
+                <input type="text"
+                       class="form-control"
+                       id="ProgramDetailsDisplayName"
+                       name="displayName"
+                       value="@Model.DisplayName"
+                       maxlength="@ProgramDetailsConsts.MaxDisplayNameLength"
+                       data-char-count="@ProgramDetailsConsts.MaxDisplayNameLength" />
+            </div>
+            <div class="mb-3">
+                <label class="form-label" for="ProgramDetailsDivision">@L["ProgramDetails:Division"]</label>
+                <input type="text"
+                       class="form-control"
+                       id="ProgramDetailsDivision"
+                       name="division"
+                       value="@Model.Division"
+                       maxlength="@ProgramDetailsConsts.MaxDivisionLength"
+                       data-char-count="@ProgramDetailsConsts.MaxDivisionLength" />
+            </div>
+            <div class="mb-3">
+                <label class="form-label" for="ProgramDetailsBranch">@L["ProgramDetails:Branch"]</label>
+                <input type="text"
+                       class="form-control"
+                       id="ProgramDetailsBranch"
+                       name="branch"
+                       value="@Model.Branch"
+                       maxlength="@ProgramDetailsConsts.MaxBranchLength"
+                       data-char-count="@ProgramDetailsConsts.MaxBranchLength" />
+            </div>
+            <div class="mb-3">
+                <label class="form-label" for="ProgramDetailsDescription">@L["ProgramDetails:Description"]</label>
+                <textarea class="form-control"
+                          id="ProgramDetailsDescription"
+                          name="description"
+                          rows="4"
+                          maxlength="@ProgramDetailsConsts.MaxDescriptionLength"
+                          data-char-count="@ProgramDetailsConsts.MaxDescriptionLength">@Model.Description</textarea>
+            </div>
+        </div>
+        <hr class="my-4" />
+        <div class="d-flex gap-2 p-2">
+            <abp-button id="ProgramDetailsSaveButton"
+                        button-type="Primary" class="me-2"
+                        type="submit"
+                        text="@L["ProgramDetails:SaveChanges"].Value" />
+            <abp-button id="ProgramDetailsResetButton"
+                        button-type="Secondary" class="me-2"
+                        type="button"
+                        text="@L["ProgramDetails:ResetChanges"].Value" />
+        </div>
+    </form>
+</div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/ActionBar.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/ActionBar.cs
index 97183d98f8..18a1e5edfc 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/ActionBar.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/ActionBar.cs
@@ -26,6 +26,8 @@ public override void ConfigureBundle(BundleConfigurationContext context)
               .AddIfNotContains("/Views/Shared/Components/ActionBar/Default.css");
             context.Files
               .AddIfNotContains("/Pages/BulkApprovals/ApproveApplicationsModal.css");
+            context.Files
+              .AddIfNotContains("/Pages/BulkActions/BulkPublishApplications.css");
         }
     }
 
@@ -48,6 +50,8 @@ public override void ConfigureBundle(BundleConfigurationContext context)
               .AddIfNotContains("/libs/jquery-maskmoney/dist/jquery.maskMoney.min.js");
             context.Files
               .AddIfNotContains("/Pages/BulkApprovals/ApproveApplicationsModal.js");
+            context.Files
+              .AddIfNotContains("/Pages/BulkActions/BulkPublishApplications.js");
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
index 7aaf21086f..274ae5d1a7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
@@ -79,6 +79,15 @@
             text="@L["ApplicationList:ApproveButton"].Value" />
         }
 
+        @if (await PermissionChecker.IsGrantedAsync(UnitySelector.Application.Status.BulkPublish))
+        {
+        <abp-button id="openBulkPublishModal"
+            text="Publish Status"
+            data-selector="applications-table-actions"
+            class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
+            button-type="Secondary" />
+        }
+
         @if(await PermissionChecker.IsGrantedAsync(UnitySelector.Application.Tags.Create) || await PermissionChecker.IsGrantedAsync(UnitySelector.Application.Tags.Delete))
         {
         <abp-button id="tagApplication"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.js
index 4ba8e589ce..f370959240 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.js
@@ -1,4 +1,5 @@
 $(function () {
+    //#region Modal Managers
     let selectedApplicationIds = [];
     let assignApplicationModal = new abp.ModalManager({
         viewUrl: 'AssigneeSelection/AssigneeSelectionModal'
@@ -24,7 +25,13 @@ $(function () {
     let applicationHistoricalPaymentRequestModal = new abp.ModalManager({
         viewUrl: 'PaymentRequests/CreateHistoricalPayments',
     });
+    let publishApplicationsModal = new abp.ModalManager({
+        viewUrl: 'BulkActions/BulkPublishApplications',
+        modalClass: 'BulkPublishModal'
+    });
+    //#endregion Modal Managers
 
+    //#region Tag Helpers
     // Helper functions to reduce nesting depth
     function groupTagsByApplication(tags, applicationIds) {
         let groupedTags = {};
@@ -132,7 +139,9 @@ $(function () {
 
         tagInput.addData(tagInputArray);
     }
+    //#endregion Tag Helpers
 
+    //#region Tag Modal Events
     tagApplicationModal.onOpen(async function () {
         let tagInput = new TagsInput({
             selector: 'SelectedTags',
@@ -172,7 +181,9 @@ $(function () {
             console.error("Error loading tag select list", error);
         }
     });
+    //#endregion Tag Modal Events
 
+    //#region Assignee Helpers
     // Helper functions for assignee modal
     function parseAssigneeData(uncommonTags, commonTags, allTags) {
         let suggestionsArray = [];
@@ -202,7 +213,9 @@ $(function () {
 
         return { suggestionsArray, tagInputArray };
     }
+    //#endregion Assignee Helpers
 
+    //#region Assignee Modal Events
     assignApplicationModal.onOpen(function () {
         let userTagsInput = new UserTagsInput({
             selector: 'SelectedAssignees',
@@ -220,6 +233,9 @@ $(function () {
         userTagsInput.addData(tagInputArray);
         document.getElementById("user-tags-input").dataset.touched = "false";
     });
+    //#endregion Assignee Modal Events
+
+    //#region Generic Modal Result Events
     tagApplicationModal.onResult(function () {
         abp.notify.success(
             'The application tags have been successfully updated.',
@@ -251,7 +267,35 @@ $(function () {
         PubSub.publish("refresh_application_list");
     });
 
-    // Batch Approval Start
+    publishApplicationsModal.onResult(function () {
+        abp.notify.success(
+            'The application(s) have been successfully published',
+            'Publish Application'
+        );
+        publishApplicationsModal.close();
+        PubSub.publish("refresh_application_list");
+    });
+    //#endregion Generic Modal Result Events
+
+    //#region Batch Publish
+    $('#openBulkPublishModal').on("click", function () {
+        // Store application IDs in distributed cache to avoid URL length limits
+        unity.grantManager.applications.applicationBulkActions
+            .storeApplicationIds({ applicationIds: selectedApplicationIds })
+            .then(function(response) {
+                // Open modal with cache key instead of application IDs array
+                publishApplicationsModal.open({
+                    cacheKey: response.cacheKey
+                });
+            })
+            .catch(function(error) {
+                abp.notify.error('Failed to prepare bulk publish. Please try again.');
+                console.error('Error storing application IDs:', error);
+            });
+    });
+    //#endregion Batch Publish
+
+    //#region Batch Approval
     $('#approveApplications').on("click", function () {
         // Store application IDs in distributed cache to avoid URL length limits
         unity.grantManager.applications.applicationBulkActions
@@ -282,8 +326,9 @@ $(function () {
         approveApplicationsSummaryModal.open({ summaryJson: summaryJson });
         PubSub.publish("refresh_application_list");
     });
-    // Batch Approval End
+    //#endregion Batch Approval
 
+    //#region Selection Events
     PubSub.subscribe("select_application", (msg, data) => {
         selectedApplicationIds.push(data.id);
         manageActionButtons();
@@ -302,7 +347,9 @@ $(function () {
         selectedApplicationIds = [];
         manageActionButtons();
     });
+    //#endregion Selection Events
 
+    //#region Action Button Click Events
     $('#assignApplication').on('click', function () {
         // Store application IDs in distributed cache to avoid URL length limits
         unity.grantManager.applications.applicationBulkActions
@@ -344,7 +391,9 @@ $(function () {
             '/GrantApplications/Details?ApplicationId=' +
             selectedApplicationIds[0];
     });
+    //#endregion Action Button Click Events
 
+    //#region Action Bar State
     let summaryWidgetManager = new abp.WidgetManager({
         wrapper: '#summaryWidgetArea',
         filterCallback: function () {
@@ -379,7 +428,9 @@ $(function () {
             }
         }
     }
+    //#endregion Action Bar State
 
+    //#region Tags and Payments
 
     $('#tagApplication').on('click', function () {
         // Store application IDs in distributed cache to avoid URL length limits
@@ -442,5 +493,6 @@ $(function () {
         abp.notify.success('The historical payment has been successfully recorded.', 'Historical Payment');
         PubSub.publish("refresh_application_list");
     });
+    //#endregion Tags and Payments
 });
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js
index d26dbd9525..b4c3ff5674 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js
@@ -52,6 +52,18 @@ $(function () {
             { title: 'One-Time Consideration', data: 'oneTimeConsideration', name: 'oneTimeConsideration', className: 'data-table-header currency-display', render: (d) => formatCurrency(d) },
             { title: 'Reconsideration Amount', data: 'reconsiderationAmount', name: 'reconsiderationAmount', className: 'data-table-header currency-display', render: (d) => formatCurrency(d) },            
             { title: 'Total Grant Amount', data: 'totalGrantAmount', name: 'totalGrantAmount', className: 'data-table-header currency-display', render: (d) => formatCurrency(d) },
+            {
+                title: 'Paid Date', data: 'paidDate', name: 'paidDate', className: 'data-table-header', width: '90px',
+                createdCell: function (td) { $(td).css('min-width', '90px'); },
+                render: function (d) {
+                    if (!d) return nullPlaceholder;
+                    try {
+                        return luxon.DateTime.fromISO(d, {
+                            locale: abp.localization.currentCulture.name,
+                        }).toUTC().toLocaleString();
+                    } catch (e) { console.warn('Paid date parse error:', e); return d; }
+                }
+            },
             {
                 title: 'Notes', data: 'fundingNotes', name: 'fundingNotes', className: 'data-table-header', width: '200px',
                 createdCell: function (td) { $(td).css('min-width', '200px'); },
@@ -64,12 +76,12 @@ $(function () {
 
                     let $editBtn = $('<button>')
                         .addClass('btn btn-sm edit-button px-0 funding-edit-btn')
-                        .attr({ 'aria-label': 'Edit', 'title': 'Edit' })
+                        .attr({ 'type': 'button', 'aria-label': 'Edit', 'title': 'Edit' })
                         .append($('<i>').addClass('fl fl-edit'));
 
                     let $deleteBtn = $('<button>')
                         .addClass('btn btn-link p-0 funding-delete-btn')
-                        .attr({ 'title': 'Delete Funding History', 'data-id': row.id })
+                        .attr({ 'type': 'button', 'title': 'Delete Funding History', 'data-id': row.id })
                         .css({ 'color': '#0066cc', 'text-decoration': 'none' })
                         .append($('<i>').addClass('fa fa-times'));
 
@@ -98,12 +110,12 @@ $(function () {
 
                     let $editBtn = $('<button>')
                         .addClass('btn btn-sm edit-button px-0 issue-edit-btn')
-                        .attr({ 'aria-label': 'Edit', 'title': 'Edit' })
+                        .attr({ 'type': 'button', 'aria-label': 'Edit', 'title': 'Edit' })
                         .append($('<i>').addClass('fl fl-edit'));
 
                     let $deleteBtn = $('<button>')
                         .addClass('btn btn-link p-0 issue-delete-btn')
-                        .attr({ 'title': 'Delete Issue Tracking', 'data-id': row.id })
+                        .attr({ 'type': 'button', 'title': 'Delete Issue Tracking', 'data-id': row.id })
                         .css({ 'color': '#0066cc', 'text-decoration': 'none' })
                         .append($('<i>').addClass('fa fa-times'));
 
@@ -144,12 +156,12 @@ $(function () {
 
                     let $editBtn = $('<button>')
                         .addClass('btn btn-sm edit-button px-0 audit-edit-btn')
-                        .attr({ 'aria-label': 'Edit', 'title': 'Edit' })
+                        .attr({ 'type': 'button', 'aria-label': 'Edit', 'title': 'Edit' })
                         .append($('<i>').addClass('fl fl-edit'));
 
                     let $deleteBtn = $('<button>')
                         .addClass('btn btn-link p-0 audit-delete-btn')
-                        .attr({ 'title': 'Delete Audit History', 'data-id': row.id })
+                        .attr({ 'type': 'button', 'title': 'Delete Audit History', 'data-id': row.id })
                         .css({ 'color': '#0066cc', 'text-decoration': 'none' })
                         .append($('<i>').addClass('fa fa-times'));
 
@@ -175,6 +187,7 @@ $(function () {
                 }
             },
             { title: 'Outstanding', data: 'outstanding', name: 'outstanding', className: 'data-table-header', width: '100px', render: (d) => d === true ? 'Yes' : 'No' },
+            { title: 'Signed-Off', data: 'signedOff', name: 'signedOff', className: 'data-table-header', width: '100px', render: (d) => d === true ? 'Yes' : 'No' },
             { title: 'Incomplete Report', data: 'incompleteReport', name: 'incompleteReport', className: 'data-table-header', width: '130px', render: (d) => d === true ? 'Yes' : 'No' },
             {
                 title: 'Note', data: 'note', name: 'note', className: 'data-table-header', width: '200px',
@@ -188,12 +201,12 @@ $(function () {
 
                     let $editBtn = $('<button>')
                         .addClass('btn btn-sm edit-button px-0 reports-edit-btn')
-                        .attr({ 'aria-label': 'Edit', 'title': 'Edit' })
+                        .attr({ 'type': 'button', 'aria-label': 'Edit', 'title': 'Edit' })
                         .append($('<i>').addClass('fl fl-edit'));
 
                     let $deleteBtn = $('<button>')
                         .addClass('btn btn-link p-0 reports-delete-btn')
-                        .attr({ 'title': 'Delete Reports History', 'data-id': row.id })
+                        .attr({ 'type': 'button', 'title': 'Delete Reports History', 'data-id': row.id })
                         .css({ 'color': '#0066cc', 'text-decoration': 'none' })
                         .append($('<i>').addClass('fa fa-times'));
 
@@ -224,7 +237,7 @@ $(function () {
 
     const fundingHistoryTable = initializeDataTable({
         dt: $('#FundingHistoryTable'),
-        defaultVisibleColumns: ['grantCategory', 'fundingYear', 'renewedFunding', 'approvedAmount', 'reconsiderationAmount', 'oneTimeConsideration', 'totalGrantAmount', 'fundingNotes', 'actions'],
+        defaultVisibleColumns: ['grantCategory', 'fundingYear', 'renewedFunding', 'approvedAmount', 'reconsiderationAmount', 'oneTimeConsideration', 'totalGrantAmount', 'paidDate', 'fundingNotes', 'actions'],
         listColumns: getFundingHistoryColumns(),
         dataEndpoint: () => unity.grantManager.applicantProfile.applicantHistory.getFundingHistoryList(getApplicantId()),
         data: () => ({}),
@@ -314,7 +327,7 @@ $(function () {
 
     const reportsHistoryTable = initializeDataTable({
         dt: $('#ReportsHistoryTable'),
-        defaultVisibleColumns: ['fiscalYear', 'reportDate', 'outstanding', 'incompleteReport', 'note', 'actions'],
+        defaultVisibleColumns: ['fiscalYear', 'reportDate', 'outstanding', 'signedOff', 'incompleteReport', 'note', 'actions'],
         listColumns: getReportsHistoryColumns(),
         dataEndpoint: () => unity.grantManager.applicantProfile.applicantHistory.getReportsHistoryList(getApplicantId()),
         data: () => ({}),
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/ApplicantSummaryViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/ApplicantSummaryViewModel.cs
index d8673b91f5..c3279e2686 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/ApplicantSummaryViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/ApplicantSummaryViewModel.cs
@@ -30,8 +30,8 @@ public class ApplicantSummaryViewModel
     [Display(Name = "ApplicantInfoView:ApplicantInfo.NonRegOrgName")]
     public string? NonRegOrgName { get; set; }
 
-    [Display(Name = "ApplicantInfoView:ApplicantInfo.OrganizationSize")]
-    public string? OrganizationSize { get; set; }
+    [Display(Name = "ApplicantInfoView:ApplicantInfo.ApproxNumberOfEmployees")]
+    public string? ApproxNumberOfEmployees { get; set; }
 
     [Display(Name = "ApplicantInfoView:ApplicantInfo.IndigenousOrgInd")]
     public bool IndigenousOrgInd { get; set; } = false;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
index 5b0dba2458..1be46ee77b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
@@ -117,7 +117,7 @@
                         <abp-input asp-for="@Model.ApplicantSummary.NonRegOrgName" />
                     </abp-column>
                     <abp-column size="_4" class="px-1">
-                        <abp-input class="numeric-mask" asp-for="@Model.ApplicantSummary.OrganizationSize" />
+                        <abp-input class="numeric-mask" asp-for="@Model.ApplicantSummary.ApproxNumberOfEmployees" />
                     </abp-column>
                     <abp-column size="_4" class="px-1">
                         <div class="switch-container">
@@ -158,15 +158,21 @@
 
                 <abp-row class="m-0 p-0">
                     <abp-column size="_4" class="px-1">
-                        <abp-select asp-for="@Model.ApplicantSummary.FiscalDay" asp-items="@Model.FiscalDayList">
+                        <abp-select asp-for="@Model.ApplicantSummary.FiscalMonth" asp-items="@Model.FiscalMonthList">
                             <option value="">Please choose...</option>
                         </abp-select>
                     </abp-column>
                     <abp-column size="_4" class="px-1">
-                        <abp-select asp-for="@Model.ApplicantSummary.FiscalMonth" asp-items="@Model.FiscalMonthList">
+                        <abp-select asp-for="@Model.ApplicantSummary.FiscalDay" asp-items="@Model.FiscalDayList">
                             <option value="">Please choose...</option>
                         </abp-select>
                     </abp-column>
+                    <abp-column size="_4" class="px-1">
+                        <div class="mb-3">
+                            <label class="form-label" for="ApplicantSummary_FiscalYearEnd">@L["ApplicantInfoView:ApplicantInfo.FiscalYearEnd"]</label>
+                            <input type="text" id="ApplicantSummary_FiscalYearEnd" class="form-control" readonly />
+                        </div>
+                    </abp-column>
                 </abp-row>
                 <abp-row class="m-0 p-0">
                     <abp-column size="_4" class="px-1">
@@ -510,17 +516,17 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td>@L["ApplicantInfoView:ApplicantInfo.OrganizationSize"].Value</td>
+                                <td>@L["ApplicantInfoView:ApplicantInfo.ApproxNumberOfEmployees"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrganizationSize" value="existing" class="me-2" />
-                                        <span id="existing_OrganizationSize"></span>
+                                        <input type="radio" name="merge_ApproxNumberOfEmployees" value="existing" class="me-2" />
+                                        <span id="existing_ApproxNumberOfEmployees"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrganizationSize" value="new" class="me-2" />
-                                        <span id="new_OrganizationSize"></span>
+                                        <input type="radio" name="merge_ApproxNumberOfEmployees" value="new" class="me-2" />
+                                        <span id="new_ApproxNumberOfEmployees"></span>
                                     </label>
                                 </td>
                             </tr>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js
index 3051f16949..d7cf7db62d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js
@@ -285,7 +285,7 @@ function getExistingApplicantData() {
         NonRegOrgName: getVal('ApplicantSummary_NonRegOrgName'),
         OrganizationType: getVal('ApplicantSummary_OrganizationType'),
         BusinessNumber: getVal('ApplicantSummary_BusinessNumber'),
-        OrganizationSize: getVal('ApplicantSummary_OrganizationSize'),
+        ApproxNumberOfEmployees: getVal('ApplicantSummary_ApproxNumberOfEmployees'),
         OrgStatus: getVal('ApplicantSummary_OrgStatus'),
         IndigenousOrgInd: $activeWidget.find('#ApplicantSummary_IndigenousOrgInd').is(':checked') ? 'Yes' : 'No',
         Sector: getVal('ApplicantSummary_Sector'),
@@ -316,7 +316,7 @@ function createNewApplicantDataObject(selectedData) {
         NonRegOrgName: selectedData.NonRegOrgName || '',
         OrganizationType: selectedData.OrganizationType || '',
         BusinessNumber: selectedData.BusinessNumber || '',
-        OrganizationSize: selectedData.OrganizationSize || '',
+        ApproxNumberOfEmployees: selectedData.ApproxNumberOfEmployees || '',
         OrgStatus: selectedData.OrgStatus || '',
         IndigenousOrgInd: selectedData.IndigenousOrgInd || '',
         Sector: selectedData.Sector || '',
@@ -528,7 +528,7 @@ function initializeApplicantLookup() {
                         OrgNumber: item.OrgNumber,
                         NonRegOrgName: item.NonRegOrgName,
                         OrganizationType: item.OrganizationType,
-                        OrganizationSize: item.OrganizationSize,
+                        ApproxNumberOfEmployees: item.ApproxNumberOfEmployees,
                         OrgStatus: item.OrgStatus,
                         BusinessNumber: item.BusinessNumber,
                         IndigenousOrgInd: item.IndigenousOrgInd,
@@ -679,6 +679,57 @@ function registerElectoralDistrictControls($container) {
     });
 }
 
+function calculateFiscalYearEnd($container) {
+    const monthVal = $container.find('#ApplicantSummary_FiscalMonth').val();
+    const dayVal = $container.find('#ApplicantSummary_FiscalDay').val();
+    const $yearEndField = $container.find('#ApplicantSummary_FiscalYearEnd');
+
+    if (!monthVal || !dayVal) {
+        $yearEndField.val('');
+        return;
+    }
+
+    const monthMap = {
+        'Jan': 1, 'Feb': 2, 'Mar': 3, 'Apr': 4,
+        'May': 5, 'Jun': 6, 'Jul': 7, 'Aug': 8,
+        'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12
+    };
+
+    const month = monthMap[monthVal];
+    const day = Number.parseInt(dayVal, 10);
+
+    if (!month || Number.isNaN(day)) {
+        $yearEndField.val('');
+        return;
+    }
+
+    const today = new Date();
+    const todayDate = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+    let year = todayDate.getFullYear();
+    const isValidMonthDay = (y) => {
+        const d = new Date(y, month - 1, day);
+        return d.getMonth() === month - 1 && d.getDate() === day;
+    };
+
+    if (!isValidMonthDay(year)) {
+        $yearEndField.val('');
+        return;
+    }
+
+    const candidate = new Date(year, month - 1, day);
+    if (candidate < todayDate) {
+        year += 1;
+        if (!isValidMonthDay(year)) {
+            $yearEndField.val('');
+            return;
+        }
+    }
+
+    const mm = String(month).padStart(2, '0');
+    const dd = String(day).padStart(2, '0');
+    $yearEndField.val(`${year}-${mm}-${dd}`);
+}
+
 function registerApplicantInfoSummaryDropdowns($container) {
     $container.find('#ApplicantSummary_Sector').on('change', function () {
         const selectedValue = $(this).val();
@@ -722,6 +773,12 @@ function registerApplicantInfoSummaryDropdowns($container) {
             $container.find('#ApplicantSummary_BusinessNumber').val(business_number.text).trigger('change');
         });
     });
+
+    $container.find('#ApplicantSummary_FiscalMonth, #ApplicantSummary_FiscalDay').on('change', function () {
+        calculateFiscalYearEnd($container);
+    });
+
+    calculateFiscalYearEnd($container);
 }
 
 function getAttributeObjectByType(type, attributes) {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/ApplicantOrganizationInfoViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/ApplicantOrganizationInfoViewComponent.cs
index a193691a4c..991e48f85f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/ApplicantOrganizationInfoViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/ApplicantOrganizationInfoViewComponent.cs
@@ -56,7 +56,7 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicantId)
                     BusinessNumber = applicant.BusinessNumber ?? string.Empty,
                     OrgStatus = applicant.OrgStatus ?? string.Empty,
                     OrganizationType = applicant.OrganizationType ?? string.Empty,
-                    OrganizationSize = applicant.OrganizationSize ?? string.Empty,                    
+                    ApproxNumberOfEmployees = applicant.ApproxNumberOfEmployees ?? string.Empty,
                     NonRegOrgName = applicant.NonRegOrgName ?? string.Empty,
                     
                     // Sector Information
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/ApplicantOrganizationInfoViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/ApplicantOrganizationInfoViewModel.cs
index 3c40725ebf..f9370f9b3b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/ApplicantOrganizationInfoViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/ApplicantOrganizationInfoViewModel.cs
@@ -42,8 +42,8 @@ public class ApplicantOrganizationInfoViewModel
         [Display(Name = "Organization Type")]
         public string OrganizationType { get; set; } = string.Empty;
 
-        [Display(Name = "Organization Size (Approximate Number of Employees)")]
-        public string OrganizationSize { get; set; } = string.Empty;
+        [Display(Name = "Approx. Number of Employees")]
+        public string ApproxNumberOfEmployees { get; set; } = string.Empty;
         
         [Display(Name = "Non-Registered Organization Name")]
         public string NonRegOrgName { get; set; } = string.Empty;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml
index 58ee78f3b7..3437137972 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml
@@ -143,7 +143,7 @@
                                     <abp-input asp-for="NonRegOrgName" id="ApplicantOrganizationInfo_NonRegOrgName" />
                                 </abp-column>
                                 <abp-column size="_4" class="px-1">
-                                    <abp-input class="numeric-mask" inputmode="numeric" asp-for="OrganizationSize" id="ApplicantOrganizationInfo_OrganizationSize" />
+                                    <abp-input class="numeric-mask" inputmode="numeric" asp-for="ApproxNumberOfEmployees" id="ApplicantOrganizationInfo_ApproxNumberOfEmployees" />
                                 </abp-column>
                                 <abp-column size="_4" class="px-1">
                                     <div class="switch-container">
@@ -160,6 +160,14 @@
                                 <abp-column size="_4" class="px-1">
                                     <abp-select asp-for="FiscalDay" asp-items="Model.FiscalDayList" id="ApplicantOrganizationInfo_FiscalDay" />
                                 </abp-column>
+                                <abp-column size="_4" class="px-1">
+                                    <div class="mb-3">
+                                        <label class="form-label" for="ApplicantOrganizationInfo_FiscalYearEnd">Fiscal Year End</label>
+                                        <input type="text" id="ApplicantOrganizationInfo_FiscalYearEnd" class="form-control" readonly />
+                                    </div>
+                                </abp-column>
+                            </abp-row>
+                            <abp-row class="m-0 p-0">
                                 <abp-column size="_4" class="px-1">
                                     <abp-input type="date" asp-for="StartedOperatingDate" id="ApplicantOrganizationInfo_StartedOperatingDate" abp-data-datepicker="false" />
                                 </abp-column>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.css
index a18a578ab2..f56ee09e68 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.css
@@ -26,9 +26,18 @@
     z-index: 999;
 }
 
-.applicant-info-container .save-button-container .floating-save-btn {
-    position: static;
-}
+    .applicant-info-container input[readonly] {
+        color: var(--bc-colors-grey-text-200);
+        pointer-events: none;
+        background-color: var(--bc-colors-grey-hover) !important;
+        opacity: var(--bs-btn-disabled-opacity);
+        background-blend-mode: difference;
+        border: var(--bs-border-width) solid var(--bs-border-color);
+    }
+
+    .applicant-info-container .save-button-container .floating-save-btn {
+        position: static;
+    }
 
 .applicant-organization-info {
     border-radius: 8px;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js
index ceed6c2aa1..1ef07dd83e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js
@@ -14,7 +14,7 @@
         'BusinessNumber',
         'OrgStatus',
         'OrganizationType',
-        'OrganizationSize',
+        'ApproxNumberOfEmployees',
         'NonRegOrgName',
         'Sector',
         'SubSector',
@@ -35,6 +35,12 @@
 
         zoneForm.init();
 
+        zoneForm.form.find('#ApplicantOrganizationInfo_FiscalMonth, #ApplicantOrganizationInfo_FiscalDay').on('change', function () {
+            calculateApplicantFiscalYearEnd(zoneForm.form);
+        });
+
+        calculateApplicantFiscalYearEnd(zoneForm.form);
+
         saveButton.on('click', async function (event) {
             event.preventDefault();
 
@@ -318,4 +324,54 @@
             populateRegisteredFields('', '', '', '', '');
         });
     }
+    function calculateApplicantFiscalYearEnd($container) {
+        const monthVal = $container.find('#ApplicantOrganizationInfo_FiscalMonth').val();
+        const dayVal = $container.find('#ApplicantOrganizationInfo_FiscalDay').val();
+        const $yearEndField = $container.find('#ApplicantOrganizationInfo_FiscalYearEnd');
+
+        if (!monthVal || !dayVal) {
+            $yearEndField.val('');
+            return;
+        }
+
+        const monthMap = {
+            'Jan': 1, 'Feb': 2, 'Mar': 3, 'Apr': 4,
+            'May': 5, 'Jun': 6, 'Jul': 7, 'Aug': 8,
+            'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12
+        };
+
+        const month = monthMap[monthVal];
+        const day = Number.parseInt(dayVal, 10);
+
+        if (!month || Number.isNaN(day)) {
+            $yearEndField.val('');
+            return;
+        }
+
+        const today = new Date();
+        const todayDate = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+        let year = todayDate.getFullYear();
+        const isValidMonthDay = (y) => {
+            const d = new Date(y, month - 1, day);
+            return d.getMonth() === month - 1 && d.getDate() === day;
+        };
+
+        if (!isValidMonthDay(year)) {
+            $yearEndField.val('');
+            return;
+        }
+
+        const candidate = new Date(year, month - 1, day);
+        if (candidate < todayDate) {
+            year += 1;
+            if (!isValidMonthDay(year)) {
+                $yearEndField.val('');
+                return;
+            }
+        }
+
+        const mm = String(month).padStart(2, '0');
+        const dd = String(day).padStart(2, '0');
+        $yearEndField.val(`${year}-${mm}-${dd}`);
+    }
 })();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.css
index 75879016f1..305a12adbe 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.css
@@ -21,7 +21,6 @@
 .applicant-payments-toolbar .dynamic-buttons-div .dt-button-collection {
     left: auto !important;
     right: 0 !important;
-    top: 100% !important;
 }
 
 #ApplicantPaymentRequestListTable_wrapper {
@@ -37,3 +36,14 @@
     overflow-y: auto !important;
     overflow-x: auto !important;
 }
+
+#ApplicantPaymentRequestListTable .error-row td {
+    background-color: #FEEAEA;
+    color: #CC0000 !important;
+}
+
+.info-btn {
+    font-size: 13pt;
+    font-family: BCSans, system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    font-weight: 100;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.js
index b5d6d4e669..1c27633b22 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.js
@@ -60,7 +60,7 @@ function getSupplierNumberColumn() {
         name: 'supplierNumber',
         data: 'supplierNumber',
         className: 'data-table-header',
-        index: 6,
+        index: 9,
     };
 }
 
@@ -70,7 +70,7 @@ function getSupplierNameColumn() {
         name: 'supplierName',
         data: 'supplierName',
         className: 'data-table-header',
-        index: 7,
+        index: 10,
     };
 }
 
@@ -81,10 +81,18 @@ function getSiteNumberColumn() {
         data: 'site.number',
         className: 'data-table-header',
         defaultContent: '',
-        index: 8,
+        index: 11,
     };
 }
 
+let applicantCasPaymentResponseModal = new abp.ModalManager({
+    viewUrl: '../PaymentRequests/CasPaymentRequestResponse',
+});
+
+function openApplicantCasResponseModal(casResponse) {
+    applicantCasPaymentResponseModal.open({ casResponse: casResponse });
+}
+
 function getPaymentStatusTextColor(status) {
     switch (status) {
         case 'L1Pending':
@@ -106,6 +114,44 @@ function getPaymentStatusTextColor(status) {
     }
 }
 
+function getInvoiceStatusColumn() {
+    return {
+        title: 'Invoice Status',
+        name: 'invoiceStatus',
+        data: 'invoiceStatus',
+        className: 'data-table-header',
+        defaultContent: '',
+        index: 6,
+    };
+}
+
+function getCasResponseColumn() {
+    return {
+        title: 'CAS Response',
+        name: 'casResponse',
+        data: 'casResponse',
+        className: 'data-table-header notexport',
+        index: 7,
+        render: function (data) {
+            if (data + '' !== 'undefined' && data?.length > 0) {
+                return '<button class="btn btn-light info-btn" type="button" onclick="openApplicantCasResponseModal(\'' + data + '\');">View Response<i class="fl fl-mapinfo"></i></button>';
+            }
+            return null;
+        },
+    };
+}
+
+function getCategoryColumn() {
+    return {
+        title: 'Category',
+        name: 'category',
+        data: 'category',
+        className: 'data-table-header',
+        defaultContent: '',
+        index: 8,
+    };
+}
+
 $(function () {
     const l = abp.localization.getResource('Payments');
     $('.unity-currency-input').maskMoney({});
@@ -124,6 +170,9 @@ $(function () {
         'status',
         'amount',
         'paymentStatus',
+        'invoiceStatus',
+        'casResponse',
+        'category',
         'supplierNumber',
         'supplierName',
         'siteNumber',
@@ -190,6 +239,41 @@ $(function () {
 
         dataTable.externalSearch('#applicant-payments-search', { delay: 300 });
 
+        dataTable.on('draw', function () {
+            dataTable.rows().every(function () {
+                let data = this.data();
+                let $row = $(this.node());
+                $row.removeClass('error-row');
+                if (data.casResponse && data.casResponse !== '' &&
+                    data.casResponse.toUpperCase() !== 'SUCCEEDED') {
+                    $row.addClass('error-row');
+                }
+            });
+        });
+
+        // Reposition the COLUMNS dropdown to open upward when there is not enough space below. Opens upward if there is no ample space in either direction.
+        $('#applicantPaymentsDynamicButtonContainerId').on('click', '.buttons-collection', function () {
+            const $btn = $(this);
+            setTimeout(function () {
+                const $collection = $('.dt-button-collection').filter(':visible').first();
+                if (!$collection.length) return;
+                const btnRect = $btn[0].getBoundingClientRect();
+                const collHeight = $collection.outerHeight();
+                const rightOffset = window.innerWidth - btnRect.right;
+                if (btnRect.bottom + collHeight > window.innerHeight) {
+                    $collection[0].style.setProperty('position', 'fixed', 'important');
+                    $collection[0].style.setProperty('bottom', (window.innerHeight - btnRect.top) + 'px', 'important');
+                    $collection[0].style.setProperty('top', '', 'important');
+                } else {
+                    $collection[0].style.setProperty('position', 'fixed', 'important');
+                    $collection[0].style.setProperty('top', btnRect.bottom + 'px', 'important');
+                    $collection[0].style.setProperty('bottom', '', 'important');
+                }
+                $collection[0].style.setProperty('left', 'auto', 'important');
+                $collection[0].style.setProperty('right', rightOffset + 'px', 'important');
+            }, 0);
+        });
+
         $('#nav-payments-tab').one('click', function () {
             dataTable.columns.adjust();
         });
@@ -203,6 +287,9 @@ $(function () {
             getStatusColumn(),
             getAmountColumn(),
             getCasPaymentStatusColumn(),
+            getInvoiceStatusColumn(),
+            getCasResponseColumn(),
+            getCategoryColumn(),
             getSupplierNumberColumn(),
             getSupplierNameColumn(),
             getSiteNumberColumn(),
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.cshtml
index 52e9348106..e3f11a5e69 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.cshtml
@@ -26,9 +26,18 @@
         {
             <abp-button id="mergeApplicants"
                         text="Merge"
+                        data-selector="applicants-table-actions"
                         class="custom-table-btn flex-none btn btn-secondary d-none"
                         button-type="Secondary" />
         }
+        @if (await PermissionChecker.IsGrantedAsync(GrantApplicationPermissions.Applicants.Delete))
+        {
+            <abp-button id="deleteApplicant"
+                        text="Delete"
+                        data-selector="applicants-table-actions"
+                        class="custom-table-btn flex-none btn btn-secondary action-bar-btn-unavailable"
+                        button-type="Secondary" />
+        }
     </div>
 
     @* Spacer to align buttons properly *@
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.js
index ef5f2c8064..b61776c93f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.js
@@ -37,10 +37,12 @@ $(function () {
             $('*[data-selector="applicants-table-actions"]').removeClass('action-bar-btn-unavailable');
             $('.action-bar').addClass('active');
 
-            // OPEN button is only visible when exactly 1 applicant is selected
+            // OPEN and DELETE buttons are only visible when exactly 1 applicant is selected
             $('#openApplicant').addClass('action-bar-btn-unavailable');
+            $('#deleteApplicant').addClass('action-bar-btn-unavailable');
             if (selectedApplicantIds.length === 1) {
                 $('#openApplicant').removeClass('action-bar-btn-unavailable');
+                $('#deleteApplicant').removeClass('action-bar-btn-unavailable');
             }
         }
 
@@ -69,6 +71,50 @@ $(function () {
         }
     });
 
+    function executeDelete(applicantId, applicantName) {
+        unity.grantManager.applicants.applicant
+            .deleteApplicant(applicantId)
+            .then(function () {
+                PubSub.publish('deselect_applicant', 'reset_data');
+                $('#ApplicantsTable').DataTable().ajax.reload();
+                abp.notify.success('Applicant "' + applicantName + '" has been deleted.');
+            })
+            .catch(function (e) {
+                console.warn('deleteApplicant error:', e);
+                const msg = e?.responseJSON?.error?.message || 'An error occurred while deleting the applicant. Please try again.';
+                abp.message.error(msg, 'Delete Failed');
+            });
+    }
+
+    // DELETE button click — pre-check submissions, then show the correct modal
+    $('#deleteApplicant').on('click', function () {
+        if (selectedApplicantIds.length !== 1) return;
+        const applicantId = selectedApplicantIds[0];
+        const applicantName = (selectedApplicants[0].applicantName || 'Applicant Name');
+
+        unity.grantManager.applicants.applicant
+            .hasSubmissions(applicantId)
+            .then(function (hasSubmissions) {
+                if (hasSubmissions) {
+                    abp.message.warn(
+                        'This applicant cannot be deleted because it is associated with one or more submissions.',
+                        'Cannot Delete Applicant'
+                    );
+                } else {
+                    abp.message.confirm(
+                        'Are you sure you want to delete the applicant "' + applicantName + '"?',
+                        'Delete Applicant',
+                        function (confirmed) {
+                            if (confirmed) executeDelete(applicantId, applicantName);
+                        }
+                    );
+                }
+            })
+            .catch(function (e) {
+                console.warn('hasSubmissions error:', e);
+            });
+    });
+
     // Handle search input
     $('#search').on('input', function () {
         let table = $('#ApplicantsTable').DataTable();
@@ -77,4 +123,4 @@ $(function () {
 
     // Initialize button states
     manageActionButtons();
-});
\ No newline at end of file
+});
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/ListMerge.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/ListMerge.js
index 79d5aa11f1..f3e7dd116f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/ListMerge.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/ListMerge.js
@@ -14,7 +14,7 @@
         { label: 'Registered Organization Number',        key: 'orgNumber',                   radioName: 'merge_OrgNumber' },
         { label: 'Non-Registered Organization Name',      key: 'nonRegOrgName',               radioName: 'merge_NonRegOrgName' },
         { label: 'Organization Type',                     key: 'organizationType',            radioName: 'merge_OrganizationType' },
-        { label: 'Organization Size',                     key: 'organizationSize',            radioName: 'merge_OrganizationSize' },
+        { label: 'Organization Size (Approximate Number of Employees)', key: 'approxNumberOfEmployees', radioName: 'merge_ApproxNumberOfEmployees' },
         { label: 'Org book status',                       key: 'orgStatus',                   radioName: 'merge_OrgStatus' },
         { label: 'Indigenous',                            key: 'indigenousOrgInd',            radioName: 'merge_IndigenousOrgInd' },
         { label: 'Sector',                                key: 'sector',                      radioName: 'merge_Sector' },
@@ -153,7 +153,7 @@
                 orgNumber:                   merged['orgNumber'] ?? null,
                 nonRegOrgName:               merged['nonRegOrgName'] ?? null,
                 organizationType:            merged['organizationType'] ?? null,
-                organizationSize:            merged['organizationSize'] ?? null,
+                approxNumberOfEmployees:     merged['approxNumberOfEmployees'] ?? null,
                 orgStatus:                   merged['orgStatus'] ?? null,
                 indigenousOrgInd:            indigenousOrgIndBool,
                 sector:                      merged['sector'] ?? null,
@@ -216,7 +216,8 @@
                 abp.notify.success('Applicants merged successfully.');
             }).catch(err => {
                 console.warn('Merge failed:', err);
-                abp.notify.error('Merge failed. Please try again.');
+                const msg = err?.responseJSON?.error?.message || 'Merge failed. Please try again.';
+                abp.message.error(msg, 'Merge Failed');
             }).always(() => {
                 $('#listMergeSpinner').addClass('d-none');
                 $('#listMergeMergeBtn').prop('disabled', false);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js
index 2d7fc573ea..ac06939a24 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js
@@ -1,4 +1,6 @@
 (function () {
+    const l = abp.localization.getResource('GrantManager');
+
     abp.widgets.ApplicationActionWidget = function ($wrapper) {
 
         let widgetManager = $wrapper.data('abp-widget-manager');
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 aafb08a420..e2a9c9030a 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
@@ -29,6 +29,7 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicationId)
                 ApplicantId = applicationApplicant.ApplicantId,
                 ApplicantName = applicationApplicant.ApplicantName ?? string.Empty,
                 ApplicationStatus = applicationApplicant.ApplicationStatus,
+                ExternalStatusVisibility = applicationApplicant.ExternalStatusVisibility,
                 ReferenceNo = applicationApplicant.ApplicationReferenceNo,
 
                 ApplicationFormId = formDetails.ApplicationFormId,
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 5a664ddc66..24b96f595f 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
@@ -8,6 +8,7 @@ public class ApplicationBreadcrumbWidgetViewModel
         public Guid ApplicantId { get; set; } = Guid.Empty;
         public string ApplicantName { get; set; } = string.Empty;
         public string ApplicationStatus { get; set; } = string.Empty;
+        public bool ExternalStatusVisibility { get; set; } = false;
 
         public Guid ApplicationFormId { get; set; } = Guid.Empty;
         public string ApplicationFormName { 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 3b9d1d321e..5b3f136d2a 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
@@ -29,7 +29,11 @@
             }
         </div>
         <div class="form-version pr-1">@Model.SubmissionFormDescription</div>
-        <div class="application-status">@Model.ApplicationStatus</div>    
+        <div class="application-status">@Model.ApplicationStatus</div>
+        @if (Model.ExternalStatusVisibility)
+        {
+            <div class="published-status">STATUS PUBLISHED</div>
+        }
     </div>
 </div>
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/Default.css
index f92c40d013..91a1807a41 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationBreadcrumbWidget/Default.css
@@ -41,3 +41,13 @@
     margin-top: 2px;
 }
 
+.application-details-breadcrumb .published-status {
+    font-weight: 700;
+    color: #2f6f3e;
+    border: 3px solid #2f6f3e;
+    border-radius: 1rem;
+    font-size: 0.8rem;
+    padding: 0.125rem 0.5rem;
+    margin-top: 2px;
+}
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
index a37d8d7332..ee8e8220a2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
@@ -8,8 +8,33 @@
 @inject IStringLocalizer<GrantManagerResource> L
 @inject IAuthorizationService AuthorizationService
 
-<div class="other-config-scrollable-content">
+<div class="other-config-scrollable-content container-fluid">
 <form id="otherConfigForm" autocomplete="off">
+    <div class="configuration-action-bar row">
+        <div class="col-12 col-md-8">
+            <h5>Other Configuration</h5>
+        </div>
+        <div class="col-12 col-md-4 d-flex align-items-center justify-content-end gap-2">
+            <abp-button id="btn-save-other-config"
+                        text="Save"
+                        icon-type="Other" icon="fl fl-save"
+                        class="btn unt-btn-primary btn-primary"
+                        abp-tooltip="Save Other Configuration"
+                        button-type="Primary" />
+            <button type="button"
+                    id="btn-cancel-other-config"
+                    class="btn unt-btn-outline-primary btn-outline-primary"
+                    abp-tooltip="Cancel changes">
+                <i class="fl fl-undo"></i> Cancel
+            </button>
+            <button type="reset"
+                    id="btn-back-other-config"
+                    class="btn unt-btn-outline-primary btn-outline-primary"
+                    abp-tooltip="Navigate back to the Forms">
+                Back
+            </button>
+        </div>
+    </div>
     <div class="row">
         <div class="col-12 p-3">
             <h6 class="mb-3"><b>Workflow Settings</b></h6>
@@ -101,32 +126,5 @@
             </label>
         </div>
     </div>
-
-
-    <div class="row">
-        <div class="col-12">
-            <div class="d-flex justify-content-start">
-                <abp-button id="btn-save-other-config"
-                            text="Save"
-                            icon-type="Other"
-                            icon="fl fl-save"
-                            class="btn unt-btn-primary btn-primary mx-1"
-                            abp-tooltip="Save Other Configuration"
-                            button-type="Primary" />
-                <button type="reset"
-                        id="btn-cancel-other-config"
-                        class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                        abp-tooltip="Cancel changes">
-                    <i class="fl fl-undo"></i> Cancel
-                </button>
-                <button type="reset"
-                        id="btn-back-other-config"
-                        class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                        abp-tooltip="Navigate back to the Forms">
-                    Back
-                </button>
-            </div>
-        </div>
-    </div>
 </form>
 </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.css
index 1388466ab7..4a9ddf92ef 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.css
@@ -1,4 +1,8 @@
-.configuration-warning {
+#otherConfigForm .form-select {
+    width: 400px !important;
+}
+
+.configuration-warning {
     color: var(--lpx-danger);
     border-color: var(--lpx-danger);
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentResults/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentResults/Default.js
index bc77bf1c35..d42cf25888 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentResults/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentResults/Default.js
@@ -38,7 +38,8 @@
 
         // Update checkboxes which are serialized if unchecked
         $(`#assessmentResultForm input:checkbox`).each(function () {
-            assessmentResultObj[this.name] = (this.checked).toString();
+            let propertyName = this.name.includes('.') ? this.name.split('.').pop() : this.name;
+            assessmentResultObj[propertyName] = this.checked;
         });
 
 
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 9af7e0bc89..c5c30a36c7 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
@@ -1,4 +1,5 @@
-@using Unity.Flex.Web.Views.Shared.Components.QuestionNumberWidget
+@using Unity.GrantManager.Web.Utilities
+@using Unity.Flex.Web.Views.Shared.Components.QuestionNumberWidget
 @using Unity.Flex.Web.Views.Shared.Components.QuestionTextAreaWidget
 @using Unity.Flex.Web.Views.Shared.Components.QuestionTextWidget
 @using Unity.Flex.Web.Views.Shared.Components.QuestionYesNoWidget
@@ -33,13 +34,13 @@
                             </span>
                         </button>
                     }
-                    <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" onclick="expandAllAccordions('assessment-scoresheet')">
+                    <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="btn-expand-all">
                         <span class="ai-button-content">
                             <i class="unt-icon-sm fa-solid fa-angles-down"></i>
                             <span>Expand All</span>
                         </span>
                     </button>
-                    <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" onclick="collapseAllAccordions('assessment-scoresheet')">
+                    <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="btn-collapse-all">
                         <span class="ai-button-content">
                             <i class="unt-icon-sm fa-solid fa-angles-up"></i>
                             <span>Collapse All</span>
@@ -76,7 +77,7 @@
                                                         <div class="accordion-item">
                                                             <h2 class="accordion-header" id="question-heading-@question.Id">
                                                                 <button class="accordion-button collapsed unt-accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#question-collapse-@question.Id" aria-expanded="true" aria-controls="question-collapse-@question.Id">
-                                                                    @sectionNumber.@questionNumber @question.Label
+                                                                    @sectionNumber.@questionNumber @Html.SanitizeRaw(question.Label)
                                                                     @if (question.Definition?.ConvertDefinition(question.Type)?.GetIsRequired() == true)
                                                                     {
                                                                         <span> *</span>
@@ -91,7 +92,7 @@
                                                             </h2>
                                                             <div id="question-collapse-@question.Id" class="accordion-collapse collapse" aria-labelledby="question-heading-@question.Id">
                                                                 <div class="accordion-body">
-                                                                    <p>@question.Description</p>
+                                                                    <p>@Html.SanitizeRaw(question.Description)</p>
 
                                                                     @switch (question.Type)
                                                                     {
@@ -190,8 +191,8 @@
                                             </div>
                                         </div>
                                         <div class="btn-group mx-3 py-2">
-                                            <button type="button" class="btn unt-btn-primary btn-primary mx-1 mb-2" disabled form="section-form-@sec.Id" id="scoresheet-section-save-@sec.Id" onclick="saveScoresSection('section-form-@sec.Id', '@sec.Id')">Save Changes</button>
-                                            <button type="button" class="btn unt-btn-link btn-link mx-2 mb-2" disabled form="section-form-@sec.Id" id="scoresheet-section-discard-@sec.Id" onclick="discardChangesScoresSection('section-form-@sec.Id', '@sec.Id')">Discard Changes</button>
+                                            <button type="button" class="btn unt-btn-primary btn-primary mx-1 mb-2" disabled form="section-form-@sec.Id" id="scoresheet-section-save-@sec.Id" data-section-id="@sec.Id" data-form-id="section-form-@sec.Id">Save Changes</button>
+                                            <button type="button" class="btn unt-btn-link btn-link mx-2 mb-2" disabled form="section-form-@sec.Id" id="scoresheet-section-discard-@sec.Id" data-section-id="@sec.Id" data-form-id="section-form-@sec.Id">Discard Changes</button>
                                         </div>
                                     </div>
                                 </form>
@@ -237,7 +238,7 @@ else
                         </div>
 
                         <div class="scores-block-score">
-                            <label class="form-label" for="CleanGrowth">Clean Growth</label>
+                            <label class="form-label" for="cleanGrowth">Clean Growth</label>
                             <input type="number" class="form-control" disabled="@Model.IsDisabled()" name="CleanGrowth" id="cleanGrowth" onkeyup="enableSaveButton(this)" onchange="enableSaveButton(this)" min="0" max="99" onkeydown="return positiveIntegersOnly(event);" value="@Model.CleanGrowth" />
                         </div>
                     </div>
@@ -247,7 +248,7 @@ else
                     <input type="number" size="18" class="form-control" disabled="disabled" name="SubTotal" id="subTotal" value="@Model.ScoreTotal()" min="0" max="2147483647" />
                 </div>
                 <div class="scores-block-save">
-                    <abp-button text="Save" type="button" id="saveAssessmentScoresBtn" disabled="true" onclick="saveAssessmentScores()" icon-type="Other" icon="fl fl-save" button-type="Light" />
+                    <abp-button text="Save" type="button" id="saveAssessmentScoresBtn" disabled="true" icon-type="Other" icon="fl fl-save" button-type="Light" />
                 </div>
             </div>
         </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 9cbc185d6b..21934f97dd 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
@@ -686,24 +686,24 @@ function queueApplicationScoring(triggerButton = null) {
     const monitorScoring = () => globalThis.AIGenerationButtonState.monitor({
         $button,
         originalHtml: existingHtml,
-        getStatus: () => unity.grantManager.grantApplications.grantApplication
-            .getAIGenerationStatus(applicationId, 'application-scoring'),
-        onComplete: () => PubSub.publish('refresh_assessment_scores', null),
+        getStatus: () => globalThis.AIGenerationApi.getStatus(applicationId, 'application-scoring'),
+        onComplete: () => {
+            PubSub.publish('refresh_assessment_scores', null);
+        },
         onFailed: (request) => abp.message.error(request?.failureReason || 'AI scoring failed.')
     });
 
-    unity.grantManager.grantApplications.grantApplication
-        .queueApplicationScoring(applicationId)
-        .done(function (request) {
-            const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
+    globalThis.AIGenerationApi.queueApplicationScoring(applicationId)
+        .done(function (generationStatus) {
+            const request = generationStatus?.generationRequest;
+            const status = String(request?.status ?? '').trim();
 
             if (status === 'Completed') {
                 globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
+                globalThis.AIGenerationButtonState?.applyStatusState(generationStatus);
                 PubSub.publish('refresh_assessment_scores', null);
-                globalThis.syncAIRateLimitButtons?.();
                 return;
             }
-
             monitorScoring();
         })
         .fail(function () {
@@ -715,3 +715,28 @@ function queueApplicationScoring(triggerButton = null) {
             globalThis.syncAIRateLimitButtons?.();
         });
 }
+
+$(function () {
+    // Static buttons
+    $(document).on('click', '#regenerateAiScoresheetBtn', function () {
+        queueApplicationScoring();
+    });
+    $(document).on('click', '#btn-expand-all', function () {
+        expandAllAccordions('assessment-scoresheet');
+    });
+    $(document).on('click', '#btn-collapse-all', function () {
+        collapseAllAccordions('assessment-scoresheet');
+    });
+    $(document).on('click', '#saveAssessmentScoresBtn', function () {
+        saveAssessmentScores();
+    });
+
+    // Dynamically-generated section buttons (event delegation)
+    $(document).on('click', '[id^="scoresheet-section-save-"]', function () {
+        saveScoresSection($(this).data('form-id'), $(this).data('section-id'));
+    });
+    $(document).on('click', '[id^="scoresheet-section-discard-"]', function () {
+        discardChangesScoresSection($(this).data('form-id'), $(this).data('section-id'));
+    });
+
+});
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js
index 827ec58c0a..61f25e632a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js
@@ -33,7 +33,7 @@ $(function () {
                 });
             }, 10);
 
-            $(downloadAll).prop('disabled', result.length === 0);
+            $(downloadAll).prop('disabled', true);
             selectedAttachmentIds = [];
             setGenerateSummariesEnabled();
 
@@ -65,7 +65,14 @@ $(function () {
     }
 
     function setGenerateSummariesEnabled() {
-        $('#generateAiSummaries').prop('disabled', selectedAttachmentIds.length === 0);
+        const disabled = selectedAttachmentIds.length === 0;
+        $('#generateAiSummaries')
+            .prop('disabled', disabled)
+            .attr('data-ai-local-disabled', disabled ? '1' : '0');
+    }
+
+    function setDownloadAllEnabled() {
+        $(downloadAll).prop('disabled', selectedAttachmentIds.length === 0);
     }
 
     function setSelectAllState() {
@@ -83,6 +90,7 @@ $(function () {
         chefsDataTable.$('.chkbox').prop('checked', false);
         $('.select-all-chefs-files').prop('checked', false);
         setGenerateSummariesEnabled();
+        setDownloadAllEnabled();
     }
 
     function setAllAttachmentSelections(isSelected) {
@@ -163,6 +171,7 @@ $(function () {
     // Generate AI summaries for the current application attachments.
     const $generateAISummariesButton = $('#generateAiSummaries');
     if ($generateAISummariesButton.length > 0) {
+        setGenerateSummariesEnabled();
         $generateAISummariesButton.on('click', function () {
             const $button = $(this);
             const triggerButton = $button.data('trigger-button');
@@ -171,6 +180,7 @@ $(function () {
                 ? chefsDataTable.rows().data().toArray()
                 : chefsDataTable.rows({ selected: true }).data().toArray();
             const summaryAttachmentIds = rows.map((row) => row.id);
+            const applicationId = getApplicationId();
 
             $button.removeData('trigger-button');
 
@@ -186,51 +196,51 @@ $(function () {
             const existingHTML = $activeButton.html();
 
             globalThis.AIGenerationButtonState?.setGenerating($activeButton);
-
-            const monitorAttachmentSummaries = () => globalThis.AIGenerationButtonState.monitor({
-                $button: $activeButton,
-                originalHtml: existingHTML,
-                getStatus: () => unity.grantManager.grantApplications.grantApplication
-                    .getAIGenerationStatus(getApplicationId(), 'attachment-summary'),
-                onComplete: () => {
-                    resetAttachmentSelection();
-                    chefsDataTable.ajax.reload();
-                    abp.notify.success('AI summaries generated successfully.');
-                },
-                onFailed: (request) => abp.message.error(request?.failureReason || 'AI summary generation failed.')
-            });
-
-            unity.grantManager.grantApplications.grantApplication
-                .queueAttachmentSummary({
-                    applicationId: getApplicationId(),
-                    attachmentIds: summaryAttachmentIds
-                })
-                .done(function (request) {
-                    const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
-
-                    if (status === 'Completed') {
-                        resetAttachmentSelection();
-                        chefsDataTable.ajax.reload();
-                        abp.notify.success('AI summaries generated successfully.');
-                        globalThis.AIGenerationButtonState?.restore($activeButton);
-                        $activeButton.html(existingHTML).prop('disabled', false);
-                        globalThis.syncAIRateLimitButtons?.();
-                        return;
-                    }
-
-                    monitorAttachmentSummaries();
+            $activeButton
+                .html(
+                    '<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Generating...</span></span>'
+                )
+                .prop('disabled', true);
+
+            globalThis.AIGenerationApi.queueAttachmentSummary({
+                applicationId: applicationId,
+                attachmentIds: summaryAttachmentIds,
+            })
+                .done(function (generationStatus) {
+                    globalThis.AIGenerationButtonState?.setGenerating($activeButton);
+                    pollAttachmentSummaryGeneration(applicationId, $activeButton, existingHTML);
                 })
                 .fail(function (error) {
-                    console.error('Error queueing AI summaries:', error);
-                    abp.message.error('An error occurred while queueing AI summaries. Please try again.');
+                    console.error('Error generating AI summaries:', error);
+                    abp.message.error('An error occurred while generating AI summaries. Please try again.');
                     globalThis.AIGenerationButtonState?.restore($activeButton);
+                    globalThis.refreshAIRateLimitState?.();
                     $activeButton.html(existingHTML).prop('disabled', false);
                     setGenerateSummariesEnabled();
-                    globalThis.syncAIRateLimitButtons?.();
                 });
         });
     }
 
+    function pollAttachmentSummaryGeneration(applicationId, $button, originalHtml) {
+        globalThis.AIGenerationButtonState.monitor({
+            $button,
+            originalHtml: originalHtml ?? $button.html(),
+            getStatus: () => globalThis.AIGenerationApi.getStatus(applicationId, 'attachment-summary'),
+            onComplete: refreshAttachmentSummaryResults,
+            onPollFailed: (error) => {
+                console.warn('Failed to poll AI attachment summary status.', error);
+                abp.message.error(error?.message || 'AI attachment summary generation failed.');
+            }
+        });
+    }
+
+    function refreshAttachmentSummaryResults() {
+        resetAttachmentSelection();
+        chefsDataTable.ajax.reload();
+        abp.notify.success('AI summaries generated successfully.');
+        globalThis.refreshAIRateLimitState?.();
+    }
+
     // Toggle all AI summaries (only if feature is enabled)
     const $toggleAllAISummariesButton = $('#toggleAllAISummaries');
     let allAISummariesExpanded = false;
@@ -335,6 +345,7 @@ $(function () {
         });
         setGenerateSummariesEnabled();
         setSelectAllState();
+        setDownloadAllEnabled();
     });
 
     chefsDataTable.on('deselect', function (e, dt, type, indexes) {
@@ -352,6 +363,7 @@ $(function () {
         });
         setGenerateSummariesEnabled();
         setSelectAllState();
+        setDownloadAllEnabled();
     });
 
     $('#resyncSubmissionAttachments').on('click', function () {
@@ -381,7 +393,7 @@ $(function () {
         const _this = $(this);
         const existingHTML = _this.html();
         const zip = new JSZip();
-        const tempFiles = chefsDataTable.rows().data().toArray().map((row) => ({
+        const tempFiles = chefsDataTable.rows({ selected: true }).data().toArray().map((row) => ({
             FormSubmissionId: row.chefsSubmissionId,
             ChefsFileId: row.chefsFileId,
             Filename: row.fileName,
@@ -455,13 +467,13 @@ function getChefsFileDownloadColumn() {
                 '<i class="fl fl-attachment-more"></i>' +
                 '</button>' +
                 '<div class="dropdown-content">' +
-                '<button class="btn fullWidth" style="margin:10px" type="button"' +
+                '<button class="btn fullWidth" style="margin:10px;margin-left:8px;" type="button"' +
                 ' chefs-submission-id="' + escapeHtmlAttribute(submissionId) + '"' +
                 ' chefs-data="' + escapeHtmlAttribute(fileId) + '"' +
                 ' chefs-file-name="' + escapeHtmlAttribute(fileName) + '"' +
                 ' chefs-display-name="' + escapeHtmlAttribute(displayName) + '"' +
                 ' onclick="previewChefsFile(event)">' +
-                '<i class="fa fa-eye"></i><span>Preview Attachment</span>' +
+                '<i class="fa fa-eye p-0"></i><span>Preview Attachment</span>' +
                 '</button>' +
                 '<button class="btn fullWidth" style="margin:10px" type="button"' +
                 ' chefs-submission-id="' + escapeHtmlAttribute(submissionId) + '"' +
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
index bf6acd2ef9..7cf334679f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
@@ -5,8 +5,29 @@
     Layout = null;
 }
 
+<div class="configuration-action-bar row">
+    <div class="col-12 col-md-8">
+        <h5>Scoresheet & Worksheets Configuration</h5>
+    </div>
+    <div class="col-12 col-md-4 btn-wrapper">
+        <abp-button id="btn-save-worksheet-config"
+                    text="Save"
+                    type="submit"
+                    icon-type="Other"
+                    icon="fl fl-save"
+                    class="btn unt-btn-primary btn-primary"
+                    style="pointer-events: all;"
+                    abp-tooltip="Save the worksheet associations for mapping to the available Unity worksheet fields"
+                    button-type="Primary"
+                    form="worksheet-config-form" />
+        <abp-button id="btn-back-worksheet-config"
+                    text="Back"
+                    class="btn unt-btn-outline-primary btn-outline-primary"
+                    abp-tooltip="Navigate back to the Forms" />
+    </div>
+</div>
 <div class="row">
-    <div class="col-6 p-3">
+    <div class="col-6 p-3 pb-0">
         <label for="applicationFormVersionRo" class="form-label">Version:</label>
         <div class="select-icon-wrapper">
             <select class="form-select form-control" id="applicationFormVersionRo" name="Version" disabled>
@@ -18,14 +39,14 @@
             }
         </div>
     </div>
-    <div class="col-6 p-3">
+    <div class="col-6 pt-3 px-2">
         <input type="hidden" id="originalScoresheetId" value="@Model!.ScoresheetId" />
         <abp-select asp-for="@Model.ScoresheetId" asp-items="@Model.ScoresheetOptionsList" id="scoresheet" label="Scoresheets:">
             <option value="">Please choose...</option>
         </abp-select>
     </div>
 </div>
-<div id="custom-fields-div" class="custom-fields-container" >
+<div id="custom-fields-div" class="custom-fields-container">
     <form method="post" asp-controller="CustomFields" asp-action="UpdateCustomFields" id="worksheet-config-form">
         <abp-input type="hidden" id="ChefsFormVersionId" asp-for="@Model.ChefsFormVersionId" />
         <abp-input type="hidden" id="AssessmentInfoSlotIds" asp-for="@Model.AssessmentInfoSlotIds" />
@@ -48,27 +69,6 @@
                         </div>
                     }
                 </div>
-                <div class="button-row row">
-                    <div class="col-12">
-                        <div class="buttons">
-                            <div class="buttons-div">
-                                <abp-button id="btn-save-worksheet-config"
-                                            text="Save"
-                                            type="submit"
-                                            icon-type="Other"                                
-                                            class="btn unt-btn-primary btn-primary mx-1"
-                                            style="pointer-events: all;"
-                                            abp-tooltip="Save the Worksheet associations to the Mapping of to the Available Unity Worksheet Fields"
-                                            button-type="Primary" />
-
-                                <abp-button id="btn-back-worksheet-config"
-                                            text="Back"
-                                            class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                                            abp-tooltip="Navigate back to the Forms" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
             <div class="slots-col">
                 <div class="slot-title">Assessment Info:</div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.cshtml
index e43cb89266..e47847b901 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.cshtml
@@ -1,15 +1,23 @@
 @using Unity.GrantManager.Localization;
 @using Microsoft.Extensions.Localization;
 @using Unity.GrantManager.Web.Views.Shared.Components.ApplicationActionWidget;
+@using Unity.GrantManager.Web.Views.Shared.Components.DetailsActionBar;
 
 @inject IStringLocalizer<GrantManagerResource> L
+@model DetailsActionBarViewModel
 
 <div class="action-bar p-2 fade-in-load" id="detailsActionBar">
     <div id="DetailsActionBarStart" class="d-flex align-items-stretch justify-content-start gap-2">
         <div class="order-first">
             @await Component.InvokeAsync(typeof(ApplicationActionWidget), new { applicationId = @Model.ApplicationId })
         </div>
-        @* Items are included here through the Review List JS*@   
+        <abp-button id="togglePublishStatusBtn"
+                    data-selector="applications-table-actions"
+                    data-is-published="@Model.ExternalStatusVisibility.ToString().ToLowerInvariant()"
+                    text='@(Model.ExternalStatusVisibility ? L["DetailsActionBar:UnpublishButton"].Value : L["DetailsActionBar:PublishButton"].Value)'
+                    icon-type="Other"
+                    button-type="Light"
+                    disabled="@(!Model.CanUpdateExternalStatusVisibility)" />
     </div>
     <div id="DetailsActionBarEnd" class="d-flex align-items-stretch justify-content-end gap-2 margin-left-auto">
         <abp-button id="tagApplication"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.js
index 649d84ad61..3df9968bc0 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/Default.js
@@ -1,4 +1,5 @@
 $(function () {
+    const l = abp.localization.getResource('GrantManager');
     let selectedApplicationIds = decodeURIComponent($("#DetailsViewApplicationId").val());    
     
     let approveApplicationsModal = new abp.ModalManager({
@@ -258,4 +259,63 @@ $(function () {
                 console.error('Error storing application IDs:', error);
             });
     });
+
+    $('#togglePublishStatusBtn').on('click', function () {
+        let $publishButton = $(this);
+        let isPublished = $publishButton.attr('data-is-published') === 'true';
+        let confirmationDetails = getPublishConfirmationDetails(isPublished);
+
+        Swal.fire({
+            title: confirmationDetails.title,
+            text: confirmationDetails.text,
+            showCancelButton: true,
+            confirmButtonText: confirmationDetails.confirmButtonText,
+            cancelButtonText: l('DetailsActionBar:CancelButton'),
+            customClass: {
+                confirmButton: 'btn btn-primary',
+                cancelButton: 'btn btn-secondary'
+            }
+        }).then((result) => {
+            if (!result.isConfirmed) {
+                return;
+            }
+
+            let nextPublishedState = !isPublished;
+
+            unity.grantManager.grantApplications.grantApplication
+                .updateExternalStatusVisibility(selectedApplicationIds, nextPublishedState)
+                .then(function () {
+                    $publishButton.attr('data-is-published', nextPublishedState.toString());
+                    $publishButton.text(nextPublishedState
+                        ? l('DetailsActionBar:UnpublishButton')
+                        : l('DetailsActionBar:PublishButton'));
+
+                    abp.notify.success(nextPublishedState 
+                        ? l('DetailsActionBar:PublishStatusUpdatedToast')
+                        : l('DetailsActionBar:UnpublishStatusUpdatedToast'));
+
+                    let canPublishStatus = abp.auth.isGranted("Unity.GrantManager.ApplicationManagement.Application.Status.Publish");
+                    let canUnpublishStatus = abp.auth.isGranted("Unity.GrantManager.ApplicationManagement.Application.Status.Unpublish");
+                    let canUpdateExternalStatusVisibility = (!nextPublishedState && canPublishStatus) || (nextPublishedState && canUnpublishStatus);
+                    $('#togglePublishStatusBtn').prop('disabled', !canUpdateExternalStatusVisibility);
+
+                    PubSub.publish('application_status_changed', nextPublishedState ? 'Publish' : 'Unpublish');
+                    PubSub.publish('refresh_detail_panel_summary');
+                })
+                .catch(function (error) {
+                    abp.notify.error(l('DetailsActionBar:PublishStatusUpdateFailed'));
+                    console.error('Error updating publish status:', error);
+                });
+        });
+    });
+
+    function getPublishConfirmationDetails(isPublished) {
+        return {
+            title: l('DetailsActionBar:ConfirmActionTitle'),
+            text: isPublished
+                ? l('DetailsActionBar:UnpublishConfirmationText')
+                : l('DetailsActionBar:PublishConfirmationText'),
+            confirmButtonText: l('DetailsActionBar:ConfirmButton')
+        };
+    }
 });
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/DetailsActionBar.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/DetailsActionBar.cs
index 03c0ece84f..dd99427fc3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/DetailsActionBar.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/DetailsActionBar.cs
@@ -1,5 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using System;
+using System.Threading.Tasks;
+using Unity.GrantManager.GrantApplications;
+using Unity.Modules.Shared;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 
@@ -7,14 +11,26 @@ namespace Unity.GrantManager.Web.Views.Shared.Components.DetailsActionBar;
 
 [Widget(ScriptFiles = new[] { "/Views/Shared/Components/DetailsActionBar/Default.js" , "/Pages/ApplicationTags/ApplicationTags.js" },
     StyleFiles = new[] { "/Views/Shared/Components/ActionBar/Default.css" })]
-public class DetailsActionBar : AbpViewComponent
+public class DetailsActionBar(
+    IGrantApplicationAppService grantApplicationAppService,
+    IAuthorizationService authorizationService) : AbpViewComponent
 {
     [BindProperty]
     public Guid SelectedApplicationId { get; set; }
 
-    public IViewComponentResult Invoke(Guid applicationId)
+    public async Task<IViewComponentResult> InvokeAsync(Guid applicationId)
     {
         SelectedApplicationId = applicationId;
-        return View();
+
+        var application = await grantApplicationAppService.GetBasicAsync(SelectedApplicationId);
+        var canPublishStatus = await authorizationService.IsGrantedAnyAsync(UnitySelector.Application.Status.Publish);
+        var canUnpublishStatus = await authorizationService.IsGrantedAnyAsync(UnitySelector.Application.Status.Unpublish);
+
+        return View(new DetailsActionBarViewModel
+        {
+            ApplicationId = SelectedApplicationId,
+            ExternalStatusVisibility = application.ExternalStatusVisibility,
+            CanUpdateExternalStatusVisibility = (!application.ExternalStatusVisibility && canPublishStatus) || (application.ExternalStatusVisibility && canUnpublishStatus),
+        });
     }
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/DetailsActionBarViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/DetailsActionBarViewModel.cs
new file mode 100644
index 0000000000..9bb87e8c81
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/DetailsActionBar/DetailsActionBarViewModel.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Unity.GrantManager.Web.Views.Shared.Components.DetailsActionBar;
+
+public class DetailsActionBarViewModel
+{
+    public Guid ApplicationId { get; set; }
+    public bool ExternalStatusVisibility { get; set; }
+    public bool CanUpdateExternalStatusVisibility { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.cshtml
index 1e13c3f457..9f1514583c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.cshtml
@@ -1,3 +1,5 @@
-<div class="px-0">
-    <abp-table id="EmailHistoryTable" hoverable-rows="true" data-resize-aware="true" class="attachments-table"></abp-table>
+@model Unity.GrantManager.Web.Views.Shared.Components.EmailHistoryWidget.EmailHistoryWidgetViewModel
+<div class="px-0">
+    <abp-table id="EmailHistoryTable" hoverable-rows="true" data-resize-aware="true" class="attachments-table"
+               data-enable-email-delay="@Model.EnableEmailDelay.ToString().ToLower()"></abp-table>
 </div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
index 02d9cdaaba..993cbcb86f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
@@ -1,23 +1,31 @@
 $(function () {
 
-    let inputAction = function() {
+    let inputAction = function () {
         const urlParams = new URL(window.location.toLocaleString()).searchParams;
         const applicationId = urlParams.get('ApplicationId');
         return applicationId;
     }
 
     let responseCallback = function (result) {
+        const normalizedResult = (result || []).map(item => ({
+            ...item,
+            templateName: resolveTemplateName(item)
+        }));
+
         if (result) {
             setTimeout(function () {
-                PubSub.publish('update_application_emails_count', { itemCount: result.length });
+                PubSub.publish('update_application_emails_count', { itemCount: normalizedResult.length });
             }, 10);
         }
 
         return {
-            data: result
+            data: normalizedResult
         };
     };
 
+    const enableEmailDelay = $('#EmailHistoryTable').data('enable-email-delay') === true
+        || $('#EmailHistoryTable').data('enable-email-delay') === 'true';
+
     let emailHistoryDataTable = $('#EmailHistoryTable').DataTable(
         abp.libs.datatables.normalizeConfiguration({
             serverSide: false,
@@ -50,63 +58,114 @@
                     title: 'Status',
                     data: 'status',
                     className: 'data-table-header',
-                    width: '13%'
+                    width: '12%'
                 },
                 {
                     title: 'Created',
                     data: 'creationTime',
                     className: 'data-table-header',
-                    width: '23%',
+                    width: '12%',
+                    render: function (data) {
+                        return data ? luxon.DateTime.fromISO(data, {
+                            locale: abp.localization.currentCulture.name,
+                        }).toLocaleString({
+                            day: "numeric",
+                            year: "numeric",
+                            month: "numeric",
+                            hour: "numeric",
+                            minute: "numeric"
+                        }) : '—';
+                    }
+                },
+                {
+                    title: 'Sent Date',
+                    data: 'sentDateTime',
+                    className: 'data-table-header',
+                    width: '12%',
                     render: function (data) {
-                        return data != null ? luxon.DateTime.fromISO(data, {
+                        return data ? luxon.DateTime.fromISO(data, {
                             locale: abp.localization.currentCulture.name,
                         }).toLocaleString({
                             day: "numeric",
                             year: "numeric",
                             month: "numeric",
                             hour: "numeric",
-                            minute: "numeric",
-                            second: "numeric"
-                        }) : '';
+                            minute: "numeric"
+                        }) : '—';
                     }
                 },
                 {
                     title: 'Sent By',
                     data: 'sentBy',
                     className: 'data-table-header',
-                    width: '16%',
-                    render: function (data) {
+                    width: enableEmailDelay ? '10%' : '16%',
+                    render: function (data, type, full) {
+                        if (full.scheduledNotificationId && full.scheduledNotificationId !== '00000000-0000-0000-0000-000000000000') {
+                            return 'Automated Notification';
+                        }
                         return data ? data.name + ' ' + data.surname : '—';
                     },
                 },
+                {
+                    title: 'Scheduled Send',
+                    data: 'sendOnDateTime',
+                    className: 'data-table-header text-center',
+                    width: '10%',
+                    visible: enableEmailDelay,
+                    render: function (data, type) {
+                        if (!data) return '—';
+                        return formatScheduledSendDateTimeUtcToPacific(data, type) || '—';
+                    }
+                },
                 {
                     title: 'To Address',
                     data: 'toAddress',
-                    visible : false ,
+                    visible: false,
                     className: 'data-table-header'
                 },
                 {
                     title: 'From Address',
                     data: 'fromAddress',
-                    visible : false ,
+                    visible: false,
                     className: 'data-table-header'
                 },
                 {
                     title: 'Body',
                     data: 'body',
-                    visible : false ,
+                    visible: false,
+                    className: 'data-table-header'
+                },
+                {
+                    title: 'Template Name',
+                    data: 'templateName',
+                    visible: false,
                     className: 'data-table-header'
                 },
+                {
+                    title: 'Scheduled Notification ID',
+                    data: 'scheduledNotificationId',
+                    visible: false,
+                    className: 'data-table-header',
+                    defaultContent: ''
+                },
                 {
                     data: 'status',
                     width: '8%',
                     className: 'text-center',
                     render: function (data, _, full, meta) {
-                        if (data === 'Draft' && abp.auth.isGranted('Notifications.Email.Send')) {
+                        // Show delete button for drafts
+                        if (data === 'Draft' && abp.auth.isGranted('Notifications.Email.DeleteDraft')) {
                             return generateDeleteButtonContent(full, meta.row);
-                        } else {
-                            return '';
                         }
+                        // Show cancel button for scheduled sends that haven't passed yet
+                        else if (full.sendOnDateTime && abp.auth.isGranted('Notifications.Email.CancelScheduled')) {
+                            const sendOnDateTime = parseUtcDateTime(full.sendOnDateTime);
+                            const now = luxon.DateTime.utc();
+                            if (sendOnDateTime && sendOnDateTime > now) {
+                                return generateCancelScheduledButtonContent(full, meta.row);
+                            }
+                        }
+                        return '';
                     },
                     orderable: false
                 }
@@ -118,6 +177,10 @@
         return `<button class="btn btn-delete-draft" type="button" onclick="deleteDraftEmail('${full.id}', '${row}')"><i class="fl fl-cancel"></i></button>`;
     }
 
+
+
+
+
     function rowFormat(d) {
         return '<div class="multi-line">' + d.body + '</div>';
     }
@@ -140,11 +203,16 @@
     emailHistoryDataTable.on('click', 'tr td', function (e) {
         let tr = e.target.closest('tr');
         let row = emailHistoryDataTable.row(tr);
-        let column = emailHistoryDataTable.column( this );
+        let column = emailHistoryDataTable.column(this);
 
-        if(column.index() > 0 && column.index() < 4) {
-            let data = row.data();
-            PubSub.publish('email_selected', data);
+        if (column.index() > 0 && column.index() < 4) {
+            const data = row.data();
+            const normalizedSelectedRow = {
+                ...data,
+                templateName: resolveTemplateName(data)
+            };
+
+            PubSub.publish('email_selected', normalizedSelectedRow);
         }
     });
 
@@ -157,6 +225,91 @@
     });
 });
 
+function resolveTemplateName(emailRow) {
+    const value = [
+        emailRow?.templateName,
+        emailRow?.emailTemplateName,
+        emailRow?.template,
+        emailRow?.TemplateName,
+        emailRow?.EmailTemplateName,
+        emailRow?.Template
+    ].find(v => typeof v === 'string' && v.trim().length > 0);
+
+    return (value || '').trim();
+}
+
+function parseUtcDateTime(value) {
+    if (!value) {
+        return null;
+    }
+
+    const normalized = String(value).trim().replace(' ', 'T');
+    const withUtcSuffix = /([zZ]|[+-]\d{2}:?\d{2})$/.test(normalized)
+        ? normalized
+        : `${normalized}Z`;
+
+    const dateTime = luxon.DateTime.fromISO(withUtcSuffix, { zone: 'utc' });
+    return dateTime.isValid ? dateTime : null;
+}
+
+function formatScheduledSendDateTimeUtcToPacific(value, type) {
+    if (type !== 'display' && type !== 'filter') {
+        return value;
+    }
+
+    const utcDateTime = parseUtcDateTime(value);
+    if (!utcDateTime) {
+        return '—';
+    }
+
+    return utcDateTime
+        .setZone('UTC-7')
+        .toLocaleString({
+            day: 'numeric',
+            year: 'numeric',
+            month: 'numeric',
+            hour: 'numeric',
+            minute: 'numeric'
+        });
+}
+
+function generateCancelScheduledButtonContent(full, row) {
+    return `<button class="btn btn-delete-delayed" type="button" onclick="cancelScheduledEmail('${full.id}', '${row}')"><i class="fl fl-cancel"></i></button>`;
+}
+
+function cancelScheduledEmail(id, rowIndex) {
+    Swal.fire({
+        title: "Cancel Scheduled Email",
+        text: "Are you sure you want to cancel this scheduled email?",
+        showCancelButton: true,
+        confirmButtonText: "Confirm",
+        customClass: {
+            confirmButton: 'btn btn-primary',
+            cancelButton: 'btn btn-secondary'
+        }
+    }).then((result) => {
+        if (result.isConfirmed) {
+            $.ajax({
+                url: `/api/app/email-notification/${id}/email`,
+                type: "DELETE",
+            })
+                .then(response => {
+                    abp.notify.success('Scheduled email has been cancelled.', 'Cancel Scheduled Email');
+                    PubSub.publish('refresh_application_emails');
+                    PubSub.publish('scheduled_email_cancelled', { id: id });
+                })
+                .catch(error => {
+                    console.error('There was a problem with the fetch operation:', error);
+                    
+                    // Extract error message from API response
+                    const errorMessage = error?.responseJSON?.error?.message || 'Failed to cancel scheduled email. Please try again.';
+                    
+                    abp.notify.error(errorMessage, 'Cancel Scheduled Email');
+                });
+        }
+    });
+}
+
 function deleteDraftEmail(id, rowIndex) {
     Swal.fire({
         title: "Delete Draft Email",
@@ -173,15 +326,20 @@ function deleteDraftEmail(id, rowIndex) {
                 {
                     url: `/api/app/email-notification/${id}/email`,
                     type: "DELETE",
-            })
-            .then(response => {
-                abp.notify.success('Draft email is successfully deleted.', 'Delete Draft Email');
-                PubSub.publish('refresh_application_emails');
-                PubSub.publish('draft_email_deleted', { id: id });
-            })
-            .catch(error => {
-                console.error('There was a problem with the fetch operation:', error);
-            });
+                })
+                .then(response => {
+                    abp.notify.success('Draft email is successfully deleted.', 'Delete Draft Email');
+                    PubSub.publish('refresh_application_emails');
+                    PubSub.publish('draft_email_deleted', { id: id });
+                })
+                .catch(error => {
+                    console.error('There was a problem with the fetch operation:', error);
+                    
+                    // Extract error message from API response
+                    const errorMessage = error?.responseJSON?.error?.message || 'Failed to delete draft email. Please try again.';
+                    
+                    abp.notify.error(errorMessage, 'Delete Draft Email');
+                });
         }
     });
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css
index 41687251bb..c98d1ae801 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css
@@ -18,6 +18,8 @@
     overflow: visible !important;
     width: 100%;
     box-sizing: border-box;
+    overflow-x: auto !important;
+    scrollbar-gutter: stable;
 }
 
 #EmailHistoryTable_wrapper .dt-scroll-head,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistoryWidgetViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistoryWidgetViewComponent.cs
index 706c878735..e4653f23e2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistoryWidgetViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistoryWidgetViewComponent.cs
@@ -1,19 +1,27 @@
 using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
+using Volo.Abp.Settings;
+using Unity.Notifications.Settings;
 
 namespace Unity.GrantManager.Web.Views.Shared.Components.EmailHistoryWidget;
 
 [Widget(
     ScriptTypes = new [] {typeof(EmailHistoryScriptBundleContributor)}, 
     StyleTypes = new [] {typeof(EmailHistoryStyleBundleContributor)})]
-public class EmailHistoryWidgetViewComponent : AbpViewComponent
+public class EmailHistoryWidgetViewComponent(ISettingProvider settingProvider) : AbpViewComponent
 {
-    public IViewComponentResult Invoke()
+    public async Task<IViewComponentResult> InvokeAsync()
     {
-        return View();
+        var enableEmailDelay = string.Equals(
+            await settingProvider.GetOrNullAsync(NotificationsSettings.Mailing.EnableEmailDelay),
+            "true", StringComparison.OrdinalIgnoreCase);
+
+        return View(new EmailHistoryWidgetViewModel { EnableEmailDelay = enableEmailDelay });
     }
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistoryWidgetViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistoryWidgetViewModel.cs
new file mode 100644
index 0000000000..6c3fa2b21f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistoryWidgetViewModel.cs
@@ -0,0 +1,6 @@
+namespace Unity.GrantManager.Web.Views.Shared.Components.EmailHistoryWidget;
+
+public class EmailHistoryWidgetViewModel
+{
+    public bool EnableEmailDelay { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
index 3762c96b59..ce6c7ea1bb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
@@ -12,6 +12,9 @@
     Layout = null;
     var sendEmailGranted    = await PermissionChecker.IsGrantedAsync("Notifications.Email.Send");
     var emailFieldsetState  = sendEmailGranted ? string.Empty : "disabled";
+    var enableEmailDelay = Model.EnableEmailDelay;
+    var scheduleEmailGranted = await PermissionChecker.IsGrantedAsync("Notifications.Email.Schedule");
+    var enableScheduleSend = enableEmailDelay && scheduleEmailGranted;
 }
 
 <div id=" emails-div@(Model.ApplicationId)" class="mt-2  emails-container" data-count="0" data-counttag="application_emails_count">
@@ -67,6 +70,7 @@
 
     <form id="EmailForm" class="email-form" autocomplete="off">
         <abp-input type="hidden" id="ApplicationId" asp-for="@Model.ApplicationId" />
+        <input type="hidden" id="EmailTemplateName" name="EmailTemplateName" value="" />
         <fieldset @emailFieldsetState>
             <legend class="d-none">Email Form</legend>
             <input type="hidden" id="EmailId" name="EmailId" />
@@ -77,115 +81,181 @@
             <input type="hidden" id="OriginalDraftEmailSubject" />
             <input type="hidden" id="OriginalDraftEmailBody" />
 
-            <abp-row class="m-0 p-0">
-                <abp-column id="templateListContainer" size="_10" class="px-2">
-                    <abp-select asp-for="@Model.EmailTemplate" asp-items="@Model.TemplatesList" id="template">
-                        <option value="">Please select</option>
-                    </abp-select>
-                </abp-column>
-                <abp-column id="templateTextContainer" size="_10" class="px-1">
-                    <abp-input id="templateText" asp-for="@Model.EmailTemplateName"></abp-input>
+            <!-- Top Buttons -->
+            <abp-row class="m-0 p-0" abp-if="@sendEmailGranted">
+                <abp-column size="_10" class="email-buttons-container">
+                    <!-- From Field -->
+                    <div class="from-field-container">
+                        <label for="EmailFrom" class="from-label">From:</label>
+                        <abp-input asp-for="@Model.EmailFrom" class="email-input from-input" suppress-label="true" />
+                    </div>
+                    <div class="email-buttons-group">
+                        <div class="btn-group">
+                            <button id="btn-send-top" type="submit" class="btn btn-primary btn-send" data-applicationId="@Model.ApplicationId">
+                                Send
+                            </button>
+                        
+                            <button id="btn-send-dropdown" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" abp-if="@enableScheduleSend">
+                                <i class="fa fa-chevron-down"></i>
+                            </button>
+                            <ul class="dropdown-menu" aria-labelledby="btn-send-dropdown">
+                                <li><a class="dropdown-item btn-send-menu" href="#">Send</a></li>
+                                <li><a class="dropdown-item btn-schedule-send-menu" href="#">Schedule Send</a></li>
+                            </ul>
+                        </div>                    
+
+                        <!-- Other Buttons (Right) -->
+                        <div class="ms-auto d-flex gap-2">
+                            <abp-button id="btn-save-top"
+                                        icon-type="Other"
+                                        icon="fl fl-save"
+                                        class="btn-save"
+                                        text="Save"
+                                        type="button"
+                                        button-type="Primary" data-applicationId="@Model.ApplicationId"></abp-button>
+
+                            <abp-button id="btn-send-discard-top"
+                                        class="close btn-send-discard"
+                                        data-dismiss="modal"
+                                        aria-label="Discard"
+                                        text="Discard"
+                                        button-type="Secondary" data-applicationId="@Model.ApplicationId"></abp-button>
+
+                            <abp-button id="btn-send-close-top"
+                                        class="close btn-send-close"
+                                        data-dismiss="modal"
+                                        aria-label="Close"
+                                        text="Close"
+                                        button-type="Secondary" data-applicationId="@Model.ApplicationId"></abp-button>
+                        </div>
+                    </div>
                 </abp-column>
             </abp-row>
-            <abp-row class="m-0 p-0">
-                <abp-column size="_10" class="px-1">
-                    <abp-input asp-for="@Model.EmailTo" class="email-input" />
+
+             <abp-row id="scheduled-delay-section"class="m-0 p-0 align-items-center" abp-if="@enableScheduleSend">
+                <abp-row class="m-0 p-0 align-items-center">
+                    <abp-column size="_12" class="px-1">
+                        <div id="scheduled-display-container" class="d-flex align-items-center gap-2 flex-wrap">
+                            <span id="scheduled-label-container">
+                                <label for="scheduleSend" class="form-label mb-0">
+                                    Scheduled Date/Time:
+                                </label>
+                            </span>                            
+                            <span id="send-on-display" class="text-muted"></span>
+                            <button type="button" id="btn-clear-schedule" class="btn btn-light" style="display: none;">
+                                Clear
+                            </button>
+                        </div>
+                        <div id="delay-datetime-validation" class="text-danger mt-1"></div>
+                        <!-- Hidden field carries the UTC ISO value submitted to the API -->
+                        <input id="SendOnDateTime" name="SendOnDateTime" type="hidden" />
+                    </abp-column>
+                </abp-row>
+            </abp-row>        
+
+            <abp-row class="m-0 p-0 align-items-start">
+                <abp-column class="col-auto px-1 label-column-aligned mt-14">
+                    <label for="EmailTo" class="form-label mb-0">To:</label>
                 </abp-column>
-            </abp-row>
-            <abp-row class="m-0 p-0">
-                <abp-column size="_10" class="px-1">
-                    <abp-input asp-for="@Model.EmailCC" class="email-input" />
+                <abp-column class="col px-1 email-to-container">
+                    <abp-input asp-for="@Model.EmailTo" class="email-input" suppress-label="true" />
+                    <button type="button" id="btn-show-bcc" class="btn btn-outline-secondary btn-sm email-bcc-button">
+                        BCC
+                    </button>
                 </abp-column>
             </abp-row>
-            <abp-row class="m-0 p-0">
-                <abp-column size="_10" class="px-1">
-                    <abp-input asp-for="@Model.EmailBCC" class="email-input" />
+            <abp-row class="m-0 p-0 align-items-start row">
+                <abp-column class="col-auto px-1 mt-14">
+                    <label for="EmailCC" class="form-label mb-0">Cc:</label>
                 </abp-column>
-            </abp-row>
-            <abp-row class="m-0 p-0">
-                <abp-column size="_10" class="px-1">
-                    <abp-input asp-for="@Model.EmailFrom" class="email-input" />
+                <abp-column class="col px-1">
+                    <abp-input asp-for="@Model.EmailCC" class="email-input" suppress-label="true" />
                 </abp-column>
             </abp-row>
-            <abp-row class="m-0 p-0">
-                <abp-column size="_10" class="px-1">
-                    <abp-input asp-for="@Model.EmailSubject" class="email-input" />
+            <abp-row class="m-0 p-0 align-items-start row" id="bcc-input-row">
+                <abp-column class="col-auto px-1 mt-14">
+                    <label for="EmailBCC" class="form-label mb-0">Bcc:</label>
+                </abp-column>
+                <abp-column class="col px-1">
+                    <abp-input asp-for="@Model.EmailBCC" class="email-input" suppress-label="true" />
                 </abp-column>
             </abp-row>
-            <abp-row class="m-0 p-0">
-                <abp-column size="_10" class="px-1">
-                    <abp-input asp-for="@Model.EmailBody" class="email-input" />
+            <abp-row class="m-0 p-0 align-items-start row">
+                <abp-column size="_12" class="px-1">
+                    <abp-input asp-for="@Model.EmailSubject" class="email-input" suppress-label="true" />
                 </abp-column>
             </abp-row>
-        </fieldset>
-        <div id="email-attachments-section" style="display:none">
-            <abp-row class="m-0 p-0">
-                <abp-column size="_12" class="px-0">
-                    <h6 class="fw-bold pt-3 pb-1 m-0">Attachments</h6>
-                    <abp-table id="EmailAttachmentsTable"
-                               hoverable-rows="true"
-                               class="attachments-table nowrap"></abp-table>
-                    <div id="attachment-upload-progress" style="display:none" class="mt-2 mb-1">
-                        <div class="progress">
-                            <div id="attachment-upload-progress-bar"
-                                 class="progress-bar progress-bar-striped progress-bar-animated"
-                                 role="progressbar"
-                                 style="width:0%"
-                                 aria-valuenow="0"
-                                 aria-valuemin="0"
-                                 aria-valuemax="100">0%</div>
-                        </div>
-                    </div>
-                    <div id="email-attachment-size-error" class="alert alert-danger mt-2" style="display:none">
-                        <i class="fa fa-exclamation-triangle me-1"></i>
-                        <span id="email-attachment-size-error-message"></span>
-                    </div>
-                    <div class="d-flex justify-content-end mt-2 mb-1">
-                        <form id="email-attachment-form" enctype="multipart/form-data">
-                            <input id="email_attachment_upload" type="file" multiple
-                                   style="display:none" />
-                            <abp-button text="Add Attachments"
-                                        id="email_attachment_upload_btn"
-                                        icon-type="Other"
-                                        icon="fl fl-plus"
-                                        button-type="Light" />
-                        </form>
-                    </div>
+            <abp-row class="m-0 p-0 px-1">
+                <abp-column size="_12" class="px-2 pe-1">
+                    <abp-input asp-for="@Model.EmailBody" class="email-input" suppress-label="true" />
                 </abp-column>
             </abp-row>
+        </fieldset>
+
+        @await Html.PartialAsync("/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml")
+
+    </form>
+
+<!-- Schedule Send Modal -->
+<div id="schedule-modal-backdrop"></div>
+<div id="schedule-send-modal">
+    <!-- Header -->
+    <div class="schedule-modal-header">
+        <h5 class="schedule-modal-title">Set a scheduled date and time</h5>
+    </div>
+
+    <!-- Main Content: Two Column Layout -->
+    <div class="schedule-modal-body d-flex gap-4">
+        <!-- Left Column: Calendar -->
+        <div class="schedule-calendar-section">
+            <div class="calendar-nav d-flex justify-content-between align-items-center mb-3">
+                <button type="button" id="btn-calendar-prev" class="btn btn-sm btn-light">←</button>
+                <span id="calendar-month-year" class="calendar-month-year">June 2026</span>
+                <button type="button" id="btn-calendar-next" class="btn btn-sm btn-light">→</button>
+            </div>
+            <div id="schedule-calendar-grid" class="calendar-grid">
+                <!-- Day grid will be generated by JavaScript -->
+            </div>
         </div>
-        <abp-row class="m-0 p-0" abp-if="@sendEmailGranted">
-            <abp-column size="_10" class="px-1">
-            <abp-modal-footer>
-                <abp-button id="btn-save"
-                            icon-type="Other"
-                            icon="fl fl-save"
-                            class="btn-save"
-                            text="Save"
-                            type="button"
-                            button-type="Primary" data-applicationId="@Model.ApplicationId"></abp-button>
-
-                <abp-button id="btn-send"
-                            class="btn-send"
-                            text="Send"
-                            type="submit"
-                            button-type="Primary" data-applicationId="@Model.ApplicationId"></abp-button>
-
-                <abp-button id="btn-send-discard"
-                            class="close btn-send-discard"
-                            data-dismiss="modal"
-                            aria-label="Discard"
-                            text="Discard"
-                            button-type="Secondary" data-applicationId="@Model.ApplicationId"></abp-button>
-
-                <abp-button id="btn-send-close"
-                            class="close btn-send-close"
-                            data-dismiss="modal"
-                            aria-label="Close"
-                            text="Close"
-                            button-type="Secondary" data-applicationId="@Model.ApplicationId"></abp-button>
-            </abp-modal-footer>
-        </abp-column>
-    </abp-row>
-</form>
-</div>
\ No newline at end of file
+
+        <!-- Right Column: Date & Time Inputs -->
+        <div class="schedule-inputs-section">
+            <!-- Date Input -->
+            <div class="schedule-input-group mb-3">
+                <label for="schedule-date-input" class="form-label">Select a date</label>
+                <div class="input-group">
+                    <input id="schedule-date-input" type="text" class="form-control" placeholder="MM/DD/YYYY" />
+                    <button type="button" class="input-group-text" disabled>
+                        <i class="fa fa-calendar"></i>
+                    </button>
+                </div>
+                <small id="schedule-date-validation" class="d-block mt-1" style="display: none;"></small>
+            </div>
+
+            <!-- Time Dropdown -->
+            <div class="schedule-input-group">
+                <label for="schedule-time-select" class="form-label">Time</label>
+                <div class="input-group">
+                    <select id="schedule-time-select" class="form-select">
+                        <option value="">Select a time</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Validation Message -->
+    <div id="schedule-modal-validation" class="text-danger mt-3" style="display: none;"></div>
+
+    <!-- Footer -->
+    <div class="schedule-modal-footer d-flex justify-content-end gap-2 mt-4">
+        <button type="button" id="btn-schedule-confirm" class="btn btn-primary btn-sm">Schedule</button>
+        <button type="button" id="btn-schedule-cancel" class="btn btn-secondary btn-sm">Cancel</button>        
+    </div>
+</div>
+
+</div>
+
+@section Scripts {
+    <script src="~/views/shared/components/emailswidget/Default.js"></script>
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
index 2a3f2197b6..d4aae78553 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
@@ -17,11 +17,138 @@
 #applicationEmailsWidget .email-input {
     outline: 0;
     margin-right: 8px;
-    margin-left: 8px;
+    margin-left: 10px;
     margin-top: 2px;
     margin-bottom: 2px;
+    height: 36px;
+}
+
+#applicationEmailsWidget input.form-control {
+    width: 99%;
+}
+
+#applicationEmailsWidget .label-column-aligned {
+    display: flex;
+    align-items: flex-start;
+    height: 100%;
+    padding-bottom: 0px;
+    flex-direction: column;
+    justify-content: flex-end;
+}
+
+#applicationEmailsWidget .col-1 {
+    width: 44px;
+}
+
+#applicationEmailsWidget .col-auto {
+    flex: 0 0 auto;
+    width: auto;
+}
+
+/* Uniform label width for To, Cc, Bcc fields */
+#applicationEmailsWidget .row.align-items-start > .col-auto,
+#applicationEmailsWidget .row.align-items-center > .col-auto {
+    flex: 0 0 46px !important;
+    width: 46px !important;
+}
+
+#applicationEmailsWidget .col {
+    flex: 1 0 0%;
+    width: 100%;
+}
+
+#applicationEmailsWidget .email-to-container {
+    position: relative;
+}
+
+#applicationEmailsWidget .email-to-container .email-input {
+    padding-right: 60px;
+}
+
+#applicationEmailsWidget .email-bcc-button {
+    position: absolute;
+    right: 8px;
+    font-size: 0.75rem;
+    padding: 0.25rem 0.5rem;
+    white-space: nowrap;
+    z-index: 10;
+}
+
+#applicationEmailsWidget #bcc-input-row {
+    display: none;
+}
+
+#applicationEmailsWidget #bcc-input-row.show {
+    display: flex;
+}
+
+
+#applicationEmailsWidget #scheduled-delay-section #send-on-display:empty {
+    display: none;
+}
+
+#applicationEmailsWidget #scheduled-delay-section #send-on-display:empty ~ #btn-clear-schedule {
+    display: none !important;
+}
+
+#applicationEmailsWidget .email-bcc-button.hide {
+    display: none;
+}
+
+#applicationEmailsWidget .from-field-container {
+    align-items: center;
+    display: flex;
+    height: 36px;
+    margin: 0px;
+    flex-grow: 1;
+    gap: 0.3rem;
+    position: relative;
+    width: 100%;
+    margin-top: 4px;
 }
 
+#applicationEmailsWidget .from-field-container .btn-send-from {
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 100%;
+    padding: 0 12px !important;
+    white-space: nowrap;
+    z-index: 10;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+#applicationEmailsWidget .from-label {
+    font-size: 1rem !important;
+    font-weight: 500;
+    white-space: nowrap;
+    margin-left: 0px !important;
+    margin-bottom: 0;
+    color: var(--bc-colors-grey-text-300);
+    min-width: 40px;
+}
+
+#applicationEmailsWidget .from-field-container .from-input {
+    min-width: 150px;
+    width: 100%;
+    height: 36px;
+    padding: 6px 8px !important;
+    position: relative;
+    flex-grow: 1;
+    padding-right: 75px !important;
+    display: block;
+    margin: 0px !important;
+}
+
+#applicationEmailsWidget .from-field-container .mb-3 {
+    display: inline-block;
+    vertical-align: middle;
+    margin-top: 9px;
+    margin-bottom: 0px;
+    flex-grow: 1;
+}
 
 #applicationEmailsWidget .email-form label {
     color: var(--bc-colors-grey-text-300);
@@ -30,6 +157,40 @@
     text-overflow: ellipsis;
     margin-left: 8px;
     margin-bottom: 0;
+    display: inline-block;
+}
+
+/* Override margin-top for labels in row layouts (To, Cc, Bcc) */
+#applicationEmailsWidget .row.align-items-start label,
+#applicationEmailsWidget .row.align-items-center label {
+    margin-top: 15px;
+    font-size: 14px;
+    font-weight: 500;
+}
+
+#applicationEmailsWidget .form-label {
+    display: inline-block;
+    color: var(--bc-colors-grey-text-300, #666666);
+    font-size: 1rem !important;
+    font-family: 'BCSans', var(--bs-font-sans-serif) !important;
+    font-weight: var(--bs-body-font-weight, 400);
+    margin-bottom: 0 !important;
+    margin-top: 0 !important;
+}
+
+/* Specific alignment fix for labels in horizontal layouts */
+#applicationEmailsWidget #scheduled-label-container {
+    display: none;
+    padding-top: 8px; /* Adjust this value to perfectly center label with the first line of input */
+}
+
+#applicationEmailsWidget #scheduled-label-container.show {
+    display: inline;
+}
+
+/* Ensure the parent row aligns to the top to prevent shifting when errors appear */
+#applicationEmailsWidget .row.align-items-start {
+    align-items: flex-start !important;
 }
 
 #applicationEmailsWidget .email-input:hover {
@@ -63,6 +224,61 @@
     color: #b9b9b9 !important;
 }
 
+/* Email template select styling */
+#applicationEmailsWidget #EmailTemplate {
+    margin-right: 8px;
+    margin-left: 8px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+/* 1. Style the select itself when the empty value is selected */
+#applicationEmailsWidget #EmailTemplate:has(option[value=""]:checked) {
+    color: #b9b9b9 !important;
+}
+
+/* 2. Style the placeholder option inside the dropdown list */
+#applicationEmailsWidget #EmailTemplate option[value=""] {
+    color: #b9b9b9 !important;
+}
+
+/* 3. Ensure valid selections return to your default text color (e.g., dark grey/black) */
+#applicationEmailsWidget #EmailTemplate option:not([value=""]) {
+    color: #212529; 
+}
+
+#applicationEmailsWidget button {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    height: 36px;
+    min-height: 36px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    max-height: 36px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+    box-sizing: border-box;
+}
+
+#user-dropdown > button {
+  height: 36px;
+  min-height: 36px;
+  max-height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  box-sizing: border-box;
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+#applicationEmailsWidget .email-buttons-group {
+    display: flex;
+    align-items: center;
+}
 
 #applicationEmailsWidget .email-btn {
     margin-top: 10px;
@@ -80,6 +296,97 @@
     box-shadow: -3px 3px 11px -3px rgba(33, 33, 33, .2);
 }
 
+#applicationEmailsWidget .btn-send-close {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+/* Send dropdown button styling */
+#applicationEmailsWidget .btn-group .dropdown-toggle {
+    padding-left: 1px !important;
+    padding-right: 1px !important;
+    border-left: 1px solid rgba(255, 255, 255, 0.2) !important;
+    min-width: 20px;
+    width: 20px;
+    margin-left: 0px !important;
+}
+
+/* When dropdown is not visible/enabled, apply right border radius to send button */
+#applicationEmailsWidget .btn-group:not(:has(.dropdown-toggle)) #btn-send-top {
+    border-top-right-radius: 3px !important;
+    border-bottom-right-radius: 3px !important;
+}
+
+#applicationEmailsWidget .form-select {
+    height: 36px;
+}
+
+#applicationEmailsWidget .btn-group .dropdown-toggle.show {
+    background-color: inherit !important;
+    color: inherit !important;
+    border-color: inherit !important;
+}
+
+#applicationEmailsWidget .btn-group .dropdown-toggle::after {
+    display: none;
+}
+
+#applicationEmailsWidget .btn-group .dropdown-toggle i {
+    font-size: 0.85rem;
+}
+
+/* Dropdown menu positioning */
+#applicationEmailsWidget .btn-group .dropdown-menu {
+    left: 0 !important;
+    right: auto !important;
+    margin-top: 0.25rem !important;
+    transform: translate(0px, 36px) !important;
+}
+
+.dropdown-menu .btn-send-menu,
+.dropdown-menu .btn-schedule-send-menu {
+    display: block;
+    width: 100%;
+    text-align: left;
+}
+
+/* Email buttons row - sticky at top */
+#applicationEmailsWidget #EmailForm .row:has(.email-buttons-container) {
+    position: sticky;
+    top: 0;
+    background-color: white;
+    z-index: 980;
+    padding-bottom: 0.8rem !important;
+}
+
+#scheduled-display-container {
+    padding-bottom: 10px;
+}
+
+/* Email buttons container */
+.email-buttons-container {
+    display: flex !important;
+    align-items: center;
+    gap: 0.5rem;
+    width: 100%;
+    overflow: visible;
+}
+
+.email-buttons-container abp-modal-footer {
+    display: contents;
+}
+
+.email-buttons-container .ms-auto {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    overflow: visible;
+}
+
+.email-buttons-container .dropdown-menu {
+    z-index: 1070;
+}
+
 #applicationEmailsWidget .email-lbl {
     display: block;
     margin-top: 0.25rem;
@@ -109,7 +416,35 @@
 }
 
 #applicationEmailsWidget .field-validation-error {
+    display: inline-block;
     margin-left: 8px;
+    white-space: nowrap;
+    font-size: 0.875rem;
+    color: #dc3545;
+}
+
+#applicationEmailsWidget .input-validation-error {
+    border: 1px solid #dc3545 !important;
+    border-style: solid !important;
+    border-color: #dc3545 !important;
+    border-width: 1px !important;
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 0.2rem rgba(220, 53, 69, 0.5) !important;
+}
+
+#applicationEmailsWidget .input-validation-error:focus,
+#applicationEmailsWidget input.input-validation-error:focus,
+#applicationEmailsWidget textarea.input-validation-error:focus,
+#applicationEmailsWidget select.input-validation-error:focus {
+    border: 1px solid #dc3545 !important;
+    border-color: #dc3545 !important;
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 0.2rem rgba(220, 53, 69, 0.5) !important;
+}
+
+#applicationEmailsWidget .from-field-container .field-validation-error {
+    position: absolute;
+    top: 85%;
+    margin-left: 0;
+    display: inline-block;
 }
 
 #applicationEmailsWidget .confirmation-label {
@@ -204,8 +539,6 @@
     justify-content: center;
 }
 
-
-
 #EmailForm {
     display: none;
 }
@@ -218,14 +551,13 @@
     display: none;
 }
 
-#applicationEmailsWidget .toast-top-center { 
+#applicationEmailsWidget .toast-top-center {
     top: 220px;
     margin: 0 auto;
     left: 50%;
     margin-left: -450px;
 }
 
-
 #applicationEmailsWidget #modal-background.active,
 #applicationEmailsWidget #modal-content.active {
     display: block;
@@ -242,7 +574,7 @@
 	border-radius: 50%;
 	border: 5px solid #eaf5fe;
 	border-right-color: #5597d4;
-	animation: rotateSpinner 800ms linear infinite;  
+	animation: rotateSpinner 800ms linear infinite;
 }
 
 #applicationEmailsWidget .email-spinner-text {
@@ -266,8 +598,473 @@
     background-color: white !important;
 }
 
+#schedule-modal-backdrop {
+    display: none;
+    position: fixed;
+    inset: 0;
+    background: rgba(0, 0, 0, 0.45);
+    z-index: 1060;
+}
+
+#schedule-send-modal {
+    display: none !important;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 600px;
+    max-width: 90vw;
+    max-height: 90vh;
+    background: #fff;
+    border-radius: 8px;
+    box-shadow: 0 8px 32px rgba(0, 0, 0, 0.15);
+    z-index: 1061;
+    padding: 24px;
+    flex-direction: column;
+    overflow: auto;
+}
+
+#schedule-send-modal.active {
+    display: flex !important;
+}
+
+/* Header */
+.schedule-modal-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 24px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid #dee2e6;
+}
+
+.schedule-modal-title {
+    font-size: 1.25rem;
+    font-weight: 600;
+    margin: 0;
+    color: #212529;
+}
+
+.btn-close-modal {
+    background: none;
+    border: none;
+    font-size: 1.5rem;
+    cursor: pointer;
+    color: #6c757d;
+    padding: 0;
+    width: auto;
+    height: auto;
+}
+
+.btn-close-modal:hover {
+    color: #212529;
+}
+
+/* Body Layout */
+.schedule-modal-body {
+    display: flex;
+    gap: 2rem;
+    flex: 1;
+    min-height: 350px;
+}
+
+/* Calendar Section */
+.schedule-calendar-section {
+    flex: 1;
+    min-width: 300px;
+}
+
+.calendar-nav {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 1.5rem;
+}
+
+.calendar-month-year {
+    font-size: 1.1rem;
+    font-weight: 600;
+    color: #212529;
+    min-width: 150px;
+    text-align: center;
+}
+
+.calendar-nav button {
+    width: 32px;
+    height: 32px;
+    padding: 0;
+    font-size: 1rem;
+}
+
+/* Calendar Grid */
+.calendar-grid {
+    display: grid;
+    grid-template-columns: repeat(7, 1fr);
+    gap: 2px;
+}
+
+.calendar-day-header {
+    text-align: center;
+    font-weight: 600;
+    font-size: 0.85rem;
+    color: #6c757d;
+    padding: 8px 0;
+    border-bottom: 1px solid #e9ecef;
+    margin-bottom: 4px;
+    grid-column: span 1;
+}
+
+.calendar-day {
+    text-align: center;
+    padding: 8px;
+    cursor: pointer;
+    border-radius: 4px;
+    font-size: 0.9rem;
+    transition: all 0.2s ease;
+    border: 2px solid transparent;
+}
+
+.calendar-day.past {
+    color: #adb5bd;
+    cursor: not-allowed;
+    background: transparent;
+}
+
+.calendar-day.today {
+    background: #0d6efd;
+    color: #fff;
+    border-radius: 50%;
+    font-weight: 600;
+}
+
+.calendar-day.selected {
+    border-color: #0d6efd;
+    font-weight: 600;
+    background: #e7f1ff;
+}
+
+.calendar-day:not(.past):hover {
+    background: #f8f9fa;
+    border-color: #0d6efd;
+}
+
+.calendar-day.today.selected {
+    border-color: #fff;
+    background: #0d6efd;
+}
+
+/* Inputs Section */
+.schedule-inputs-section {
+    flex: 1;
+    min-width: 240px;
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+}
+
+#schedule-date-input {
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.schedule-input-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.schedule-input-group label {
+    font-size: 0.95rem;
+    font-weight: 500;
+    margin-bottom: 0.5rem;
+    color: #495057;
+}
+
+#schedule-date-input,
+#schedule-time-select {
+    padding: 0.5rem 0.75rem;
+    font-size: 0.95rem;
+    border: 1px solid #ced4da;
+    border-radius: 0.25rem;
+}
+
+#schedule-date-input:focus,
+#schedule-time-select:focus {
+    border-color: #0d6efd;
+    box-shadow: 0 0 0 0.2rem rgba(13, 110, 253, 0.25);
+    outline: none;
+}
+
+.input-group-text {
+    background: #f8f9fa;
+    border-color: #ced4da;
+    color: #495057;
+}
+
+/* Footer */
+.schedule-modal-footer {
+    margin-top: auto;
+    padding-top: 16px;
+    border-top: 1px solid #dee2e6;
+}
+
+.schedule-modal-footer button {
+    min-width: 100px;
+}
+
+#schedule-modal-validation {
+    font-size: 0.85rem;
+}
+
+/* Responsive */
+@media (max-width: 768px) {
+    #schedule-send-modal {
+        width: 95vw;
+        max-height: 95vh;
+        padding: 16px;
+    }
+
+    .schedule-modal-body {
+        flex-direction: column;
+        gap: 1rem;
+        min-height: auto;
+    }
+
+    .schedule-calendar-section,
+    .schedule-inputs-section {
+        min-width: auto;
+        width: 100%;
+    }
+}
+
+#btn-picker-ok {
+    display: none;
+}
+
+#send-on-display {
+    font-size: 0.9em;
+}
+
+#btn-clear-schedule {
+    display: none;
+}
+
+#delay-datetime-validation {
+    display: none;
+    font-size: 0.85em;
+}
+
+.send-date-hint {
+    font-size: 0.85em;
+}
+
+input#EmailFrom.input-validation-error {
+    margin-bottom: -20px !important;
+}
+
+
+
+.mt-14 {
+    margin-top: 14px !important;
+}
+
 @keyframes rotateSpinner {
 	to {
 		transform: rotate(360deg);
 	}
-}
\ No newline at end of file
+}
+
+/* ============================================
+   TinyMCE Email Composer Styling
+   ============================================ */
+
+/* Hide TinyMCE toolbar completely */
+.tox-tinymce:has(#EmailBody) .tox-toolbar__primary {
+    display: none !important;
+}
+
+/* Container for template label and menu buttons */
+.tinymce-template-label-top-right {
+    position: static !important;
+    font-size: 13px;
+    color: #444;
+    user-select: none;
+    display: flex;
+    gap: 5px;
+    align-items: center;
+    justify-content: flex-end;
+    margin: 0 0 8px;
+    width: 100%;
+}
+
+/* Template label text */
+
+.template-label-text {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  padding: 6px 14px;
+  font-size: 18px;
+  font-weight: 700 !important;
+  line-height: 18px;
+  color: #6c757d !important;
+  background-color: transparent;
+  border: 1px solid #6c757d !important;
+  border-radius: 3px;
+  cursor: pointer !important;
+  transition: all 0.15s ease-in-out;
+}
+
+.template-label-text:hover {
+  background-color: #6c757d;
+  color: #fff !important;
+}
+
+
+
+.template-label-text.no-permission {
+    cursor: default;
+    background: #f9f9f9;
+}
+
+/* TinyMCE-style toolbar group for templates button */
+.templates-toolbar-group {
+    display: flex;
+    align-items: center;
+    gap: 0;
+    padding: 0;
+    margin: 0;
+}
+
+/* TinyMCE-style menu button */
+.tinymce-menu-button {
+    display: inline-flex;
+    align-items: center;
+    padding: 0;
+    background: #f0f0f0;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    cursor: pointer;
+    font-size: 14px;
+    white-space: nowrap;
+    user-select: none;
+    position: relative;
+    height: 32px;
+    min-width: 60px;
+    transition: background-color 0.1s ease-in-out;
+}
+
+.tinymce-menu-button:hover {
+    background: #e0e0e0;
+}
+
+.tinymce-menu-button:active {
+    background: #d0d0d0;
+}
+
+.tinymce-menu-button.tox-tbtn--select {
+    justify-content: space-between;
+    padding: 0 8px;
+    gap: 4px;
+}
+
+.tox-tbtn__select-label {
+    display: inline-block;
+    font-weight: 500;
+    color: #333;
+    font-size: 13px;
+}
+
+.tox-tbtn__select-chevron {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 16px;
+    height: 16px;
+    flex-shrink: 0;
+}
+
+.tox-tbtn__select-chevron svg {
+    width: 10px;
+    height: 10px;
+    display: block;
+}
+
+/* Dropdown menu styling */
+.templates-dropdown-menu {
+    position: fixed !important;
+    background: #fff;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.15);
+    z-index: 9999 !important;
+    min-width: 250px;
+    max-height: 300px;
+    overflow-y: auto;
+    margin-top: 2px;
+}
+
+/* Custom dropdown menu styling (not Bootstrap) */
+.custom-dropdown-menu {
+    list-style: none;
+    padding: 0 !important;
+    margin: 0 !important;
+    display: block !important;
+}
+
+.custom-dropdown-item {
+    padding: 8px 12px;
+    cursor: pointer;
+    border-bottom: 1px solid #eee;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    transition: background 0.15s ease-in-out;
+    display: block !important;
+}
+
+.custom-dropdown-item:hover {
+    background: #f5f5f5;
+}
+
+.custom-dropdown-item:last-child {
+    border-bottom: none !important;
+}
+
+/* Position Templates button in top right of toolbar */
+.tox:has(#EmailBody) .templates-button-container {
+    position: absolute !important;
+    top: 5px !important;
+    right: 10px !important;
+    z-index: 10 !important;
+}
+
+.tox *:not(svg):not(rect) {
+    background-color: initial;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+    font-size: 14px !important;
+    font-weight: 400 !important;
+    font-style: normal;
+    color: rgb(34, 47, 62) !important;
+}
+
+/* Style the Templates select element */
+.templates-select {
+    background: #f7f7f7 !important;
+    padding: 4px 8px !important;
+    border: 1px solid #ccc !important;
+    border-radius: 3px !important;
+    cursor: pointer !important;
+    font-size: 13px !important;
+    white-space: nowrap !important;
+    user-select: none !important;
+    height: 37px !important;
+}
+
+
+
+
+.templates-select:active,
+.templates-select:focus {
+    outline: none !important;
+}
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index ba75a8b601..34dc4acb99 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -1,14 +1,30 @@
-$(function () {
-    const emptyGuid = '00000000-0000-0000-0000-000000000000';
+$(document).ready(function () {
+    const BC_PERMANENT_DST_ZONE = 'UTC-7';
+    // Close dropdown menus when clicking outside
+    $(document).on('click', function (e) {
+        if (!$(e.target).closest('.tinymce-menu-button, .custom-dropdown-menu').length) {
+            $('.custom-dropdown-menu').remove();
+        }
+    });
+
     const UIElements = {
         applicationId: $('#DetailsViewApplicationId')[0].value,
-        btnSend: $('#btn-send'),
-        btnSave: $('#btn-save'),
-        btnDiscard: $('#btn-send-discard'),
+        btnSend: $('#btn-send-top'),
+        btnSendDropdown: $('#btn-send-dropdown'),
+        btnSave: $('#btn-save-top'),
+        btnDiscard: $('#btn-send-discard-top'),
+        btnSendClose: $('#btn-send-close-top'),
         btnConfirmSend: $('#btn-confirm-send'),
         btnCancelEmail: $('#btn-cancel-email'),
         btnNewEmail: $('#btn-new-email'),
-        btnSendClose: $('#btn-send-close'),
+        btnShowBCC: $('#btn-show-bcc'),
+        btnEmailTypeMail: $('#email-type-mail'),
+        btnEmailTypeTemplate: $('#email-type-template'),
+        templateModalBackdrop: $('#template-modal-backdrop'),
+        templateModal: $('#template-selection-modal'),
+        templateSelectionDropdown: $('#TemplateSelectionDropdown'),
+        btnTemplateCancel: $('#btn-template-cancel'),
+        btnTemplateModalClose: $('#btn-template-modal-close'),
         emailForm: $('#EmailForm'),
         inputEmailId: $('#EmailId'),
         inputEmailTo: $($('#EmailTo')[0]),
@@ -26,7 +42,26 @@
         inputOriginalEmailBody: $($('#OriginalDraftEmailBody')[0]),
         emailSpinner: $('#spinner-modal'),
         confirmationModal: $('#confirmation-modal'),
-        alertEmailReadonly: $('#email-alert-readonly')
+        alertEmailReadonly: $('#email-alert-readonly'),
+        inputSendOnDateTime: $('#SendOnDateTime'),
+        delayDateTimeValidation: $('#delay-datetime-validation'),
+        sendOnDisplay: $('#send-on-display'),
+        btnClearSchedule: $('#btn-clear-schedule'),
+        scheduleModalBackdrop: $('#schedule-modal-backdrop'),
+        scheduleModal: $('#schedule-send-modal'),
+        scheduleModalValidation: $('#schedule-modal-validation'),
+        scheduleCalendarGrid: $('#schedule-calendar-grid'),
+        calendarMonthYear: $('#calendar-month-year'),
+        btnCalendarPrev: $('#btn-calendar-prev'),
+        btnCalendarNext: $('#btn-calendar-next'),
+        scheduleDateInput: $('#schedule-date-input'),
+        scheduleDateValidation: $('#schedule-date-validation'),
+        scheduleTimeSelect: $('#schedule-time-select'),
+        btnScheduleCancel: $('#btn-schedule-cancel'),
+        btnScheduleConfirm: $('#btn-schedule-confirm'),
+        btnScheduleModalClose: $('#btn-schedule-modal-close'),
+        btnOpenScheduleModal: $('#btn-open-schedule-modal'),
+        bccInputRow: $('#bcc-input-row')
     };
 
     let defaultValues = {
@@ -40,15 +75,66 @@
     let editorInstance;
     let isNewEmailDraft = false;
     let newDraftId = null;
+    let selectedEmailData = null; // Store original email data when selected from table
     let emailAttachmentsTable = null;
+    let activeTemplateId = null; // Track if a template has been applied to the current draft
+    let originalTemplateState = { name: '', id: '' }; // Baseline template for discard restore
+    let activeTemplateAttachmentCount = 0; // Track how many attachments were copied from the active template
+    let isApplicationEmailContext = true; // Flag to track if we're in application email or template preview context
+    let cachedTemplates = null; // Cache templates globally
+    let scheduleState = {
+        currentMonth: new Date().getMonth(),
+        currentYear: new Date().getFullYear(),
+        selectedDate: null,
+        selectedTime: null
+    };
+
+
     function bindUIEvents() {
-        UIElements.btnNewEmail.on('click', handleNewEmail);
+        // Remove any existing event handlers to prevent duplicates
+        UIElements.btnNewEmail.off('click');
+        UIElements.btnSend.off('click');
+        UIElements.btnSave.off('click');
+        UIElements.btnDiscard.off('click');
+        UIElements.btnSendClose.off('click');
+        UIElements.btnConfirmSend.off('click');
+        UIElements.btnCancelEmail.off('click');
+        UIElements.btnTemplateCancel.off('click');
+        UIElements.btnTemplateModalClose.off('click');
+        $('.btn-send-menu').off('click');
+        $('.btn-schedule-send-menu').off('click');
+
+        // Bind button handlers
+        UIElements.btnNewEmail.on('click', function (e) {
+            e.preventDefault();
+            handleNewEmail(false);
+        });
         UIElements.btnSend.on('click', handleSendEmail);
         UIElements.btnSave.on('click', handleSaveEmail);
         UIElements.btnDiscard.on('click', handleDiscardEmail);
+        UIElements.btnSendClose.on('click', handleCloseEmail);
+
+        // Send dropdown menu items
+        $('.btn-send-menu').on('click', function (e) {
+            e.preventDefault();
+            handleSendEmail(e);
+        });
+
+        $('.btn-schedule-send-menu').on('click', function (e) {
+            e.preventDefault();
+            // Reset schedule state and open modal
+            scheduleState.currentMonth = new Date().getMonth();
+            scheduleState.currentYear = new Date().getFullYear();
+            scheduleState.selectedDate = null;
+            scheduleState.selectedTime = null;
+            openScheduleModal(scheduleState);
+        });
+
         UIElements.btnConfirmSend.on('click', handleConfirmSendEmail);
         UIElements.btnCancelEmail.on('click', handleCancelEmailSend);
-        UIElements.btnSendClose.on('click', handleCloseEmail);
+        UIElements.btnTemplateCancel.on('click', closeTemplateSelectionModal);
+        UIElements.btnTemplateModalClose.on('click', closeTemplateSelectionModal);
+        UIElements.templateSelectionDropdown.on('change', handleTemplateSelection);
         UIElements.inputEmailSubject.on('change', handleKeyUpTrim);
         UIElements.inputEmailFrom.on('change', handleKeyUpTrim);
         UIElements.inputEmailCC.on('change', handleKeyUpTrim);
@@ -58,113 +144,707 @@
         UIElements.inputEmailCC.on('change', validateEmailCC);
         UIElements.inputEmailBCC.on('change', validateEmailBCC);
 
+        // Add real-time validation on input event (as user types) - show errors without toast
+        UIElements.inputEmailTo.on('input', function () {
+            validateEmailFieldWithOptions(UIElements.inputEmailToField, false, false, false); // showToast=false, onlyShowErrorsIfHasContent=false
+        });
+        UIElements.inputEmailCC.on('input', function () {
+            validateEmailFieldWithOptions(UIElements.inputEmailCC[0], false, false, false);
+        });
+        UIElements.inputEmailBCC.on('input', function () {
+            validateEmailFieldWithOptions(UIElements.inputEmailBCC[0], false, false, false);
+        });
+
+        // Add blur event handler to validate and show errors when leaving field
+        UIElements.inputEmailTo.on('blur', function () {
+            validateEmailFieldWithOptions(UIElements.inputEmailToField, false, false, false); // showToast=false
+        });
+        UIElements.inputEmailCC.on('blur', function () {
+            validateEmailFieldWithOptions(UIElements.inputEmailCC[0], false, false, false);
+        });
+        UIElements.inputEmailBCC.on('blur', function () {
+            validateEmailFieldWithOptions(UIElements.inputEmailBCC[0], false, false, false);
+        });
+
         UIElements.inputEmailTo.on('input', handleDraftChange);
+        UIElements.inputEmailTo.on('change', handleDraftChange);
         UIElements.inputEmailCC.on('input', handleDraftChange);
+        UIElements.inputEmailCC.on('change', handleDraftChange);
         UIElements.inputEmailBCC.on('input', handleDraftChange);
+        UIElements.inputEmailBCC.on('change', handleDraftChange);
         UIElements.inputEmailFrom.on('input', handleDraftChange);
+        UIElements.inputEmailFrom.on('change', handleDraftChange);
         UIElements.inputEmailSubject.on('input', handleDraftChange);
+        UIElements.inputEmailSubject.on('change', handleDraftChange);
         UIElements.inputEmailBody.on('input', handleDraftChange);
+        UIElements.inputEmailBody.on('change', handleDraftChange);
+
+        // BCC button and input handlers
+        UIElements.btnShowBCC.on('click', handleShowBCC);
+        UIElements.inputEmailBCC.on('input', toggleBCCVisibility);
+        UIElements.inputEmailBCC.on('change', toggleBCCVisibility);
+
+        bindDelayModeEvents();
 
         $('.details-scrollable').on('scroll.emailWidget', function () {
             $('.tox-toolbar__overflow').hide();
         });
+
+        // Initialize BCC visibility on load
+        toggleBCCVisibility();
     }
 
     init();
 
+    function initializeValidator() {
+        UIElements.emailForm.validate({
+            errorClass: 'field-validation-error',
+            validClass: 'field-validation-valid',
+            highlight: function (element, errorClass, validClass) {
+                $(element).addClass('input-validation-error').removeClass(validClass);
+            },
+            unhighlight: function (element, errorClass, validClass) {
+                $(element).removeClass('input-validation-error').addClass(validClass);
+            },
+            errorPlacement: function (error, element) {
+                // Create or update error span after the element
+                let errorSpan = element.siblings('.field-validation-error');
+                if (errorSpan.length === 0) {
+                    errorSpan = $('<span class="field-validation-error"></span>').insertAfter(element);
+                }
+                errorSpan.text(error.text());
+            }
+        });
+    }
+
     function init() {
         bindUIEvents();
+        initializeValidator();
         defaultValues.emailTo = UIElements.inputOriginalEmailTo.val();
         defaultValues.emailFrom = UIElements.inputOriginalEmailFrom.val();
         defaultValues.emailCC = UIElements.inputOriginalEmailCC.val() || '';
         defaultValues.emailBCC = UIElements.inputOriginalEmailBCC.val() || '';
-        if (window.toastr) { toastr.options.positionClass = 'toast-top-center'; }
+        if (globalThis.toastr) { toastr.options.positionClass = 'toast-top-center'; }
+        preloadTemplates(); // Pre-fetch templates on page load
         initTemplateDetails();
         $('#templateTextContainer').hide();
+        $('#scheduled-delay-section').hide();
         UIElements.btnSave.hide();
         UIElements.btnSend.hide();
+        UIElements.btnSendDropdown.hide();
         UIElements.btnDiscard.hide();
         UIElements.btnSendClose.hide();
     }
 
     async function initTemplateDetails() {
-       applicationDetails = await loadApplicationDetails();
-       mappingConfig = await getTemplateVariables();
+        applicationDetails = await loadApplicationDetails();
+        mappingConfig = await getTemplateVariables();
     }
 
     function disableEmail() {
-        UIElements.btnSend.attr('disabled', true);
-        UIElements.btnSave.attr('disabled', true);
-        UIElements.btnDiscard.attr('disabled', true);
-        UIElements.inputEmailTo.attr('disabled', true);
-        UIElements.inputEmailCC.attr('disabled', true);
-        UIElements.inputEmailBCC.attr('disabled', true);
-        UIElements.inputEmailFrom.attr('disabled', true);
-        UIElements.inputEmailSubject.attr('disabled', true);
-        UIElements.inputEmailBody.attr('disabled', true);
+        UIElements.btnSend.prop('disabled', true);
+        UIElements.btnSendDropdown.prop('disabled', true);
+        UIElements.btnSave.prop('disabled', true);
+        UIElements.btnDiscard.prop('disabled', true);
+        UIElements.inputEmailTo.prop('disabled', true);
+        UIElements.inputEmailCC.prop('disabled', true);
+        UIElements.inputEmailBCC.prop('disabled', true);
+        UIElements.inputEmailFrom.prop('disabled', true);
+        UIElements.inputEmailSubject.prop('disabled', true);
+        UIElements.inputEmailBody.prop('disabled', true);
+
+        // Make TinyMCE read-only if it exists
+        const editor = tinymce.get('EmailBody');
+        editor?.mode.set('readonly');
     }
 
     function enableEmail() {
-        UIElements.btnSend.attr('disabled', false);
-        UIElements.btnSave.attr('disabled', false);
-        UIElements.btnDiscard.attr('disabled', false);
-        UIElements.inputEmailTo.attr('disabled', false);
-        UIElements.inputEmailCC.attr('disabled', false);
-        UIElements.inputEmailBCC.attr('disabled', false);
-        UIElements.inputEmailFrom.attr('disabled', false);
-        UIElements.inputEmailSubject.attr('disabled', false);
-        UIElements.inputEmailBody.attr('disabled', false);
+        UIElements.btnSend.prop('disabled', false);
+        UIElements.btnSendDropdown.prop('disabled', false);
+        UIElements.btnSave.prop('disabled', false);
+        UIElements.btnDiscard.prop('disabled', false);
+        UIElements.inputEmailTo.prop('disabled', false);
+        UIElements.inputEmailCC.prop('disabled', false);
+        UIElements.inputEmailBCC.prop('disabled', false);
+        UIElements.inputEmailFrom.prop('disabled', false);
+        UIElements.inputEmailSubject.prop('disabled', false);
+        UIElements.inputEmailBody.prop('disabled', false);
+
+        // Make TinyMCE editable if it exists
+        const editor = tinymce.get('EmailBody');
+        editor?.mode.set('design');
+    }
+
+    function validateScheduleDate() {
+        const dateStr = UIElements.scheduleDateInput.val();
+        // Clear any previous validation messages and error toasts
+        UIElements.scheduleDateValidation.removeClass('text-success').removeClass('text-danger').text('').hide();
+
+        if (dateStr?.length === 10) {
+            const [month, day, year] = dateStr.split('/').map(Number);
+            if (isValidDate(month, day, year)) {
+                scheduleState.selectedDate = new Date(year, month - 1, day);
+                scheduleState.currentMonth = month - 1;
+                scheduleState.currentYear = year;
+                renderCalendarGrid(scheduleState);
+                UIElements.scheduleDateValidation.text('✓ Valid date').removeClass('text-danger').addClass('text-success').show();
+            } else {
+                const errorMsg = '✗ Invalid date';
+                UIElements.scheduleDateValidation.text(errorMsg).removeClass('text-success').addClass('text-danger').show();
+                showValidationErrorToast([errorMsg]);
+            }
+        } else if (dateStr) {
+            const errorMsg = '✗ Invalid date format (use MM/DD/YYYY)';
+            UIElements.scheduleDateValidation.text(errorMsg).removeClass('text-success').addClass('text-danger').show();
+            showValidationErrorToast([errorMsg]);
+        } else {
+            UIElements.scheduleDateValidation.hide();
+        }
+    }
+
+    function bindDelayModeEvents() {
+        // Use global scheduleState
+        scheduleState.currentMonth = new Date().getMonth();
+        scheduleState.currentYear = new Date().getFullYear();
+        scheduleState.selectedDate = null;
+        scheduleState.selectedTime = null;
+
+        // Initialize time dropdown with 30-minute intervals
+        initializeTimeDropdown();
+
+        // Open modal
+        UIElements.btnOpenScheduleModal.on('click', function () {
+            openScheduleModal(scheduleState);
+        });
+
+        // Close modal
+        UIElements.btnScheduleModalClose.on('click', function () {
+            closeScheduleModal();
+        });
+        UIElements.btnScheduleCancel.on('click', function () {
+            closeScheduleModal();
+        });
+        UIElements.scheduleModalBackdrop.on('click', function () {
+            closeScheduleModal();
+        });
+
+        // Calendar navigation
+        UIElements.btnCalendarPrev.on('click', function () {
+            scheduleState.currentMonth--;
+            if (scheduleState.currentMonth < 0) {
+                scheduleState.currentMonth = 11;
+                scheduleState.currentYear--;
+            }
+            renderCalendarGrid(scheduleState);
+        });
+
+        UIElements.btnCalendarNext.on('click', function () {
+            scheduleState.currentMonth++;
+            if (scheduleState.currentMonth > 11) {
+                scheduleState.currentMonth = 0;
+                scheduleState.currentYear++;
+            }
+            renderCalendarGrid(scheduleState);
+        });
+
+        // Date input two-way binding with input masking for MM/DD/YYYY
+        UIElements.scheduleDateInput.on('input', function () {
+            let val = UIElements.scheduleDateInput.val().replaceAll(/\D/, '');
+            if (val.length > 8) val = val.substring(0, 8);
+            if (val.length >= 2) {
+                val = val.substring(0, 2) + '/' + val.substring(2);
+            }
+            if (val.length >= 5) {
+                val = val.substring(0, 5) + '/' + val.substring(5);
+            }
+            UIElements.scheduleDateInput.val(val);
+
+            // Validate immediately when a complete date is entered (MM/DD/YYYY = 10 chars)
+            if (val.length === 10) {
+                validateScheduleDate();
+            } else if (val.length < 10 && val.length > 0) {
+                // Clear validation messages while user is still typing an incomplete date
+                UIElements.scheduleDateValidation.hide();
+            }
+        });
+
+        UIElements.scheduleDateInput.on('blur', function () {
+            validateScheduleDate();
+        });
+
+        // Time dropdown
+        UIElements.scheduleTimeSelect.on('change', function () {
+            scheduleState.selectedTime = UIElements.scheduleTimeSelect.val();
+            UIElements.scheduleModalValidation.hide();
+        });
+
+        // Confirm button
+        UIElements.btnScheduleConfirm.on('click', function () {
+            confirmScheduleDateTime(scheduleState);
+        });
+
+        // Clear button
+        UIElements.btnClearSchedule.on('click', function () {
+            clearScheduleValue();
+        });
+
+
+    }
+
+    function initializeTimeDropdown() {
+        const times = [];
+        for (let hour = 0; hour < 24; hour++) {
+            for (let minute = 0; minute < 60; minute += 30) {
+                const ampm = hour >= 12 ? 'PM' : 'AM';
+                const displayHour = hour % 12 === 0 ? 12 : hour % 12;
+                const timeStr = `${displayHour.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')} ${ampm}`;
+                const timeValue = `${hour.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}`;
+                times.push({ label: timeStr, value: timeValue });
+            }
+        }
+
+        UIElements.scheduleTimeSelect.empty().append('<option value="">Select a time</option>');
+        times.forEach(t => {
+            UIElements.scheduleTimeSelect.append(`<option value="${t.value}">${t.label}</option>`);
+        });
+    }
+
+    function getMaxScheduleDate() {
+        const max = new Date();
+        max.setFullYear(max.getFullYear() + 50);
+        return max;
+    }
+
+    function renderCalendarGrid(state) {
+        // Update header
+        const monthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+        UIElements.calendarMonthYear.text(`${monthNames[state.currentMonth]} ${state.currentYear}`);
+
+        // Clear grid
+        UIElements.scheduleCalendarGrid.empty();
+
+        // Day headers
+        const dayHeaders = ['S', 'M', 'T', 'W', 'T', 'F', 'S'];
+        dayHeaders.forEach(day => {
+            UIElements.scheduleCalendarGrid.append(`<div class="calendar-day-header">${day}</div>`);
+        });
+
+        // Get first day of month and number of days
+        const firstDay = new Date(state.currentYear, state.currentMonth, 1).getDay();
+        const daysInMonth = new Date(state.currentYear, state.currentMonth + 1, 0).getDate();
+        const today = new Date();
+        today.setHours(0, 0, 0, 0);
+        const maxDate = getMaxScheduleDate();
+        maxDate.setHours(0, 0, 0, 0);
+
+        // Add empty cells for days before month starts
+        for (let i = 0; i < firstDay; i++) {
+            UIElements.scheduleCalendarGrid.append('<div></div>');
+        }
+
+        // Add day cells
+        for (let day = 1; day <= daysInMonth; day++) {
+            const cellDate = new Date(state.currentYear, state.currentMonth, day);
+            cellDate.setHours(0, 0, 0, 0);
+            const isPast = cellDate < today;
+            const isFuture = cellDate > maxDate;
+            const isToday = cellDate.getTime() === today.getTime();
+            const isSelected = state.selectedDate?.getTime() === cellDate.getTime();
+
+            let classes = 'calendar-day';
+            if (isPast) classes += ' past';
+            if (isFuture) classes += ' past';
+            if (isToday) classes += ' today';
+            if (isSelected) classes += ' selected';
+
+            const $dayCell = $(`<div class="${classes}">${day}</div>`);
+
+            if (!isPast && !isFuture) {
+                $dayCell.on('click', function () {
+                    // Clear error immediately when user clicks a date
+                    UIElements.scheduleDateValidation.removeClass('text-success').removeClass('text-danger').text('').hide();
+
+                    state.selectedDate = new Date(state.currentYear, state.currentMonth, day);
+                    const month = (state.currentMonth + 1).toString().padStart(2, '0');
+                    const dayStr = day.toString().padStart(2, '0');
+                    UIElements.scheduleDateInput.val(`${month}/${dayStr}/${state.currentYear}`);
+                    validateScheduleDate();
+                    renderCalendarGrid(state);
+                });
+            }
+
+            UIElements.scheduleCalendarGrid.append($dayCell);
+        }
+    }
+
+    function openScheduleModal(state) {
+        // Show modal and backdrop first
+        UIElements.scheduleModalBackdrop.show();
+        UIElements.scheduleModal.addClass('active');
+
+        // Bind Escape key only when modal is open
+        $(document).off('keydown.scheduleModal').on('keydown.scheduleModal', function (e) {
+            if (e.key === 'Escape') {
+                closeScheduleModal();
+            }
+        });
+
+        // Pre-populate with existing value if set, otherwise default to today
+        const existing = UIElements.inputSendOnDateTime.val();
+        if (existing) {
+            const existingDateTime = luxon.DateTime.fromISO(existing, { zone: 'utc' }).setZone(BC_PERMANENT_DST_ZONE);
+            const bcPstDate = existingDateTime.isValid ? existingDateTime.toJSDate() : new Date(existing);
+            state.selectedDate = bcPstDate;
+            state.currentMonth = bcPstDate.getMonth();
+            state.currentYear = bcPstDate.getFullYear();
+            const month = (bcPstDate.getMonth() + 1).toString().padStart(2, '0');
+            const day = bcPstDate.getDate().toString().padStart(2, '0');
+            UIElements.scheduleDateInput.val(`${month}/${day}/${bcPstDate.getFullYear()}`);
+            const hour = bcPstDate.getHours().toString().padStart(2, '0');
+            const minute = bcPstDate.getMinutes().toString().padStart(2, '0');
+            UIElements.scheduleTimeSelect.val(`${hour}:${minute}`);
+            state.selectedTime = `${hour}:${minute}`;
+        } else {
+            // Default to today + 1 day at 9:00 AM
+            const tomorrow = new Date();
+            tomorrow.setDate(tomorrow.getDate() + 1);
+            tomorrow.setHours(9, 0, 0, 0);
+
+            state.selectedDate = tomorrow;
+            state.currentMonth = tomorrow.getMonth();
+            state.currentYear = tomorrow.getFullYear();
+
+            const month = (tomorrow.getMonth() + 1).toString().padStart(2, '0');
+            const day = tomorrow.getDate().toString().padStart(2, '0');
+            UIElements.scheduleDateInput.val(`${month}/${day}/${tomorrow.getFullYear()}`);
+            UIElements.scheduleTimeSelect.val('09:00');
+            state.selectedTime = '09:00';
+        }
+
+        // Use setTimeout to ensure modal is visible before rendering
+        setTimeout(function () {
+            renderCalendarGrid(state);
+            UIElements.scheduleModalValidation.hide();
+            UIElements.scheduleDateValidation.hide();
+            UIElements.scheduleDateInput.focus();
+        }, 100);
     }
 
-    function handleKeyUpTrim(e) {
-        let trimmedString = e.currentTarget.value.trim();
-        e.currentTarget.value = trimmedString;
+    function closeScheduleModal() {
+        UIElements.scheduleModal.removeClass('active');
+        UIElements.scheduleModalBackdrop.hide();
+        $(document).off('keydown.scheduleModal');
+        // Clear modal validation message
+        UIElements.scheduleModalValidation.hide();
+    }
+
+    function confirmScheduleDateTime(state) {
+        if (!state.selectedDate || !state.selectedTime) {
+            const errorMsg = 'Please select both a date and time.';
+            UIElements.scheduleModalValidation.text(errorMsg).show();
+            showValidationErrorToast([errorMsg]);
+            return; // Keep modal open on validation error
+        }
+
+        // Build selected date/time in BC Pacific timezone.
+        const [hours, minutes] = state.selectedTime.split(':').map(Number);
+        const bcSelection = luxon.DateTime.fromObject(
+            {
+                year: state.selectedDate.getFullYear(),
+                month: state.selectedDate.getMonth() + 1,
+                day: state.selectedDate.getDate(),
+                hour: hours,
+                minute: minutes,
+                second: 0,
+                millisecond: 0
+            },
+            { zone: BC_PERMANENT_DST_ZONE }
+        );
+
+        if (!bcSelection.isValid) {
+            const errorMsg = 'Invalid date/time selection.';
+            UIElements.scheduleModalValidation.text(errorMsg).show();
+            showValidationErrorToast([errorMsg]);
+            return;
+        }
+
+        // Validate future date/time
+        const now = luxon.DateTime.now().setZone(BC_PERMANENT_DST_ZONE);
+        if (bcSelection <= now) {
+            const errorMsg = 'Please select a future date and time.';
+            UIElements.scheduleModalValidation.text(errorMsg).show();
+            showValidationErrorToast([errorMsg]);
+            return; // Keep modal open on validation error
+        }
+
+        // Validate max date (50 years from today)
+        const maxDate = getMaxScheduleDate();
+        if (bcSelection.toJSDate() > maxDate) {
+            const errorMsg = 'Please select a date within 50 years from today.';
+            UIElements.scheduleModalValidation.text(errorMsg).show();
+            showValidationErrorToast([errorMsg]);
+            return; // Keep modal open on validation error
+        }
+
+        // Convert BC Pacific wall time to UTC for storage/submission.
+        const utcIso = bcSelection.toUTC().toISO({ suppressMilliseconds: true });
+
+        // Commit to hidden field
+        UIElements.inputSendOnDateTime.val(utcIso);
+
+        // Display in BC Pacific timezone.
+        const formattedDate = bcSelection.toFormat('yyyy-MM-dd');
+        const formattedTime = bcSelection.toFormat('h:mm a');
+        UIElements.sendOnDisplay.text(`${formattedDate}, ${formattedTime}`);
+        UIElements.btnClearSchedule.show();
+        $('#scheduled-label-container').addClass('show');
+        $('#scheduled-delay-section').show();
+        UIElements.delayDateTimeValidation.hide();
+        closeScheduleModal();
+    }
+
+
+
+    function updateScheduledDateDisplay() {
+        const dateTimeValue = UIElements.inputSendOnDateTime.val();
+        if (dateTimeValue) {
+            // Stored value is UTC; render in BC Pacific timezone.
+            const dt = luxon.DateTime.fromISO(dateTimeValue, { zone: 'utc' }).setZone(BC_PERMANENT_DST_ZONE);
+            if (dt.isValid) {
+                UIElements.sendOnDisplay.text(`${dt.toFormat('yyyy-MM-dd')}, ${dt.toFormat('h:mm a')}`);
+            } else {
+                UIElements.sendOnDisplay.text('');
+            }
+            UIElements.btnClearSchedule.show();
+            $('#scheduled-label-container').addClass('show');
+            $('#scheduled-delay-section').show();
+        } else {
+            UIElements.sendOnDisplay.text('');
+            UIElements.btnClearSchedule.hide();
+            $('#scheduled-label-container').removeClass('show');
+            $('#scheduled-delay-section').hide();
+        }
+    }
+
+    function clearScheduleValue() {
+        UIElements.inputSendOnDateTime.val('');
+        UIElements.sendOnDisplay.text('');
+        UIElements.btnClearSchedule.hide();
+        $('#scheduled-label-container').removeClass('show');
+        $('#scheduled-delay-section').hide();
+        UIElements.delayDateTimeValidation.hide();
+        UIElements.scheduleDateInput.val('');
+        UIElements.scheduleTimeSelect.val('');
     }
 
     function closeEmailFormUI() {
+        // Close any open dropdowns
+        const dropdownIds = ['btn-send-dropdown'];
+        dropdownIds.forEach(id => {
+            bootstrap.Dropdown.getInstance(document.getElementById(id))?.hide();
+        });
+
+        // Clear all validation errors
+        UIElements.emailForm.find('.input-validation-error').removeClass('input-validation-error').addClass('field-validation-valid');
+        UIElements.emailForm.find('.field-validation-error').html('').removeClass('field-validation-error').addClass('field-validation-valid');
+
+        // Reset jQuery validator state
+        const validator = UIElements.emailForm.validate();
+        validator?.resetForm();
+
+
+        // Clear toastr notifications
+        if (globalThis.toastr) {
+            toastr.clear();
+        }
+
         $('#modal-content, #modal-background').removeClass('active');
         UIElements.emailForm.removeClass('active');
+        $('#EmailTemplateName').val('');
         UIElements.btnNewEmail.removeClass('hide');
         UIElements.alertEmailReadonly.removeClass('hide');
         UIElements.emailForm.trigger("reset");
+        clearScheduleValue();
         $('#email-attachments-section').hide();
         enableEmail();
         UIElements.btnSave.hide();
         UIElements.btnSend.hide();
+        UIElements.btnSendDropdown.hide();
         UIElements.btnDiscard.hide();
         UIElements.btnSendClose.hide();
+        UIElements.bccInputRow.removeClass('show');
+        UIElements.btnShowBCC.removeClass('hide');
+
+        // Clear the stored selected email data when form is closed
+        selectedEmailData = null;
+
+        // Reset draft viewing flag
+        isViewingDraft = false;
     }
 
     function handleCloseEmail() {
         if (isNewEmailDraft && newDraftId) {
             $.ajax({ url: `/api/app/email-notification/${newDraftId}/email`, type: 'DELETE' })
                 .catch(e => console.warn('Failed to delete draft on close:', e));
-            isNewEmailDraft = false; 
+            isNewEmailDraft = false;
             newDraftId = null;
         }
+        activeTemplateId = null;
+        originalTemplateState = { name: '', id: '' };
+        activeTemplateAttachmentCount = 0;
         closeEmailFormUI();
     }
 
     function handleDiscardEmail() {
-        UIElements.inputEmailTo.val(UIElements.inputOriginalEmailTo.val());
-        UIElements.inputEmailCC.val(UIElements.inputOriginalEmailCC.val());
-        UIElements.inputEmailBCC.val(UIElements.inputOriginalEmailBCC.val());
-        UIElements.inputEmailFrom.val(UIElements.inputOriginalEmailFrom.val());
-        UIElements.inputEmailSubject.val(UIElements.inputOriginalEmailSubject.val());
-        UIElements.inputEmailBody.val(UIElements.inputOriginalEmailBody.val());
+        // If it's a new email draft, delete it and reset the form
+        if (isNewEmailDraft && newDraftId) {
+            $.ajax({
+                url: `/api/app/email-notification/${newDraftId}/email`,
+                type: 'DELETE'
+            })
+                .done(() => {
+                    isNewEmailDraft = false;
+                    newDraftId = null;
+                    // Reset all fields to empty
+                    UIElements.inputEmailTo.val('');
+                    UIElements.inputEmailCC.val('');
+                    UIElements.inputEmailBCC.val('');
+                    UIElements.inputEmailFrom.val('');
+                    UIElements.inputEmailSubject.val('');
+                    UIElements.inputEmailBody.val('');
+                    // Reset TinyMCE editor
+                    if (tinymce.get("EmailBody")) {
+                        tinymce.get("EmailBody").setContent('');
+                    }
+                    // Reset original values
+                    UIElements.inputOriginalEmailTo.val('');
+                    UIElements.inputOriginalEmailCC.val('');
+                    UIElements.inputOriginalEmailBCC.val('');
+                    UIElements.inputOriginalEmailFrom.val('');
+                    UIElements.inputOriginalEmailSubject.val('');
+                    UIElements.inputOriginalEmailBody.val('');
+                    // Clear template
+                    $('#EmailTemplate').val('').trigger('change');
+                    $('#EmailTemplateName').val('');
+                    activeTemplateId = null;
+                    originalTemplateState = { name: '', id: '' };
+                    updateSelectedTemplateLabel('', '');
+                    // Reset scheduled send
+                    clearScheduleValue();
+                    // Reset validation errors
+                    resetValidationErrors();
+                    // Reset draft change state
+                    handleDraftChange();
+                    // Reset BCC visibility
+                    toggleBCCVisibility();
+                    // Show success toast
+                    if (globalThis.toastr) {
+                        toastr.success('Changes discarded', 'Email Reset');
+                    }
+                })
+                .fail(e => {
+                    console.warn('Failed to delete draft on discard:', e);
+                    // Still reset the form even if delete fails
+                    isNewEmailDraft = false;
+                    newDraftId = null;
+                    // Reset all fields to empty
+                    UIElements.inputEmailTo.val('');
+                    UIElements.inputEmailCC.val('');
+                    UIElements.inputEmailBCC.val('');
+                    UIElements.inputEmailFrom.val('');
+                    UIElements.inputEmailSubject.val('');
+                    UIElements.inputEmailBody.val('');
+                    // Reset TinyMCE editor
+                    if (tinymce.get("EmailBody")) {
+                        tinymce.get("EmailBody").setContent('');
+                    }
+                    // Reset original values
+                    UIElements.inputOriginalEmailTo.val('');
+                    UIElements.inputOriginalEmailCC.val('');
+                    UIElements.inputOriginalEmailBCC.val('');
+                    UIElements.inputOriginalEmailFrom.val('');
+                    UIElements.inputOriginalEmailSubject.val('');
+                    UIElements.inputOriginalEmailBody.val('');
+                    // Clear template
+                    $('#EmailTemplate').val('').trigger('change');
+                    $('#EmailTemplateName').val('');
+                    activeTemplateId = null;
+                    originalTemplateState = { name: '', id: '' };
+                    updateSelectedTemplateLabel('', '');
+                    // Reset scheduled send
+                    clearScheduleValue();
+                    // Reset validation errors
+                    resetValidationErrors();
+                    // Reset draft change state
+                    handleDraftChange();
+                    // Reset BCC visibility
+                    toggleBCCVisibility();
+                });
+        } else {
+            // Reset existing email to stored original data
+            if (selectedEmailData) {
+                const originalTemplateName = originalTemplateState.name;
+                const originalTemplateId = originalTemplateState.id;
+
+                UIElements.inputEmailTo.val(selectedEmailData.toAddress);
+                UIElements.inputEmailCC.val(selectedEmailData.cc?.replaceAll(',', '; ') ?? '');
+                UIElements.inputEmailBCC.val(selectedEmailData.bcc?.replaceAll(',', '; ') ?? '');
+                UIElements.inputEmailFrom.val(selectedEmailData.fromAddress);
+                UIElements.inputEmailSubject.val(selectedEmailData.subject);
+                UIElements.inputEmailBody.val(refreshTodayDateSpans(selectedEmailData.body));
+                $('#EmailTemplateName').val(originalTemplateName);
+                activeTemplateId = originalTemplateId || null;
+                updateSelectedTemplateLabel(originalTemplateName, originalTemplateId);
+
+                // Reset TinyMCE editor
+                const resetBodyContent = selectedEmailData.body ? refreshTodayDateSpans(selectedEmailData.body) : '';
+                tinymce.get("EmailBody")?.setContent(resetBodyContent || '');
+
+                // Reset scheduled send date/time to original state
+                if (selectedEmailData.sendOnDateTime) {
+                    UIElements.inputSendOnDateTime.val(selectedEmailData.sendOnDateTime);
+                    updateScheduledDateDisplay();
+                } else {
+                    clearScheduleValue();
+                }
+            } else {
+                // Fallback to hidden inputs if selectedEmailData is not available
+                UIElements.inputEmailTo.val(UIElements.inputOriginalEmailTo.val());
+                UIElements.inputEmailCC.val(UIElements.inputOriginalEmailCC.val());
+                UIElements.inputEmailBCC.val(UIElements.inputOriginalEmailBCC.val());
+                UIElements.inputEmailFrom.val(UIElements.inputOriginalEmailFrom.val());
+                UIElements.inputEmailSubject.val(UIElements.inputOriginalEmailSubject.val());
+                UIElements.inputEmailBody.val(UIElements.inputOriginalEmailBody.val());
+                $('#EmailTemplateName').val(originalTemplateState.name || '');
+                activeTemplateId = originalTemplateState.id || null;
+                updateSelectedTemplateLabel(originalTemplateState.name || '', originalTemplateState.id || '');
+
+                // Reset TinyMCE editor
+                const fallbackBodyContent = UIElements.inputOriginalEmailBody.val() || '';
+                tinymce.get("EmailBody")?.setContent(fallbackBodyContent);
+
+                // Reset scheduled send date/time to original state
+                clearScheduleValue();
+            }
+
+            // Clear validation errors
+            resetValidationErrors();
+
+            // Show success toast
+            if (globalThis.toastr) {
+                toastr.success('Changes discarded', 'Email Reset');
+            }
+
+            // Disable save and discard buttons since no changes are present
+            handleDraftChange();
+        }
     }
 
     function handleCancelEmailSend() {
         $('#modal-content, #modal-background').removeClass('active');
     }
 
-    function getToolbarOptions() {
-        return 'undo redo | styles | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image | code preview';
-    }
 
-    function getPlugins() {
-        return 'lists link image preview code';
-    }
     function resetEmailBody() {
         const id = 'EmailBody';
 
@@ -190,16 +870,452 @@
         });
     }
 
-    async function handleNewEmail() {
+    function closeTemplateSelectionModal() {
+        UIElements.templateModalBackdrop.hide();
+        UIElements.templateModal.hide();
+        UIElements.templateSelectionDropdown.val('');
+    }
+
+    async function copyTemplateAttachments(templateId, emailLogId) {
+        try {
+            const response = await $.ajax({
+                url: `/api/form-notifications/email-template/${templateId}/copy-attachments`,
+                type: 'POST',
+                data: JSON.stringify({ emailLogId: emailLogId }),
+                contentType: 'application/json'
+            });
+            return response?.attachmentCount || 0;
+        } catch (e) {
+            console.warn('Failed to copy template attachments:', e);
+            return 0;
+        }
+    }
+
+    async function deleteOriginAttachments(emailLogId) {
+        try {
+            const response = await $.ajax({
+                url: `/api/form-notifications/email-log/${emailLogId}/origin-attachments`,
+                type: 'DELETE'
+            });
+            return response?.attachmentCount || 0;
+        } catch (e) {
+            console.warn('Failed to delete origin attachments:', e);
+            return 0;
+        }
+    }
+
+    function populateTemplatesSelectOptions($select, templates) {
+        const $placeholder = $select.find('option[value=""]').first();
+
+        // Always rebuild non-placeholder options to avoid duplicate entries.
+        $select.find('option').not($placeholder).remove();
+
+        const seenTemplateIds = new Set();
+        templates.forEach((template) => {
+            const templateName = template.name || template.Name || 'Unnamed Template';
+            const templateId = (template.id || template.Id || '').toString();
+            if (!templateId || seenTemplateIds.has(templateId)) {
+                return;
+            }
+
+            seenTemplateIds.add(templateId);
+
+            const $option = $('<option>')
+                .val(templateId)
+                .text(templateName);
+
+            if (activeTemplateId && templateId === activeTemplateId.toString()) {
+                $option.prop('selected', true);
+            }
+
+            $option.appendTo($select);
+        });
+    }
+
+    function hasLoadedTemplateOptions($select) {
+        return $select.find('option').toArray().some(option => {
+            return ($(option).val() || '').toString().trim() !== '';
+        });
+    }
+
+    async function ensureTemplatesSelectOptionsLoaded($select) {
+        if (hasLoadedTemplateOptions($select)) {
+            return;
+        }
+
+        let templates = cachedTemplates;
+        if (!templates) {
+            try {
+                templates = await $.ajax({
+                    url: `/api/form-notifications/templates`,
+                    type: 'GET'
+                });
+                cachedTemplates = templates;
+            } catch (e) {
+                console.error('Failed to fetch templates:', e);
+                return;
+            }
+        }
+
+        if (templates?.length > 0) {
+            populateTemplatesSelectOptions($select, templates);
+        }
+    }
+
+    async function fetchTemplateById(templateId) {
+        let templates = cachedTemplates;
+        if (!templates) {
+            try {
+                templates = await $.ajax({
+                    url: `/api/form-notifications/templates`,
+                    type: 'GET'
+                });
+                cachedTemplates = templates;
+            } catch (e) {
+                console.error('Failed to fetch templates:', e);
+                abp.notify.error('Failed to apply template.');
+                return null;
+            }
+        }
+        return templates.find(t => t.id === templateId || t.Id === templateId);
+    }
+
+    function updateSelectedTemplateLabel(templateName, templateId) {
+        const normalizedTemplateName = normalizeTemplateName(templateName);
+        const dropdownLabel = normalizedTemplateName || 'Templates';
+        const selectedTemplateValue = (templateId || activeTemplateId || '').toString();
+
+        const $templateNameInput = $('#EmailTemplateName');
+        if ($templateNameInput.length) {
+            $templateNameInput.val(normalizedTemplateName);
+        }
+
+        // Keep the disabled placeholder option text in sync with the selected template.
+        $('.templates-select').each(function () {
+            const $select = $(this);
+            let $placeholder = $select.find('option[value=""]').first();
+
+            if (!$placeholder.length) {
+                $placeholder = $('<option>')
+                    .val('')
+                    .prependTo($select);
+            }
+
+            $placeholder
+                .text(dropdownLabel)
+                .prop('disabled', true)
+                .prop('hidden', true);
+
+            // Never delete template options; hide only the currently selected one.
+            // This avoids list shrinking and allows previously selected options to reappear.
+            $select.find('option').not($placeholder).each(function () {
+                const $option = $(this);
+                const optionText = ($option.text() || '').trim();
+                const optionValue = ($option.val() || '').toString();
+                const matchesByValue = !!selectedTemplateValue && optionValue === selectedTemplateValue;
+                const matchesByName = !!normalizedTemplateName && optionText === normalizedTemplateName;
+
+                $option.prop('hidden', matchesByValue || matchesByName);
+            });
+
+            if (!$select.val()) {
+                $placeholder.prop('selected', true);
+            }
+        });
+
+        const $labelContainer = (typeof getSelectedTemplateLabelContainer === 'function')
+            ? getSelectedTemplateLabelContainer()
+            : $('.selected-template-label-container').first();
+
+        if (!$labelContainer.length) {
+            return;
+        }
+
+        const $existingLabel = $labelContainer.find('.template-label-text');
+
+        if (!normalizedTemplateName) {
+            $existingLabel.remove();
+            return;
+        }
+
+        if ($existingLabel.length) {
+            $existingLabel.html(`📄 ${$('<div>').text(normalizedTemplateName).html()}`);
+            return;
+        }
+
+        const hasPermission = abp.auth.isGranted('SettingManagement.Notifications');
+        const $templateLabel = $('<button type="button">')
+            .addClass('template-label-text')
+            .html(`📄 ${$('<div>').text(normalizedTemplateName).html()}`);
+
+        if (!hasPermission) {
+            $templateLabel.addClass('no-permission');
+        }
+
+        if (hasPermission) {
+            $templateLabel.attr('title', 'Open template in settings')
+                .on('click', async function (e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    localStorage.setItem('ConfigurationManagement_ActiveMenu', 'notifications-menu-item');
+                    localStorage.setItem('notifications-active-tab', 'nav-template-tab');
+                    localStorage.setItem('notifications-template-to-select', templateId || activeTemplateId || '');
+                    await new Promise(resolve => setTimeout(resolve, 50));
+                    window.location.href = '/ConfigurationManagement';
+                });
+        }
+
+        $labelContainer.empty().append($templateLabel);
+    }
+
+    function resolveTemplateRecipientEmails(template) {
+        if (!template) {
+            return '';
+        }
+
+        const directRecipients = [
+            template.emailTo,
+            template.EmailTo,
+            template.toAddress,
+            template.ToAddress,
+            template.to,
+            template.To
+        ].find(value => typeof value === 'string' && value.trim());
+
+        if (directRecipients) {
+            return directRecipients.trim();
+        }
+
+        const recipientCategory = (template.recipientCategory || template.RecipientCategory || '').trim().toLowerCase();
+        const recipientIdentifier = (template.recipientIdentifier || template.RecipientIdentifier || '').trim();
+        if (!recipientIdentifier) {
+            return '';
+        }
+
+        const identifiers = recipientIdentifier
+            .split(',')
+            .map(value => value.trim())
+            .filter(Boolean);
+
+        const emails = new Set();
+        identifiers.forEach((identifier) => {
+            if (validateEmail(identifier)) {
+                emails.add(identifier);
+                return;
+            }
+
+            if (recipientCategory === 'external') {
+                if (identifier.toLowerCase() === 'applicationcontact' && applicationDetails?.contactEmail) {
+                    emails.add(applicationDetails.contactEmail);
+                }
+
+                if (identifier.toLowerCase() === 'signingauthority' && applicationDetails?.signingAuthorityEmail) {
+                    emails.add(applicationDetails.signingAuthorityEmail);
+                }
+            }
+        });
+
+        return Array.from(emails).join('; ');
+    }
+
+    async function resolveTemplateRecipientEmailsFromApi(template, templateId) {
+        const localRecipients = resolveTemplateRecipientEmails(template);
+        const resolvedTemplateId = (templateId || template?.id || template?.Id || '').toString().trim();
+        const applicationId = (UIElements.applicationId || '').toString().trim();
+
+        if (!resolvedTemplateId) {
+            return localRecipients;
+        }
+
+        try {
+            const response = await $.ajax({
+                url: `/api/form-notifications/templates/${resolvedTemplateId}/resolved-recipients`,
+                type: 'GET',
+                data: applicationId ? { applicationId } : {}
+            });
+
+            const apiRecipients = (response?.emailTo || response?.EmailTo || '').trim();
+            return apiRecipients || localRecipients;
+        } catch (e) {
+            console.warn('Failed to resolve template recipients from API, using local fallback:', e);
+            return localRecipients;
+        }
+    }
+
+    async function processTemplateBody(body) {
+        if (body && applicationDetails && mappingConfig) {
+            try {
+                const templateData = extractTemplateData(applicationDetails, mappingConfig);
+                const template = Handlebars.compile(body);
+                const processedBody = template(templateData);
+                console.log('Template variables replaced, rendered body length:', processedBody?.length);
+                return processedBody;
+            } catch (e) {
+                console.warn('Failed to process template variables:', e);
+            }
+        } else {
+            console.log('Handlebars processing skipped - applicationDetails or mappingConfig not available');
+        }
+        return body;
+    }
+
+    async function confirmTemplateReplacement() {
+        if (!newDraftId) {
+            return true;
+        }
+
+        let confirmMessage = 'Any changes to the email will be reverted to the template defaults.';
+        if (activeTemplateAttachmentCount > 0) {
+            confirmMessage += `\n\nThe ${activeTemplateAttachmentCount} attachment${activeTemplateAttachmentCount === 1 ? '' : 's'} copied from the previous template will also be removed.`;
+        }
+
+        const confirm = await Swal.fire({
+            title: 'Apply Template?',
+            text: confirmMessage,
+            icon: 'warning',
+            showCancelButton: true,
+            confirmButtonText: 'Apply Template',
+            cancelButtonText: 'Cancel'
+        });
+
+        if (!confirm.isConfirmed) {
+            return false;
+        }
+
+        if (activeTemplateAttachmentCount > 0) {
+            await deleteOriginAttachments(newDraftId);
+            activeTemplateAttachmentCount = 0;
+            if (emailAttachmentsTable) {
+                emailAttachmentsTable.ajax.reload();
+            }
+        }
+
+        return true;
+    }
+
+    async function applyTemplateParamsToEmail(subject, body, sendFrom, templateName, selectedTemplateId, templateRecipients) {
+        const draftId = await handleNewEmail(true, subject, body, sendFrom, templateName, selectedTemplateId);
+        activeTemplateId = selectedTemplateId;
+        activeTemplateAttachmentCount = 0;
+        updateSelectedTemplateLabel(templateName, selectedTemplateId);
+
+        if (templateRecipients) {
+            UIElements.inputEmailTo.val(templateRecipients).trigger('change');
+            UIElements.inputOriginalEmailTo.val(templateRecipients);
+        }
+
+        const attachmentCount = await copyTemplateAttachments(selectedTemplateId, draftId);
+        activeTemplateAttachmentCount = attachmentCount;
+
+        if (emailAttachmentsTable) {
+            emailAttachmentsTable.ajax.reload();
+        }
+
+        return attachmentCount;
+    }
+
+    async function handleTemplateSelection() {
+        const selectedTemplateId = UIElements.templateSelectionDropdown.val();
+
+        if (!selectedTemplateId) {
+            return;
+        }
+
+        closeTemplateSelectionModal();
+
+        try {
+            const response = await $.ajax({
+                url: `/api/form-notifications/templates`,
+                type: 'GET'
+            });
+
+            console.log('API Response:', response);
+            console.log('Selected Template ID:', selectedTemplateId);
+
+            const { selectedTemplate, useUpperCase } = findTemplateById(response, selectedTemplateId);
+
+            if (!selectedTemplate) {
+                abp.notify.error('Selected template not found.');
+                return;
+            }
+
+            console.log('Selected template:', selectedTemplate);
+
+            const { subject, body: initialBody, sendFrom, name: templateName } = extractTemplateValues(selectedTemplate, useUpperCase);
+            console.log('Template values - Subject:', subject, 'Body length:', initialBody?.length, 'SendFrom:', sendFrom);
+
+            const body = await processTemplateBody(initialBody);
+            const templateRecipients = await resolveTemplateRecipientEmailsFromApi(selectedTemplate, selectedTemplateId);
+
+            const shouldContinue = await confirmTemplateReplacement();
+            if (!shouldContinue) {
+                return;
+            }
+
+            const attachmentCount = await applyTemplateParamsToEmail(subject, body, sendFrom, templateName, selectedTemplateId, templateRecipients);
+
+            await Swal.fire({
+                title: 'Template Applied',
+                text: attachmentCount > 0
+                    ? buildSuccessMessage(attachmentCount)
+                    : 'Template applied successfully. No attachments were copied.',
+                icon: 'success',
+                confirmButtonText: 'OK'
+            });
+        } catch (e) {
+            console.error('Failed to load template - Full error:', e);
+            console.error('Response text:', e.responseText);
+            console.error('Status:', e.status);
+            abp.notify.error('Failed to load template. Please try again.');
+        }
+    }
+
+
+    function handleShowBCC() {
+        // Show BCC input row and hide the button
+        UIElements.bccInputRow.addClass('show');
+        UIElements.btnShowBCC.addClass('hide');
+        UIElements.inputEmailBCC.focus();
+    }
+
+    function toggleBCCVisibility() {
+        const bccValue = UIElements.inputEmailBCC.val().trim();
+
+        if (bccValue) {
+            // If BCC has value, show row and hide button
+            UIElements.bccInputRow.addClass('show');
+            UIElements.btnShowBCC.addClass('hide');
+        } else {
+            // If BCC is empty, hide row and show button
+            UIElements.bccInputRow.removeClass('show');
+            UIElements.btnShowBCC.removeClass('hide');
+        }
+    }
+
+    async function handleNewEmail(fromTemplate = false, templateSubject = '', templateBody = '', templateFrom = '', templateName = '', templateId = '') {
+        // Set context flag - if loaded from template, it's not application email context
+        isApplicationEmailContext = !fromTemplate;
+
+        // Update body class for CSS visibility control
+        if (isApplicationEmailContext) {
+            document.body.classList.add('application-email-context');
+        } else {
+            document.body.classList.remove('application-email-context');
+        }
+
+        isViewingDraft = true; // New emails are drafts
         resetEmailBody();
-        $('#templateListContainer').show();
-        $('#templateTextContainer').hide();
+        const normalizedTemplateName = normalizeTemplateName(templateName);
+        const normalizedTemplateId = (templateId || '').toString();
+        $('#EmailTemplateName').val(normalizedTemplateName);
+        originalTemplateState = { name: normalizedTemplateName, id: normalizedTemplateId };
+        activeTemplateId = normalizedTemplateId || null;
         UIElements.inputOriginalEmailTo.val(defaultValues.emailTo);
         UIElements.inputOriginalEmailCC.val(defaultValues.emailCC);
         UIElements.inputOriginalEmailBCC.val(defaultValues.emailBCC);
         UIElements.inputOriginalEmailFrom.val(defaultValues.emailFrom);
-        UIElements.inputOriginalEmailSubject.val("");
-        UIElements.inputOriginalEmailBody.val("");
+        UIElements.inputOriginalEmailSubject.val(templateSubject);
+        UIElements.inputOriginalEmailBody.val(templateBody);
 
         try {
             const draftId = await initializeDraft(UIElements.applicationId);
@@ -212,15 +1328,19 @@
             return;
         }
 
-        if (tinymce.get("EmailBody")) {
-            tinymce.get("EmailBody").remove();
-        }
+        tinymce.get("EmailBody")?.remove();   
 
+        // Show modal FIRST so element is in DOM
+        UIElements.inputEmailSubject.val(templateSubject);
+        UIElements.inputEmailFrom.val(templateFrom || defaultValues.emailFrom);
+        showModalEmail();
+
+        // Then initialize TinyMCE
         tinymce.init({
             license_key: 'gpl',
             selector: '#EmailBody',
             plugins: getPlugins(),
-            toolbar: getToolbarOptions(),
+            menubar: 'file edit view insert format tools',
             resize: true,
             statusbar: true,
             elementpath: false,
@@ -230,21 +1350,54 @@
             skin: false,
             ui_container: '.details-scrollable',
             setup: function (editor) {
+                // Register Variables menu button - only in TEMPLATE context (not application)
+                if (!isApplicationEmailContext) {
+                    registerVariablesMenuButton(editor);
+                }
+
                 editor.on("input", (e) => {
                     UIElements.inputEmailBody.val(editor.getContent());
                     handleDraftChange();
                 });
                 editorInstance = editor;
-                editorInstance.setContent('');
+            },
+            init_instance_callback: function (editor) {
+                try {
+                    if (templateBody) {
+                        const sanitizedTemplateBody = sanitizeTinyMceHtml(templateBody);
+                        editor.setContent(sanitizedTemplateBody, { format: 'html' });
+                        UIElements.inputEmailBody.val(sanitizedTemplateBody);
+                    } else {
+                        editor.setContent('');
+                    }
+                } catch (e) {
+                    console.error('Error setting TinyMCE content:', e);
+                }
+
+                // Create label/button container unconditionally
+                setTimeout(() => {
+                    const $menubar = $(editor.getContainer()).find('.tox-menubar');
+                    if (!$menubar.length) return;
+
+                    updateSelectedTemplateLabel(templateName, templateId);
+
+                    // Templates button - add to TinyMCE menu bar at bottom
+                    if (!$menubar.find('.templates-button-container').length) {
+                        const $templatesSelect = createTemplateSelect(templateName, isViewingDraft);
+                        bindTemplateSelectEvents($templatesSelect, isViewingDraft);
+                        $menubar.append($templatesSelect);
+                    }
+                }, 0);  // setTimeout for rendering after editor init
             }
         });
 
         $('#email-attachments-section').show();
         $('#email_attachment_upload_btn').show();
         initEmailAttachmentsTable(UIElements.inputEmailId.val(), true);
-        handleDraftChange();
-        showModalEmail();
         resetValidationErrors();
+
+        // Return the draft ID so it can be used by the caller (e.g., for copying template attachments)
+        return newDraftId;
     }
 
     function showModalEmail() {
@@ -253,62 +1406,79 @@
         UIElements.alertEmailReadonly.addClass('hide');
         UIElements.btnSave.show();
         UIElements.btnSend.show();
+        UIElements.btnSendDropdown.show();
         UIElements.btnDiscard.show();
         UIElements.btnSendClose.show();
+        toggleBCCVisibility();
     }
 
-    function validateEmail(email) {
-        const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-        return emailRegex.exec(String(email).toLowerCase()) !== null;
-    }
-
-    function validateEmailTo() {
-        return validateEmailField(UIElements.inputEmailToField, true); // EmailTo is required
+    function validateEmailTo(suppressToast = false) {
+        const result = validateEmailField(UIElements.inputEmailToField, true, !suppressToast);
+        return suppressToast ? result : result.isValid; // For backward compatibility
     }
 
-    function validateEmailCC() {
-        return validateEmailField(UIElements.inputEmailCC[0], false); // CC is optional
+    function validateEmailCC(suppressToast = false) {
+        const result = validateEmailField(UIElements.inputEmailCC[0], false, !suppressToast);
+        return suppressToast ? result : result.isValid; // For backward compatibility
     }
 
-    function validateEmailBCC() {
-        return validateEmailField(UIElements.inputEmailBCC[0], false); // BCC is optional
+    function validateEmailBCC(suppressToast = false) {
+        const result = validateEmailField(UIElements.inputEmailBCC[0], false, !suppressToast);
+        return suppressToast ? result : result.isValid; // For backward compatibility
     }
 
     function handleConfirmSendEmail() {
         UIElements.confirmationModal.hide();
         UIElements.emailSpinner.show();
-        let templateName = '';
-        if (isNewEmailDraft) {
-            templateName = $("#template option:selected").text();
-            if (!templateName || templateName === '' || templateName === 'Please select') {
-                templateName = "No Template Selected";
-            }
+        const templateName =
+            normalizeTemplateName($('#EmailTemplateName').val()) ||
+            normalizeTemplateName($("#EmailTemplate option:selected").text());
+
+        const rawDateTime = UIElements.inputSendOnDateTime.length ? UIElements.inputSendOnDateTime.val() : '';
+        // Hidden field already holds the UTC ISO string set when the modal was confirmed.
+        const sendOnDateTime = rawDateTime || null;
+
+        // Ensure body content is synced from editor
+        let emailBody = '';
+        if (editorInstance) {
+            emailBody = editorInstance.getContent();
+        } else if (tinymce.get('EmailBody')) {
+            emailBody = tinymce.get('EmailBody').getContent();
         } else {
-            templateName = $('#templateText').val();
+            emailBody = UIElements.inputEmailBody.val();
         }
-        unity.grantManager.emails.email
-            .create({
+
+        performSendEmail(emailBody, templateName, sendOnDateTime);
+    }
+
+    function performSendEmail(emailBody, templateName, sendOnDateTime) {
+        $.ajax({
+            url: '/api/app/email/send',
+            type: 'POST',
+            contentType: 'application/json',
+            data: JSON.stringify({
                 emailId: UIElements.inputEmailId[0].value,
                 applicationId: UIElements.applicationId,
                 emailTo: UIElements.inputEmailTo[0].value,
                 emailCC: UIElements.inputEmailCC[0].value,
                 emailBCC: UIElements.inputEmailBCC[0].value,
                 emailFrom: UIElements.inputEmailFrom[0].value,
-                emailBody: editorInstance.getContent(),
+                emailBody: emailBody,
                 emailSubject: UIElements.inputEmailSubject[0].value,
                 currentUserId: decodeURIComponent(abp.currentUser.id),
                 emailTemplateName: templateName,
+                sendOnDateTime: sendOnDateTime,
             })
-            .then(function () {
-                isNewEmailDraft = false; newDraftId = null;
-                hideConfirmation();
-                handleCloseEmail();
-                abp.notify.success('Your email is being sent');
-                PubSub.publish('refresh_application_emails');
-            }).catch(function () {
-                hideConfirmation();
-                abp.notify.error('An error ocurred your email could not be sent.');
-            });
+        }).done(function () {
+            isNewEmailDraft = false; newDraftId = null;
+            hideConfirmation();
+            handleCloseEmail();
+            abp.notify.success('Your email is being sent');
+            PubSub.publish('refresh_application_emails');
+        }).fail(function () {
+            hideConfirmation();
+            abp.notify.error('An error ocurred your email could not be sent.');
+        });
     }
 
     function hideConfirmation() {
@@ -324,101 +1494,180 @@
 
     function handleSaveEmail(e) {
         if (validateEmailForm(e)) {
-            let templateName = '';
-            if (isNewEmailDraft) {
-                templateName = $("#template option:selected").text();
-                if (!templateName || templateName === '' || templateName === 'Please select') {
-                    templateName = "No Template Selected";
-                }
-            } else {
-                templateName = $('#templateText').val();
+            // Check if email is scheduled
+            const sendOnDateTime = UIElements.inputSendOnDateTime.val();
+            if (sendOnDateTime) {
+                // Email is scheduled, show confirmation
+                Swal.fire({
+                    title: 'Scheduled Email',
+                    text: 'Scheduled Emails can not be saved as Draft',
+                    icon: 'info',
+                    confirmButtonText: 'OK'
+                });
+                UIElements.btnSave.prop('disabled', false);
+                return;
             }
 
+            const templateName =
+                normalizeTemplateName($('#EmailTemplateName').val()) ||
+                normalizeTemplateName($("#EmailTemplate option:selected").text());
+
             UIElements.btnSave.prop('disabled', true);
-            unity.grantManager.emails.email
-                .saveDraft({
+
+            // Ensure body content is synced from editor
+            let emailBody = '';
+            if (editorInstance) {
+                emailBody = editorInstance.getContent();
+            } else if (tinymce.get('EmailBody')) {
+                emailBody = tinymce.get('EmailBody').getContent();
+            } else {
+                emailBody = UIElements.inputEmailBody.val();
+            }
+
+            $.ajax({
+                url: '/api/app/email/save-draft',
+                type: 'POST',
+                contentType: 'application/json',
+                data: JSON.stringify({
                     emailId: UIElements.inputEmailId[0].value,
                     applicationId: UIElements.applicationId,
                     emailTo: UIElements.inputEmailTo[0].value,
                     emailCC: UIElements.inputEmailCC[0].value,
                     emailBCC: UIElements.inputEmailBCC[0].value,
                     emailFrom: UIElements.inputEmailFrom[0].value,
-                    emailBody: editorInstance.getContent(),
+                    emailBody: emailBody,
                     emailSubject: UIElements.inputEmailSubject[0].value,
                     currentUserId: decodeURIComponent(abp.currentUser.id),
                     emailTemplateName: templateName,
+                    sendOnDateTime: UIElements.inputSendOnDateTime.val() || null,
                 })
-                .then(function () {
-                    isNewEmailDraft = false; newDraftId = null;
-                    handleCloseEmail();
-                    abp.notify.success('Your email has been saved.');
-                    PubSub.publish('refresh_application_emails');
-                }).catch(function () {
-                    UIElements.btnSave.prop('disabled', false);
-                    abp.notify.error('An error ocurred your email could not be saved.');
-                });
+            }).done(function () {
+                isNewEmailDraft = false; newDraftId = null;
+                handleCloseEmail();
+                abp.notify.success('Your email has been saved.');
+                PubSub.publish('refresh_application_emails');
+            }).fail(function () {
+                UIElements.btnSave.prop('disabled', false);
+                abp.notify.error('An error ocurred your email could not be saved.');
+            });
         } else {
+            // validateEmailForm() already shows the error toast if there are validation errors
             return false;
         }
     }
 
-    function validateEmailField(fieldElement, isRequired = false) {
+    function validateEmailField(fieldElement, isRequired = false, showToast = true, onlyShowErrorsIfHasContent = false) {
         // Get the field's value and trim whitespace
         let emailValue = fieldElement.value.trim();
 
         // Remove trailing commas, semicolons, or spaces
         emailValue = emailValue.replace(/[;,\s]+$/, '');
 
-        // If the field is empty and not required, it's valid
+        // If the field is empty and not required, clear any existing errors
         if (!isRequired && emailValue === '') {
-            return true;
+            return clearFieldErrors(fieldElement);
         }
 
         // Split by comma or semicolon, and trim each email
         let emails = emailValue.split(/[,;]/g).map(email => email.trim());
         let fieldName = fieldElement.name;
+        let errorSpan = getOrCreateErrorSpan(fieldElement, fieldName);
+
+        // Validate each email
+        const validationResult = validateEmailsInField(emails, emailValue, fieldName, errorSpan, fieldElement, isRequired, showToast);
+        return validationResult;
+    }
+
+    globalThis.validateEmailField = validateEmailField;
+
+    function clearFieldErrors(fieldElement) {
+        let errorSpan = $(`span[data-valmsg-for*='${fieldElement.name}']`)[0];
+        if (errorSpan) {
+            $(errorSpan).addClass('field-validation-valid').removeClass('field-validation-error');
+            $(errorSpan).html('');
+        }
+        $(fieldElement).removeClass('input-validation-error');
+        return { isValid: true, error: null };
+    }
+
+    function getOrCreateErrorSpan(fieldElement, fieldName) {
         let errorSpan = $(`span[data-valmsg-for*='${fieldName}']`)[0];
 
-        // Initialize as valid
-        let isValid = true;
-        let errorMessage = '';
+        if (!errorSpan) {
+            errorSpan = document.createElement('span');
+            errorSpan.className = 'field-validation-valid';
+            errorSpan.dataset.valmsgFor = fieldName;
+            errorSpan.dataset.valmsgReplace = 'true';
+            fieldElement.parentNode.appendChild(errorSpan);
+        }
+        return errorSpan;
+    }
 
-        // Check each email
+    function validateEmailsInField(emails, emailValue, fieldName, errorSpan, fieldElement, isRequired, showToast) {
         for (let emailStr of emails) {
             // Skip empty emails in optional fields
-            if (emailStr === '' && !isRequired) {
-                continue;
+            if (emailStr === '' && !isRequired) continue;
+
+            // Get error message for this email
+            const errorMessage = getEmailValidationError(emailStr, emailValue, fieldName);
+            if (errorMessage) {
+                updateErrorSpanDisplay(errorSpan, fieldElement, errorMessage, showToast);
+                return { isValid: false, error: errorMessage };
             }
+        }
 
-            // Check if the email is empty or invalid
-            if (emailStr === '' || !validateEmail(emailStr)) {
-                // Handle empty email input
-                if (emailStr === '') {
-                    errorMessage = emailValue.length > 0
-                        ? `An email is required after each comma or semicolon.`
-                        : `The ${escapeHtml(fieldName)} field is required.`;
-                } else {
-                    // Handle invalid email format
-                    errorMessage = `Please enter a valid email in ${escapeHtml(fieldName)}: ${escapeHtml(emailStr)}`;
-                }
+        // All emails valid - clear errors
+        $(errorSpan).addClass('field-validation-valid').removeClass('field-validation-error');
+        $(errorSpan).html('');
+        $(fieldElement).removeClass('input-validation-error');
+        return { isValid: true, error: null };
+    }
 
-                // Display the error message
-                $(errorSpan).addClass('field-validation-error').removeClass('field-validation-valid');
-                $(errorSpan).html(errorMessage);
+    function updateErrorSpanDisplay(errorSpan, fieldElement, errorMessage, showToast) {
+        $(errorSpan).addClass('field-validation-error').removeClass('field-validation-valid');
+        $(errorSpan).html(errorMessage);
+        $(fieldElement).addClass('input-validation-error');
+        if (showToast) {
+            showValidationErrorToast([errorMessage]);
+        }
+    }
 
-                // Mark the validation as invalid and exit the loop
-                isValid = false;
-                break;
-            }
+
+    function getTinyMceContent() {
+        let tinymceContent = '';
+        if (editorInstance) {
+            tinymceContent = editorInstance.getContent({ format: 'text' }).trim();
+        } else {
+            tinymceContent = tinymce.get('EmailBody')?.getContent({ format: 'text' }).trim() || UIElements.inputEmailBody.val().trim();
         }
+        return tinymceContent;
+    }
 
-        // Clear error message if all emails are valid
-        if (isValid) {
-            $(errorSpan).addClass('field-validation-valid').removeClass('field-validation-error');
-            $(errorSpan).html('');
+
+    function handleEmailFormValidationResult(isValid, allErrors, errorList, fieldName, onlyErrorIsTinyMCE) {
+        if (onlyErrorIsTinyMCE) {
+            let fieldElement = $('textarea[name="' + fieldName + '"]');
+            fieldElement.removeClass('input-validation-error');
+            fieldElement.siblings('.field-validation-error').remove();
+            if (allErrors.length > 0) {
+                showValidationErrorToast(allErrors);
+                return false;
+            }
+            return true;
         }
 
-        return isValid;
+        if (isValid && allErrors.length === 0) return true;
+
+        // Collect jQuery validator errors
+        const formErrors = errorList.map(err => normalizeErrorMessage(err.message));
+        formErrors.forEach(err => {
+            if (!allErrors.includes(err)) allErrors.push(err);
+        });
+
+        if (allErrors.length > 0) {
+            showValidationErrorToast(allErrors);
+        }
+        return false;
     }
 
     function validateEmailForm(e) {
@@ -426,38 +1675,34 @@
         e.stopPropagation();
         e.preventDefault();
 
-        // Validate all email fields
-        let isToValid = validateEmailTo();
-        let isCCValid = validateEmailCC();
-        let isBCCValid = validateEmailBCC();
-
-        // If any email field is invalid, return false
-        if (!isToValid || !isCCValid || !isBCCValid) {
-            return false;
+        // Sync TinyMCE content to textarea BEFORE running jQuery validation
+        if (editorInstance) {
+            UIElements.inputEmailBody.val(editorInstance.getContent());
+        } else {
+            UIElements.inputEmailBody.val(tinymce.get('EmailBody')?.getContent() || UIElements.inputEmailBody.val());
         }
 
+        // Run jQuery validation for other required fields (Subject, Body, From)
         let isValid = UIElements.emailForm.valid();
         let validator = UIElements.emailForm.validate();
         let fieldName = 'EmailBody';
         let errorList = validator.errorList;
-        let tinymceContent = tinymce.get(fieldName).getContent({ format: 'text' }).trim();
 
-        let onlyErrorIsTinyMCE = (
-            errorList.length === 1 &&
-            errorList[0].element.name === fieldName &&
-            tinymceContent.length > 0
-        );
+        // Run custom email validations after jQuery validation so jQuery does not clear custom field errors.
+        let toResult = validateEmailTo(true); // suppressToast = true
+        let ccResult = validateEmailCC(true);
+        let bccResult = validateEmailBCC(true);
+        let allErrors = collectEmailFieldErrors(toResult, ccResult, bccResult);
 
-        if (!isValid && onlyErrorIsTinyMCE) {
-            let fieldElement = $('textarea[name="' + fieldName + '"]');
-            fieldElement.removeClass('input-validation-error');
-            fieldElement.siblings('.field-validation-error').remove();
-            return true;
-        } else if (isValid) {
-            return true;
-        } else {
-            return false;
-        }
+        console.log('Email field validation results:', { toResult, ccResult, bccResult });
+        console.log('Collected email errors:', allErrors);
+
+        // Get TinyMCE content and check validation state
+        let tinymceContent = getTinyMceContent();
+        let onlyErrorIsTinyMCE = checkOnlyErrorIsTinyMCE(isValid, errorList, fieldName, tinymceContent);
+
+        // Handle validation result using helper
+        return handleEmailFormValidationResult(isValid, allErrors, errorList, fieldName, onlyErrorIsTinyMCE);
     }
 
     function handleSendEmail(e) {
@@ -466,33 +1711,43 @@
             showConfirmation(); // Show confirmation if the form is valid
             return true; // Return true to indicate success
         }
-        // If form is not valid, do not show confirmation
-        return false; // Return false if validation or other conditions fail
+        // validateEmailForm() already shows the error toast if there are validation errors
+        return false;
     }
 
     function handleDraftChange() {
+        // Only allow draft changes if we're viewing a draft email
+        if (!isViewingDraft) {
+            console.log('handleDraftChange: Returning early because isViewingDraft is false');
+            return;
+        }
+        console.log('handleDraftChange: Processing for draft email');
         const isDraftChanged = checkDraftChanges();
-        UIElements.btnSave.attr('disabled', !isDraftChanged);
-        UIElements.btnDiscard.attr('disabled', !isDraftChanged);
+        UIElements.btnSave.prop('disabled', !isDraftChanged);
+        UIElements.btnDiscard.prop('disabled', !isDraftChanged);
     }
 
     function checkDraftChanges() {
+        const currentTemplateName = normalizeTemplateName($('#EmailTemplateName').val());
+        const originalTemplateName = normalizeTemplateName(originalTemplateState.name);
+
         return UIElements.inputEmailTo.val() !== UIElements.inputOriginalEmailTo.val() ||
-               UIElements.inputEmailCC.val() !== UIElements.inputOriginalEmailCC.val() ||
-               UIElements.inputEmailBCC.val() !== UIElements.inputOriginalEmailBCC.val() ||
-               UIElements.inputEmailFrom.val() !== UIElements.inputOriginalEmailFrom.val() ||
-               UIElements.inputEmailSubject.val() !== UIElements.inputOriginalEmailSubject.val() ||
-               UIElements.inputEmailBody.val() !== UIElements.inputOriginalEmailBody.val();
+            UIElements.inputEmailCC.val() !== UIElements.inputOriginalEmailCC.val() ||
+            UIElements.inputEmailBCC.val() !== UIElements.inputOriginalEmailBCC.val() ||
+            UIElements.inputEmailFrom.val() !== UIElements.inputOriginalEmailFrom.val() ||
+            UIElements.inputEmailSubject.val() !== UIElements.inputOriginalEmailSubject.val() ||
+            UIElements.inputEmailBody.val() !== UIElements.inputOriginalEmailBody.val() ||
+            currentTemplateName !== originalTemplateName;
     }
 
     function resetValidationErrors() {
-        UIElements.emailForm.find('.field-validation-error').each(function() {
+        UIElements.emailForm.find('.field-validation-error').each(function () {
             $(this).removeClass('field-validation-error').addClass('field-validation-valid').html('');
         });
     }
-   
- 
-    $('#template').on('change', async function () {
+
+
+    $('#EmailTemplate').on('change', async function () {
         console.log(this.value);
 
         try {
@@ -505,8 +1760,14 @@
             const renderedHtml = template(templateData);
             $('#EmailFrom').val(templateDetails.sendFrom)
             $('#EmailSubject').val(templateDetails.subject)
-            editorInstance.setContent(renderedHtml);
-            UIElements.btnSave.attr('disabled', false);
+            if (renderedHtml) {
+                editorInstance.setContent(renderedHtml);
+            }
+
+            // Only enable save button if we're viewing a draft
+            if (isViewingDraft) {
+                UIElements.btnSave.attr('disabled', false);
+            }
         } catch (error) {
             console.error("Error loading data:", error);
         }
@@ -556,22 +1817,6 @@
         });
     }
 
-    function toTitleCase(str) {
-        return str.replace(/\b\w/g, function (char) {
-            return char.toUpperCase();
-        }).replace(/\B\w/g, function (char) {
-            return char.toLowerCase();
-        });
-    }
-
-    function createCurrencyFormatter() {
-        return new Intl.NumberFormat('en-CA', {
-            style: 'currency',
-            currency: 'CAD',
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2,
-        });
-    }
 
     const currencyFormatter = createCurrencyFormatter();
 
@@ -607,7 +1852,7 @@
 
         // Handle lookup fields to Title Case
         if (formatters.lookup.includes(token)) {
-            return toTitleCase(inputString.replace(/_/g, ' '));
+            return toTitleCase(inputString.replaceAll('_', ' '));
         }
 
         return inputString;
@@ -617,7 +1862,7 @@
 
     const buildTodayDateHtml = () => {
         const formatted = new Intl.DateTimeFormat('en-CA', {
-            timeZone: 'America/Vancouver',
+            timeZone: 'Etc/GMT+7',
             year: 'numeric',
             month: 'long',
             day: 'numeric'
@@ -628,11 +1873,20 @@
     const refreshTodayDateSpans = (html) => {
         if (!html) return html;
         return html.replaceAll(
-            /<span[^>]*data-token="today_date"[^>]*>[\s\S]*?<\/span>/gi,
+            /<span\s[^>]*?data-token="today_date"[^>]*?>[\s\S]*?<\/span>/gi,
             buildTodayDateHtml()
         );
     };
 
+    function registerVariablesMenuButton(editor) {
+        editor.ui.registry.addMenuButton('variablesButton', {
+            text: 'Variables',
+            fetch: (callback) => {
+                callback(buildVariablesMenuItems(mappingConfig, editor));
+            }
+        });
+    }
+
     function extractTemplateData(apiResponse, mappingConfig) {
         const templateData = {};
 
@@ -646,56 +1900,212 @@
 
             const value = getValueByPath(apiResponse, mapTo);
 
-            let formatValue = processString(token,value);
-            templateData[token] = formatValue !== undefined ? formatValue : "";
+            let formatValue = processString(token, value);
+            templateData[token] = formatValue ?? "";
         });
 
         return templateData;
     }
 
-    // Helper to resolve nested properties from a string path (e.g., "applicant.applicantName")
-    function getValueByPath(obj, path) {
-        return path.split('.').reduce((acc, key) => acc?.[key], obj);
+    function buildConfirmationMessage() {
+        let message = 'Selecting a template will revert any changes made to this email.';
+        if (activeTemplateAttachmentCount > 0) {
+            const count = activeTemplateAttachmentCount;
+            const plural = count === 1 ? '' : 's';
+            message += `\n\nThe ${count} attachment${plural} from the previous template will be removed and replaced with any new template attachments.`;
+        }
+        return message;
+    }
+
+    async function showTemplateConfirmation() {
+        const result = await Swal.fire({
+            title: 'Apply Template?',
+            text: buildConfirmationMessage(),
+            icon: 'warning',
+            showCancelButton: true,
+            confirmButtonText: 'Apply Template',
+            cancelButtonText: 'Cancel'
+        });
+        return result.isConfirmed;
+    }
+
+    async function clearPreviousAttachments(currentEmailId) {
+        if (currentEmailId) {
+            await deleteOriginAttachments(currentEmailId);
+            activeTemplateAttachmentCount = 0;
+            if (emailAttachmentsTable) {
+                emailAttachmentsTable.ajax.reload();
+            }
+        }
+    }
+
+    async function populateEmailFields(fields, body, templateRecipients) {
+        UIElements.inputEmailSubject.val(fields.subject);
+        if (body) {
+            editorInstance.setContent(body);
+        }
+        UIElements.inputEmailBody.val(body || '');
+        UIElements.inputEmailFrom.val(fields.sendFrom || defaultValues.emailFrom);
+        if (templateRecipients) {
+            UIElements.inputEmailTo.val(templateRecipients).trigger('change');
+        }
+    }
+
+    // Helper function to apply a template to the current email
+    async function applyTemplateToEmail(template) {
+        try {
+            const currentEmailId = UIElements.inputEmailId.val();
+
+            if (!await showTemplateConfirmation()) {
+                return;
+            }
+
+            await clearPreviousAttachments(currentEmailId);
+
+            const fields = extractTemplateFields(template);
+            let body = fields.body;
+            body = await processTemplateBody(body);
+
+            const templateRecipients = await resolveTemplateRecipientEmailsFromApi(template, fields.id);
+            await populateEmailFields(fields, body, templateRecipients);
+
+            activeTemplateId = fields.id;
+            activeTemplateAttachmentCount = 0;
+            updateSelectedTemplateLabel(fields.name, fields.id);
+            handleDraftChange();
+
+            const attachmentCount = await copyTemplateAttachments(fields.id, currentEmailId);
+            activeTemplateAttachmentCount = attachmentCount;
+
+            if (emailAttachmentsTable) {
+                emailAttachmentsTable.ajax.reload();
+            }
+
+            const message = buildSuccessMessage(attachmentCount);
+            await showSuccessNotification(message);
+        } catch (e) {
+            console.error('Failed to apply template:', e);
+            abp.notify.error('Failed to apply template. Please try again.');
+        }
+    }
+
+    let isViewingDraft = false; // Track if we're viewing a draft email
+
+    async function preloadTemplates() {
+        if (cachedTemplates) return;
+        try {
+            cachedTemplates = await $.ajax({
+                url: `/api/form-notifications/templates`,
+                type: 'GET'
+            });
+        } catch (e) {
+            console.warn('Failed to preload templates:', e);
+            cachedTemplates = [];
+        }
+    }
+
+    function createTemplateSelect(selectedRecordTemplateName, isDraft) {
+        const $templatesSelect = $('<select>')
+            .addClass('templates-select templates-button-container')
+            .attr('title', 'Select a template to apply');
+
+        $templatesSelect.prop('disabled', !isDraft);
+
+        $('<option>')
+            .val('')
+            .text(selectedRecordTemplateName || 'Templates')
+            .prop('selected', true)
+            .prop('disabled', true)
+            .prop('hidden', !selectedRecordTemplateName)
+            .appendTo($templatesSelect);
+
+        if (cachedTemplates?.length > 0) {
+            populateTemplatesSelectOptions($templatesSelect, cachedTemplates);
+        }
+
+        return $templatesSelect;
     }
 
-    function escapeHtml(str) {
-        return String(str)
-            .replace(/&/g, '&amp;')
-            .replace(/</g, '&lt;')
-            .replace(/>/g, '&gt;')
-            .replace(/"/g, '&quot;')
-            .replace(/'/g, '&#39;');
+    function bindTemplateSelectEvents($select, isDraft) {
+        $select.on('change', async function () {
+            if (!isDraft) return;
+            const $this = $(this);
+            const selectedTemplateId = $this.val();
+            if (!selectedTemplateId) return;
+            
+            $this.val('');
+            
+            const template = await fetchTemplateById(selectedTemplateId);
+            if (!template) {
+                abp.notify.error('Template not found.');
+                return;
+            }
+            
+            await applyTemplateToEmail(template);
+        });
+
+        $select.on('click', async function (e) {
+            if (!isDraft || $(this).prop('disabled')) {
+                e.preventDefault();
+                return;
+            }
+            
+            try {
+                await ensureTemplatesSelectOptionsLoaded($(this));
+            } catch (err) {
+                console.error('Failed to load templates:', err);
+                abp.notify.error('Failed to load templates.');
+            }
+        });
     }
 
     PubSub.subscribe('email_selected', (msg, data) => {
+        console.log("EMAIL SELECTED EVENT FIRED", data);
+
+        // Set application context (editing existing emails, not templates)
+        isApplicationEmailContext = true;
+        document.body.classList.add('application-email-context');
+
+        // Determine if this is a draft FIRST, before any field population
+        const status = (data?.status || '').toString().trim().toLowerCase();
+        const isDraft = status === 'draft';
+        isViewingDraft = isDraft; // Set flag early to prevent handleDraftChange from enabling buttons
+        console.log('isViewingDraft set to:', isViewingDraft);
+
+        // Store the original selected email data for discard functionality
+        selectedEmailData = structuredClone(data);
+
         if (isNewEmailDraft && newDraftId) {
             $.ajax({ url: `/api/app/email-notification/${newDraftId}/email`, type: 'DELETE' })
                 .catch(e => console.warn('Failed to delete abandoned draft on email_selected:', e));
-            isNewEmailDraft = false; 
+            isNewEmailDraft = false;
             newDraftId = null;
         }
+
+        const selectedRecordTemplateName = resolveEmailRecordTemplateName(data);
+        activeTemplateId = data?.templateId || data?.emailTemplateId || data?.TemplateId || data?.EmailTemplateId || activeTemplateId;
+        originalTemplateState = {
+            name: selectedRecordTemplateName,
+            id: (activeTemplateId || '').toString()
+        };
+
         resetValidationErrors();
         console.log("data", data)
-        $('#templateListContainer').hide();
-        $('#templateTextContainer').show();
-        $('#templateText').val(data.templateName);
-        $('#templateText').prop('disabled', true);
+        $('#EmailTemplateName').val(selectedRecordTemplateName);
         UIElements.inputEmailId.val(data.id);
         UIElements.inputOriginalEmailTo.val(data.toAddress);
-        UIElements.inputOriginalEmailCC.val(data.cc ? data.cc.replace(/,/g, '; ') : '');
-        UIElements.inputOriginalEmailBCC.val(data.bcc ? data.bcc.replace(/,/g, '; ') : '');
+        UIElements.inputOriginalEmailCC.val(data.cc?.replaceAll(',', '; ') ?? '');
+        UIElements.inputOriginalEmailBCC.val(data.bcc?.replaceAll(',', '; ') ?? '');
         UIElements.inputOriginalEmailFrom.val(data.fromAddress);
         UIElements.inputOriginalEmailSubject.val(data.subject);
-         resetEmailBody(); 
-        if (tinymce.get("EmailBody")) {
-            tinymce.get("EmailBody").remove(); // remove existing instance
-        }
+        resetEmailBody();
+        tinymce.get("EmailBody")?.remove(); // remove existing instance
 
         tinymce.init({
             license_key: 'gpl',
             selector: '#EmailBody',
             plugins: getPlugins(),
-            toolbar: getToolbarOptions(),
+            menubar: 'file edit view insert format tools',
             resize: true,
             statusbar: true,
             elementpath: false,
@@ -710,17 +2120,68 @@
                     handleDraftChange();
                 });
                 editorInstance = editor;
-                editorInstance.setContent(refreshTodayDateSpans(data.body));
+            },
+            init_instance_callback: function (editor) {
+                // Set initial content
+                const bodyContent = data.body ? refreshTodayDateSpans(data.body) : '';
+                if (bodyContent) {
+                    const sanitizedBodyContent = sanitizeTinyMceHtml(bodyContent);
+                    editorInstance.setContent(sanitizedBodyContent);
+                }
+
+                // Create template label and buttons in label container
+                setTimeout(() => {
+                    const $menubar = $(editor.getContainer()).find('.tox-menubar');
+                    if (!$menubar.length) return;
+
+                    updateSelectedTemplateLabel(selectedRecordTemplateName, activeTemplateId || '');
+
+                    // Templates select - add to TinyMCE menu bar at bottom
+                    if (!$menubar.find('.templates-button-container').length) {
+                        const $templatesSelect = createTemplateSelect(selectedRecordTemplateName, isDraft);
+                        bindTemplateSelectEvents($templatesSelect, isDraft);
+                        $menubar.append($templatesSelect);
+                    }
+
+                    // Ensure disabled option text matches selected record after select exists.
+                    updateSelectedTemplateLabel(selectedRecordTemplateName, activeTemplateId || '');
+                }, 100);
             }
         });
         UIElements.inputEmailTo.val(data.toAddress);
-        UIElements.inputEmailCC.val(data.cc ? data.cc.replace(/,/g, '; ') : '');
-        UIElements.inputEmailBCC.val(data.bcc ? data.bcc.replace(/,/g, '; ') : '');
+        UIElements.inputEmailCC.val(data.cc?.replaceAll(',', '; ') ?? '');
+        UIElements.inputEmailBCC.val(data.bcc?.replaceAll(',', '; ') ?? '');
         UIElements.inputEmailFrom.val(data.fromAddress);
         UIElements.inputEmailSubject.val(data.subject);
-        UIElements.inputEmailBody.val(refreshTodayDateSpans(data.body));
+        const bodyContentWithRefresh = refreshTodayDateSpans(data.body);
+        UIElements.inputEmailBody.val(bodyContentWithRefresh);
+        UIElements.inputOriginalEmailBody.val(bodyContentWithRefresh);
+
+        // Load scheduled send date/time if available
+        if (data.sendOnDateTime) {
+            UIElements.inputSendOnDateTime.val(data.sendOnDateTime);
+            updateScheduledDateDisplay();
+        } else {
+            UIElements.inputSendOnDateTime.val('');
+            updateScheduledDateDisplay();
+        }
+
+        // Set the template dropdown to the current template if available
+        // Find the option by its text (template name) since values are GUIDs
+        if (data.templateName) {
+            const option = $('#EmailTemplate').find('option').filter(function () {
+                return $(this).text() === data.templateName;
+            });
+            if (option.length > 0) {
+                // Set without triggering change to avoid overwriting form fields with template defaults
+                $('#EmailTemplate').val(option.val());
+            }
+        }
+
+        // Always show the template dropdown, but disable it for sent emails
+        $('#templateListContainer').show();
+        $('#EmailTemplate').prop('disabled', !isDraft);
 
-        const isDraft = data?.status === 'Draft';
         if (isDraft) {
             enableEmail();
             handleDraftChange();
@@ -728,19 +2189,34 @@
         } else {
             disableEmail();
             $('#email_attachment_upload_btn').hide();
+            // Don't show clear schedule button for sent emails
+            UIElements.btnClearSchedule.hide();
+
+            // Extra safety: ensure buttons stay disabled for sent emails
+            setTimeout(() => {
+                if (!isViewingDraft) {
+                    UIElements.btnSave.prop('disabled', true);
+                    UIElements.btnSend.prop('disabled', true);
+                    UIElements.btnSendDropdown.prop('disabled', true);
+                    UIElements.btnDiscard.prop('disabled', true);
+                    console.log('Extra safety check: buttons re-disabled for sent email');
+                }
+            }, 100);
         }
         $('#email-attachments-section').show();
         initEmailAttachmentsTable(data.id, isDraft);
 
+        console.log("About to call showModalEmail() - emailForm element:", UIElements.emailForm);
         showModalEmail();
+        console.log("showModalEmail() called successfully");
         resetValidationErrors();
     });
 
     PubSub.subscribe(
         'applicant_info_updated',
         (_, ApplicantInfoObj) => {
-            if(ApplicantInfoObj+"" !== "undefined"
-                && ApplicantInfoObj.ContactEmail+"" != "undefined"
+            if (ApplicantInfoObj + "" !== "undefined"
+                && ApplicantInfoObj.ContactEmail + "" != "undefined"
                 && ApplicantInfoObj.ContactEmail !== "") {
                 UIElements.inputEmailTo[0].value = ApplicantInfoObj.ContactEmail;
             }
@@ -958,7 +2434,7 @@
                         const pct = Math.round((e.loaded / e.total) * 100);
                         $('#attachment-upload-progress-bar')
                             .css('width', pct + '%')
-                            .attr('aria-valuenow', pct)
+                            .attr('value', pct)
                             .text(pct + '%');
                     }
                 });
@@ -988,21 +2464,163 @@
     }
 });
 
-function generateEmailAttachmentButtonContent(attachmentId) {
-    return `
-        <div class="dropdown" style="float:right;">
-            <button class="btn btn-light dropbtn" type="button">
-                <i class="fl fl-attachment-more"></i>
-            </button>
-            <div class="dropdown-content">
-                <button class="btn fullWidth" style="margin:10px" type="button"
-                        onclick="deleteEmailAttachment('${attachmentId}')">
-                    <i class="fl fl-cancel"></i><span>Delete Attachment</span>
-                </button>
-            </div>
-        </div>`;
+
+/**
+ * Returns TinyMCE editor toolbar options
+ * @returns {string} Toolbar configuration
+ */
+function getToolbarOptions() {
+    return 'undo redo | styles | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist | link image | code preview';
+}
+
+/**
+ * Returns TinyMCE editor plugins
+ * @returns {string} Comma-separated plugin names
+ */
+function getPlugins() {
+    return 'lists link image preview code';
+}
+
+/**
+ * Returns a valid template name, or empty when placeholder/sentinel values are selected.
+ * @param {string} value - Candidate template name
+ * @returns {string} Normalized template name
+ */
+function normalizeTemplateName(value) {
+    const name = (value || '').trim();
+    if (!name) {
+        return '';
+    }
+
+    const lowerName = name.toLowerCase();
+    if (
+        lowerName === 'please select' ||
+        lowerName === 'select a template' ||
+        lowerName === 'templates' ||
+        lowerName === 'no template selected' ||
+        lowerName.includes('select')
+    ) {
+        return '';
+    }
+
+    return name;
+}
+
+function resolveEmailRecordTemplateName(emailRecord) {
+    const rawName = [
+        emailRecord?.templateName,
+        emailRecord?.emailTemplateName,
+        emailRecord?.template,
+        emailRecord?.templateTitle,
+        emailRecord?.TemplateName,
+        emailRecord?.EmailTemplateName,
+        emailRecord?.Template,
+        emailRecord?.TemplateTitle
+    ].find(value => normalizeTemplateName(value));
+
+    return normalizeTemplateName(rawName || '');
+}
+
+/**
+ * TinyMCE can throw when loading persisted blob: URIs without a matching blob cache entry.
+ * Strip blob URLs from HTML before setContent to avoid editor initialization crashes.
+ * @param {string} html - Raw HTML
+ * @returns {string} Sanitized HTML safe for TinyMCE setContent
+ */
+function sanitizeTinyMceHtml(html) {
+    if (!html || typeof html !== 'string') {
+        return html || '';
+    }
+
+    try {
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(`<div id="tinymce-sanitize-root">${html}</div>`, 'text/html');
+        const root = doc.getElementById('tinymce-sanitize-root');
+        if (!root) {
+            return html;
+        }
+
+        root.querySelectorAll('[src], [href], [style]').forEach((element) => {
+            const src = element.getAttribute('src');
+            if (src?.trim().toLowerCase().startsWith('blob:')) {
+                element.removeAttribute('src');
+            }
+
+            const href = element.getAttribute('href');
+            if (href?.trim().toLowerCase().startsWith('blob:')) {
+                element.removeAttribute('href');
+            }
+
+            const style = element.getAttribute('style');
+            if (style?.toLowerCase().includes('blob:')) {
+                element.setAttribute('style', style.replaceAll(/url\([^)]*blob:[^)]*\)/gi, 'url("")'));
+            }
+        });
+
+        return root.innerHTML;
+    } catch (e) {
+        console.warn('Failed to sanitize TinyMCE HTML content:', e);
+        return html;
+    }
+}
+
+
+/**
+ * Displays validation error toast using abp.notify or toastr
+ * @param {string[]} errors - Array of error messages to display
+ */
+function showValidationErrorToast(errors) {
+    if (!errors?.length) return;
+
+    // Build error message with line breaks for each error
+    let errorMessage = errors.map((err, idx) => (idx === 0 ? '• ' : '') + err).join('<br>• ');
+
+    console.log('Showing validation errors:', errors);
+
+    // Use abp.notify if available, fallback to toastr if available
+    if (globalThis.abp?.notify) {
+        const errorTitle = 'Validation Error' + (errors.length > 1 ? 's' : '');
+        abp.notify.error(errorMessage, errorTitle);
+    } else if (globalThis.toastr) {
+        toastr.error(errorMessage, 'Validation Error' + (errors.length > 1 ? 's' : ''), {
+            timeOut: 0,
+            extendedTimeOut: 0,
+            closeButton: true,
+            escapeHtml: false
+        });
+    } else {
+        // Final fallback: alert
+        console.error('Validation Errors:', errors.join('\n'));
+        alert('Validation Error:\n\n' + errors.join('\n'));
+    }
 }
 
+/**
+ * Gets email validation error message
+ * @param {string} emailStr - Email string to validate
+ * @param {string} emailValue - Email value for error context
+ * @param {string} fieldName - Field name for error message
+ * @returns {string|null} Error message or null if valid
+ */
+function getEmailValidationError(emailStr, emailValue, fieldName) {
+    if (emailStr === '' || !validateEmail(emailStr)) {
+        let errorMessage;
+        if (emailStr === '') {
+            errorMessage = emailValue.length > 0
+                ? `An email is required after each comma or semicolon.`
+                : `The ${escapeHtml(fieldName)} field is required.`;
+        } else {
+            errorMessage = `Please enter a valid email in ${escapeHtml(fieldName)}: ${escapeHtml(emailStr)}`;
+        }
+        return normalizeErrorMessage(errorMessage);
+    }
+    return null;
+}
+
+/**
+ * Deletes email attachment with confirmation
+ * @param {string} attachmentId - Attachment ID to delete
+ */
 function deleteEmailAttachment(attachmentId) {
     abp.message.confirm(
         'Are you sure you want to delete this attachment?',
@@ -1023,3 +2641,224 @@ function deleteEmailAttachment(attachmentId) {
         }
     );
 }
+
+
+/**
+ * Generates HTML for email attachment button
+ * @param {string} attachmentId - Attachment ID
+ * @returns {string} HTML for attachment button
+ */
+function generateEmailAttachmentButtonContent(attachmentId) {
+    return `<button class="btn fullWidth" style="margin:10px" type="button" onclick="deleteEmailAttachment('${attachmentId}')">
+                <i class="fl fl-cancel"></i>
+            </button>`;
+}
+
+/**
+ * Collects email field validation errors
+ * @param {object} toResult - To field validation result
+ * @param {object} ccResult - CC field validation result
+ * @param {object} bccResult - BCC field validation result
+ * @returns {string[]} Array of error messages
+ */
+function collectEmailFieldErrors(toResult, ccResult, bccResult) {
+    let allErrors = [];
+    if (!toResult.isValid && toResult.error) allErrors.push(toResult.error);
+    if (!ccResult.isValid && ccResult.error) allErrors.push(ccResult.error);
+    if (!bccResult.isValid && bccResult.error) allErrors.push(bccResult.error);
+    return allErrors;
+}
+
+/**
+ * Checks if only TinyMCE editor has validation error
+ * @param {boolean} isValid - Overall form validity
+ * @param {array} errorList - jQuery validator error list
+ * @param {string} fieldName - Field name to check
+ * @param {string} tinymceContent - TinyMCE editor content
+ * @returns {boolean} True if only TinyMCE has error
+ */
+function checkOnlyErrorIsTinyMCE(isValid, errorList, fieldName, tinymceContent) {
+    return !isValid && errorList.length === 1 &&
+        errorList[0].element.name === fieldName &&
+        tinymceContent.length > 0;
+}
+
+
+function validateEmailFieldWithOptions(fieldElement, isRequired = false, showToast = false, onlyShowErrorsIfHasContent = false) {
+    const result = globalThis.validateEmailField(fieldElement, isRequired, showToast, onlyShowErrorsIfHasContent);
+    return result;
+}
+
+/**
+ * Trims input value on keyup event
+ * @param {event} e - Keyup event
+ */
+function handleKeyUpTrim(e) {
+    let trimmedString = e.currentTarget.value.trim();
+    e.currentTarget.value = trimmedString;
+}
+
+
+/**
+  * Validates email format
+  * @param {string} email - Email address to validate
+  * @returns {boolean} True if valid email format
+  */
+function validateEmail(email) {
+    // Optimized regex to prevent ReDoS: use atomic-like patterns with specific character classes
+    const emailRegex = /^[a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+    return emailRegex.exec(String(email).toLowerCase()) !== null;
+}
+
+/**
+ * Escapes HTML special characters to prevent XSS
+ * @param {string} str - String to escape
+ * @returns {string} HTML-escaped string
+ */
+function escapeHtml(str) {
+    return String(str)
+        .replaceAll('&', '&amp;')
+        .replaceAll('<', '&lt;')
+        .replaceAll('>', '&gt;')
+        .replaceAll('"', '&quot;')
+        .replaceAll("'", '&#39;');
+}
+
+/**
+ * Normalizes error messages by replacing field names with user-friendly labels
+ * @param {string} message - Error message to normalize
+ * @returns {string} Normalized error message
+ */
+function normalizeErrorMessage(message) {
+    if (!message) return message;
+
+    // Handle "The {FieldName} field" format
+    message = message
+        .replaceAll(/The EmailTo field/gi, 'The To field')
+        .replaceAll(/The EmailCC field/gi, 'The CC field')
+        .replaceAll(/The EmailBCC field/gi, 'The BCC field')
+        .replaceAll(/The EmailFrom field/gi, 'The From field')
+        .replaceAll(/The EmailSubject field/gi, 'The Subject field')
+        .replaceAll(/The EmailBody field/gi, 'The Body field');
+
+    // Also handle just the field names themselves in case they appear elsewhere
+    message = message.replaceAll(/(EmailTo|EmailCC|EmailBCC|EmailFrom|EmailSubject|EmailBody)/g, (match) => {
+        const replacements = {
+            'EmailTo': 'To',
+            'EmailCC': 'CC',
+            'EmailBCC': 'BCC',
+            'EmailFrom': 'From',
+            'EmailSubject': 'Subject',
+            'EmailBody': 'Body'
+        };
+        return replacements[match] ?? match;
+    });
+
+    return message;
+}
+
+
+function buildVariablesMenuItems(config, editor) {
+    return (config || []).map(item => ({
+        type: 'menuitem',
+        text: item.name,
+        onAction: () => {
+            editor.insertContent(`{{${item.token}}}`);
+        }
+    }));
+}
+
+/**
+ * Validates date values
+ * @param {number} month - Month (1-12)
+ * @param {number} day - Day (1-31)
+ * @param {number} year - Year
+ * @returns {boolean} True if valid date
+ */
+function isValidDate(month, day, year) {
+    const date = new Date(year, month - 1, day);
+    return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day;
+}
+
+/**
+ * Converts string to title case
+ * @param {string} str - String to convert
+ * @returns {string} Title-cased string
+ */
+function toTitleCase(str) {
+    return str.toLowerCase().replace(/\b\w/g, function (char) {
+        return char.toUpperCase();
+    });
+}
+
+/**
+ * Gets nested object property by dot-notation path
+ * @param {object} obj - Object to traverse
+ * @param {string} path - Property path (e.g., "applicant.applicantName")
+ * @returns {*} Value at path or undefined
+ */
+function getValueByPath(obj, path) {
+    return path.split('.').reduce((acc, key) => acc?.[key], obj);
+}
+
+/**
+ * Creates a currency formatter for Canadian dollars
+ * @returns {Intl.NumberFormat} Formatter instance
+ */
+function createCurrencyFormatter() {
+    return new Intl.NumberFormat('en-CA', {
+        style: 'currency',
+        currency: 'CAD',
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+    });
+}
+
+function extractTemplateFields(template) {
+    return {
+        subject: template.subject || template.Subject || '',
+        body: template.body || template.bodyHTML || template.Body || template.BodyHTML || '',
+        sendFrom: template.sendFrom || template.SendFrom || '',
+        id: template.id || template.Id,
+        name: template.name || template.Name || 'Unnamed Template'
+    };
+}
+
+function findTemplateById(templates, templateId) {
+    let selectedTemplate = templates.find(t => t.id === templateId);
+    let useUpperCase = false;
+
+    if (!selectedTemplate) {
+        console.warn('Template not found with camelCase, checking with PascalCase...');
+        console.log('Available template IDs:', templates.map(t => t.id || t.Id));
+        selectedTemplate = templates.find(t => t.Id === templateId);
+        useUpperCase = true;
+    }
+
+    return { selectedTemplate, useUpperCase };
+}
+
+function extractTemplateValues(template, useUpperCase) {
+    const subject = useUpperCase ? template.Subject : template.subject;
+    const body = useUpperCase ? (template.Body || template.BodyHTML) : (template.body || template.bodyHTML);
+    const sendFrom = useUpperCase ? template.SendFrom : template.sendFrom;
+    const name = useUpperCase ? template.Name : template.name;
+    return { subject, body, sendFrom, name };
+}
+
+function buildSuccessMessage(attachmentCount) {
+    const plural = attachmentCount === 1 ? '' : 's';
+    const verbForm = attachmentCount === 1 ? 'has' : 'have';
+    return attachmentCount > 0
+        ? `${attachmentCount} attachment${plural} from the template ${verbForm} been copied to this email.`
+        : 'Template applied successfully. No attachments were copied.';
+}
+
+async function showSuccessNotification(message) {
+    await Swal.fire({
+        title: 'Template Applied',
+        text: message,
+        icon: 'success',
+        confirmButtonText: 'OK'
+    });
+}
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs
index 87aba21589..76fab2f882 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewComponent.cs
@@ -27,12 +27,17 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicationId, Guid cur
             Application application = await applicationRepository.WithBasicDetailsAsync(applicationId);
 
             var defaultFromAddress = await settingProvider.GetOrNullAsync(NotificationsSettings.Mailing.DefaultFromAddress);
+            var enableEmailDelay = string.Equals(
+                await settingProvider.GetOrNullAsync(NotificationsSettings.Mailing.EnableEmailDelay),
+                "true", StringComparison.OrdinalIgnoreCase);
+
             EmailsWidgetViewModel model = new()
             {
                 ApplicationId = applicationId,
                 CurrentUserId = currentUserId,
                 EmailTo = application?.ApplicantAgent?.Email ?? string.Empty,
                 EmailFrom = defaultFromAddress ?? "NoReply@gov.bc.ca",
+                EnableEmailDelay = enableEmailDelay
             };
             await PopulateTemplates(model);
 
@@ -40,7 +45,7 @@ public async Task<IViewComponentResult> InvokeAsync(Guid applicationId, Guid cur
         }
         private async Task PopulateTemplates(EmailsWidgetViewModel model)
         {
-            var templates = await templateService.GetTemplatesByTenent();
+            var templates = await templateService.GetTemplatesByTenant();
 
             templates.ForEach(t =>
            {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewModel.cs
index 4203163736..78803368f1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewModel.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/EmailsWidgetViewModel.cs
@@ -11,33 +11,33 @@ public class EmailsWidgetViewModel
     {
         [Required]
         [Placeholder("To")]
-        [DisplayName("Email To")]
+        [DisplayName("To")]
         public string EmailTo { get; set; } = string.Empty;
 
         [Required]
         [Placeholder("From")]
         [DataType(DataType.EmailAddress)]
-        [DisplayName("Email From")]
+        [DisplayName("From")]
         public string EmailFrom { get; set; } = string.Empty;
 
         [Placeholder("CC")]
-        [DisplayName("Email CC")]
+        [DisplayName("CC")]
         public string? EmailCC { get; set; }
 
         [Placeholder("BCC")]
-        [DisplayName("Email BCC")]
+        [DisplayName("BCC")]
         public string? EmailBCC { get; set; }
         
         [Required]
-        [Placeholder("Subject")]
-        [DisplayName("Email Subject")]
+        [Placeholder("Add a subject")]
+        [DisplayName("Subject")]
         [MaxLength(1023)]
         public string EmailSubject { get; set; } = string.Empty;
 
 
         [TextArea(Rows = 4)]
         [Placeholder("Body of email")]
-        [DisplayName("Email Body")]
+        [DisplayName("Body")]
         [Required]
         public string EmailBody { get; set; } = string.Empty;
         public Guid OwnerId { get; set; }
@@ -45,12 +45,11 @@ public class EmailsWidgetViewModel
         public Guid EmailId { get; set; } = Guid.Empty;
         public Guid CurrentUserId { get; set; }
 
-        [DisplayName("Email Template")]
+        [DisplayName("Template")]
         public Guid? EmailTemplate { get; set; }
-
-        [DisplayName("Email Template")]
-        public string? EmailTemplateName { get; set; }
-
         public List<SelectListItem> TemplatesList { get; set; } = new();
+
+        /// <summary>Whether the email delay feature is enabled for this tenant.</summary>
+        public bool EnableEmailDelay { get; set; }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml
new file mode 100644
index 0000000000..95d6a5f267
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/_EmailAttachments.cshtml
@@ -0,0 +1,34 @@
+<div id="email-attachments-section" class="px-3" style="display:none">
+    <abp-row class="m-0 p-0">
+        <abp-column size="_12" class="px-0">
+            <h6 class="fw-bold pt-3 pb-1 m-0">Attachments</h6>
+            <abp-table id="EmailAttachmentsTable"
+                        hoverable-rows="true"
+                        class="attachments-table nowrap"></abp-table>
+            <div id="attachment-upload-progress" style="display:none" class="mt-2 mb-1">
+                <div class="progress">
+                    <progress id="attachment-upload-progress-bar"
+                            class="progress-bar progress-bar-striped progress-bar-animated"
+                            style="width:0%"
+                            value="0"
+                            max="100">0%</progress>
+                </div>
+            </div>
+            <div id="email-attachment-size-error" class="alert alert-danger mt-2" style="display:none">
+                <i class="fa fa-exclamation-triangle me-1"></i>
+                <span id="email-attachment-size-error-message"></span>
+            </div>
+            <div class="d-flex justify-content-end mt-2 mb-1">
+                <form id="email-attachment-form" enctype="multipart/form-data">
+                    <label for="email_attachment_upload" style="display:none">Email Attachment Upload</label>
+                    <input id="email_attachment_upload" type="file" multiple style="display:none"/>
+                    <abp-button text="Add Attachments"
+                                id="email_attachment_upload_btn"
+                                icon-type="Other"
+                                icon="fl fl-plus"
+                                button-type="Light" />
+                </form>
+            </div>
+        </abp-column>
+    </abp-row>
+</div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.cshtml
new file mode 100644
index 0000000000..061e8cd0f7
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.cshtml
@@ -0,0 +1,131 @@
+@model Unity.GrantManager.Web.Views.Shared.Components.Notifications.NotificationsViewModel
+@using Volo.Abp.Authorization.Permissions
+@using Unity.Notifications.Permissions;
+@inject IPermissionChecker PermissionChecker
+
+<link rel="stylesheet" href="/libs/select2/dist/css/select2.min.css" />
+<link rel="stylesheet" href="/libs/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css" />
+<link rel="stylesheet" href="/Views/Shared/Components/Notifications/Default.css" />
+
+<script src="/js/formConfiguration/NotificationsPreview.js"></script>
+<script src="/Views/Shared/Components/Notifications/Default.js"></script>
+
+<div class="notifications-widget p-3">
+    <div class="d-flex justify-content-between align-items-center mb-3">
+        <h6 class="mb-0"><label for="NotificationsTable" class="form-label">Scheduled &amp; Event Based Notifications</label></h6>
+        @if (await PermissionChecker.IsGrantedAsync(NotificationsPermissions.Email.ScheduleCreate)) 
+        {   
+        <button id="btn-add-notification" class="btn unt-btn-primary btn-primary btn-sm">Create Automated Notification</button>
+        }
+    </div>
+
+    <div id="notifications-list" class="mb-3">
+        <table id="NotificationsTable" class="table table-striped notification-table">
+            <th></th>
+        </table>
+    </div>
+
+    <template id="notification-actions-template">
+        <div class="button-group">
+            @if (await PermissionChecker.IsGrantedAsync(NotificationsPermissions.Email.ScheduleCreate)) 
+            {              
+            <button class="btn unt-btn-primary btn-sm abp-action-button js-edit-notification notification-action-btn" type="button">
+                <span>Edit</span>
+            </button>
+            }
+            @if (await PermissionChecker.IsGrantedAsync(NotificationsPermissions.Email.ScheduleCancel)) 
+            {            
+            <button class="btn unt-btn-outline-primary btn-sm abp-action-button js-cancel-notification notification-action-btn" type="button">
+                <span>Cancel</span>
+            </button>
+            }
+        </div>
+    </template>
+
+    <!-- Create/Edit Modal -->
+    <div id="notificationModal" class="modal" tabindex="-1">
+        <div class="modal-dialog modal-xl">
+            <div class="modal-content notification-modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Create Scheduled Notification</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body notification-modal-body">
+                    <form id="notificationForm" novalidate>
+                        <div id="modalColumns">
+
+                            <div id="leftColumn" class="left-col">
+                                <div class="mb-3">
+                                    <label for="templateSelect" class="form-label">Email Template</label>
+                                    <select id="templateSelect" class="form-select" required></select>
+                                    <div class="invalid-feedback">Please select an email template.</div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="triggerType" class="form-label">Trigger Type</label>
+                                    <select id="triggerType" class="form-select" required>
+                                        <option value=""></option>
+                                        <option value="Date">Date</option>
+                                        <option value="Event">Event</option>
+                                    </select>
+                                    <div class="invalid-feedback">Please select a trigger type.</div>
+                                </div>
+                                <div id="dateOptions" class="hidden-section">
+                                    <div class="mb-3">
+                                        <label for="dateType" class="form-label">Notification Date Type</label>
+                                        <select id="dateType" class="form-select" required>
+                                            <option value=""></option>
+                                            <option value="NotificationDate">Notification Date</option>
+                                            <option value="DueDate">Due Date</option>
+                                            <option value="ProjectStartDate">Project Start Date</option>
+                                            <option value="ProjectEndDate">Project End Date</option>
+                                            <option value="ContractExecutionDate">Contract Execution Date</option>
+                                        </select>
+                                        <div class="invalid-feedback">Please select a date type.</div>
+                                    </div>
+                                </div>
+                                <div id="eventOptions" class="hidden-section">
+                                    <div class="mb-3">
+                                        <label for="statusSelect" class="form-label">Application Status Trigger</label>
+                                        <select id="statusSelect" class="form-select" required></select>
+                                        <div class="invalid-feedback">Please select an application status.</div>
+                                    </div>
+                                </div>
+                                <div id="recipientOptions" class="hidden-section">
+                                    <div class="mb-3">
+                                        <label for="recipientCategory" class="form-label">Recipient Category</label>
+                                        <select id="recipientCategory" class="form-select" required>
+                                            <option value=""></option>
+                                            <option value="Internal">Internal</option>
+                                            <option value="External">External</option>
+                                        </select>
+                                        <div class="invalid-feedback">Please select a recipient category.</div>
+                                    </div>
+                                    <div class="mb-3">
+                                        <label for="recipientSelect" class="form-label">Recipient</label>
+                                        <select id="recipientSelect" class="form-select" name="recipients[]" multiple data-placeholder="Select recipients..." required></select>
+                                        <div class="invalid-feedback">Please select at least one recipient.</div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div id="rightColumn" class="right-col">
+                                <label for="templatePreview" class="form-label">Template Preview</label>
+                                <div class="template-preview-container">
+                                    <div id="templatePreview" class="p-2 template-preview-text"></div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </form>
+                </div>
+                <div class="notification-info-note">
+                    <strong>Note:</strong> If Recipients are not found, then no email will be drafted or sent.
+                </div>
+                <div class="modal-footer notification-modal-footer">
+                    <button id="btn-save-notification" type="button" class="btn unt-btn-primary btn-primary">Save</button>
+                    <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" data-bs-dismiss="modal">Cancel</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.css
new file mode 100644
index 0000000000..2ed7dbd718
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.css
@@ -0,0 +1,186 @@
+/* Notifications widget styles */
+.notifications-widget {
+    padding: 1rem;
+    background: #f8f9fb;
+    font-family: var(--bs-body-font-family, 'BCSans', sans-serif);
+    font-size: var(--bc-font-size, 1rem);
+}
+.notifications-widget .card { border: 0; }
+.notifications-widget .card .card-body { background: #fff; }
+
+/* Select2 Bootstrap 5 Theme - Use default styling */
+/* Let Select2's Bootstrap 5 theme handle the layout naturally */
+.select2-container--bootstrap-5 .select2-selection--multiple {
+    min-height: 38px;
+    height: auto;
+    max-height: 150px;
+    overflow-y: auto;
+}
+
+/* Ensure the Select2 box matches standard input borders and radius */
+.select2-container--bootstrap-5 .select2-selection {
+    border: 2px solid #2e5dd7 !important;
+    border-radius: 8px !important;
+    height: auto !important;
+    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out !important;
+}
+
+/* Match the focus state (glow) of other inputs */
+.select2-container--bootstrap-5.select2-container--focus .select2-selection {
+    border-color: #2e5dd7 !important;
+    box-shadow: 0 0 0 0.25rem rgba(46, 93, 215, 0.25) !important;
+    outline: 0 !important;
+}
+
+.select2-container--bootstrap-5.select2-container--disabled .select2-selection--multiple {
+    background-color: #e9ecef;
+    border-color: #dee2e6;
+    cursor: not-allowed;
+}
+
+/* Suppress Bootstrap's invalid !-circle icon on selects; keep red border only */
+#notificationForm .form-select.is-invalid,
+#notificationForm .form-select.is-invalid:focus {
+    background-image: var(--bs-form-select-bg-img);
+    background-size: 16px 12px;
+    background-position: right 0.75rem center;
+    padding-right: 2.25rem;
+}
+
+/* Modal column layout */
+#modalColumns { 
+    align-items: stretch; 
+    gap: 60px;
+    display: flex;
+    flex: 1 1 auto;
+    min-height: 0;
+}
+
+.left-col { 
+    flex: 0 0 33%; 
+    min-width: 320px;
+    overflow-y: auto;
+}
+
+.right-col { 
+    flex: 1 1 0;
+    display: flex;
+    flex-direction: column;
+    min-width: 0;
+}
+
+#notificationForm { 
+    display: flex; 
+    flex-direction: column; 
+    flex: 1 1 auto; 
+    min-height: 0; 
+}
+
+/* Modal styling */
+.notification-modal-content {
+    display: flex;
+    flex-direction: column;
+    min-width: 900px;
+    min-height: 480px;
+    max-height: 85vh;
+}
+
+.notification-modal-body {
+    overflow: hidden;
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
+}
+
+.notification-modal-footer {
+    flex-shrink: 0;
+}
+
+/* Notification info note styling */
+.notification-info-note {
+    background-color: #d1ecf1;
+    border: 1px solid #bee5eb;
+    color: #0c5460;
+    padding: 12px 16px;
+    margin: 16px;
+    border-radius: 4px;
+    font-size: 0.95rem;
+    line-height: 1.5;
+}
+
+/* Template preview styling */
+.template-preview-container {
+    padding: 12px;
+    background: #fff;
+    flex: 1;
+    overflow: auto;
+    box-sizing: border-box;
+    border: 1px solid #dee2e6;
+}
+
+.template-preview-text {
+    min-height: 120px;
+    white-space: pre-wrap;
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+}
+
+/* Hidden sections (display:none handled by JavaScript) */
+.hidden-section {
+    display: none;
+}
+
+/* Notifications table styling */
+.notification-table {
+    width: 100%;
+}
+
+/* Notification table action buttons */
+.notification-action-btn {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+.button-group {
+    display: flex;
+    justify-content: center;
+}
+
+.dt-column-title, table.dataTable thead th {
+    color: #fff;
+    font-weight: 500;
+    font-size: 18px;
+}
+
+table.dataTable td {
+    word-wrap: break-word;
+    max-width: 250px;
+    font-size: 15px;
+}
+
+.unt-btn-outline-primary {
+    background-color: white;
+}
+
+.js-delete-notification {
+    padding: 10px 5px;
+}
+
+.badge {
+    min-height: 24px;
+    /* Layout & Alignment */
+    display: inline-block;
+    vertical-align: middle;
+    
+    /* Text Spacing */
+    line-height: 1;
+    
+    /* Visually centered padding (compensates for font metrics) */
+    padding-top: 8px;
+    padding-bottom: 8px;
+    
+    /* Horizontal padding (inherited from Bootstrap default) */
+    padding-left: 0.65em;
+    padding-right: 0.65em;
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js
new file mode 100644
index 0000000000..a81ab5d530
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Default.js
@@ -0,0 +1,798 @@
+(function () {
+    let formId;
+    let notificationsTable;
+    let select2Ready = false;
+    let select2Loading = false;
+    let initialized = false;  // Guard against reinitializing
+    let isSaving = false;  // Guard against duplicate submissions
+
+    // Load Select2 library dynamically only after jQuery is available
+    function loadSelect2Library() {
+        if (select2Loading || select2Ready || ($ === undefined)) {
+            return;
+        }
+        select2Loading = true;
+
+        const script = document.createElement('script');
+        script.src = '/libs/select2/dist/js/select2.min.js';
+        script.onerror = function() {
+            console.error('Failed to load Select2 library');
+            select2Loading = false;
+        };
+        document.head.appendChild(script);
+    }
+
+    // Wait for select2 to be available, then initialize
+    function waitForSelect2() {
+        if ($ === undefined) {
+            // jQuery not available yet, try again
+            setTimeout(waitForSelect2, 50);
+            return;
+        }
+
+        if (!select2Loading && ($.fn === undefined || !$.fn.select2)) {
+            // Select2 script not loaded yet, load it
+            loadSelect2Library();
+            setTimeout(waitForSelect2, 100);
+            return;
+        }
+
+        if ($.fn?.select2) {
+            if (!select2Ready) {
+                select2Ready = true;
+                try {
+                    $('#recipientSelect').select2({
+                        theme: 'bootstrap-5',
+                        width: '100%',
+                        closeOnSelect: true,
+                        allowClear: false
+                    });
+                } catch (e) {
+                    console.error('Failed to initialize Select2:', e);
+                    select2Ready = false;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    // Keep trying to initialize select2 until it's available
+    function initSelect2WhenReady() {
+        if (!select2Ready) {
+            if (waitForSelect2()) {
+                return;
+            }
+            // Keep trying
+            setTimeout(initSelect2WhenReady, 100);
+        }
+    }
+
+    // Helper function to get selected recipient values (filters out blank option)
+    function getSelectedRecipients() {
+        if (select2Ready && $ !== undefined) {
+            const val = $('#recipientSelect').val();
+            const toArray = (val) => {
+            if (Array.isArray(val)) return val;
+            return val ? [val] : [];
+            };
+
+            const arr = toArray(val);
+            // Filter out empty strings (the blank option)
+            return arr.filter(v => v && v.trim() !== '');
+        }
+        
+        // Fallback: get selected options directly
+        return Array.from(document.getElementById('recipientSelect')?.options ?? [])
+            .filter(opt => opt.selected && opt.value)
+            .map(opt => opt.value);
+    }
+
+    // Helper function to set selected values
+    function setSelectedRecipients(values) {
+        let valueArr;
+        if (Array.isArray(values)) {
+            valueArr = values;
+        } else if (values) {
+            valueArr = [values];
+        } else {
+            valueArr = [];
+        }
+        
+        // Set selected on all options
+        Array.from(document.getElementById('recipientSelect')?.options ?? []).forEach(opt => {
+            opt.selected = valueArr.includes(opt.value);
+        });
+        
+        // Refresh select2 if available
+        if (select2Ready && $.fn?.select2) {
+            try {
+                $('#recipientSelect').trigger('change');
+            } catch (e) {
+                console.debug('Select2 refresh failed:', e.message);
+            }
+        }
+    }
+
+    // Helper function to clear selected values
+    function clearSelectedRecipients() {
+        setSelectedRecipients([]);
+    }
+
+    // Refresh select2 if ready
+    function refreshSelect2() {
+        if (select2Ready && $.fn?.select2) {
+            try {
+                $('#recipientSelect').trigger('change');
+            } catch (e) {
+                console.debug('Select2 refresh failed:', e.message);
+            }
+        }
+    }
+
+    function fetchTemplates() {
+        return fetch('/api/form-notifications/templates').then(r => r.json());
+    }
+
+    function fetchStatuses() {
+        return fetch('/api/form-notifications/statuses').then(r => r.json());
+    }
+
+    function fetchRecipients(category) {
+        return fetch('/api/form-notifications/recipients?category=' + encodeURIComponent(category)).then(r => r.json());
+    }
+
+    function renderTriggerDetail(data, type, row) {
+        let detail = '';
+        if (row.triggerType === 'Date') {
+            detail = row.dateType ? row.dateType : '';
+        } else {
+            detail = row.eventStatus ? row.eventStatus : '';
+        }
+        if (row.recipientCategory) {
+            detail += (detail ? ' → ' : '') + 'Category: ' + row.recipientCategory;
+        }
+        if (row.recipientIdentifier) {
+            detail += (detail ? ', ' : '') + 'Recipients: ' + row.recipientIdentifier;
+        }
+        return detail;
+    }
+
+    function getNotificationColumns() {
+        let index = 0;
+        return [
+            { title: 'Template',      name: 'templateName', data: 'templateName', visible: true, index: index++ },
+            { title: 'Trigger Type',  name: 'triggerType',  data: 'triggerType',  visible: true, index: index++ },
+            { title: 'Trigger Detail',name: 'triggerDetail',data: null, visible: true, orderable: true, defaultContent: '', index: index++,
+              render: renderTriggerDetail },
+            { title: 'Status', name: 'status', data: 'isActive', visible: true, orderable: true, index: index++,
+              render: function (data) {
+                  return data
+                      ? '<span class="badge bg-success">Active</span>'
+                      : '<span class="badge bg-dark">Cancelled</span>';
+              }
+            },
+            { title: 'Actions', name: 'rowActions', data: null, visible: true, orderable: false,
+              className: 'text-center notexport', defaultContent: '', index: index++,
+              render: function (data, type, row) { return generateNotificationsButtonContent(row); }
+            }
+        ];
+    }
+
+    function initNotificationsTable() {
+        // Check if DataTable is already initialized
+        const table = $('#NotificationsTable');
+        if ($.fn.dataTable.isDataTable('#NotificationsTable')) {
+            // Already initialized, just reload the data
+            notificationsTable = table.DataTable();
+            notificationsTable.ajax.reload();
+            return;
+        }
+
+        // Use $.ajax so abp.libs.datatables.createAjax gets a jQuery-compatible deferred (has .always())
+        function notificationsEndpoint() {
+            return $.ajax({
+                url: '/api/form-notifications/' + encodeURIComponent(formId),
+                type: 'GET',
+                dataType: 'json'
+            });
+        }
+
+        notificationsTable = initializeDataTable({
+            dt: table,
+            listColumns: getNotificationColumns(),
+            defaultVisibleColumns: ['templateName', 'triggerType', 'triggerDetail', 'status', 'rowActions'],
+            defaultSortColumn: { name: 'templateName', dir: 'asc' },
+            dataEndpoint: notificationsEndpoint,
+            data: {},
+            responseCallback,
+            actionButtons: [],
+            pagingEnabled: true,
+            reorderEnabled: false,
+            languageSetValues: {},
+            dynamicButtonContainerId: null,
+            useNullPlaceholder: false,
+            disableColumnSelect: true,
+            externalFilterButtonId: null,
+            lengthMenu: [10, 25, 50]
+        });
+
+        // jQuery event delegation — survives DataTables redraws
+        $('#notifications-list').on('click', '.js-edit-notification', function () {
+            onEditNotification($(this).data('id'));
+        });
+        $('#notifications-list').on('click', '.js-cancel-notification', function () {
+            onCancelNotification($(this).data('id'));
+        });
+    }
+
+    function reloadTable() {
+        if (notificationsTable) {
+            notificationsTable.ajax.reload();
+        }
+    }
+
+    function onCancelNotification(id) {
+        if (!id) return;
+        Swal.fire({
+            title: 'Cancel Notification Plan?',
+            html: 'Are you sure you want to cancel this notification plan?<br><br>All future scheduled notifications and event-based triggers will be stopped. This action cannot be undone. Notifications that have already been sent are not impacted.',
+            showCancelButton: true,
+            confirmButtonText: 'Confirm',
+            cancelButtonText: 'Cancel',
+            customClass: {
+                confirmButton: 'btn btn-primary',
+                cancelButton: 'btn btn-secondary'
+            }
+        }).then((result) => {
+            if (!result.isConfirmed) return;
+            fetch('/api/form-notifications/' + encodeURIComponent(formId) + '/' + encodeURIComponent(id) + '/cancel', {
+                    method: 'PATCH',
+                    headers: { 'RequestVerificationToken': abp.security.antiForgery.getToken() }
+                })
+                .then(r => {
+                    if (!r.ok) throw new Error('Failed to cancel');
+                    abp.notify.success('Notification plan cancelled');
+                    reloadTable();
+                })
+                .catch(err => {
+                    console.error(err);
+                    abp.notify.error('Failed to cancel notification plan');
+                });
+        });
+    }
+
+
+    function onEditNotification(id) {
+        if (!id) return;
+        fetch('/api/form-notifications/' + encodeURIComponent(formId))
+            .then(r => r.json())
+            .then(list => {
+                const row = list.find(n => String(n.id) === String(id));
+                if (!row) { abp.notify.error('Notification not found'); return; }
+                populateModalForEdit(row);
+            })
+            .catch(err => {
+                console.error(err);
+                abp.notify.error('Failed to load notification for editing');
+            });
+    }
+
+    async function populateModalForEdit(row) {
+        resetValidationState();
+
+        // Load recipients for both Event and Date trigger types
+        if (row.recipientCategory) {
+            try {
+                const list = await fetchRecipients(row.recipientCategory);
+                populateRecipients(list);
+            } catch (err) {
+                console.error('Failed to pre-load recipients for edit modal', err);
+            }
+        }
+
+        const modalEl = document.getElementById('notificationModal');
+        if (modalEl) {
+            modalEl.dataset.editId = row.id;
+        }
+        document.getElementById('notificationModal')?.addEventListener('shown.bs.modal', function () {
+            const setVal = (id, val) => {
+                document.getElementById(id).value = val ?? '';
+            };
+
+            setVal('templateSelect', row.templateId);
+            updatePreview();
+
+            setVal('triggerType', row.triggerType);
+            // Use class-based visibility
+            const dateOptionsEl = document.getElementById('dateOptions');
+            const eventOptionsEl = document.getElementById('eventOptions');
+            const recipientOptionsEl = document.getElementById('recipientOptions');
+            
+            if (row.triggerType === 'Date') {
+                dateOptionsEl?.classList.remove('hidden-section');
+                eventOptionsEl?.classList.add('hidden-section');
+                recipientOptionsEl?.classList.remove('hidden-section');
+            } else if (row.triggerType === 'Event') {
+                dateOptionsEl?.classList.add('hidden-section');
+                eventOptionsEl?.classList.remove('hidden-section');
+                recipientOptionsEl?.classList.remove('hidden-section');
+            }
+
+            if (row.triggerType === 'Date') {
+                setVal('dateType', row.dateType);
+                setVal('recipientCategory', row.recipientCategory);
+                // Set multiple values for recipient select
+                const values = row.recipientIdentifier ? row.recipientIdentifier.split(',').map(v => v.trim()) : [];
+                setSelectedRecipients(values);
+            } else if (row.triggerType === 'Event') {
+                setVal('statusSelect', row.applicationStatusId);
+                setVal('recipientCategory', row.recipientCategory);
+                // Set multiple values for recipient select
+                const values = row.recipientIdentifier ? row.recipientIdentifier.split(',').map(v => v.trim()) : [];
+                setSelectedRecipients(values);
+            }
+        }, { once: true });
+
+        showModal();
+    }
+
+    function populateTemplates(templates) {
+        const sel = document.getElementById('templateSelect');
+        sel.innerHTML = '';
+        const blank = document.createElement('option');
+        blank.value = '';
+        blank.text = '';
+        sel.appendChild(blank);
+        templates.forEach(t => {
+            const opt = document.createElement('option');
+            // Use template id as the option value so we can reference templates reliably
+            opt.value = t.id;
+            opt.text = t.name + ' — ' + t.subject;
+            sel.appendChild(opt);
+        });
+        updatePreview();
+    }
+
+    function populateStatuses(statuses) {
+        const sel = document.getElementById('statusSelect');
+        if (!sel) return;
+        sel.innerHTML = '';
+        const blank = document.createElement('option');
+        blank.value = '';
+        blank.text = '';
+        sel.appendChild(blank);
+        statuses.forEach(s => {
+            const opt = document.createElement('option');
+            opt.value = s.id;
+            opt.text = s.internalStatus;
+            sel.appendChild(opt);
+        });
+    }
+
+    function populateRecipients(list) {
+        const sel = document.getElementById('recipientSelect');
+        if (!sel) return;
+        sel.innerHTML = '';
+        // Add a blank default option first (required by spec, but hidden from dropdown)
+        const empty = document.createElement('option');
+        empty.value = '';
+        empty.text = '';
+        empty.disabled = true; // Hide from Select2 dropdown
+        sel.appendChild(empty);
+        list.forEach(r => {
+            const opt = document.createElement('option');
+            opt.value = r.id;
+            opt.text = r.displayName;
+            sel.appendChild(opt);
+        });
+        // Refresh select2 if available
+        refreshSelect2();
+    }
+
+    function decodeHtmlEntities(value) {
+        if (!value || typeof value !== 'string') {
+            return '';
+        }
+
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(value, 'text/html');
+        return doc.documentElement.textContent || '';
+    }
+
+    function decodeHtmlEntitiesRecursively(value, maxPasses = 12) {
+        let current = value || '';
+        for (let i = 0; i < maxPasses; i++) {
+            const decoded = decodeHtmlEntities(current);
+            if (!decoded || decoded === current) {
+                break;
+            }
+            current = decoded;
+
+            if (/<[a-z][\s\S]*>/i.test(current)) {
+                break;
+            }
+        }
+        return current;
+    }
+
+    function resolveTemplatePreviewBody(template) {
+        const rawBody =
+            template?.body ||
+            template?.bodyHtml ||
+            template?.bodyHTML ||
+            template?.Body ||
+            template?.BodyHtml ||
+            template?.BodyHTML ||
+            '';
+
+        const decodedBody = decodeHtmlEntitiesRecursively(rawBody);
+
+        // Prefer decoded content when it results in actual HTML tags.
+        if (/<[a-z][\s\S]*>/i.test(decodedBody)) {
+            return decodedBody;
+        }
+
+        // Fall back to raw body when it already contains HTML tags.
+        if (/<[a-z][\s\S]*>/i.test(rawBody)) {
+            return rawBody;
+        }
+
+        // Plain text body (no tags) still displays correctly.
+        return decodedBody || rawBody;
+    }
+
+    function renderTemplatePreview(previewElement, template) {
+        if (!previewElement) {
+            return;
+        }
+
+        previewElement.replaceChildren();
+
+        if (!template) {
+            return;
+        }
+
+        const subjectRow = document.createElement('div');
+        const subjectLabel = document.createElement('strong');
+        subjectLabel.textContent = 'Subject: ';
+        const subjectValue = document.createElement('span');
+        subjectValue.textContent = template.subject || template.Subject || '';
+        subjectRow.append(subjectLabel, subjectValue);
+
+        const bodyRow = document.createElement('div');
+        bodyRow.innerHTML = resolveTemplatePreviewBody(template);
+
+        previewElement.append(subjectRow, document.createElement('br'), bodyRow);
+    }
+
+    function updatePreview() {
+        const sel = document.getElementById('templateSelect');
+        const preview = document.getElementById('templatePreview');
+        if (sel === null || preview === null) return;
+        const val = sel.value;
+        fetch('/api/form-notifications/templates').then(r => r.json()).then(list => {
+            const t = list.find(x => String(x.id) === String(val));
+            renderTemplatePreview(preview, t);
+        });
+    }
+
+    function showModal() {
+        resetValidationState();
+
+        ['templateSelect', 'triggerType', 'dateType', 'statusSelect', 'recipientCategory'].forEach(id => {
+            document.getElementById(id).value = '';
+        });
+
+        // Clear selectpicker
+        clearSelectedRecipients();
+
+        // Hide all option sections using classes
+        document.getElementById('dateOptions')?.classList.add('hidden-section');
+        document.getElementById('eventOptions')?.classList.add('hidden-section');
+        document.getElementById('recipientOptions')?.classList.add('hidden-section');
+        renderTemplatePreview(document.getElementById('templatePreview'), null);
+
+        const modalEl = document.getElementById('notificationModal');
+        if (modalEl === null) return;
+        bootstrap.Modal.getOrCreateInstance(modalEl).show();
+    }
+
+    function validateForm(triggerType) {
+        const form = document.getElementById('notificationForm');
+        if (!form) return false;
+
+        let valid = true;
+
+        const requiredAlways = ['templateSelect', 'triggerType'];
+        const requiredForDate = ['dateType', 'recipientCategory', 'recipientSelect'];
+        const requiredForEvent = ['statusSelect', 'recipientCategory', 'recipientSelect'];
+
+        const fieldsToValidate = [
+            ...requiredAlways,
+            ...(triggerType === 'Date' ? requiredForDate : []),
+            ...(triggerType === 'Event' ? requiredForEvent : [])
+        ];
+
+        // Clear all first
+        form.querySelectorAll('.is-invalid').forEach(el => el.classList.remove('is-invalid'));
+
+        fieldsToValidate.forEach(id => {
+            const el = document.getElementById(id);
+            if (!el) return;
+            
+            let isEmpty = false;
+            if (el.id === 'recipientSelect') {
+                // For selectpicker, check if any recipients are selected
+                isEmpty = getSelectedRecipients().length === 0;
+            } else {
+                isEmpty = !el.value;
+            }
+            
+            if (isEmpty) {
+                el.classList.add('is-invalid');
+                valid = false;
+            }
+        });
+
+        return valid;
+    }
+
+    function generateNotificationsButtonContent(row) {
+        const template = document.getElementById('notification-actions-template');
+        if (!template) return '';
+
+        const container = document.createElement('div');
+        container.appendChild(template.content.cloneNode(true));
+
+        const editBtn = container.querySelector('.js-edit-notification');
+        if (editBtn) {
+            if (row.isActive) {
+                editBtn.dataset.id = row.id;
+            } else {
+                editBtn.remove();
+            }
+        }
+
+        const cancelBtn = container.querySelector('.js-cancel-notification');
+        if (cancelBtn) {
+            if (row.isActive) {
+                cancelBtn.dataset.id = row.id;
+            } else {
+                cancelBtn.remove();
+            }            
+        }
+        return container.innerHTML;
+    }
+
+    function init() {
+        // Prevent multiple initializations
+        if (initialized) {
+            console.warn('init() called again but already initialized, returning early');
+            return;
+        }
+        
+        console.debug('init() starting');
+        
+        formId = document.getElementById('applicationFormId')?.value;
+        if (!formId) {
+            console.warn('formId not found, returning from init()');
+            return;
+        }
+
+        initialized = true;
+        console.debug('Marking initialized = true');
+
+        configureSubmitOnlyValidation();
+
+        const modalEl = document.getElementById('notificationModal');
+        if (modalEl) {
+            // Always reset validation when modal is fully closed
+            modalEl.addEventListener('hidden.bs.modal', () => resetValidationState());
+            // Also reset when modal starts opening
+            modalEl.addEventListener('show.bs.modal', () => resetValidationState());
+            // Refresh select2 when modal is shown
+            modalEl.addEventListener('shown.bs.modal', () => {
+                refreshSelect2();
+            });
+        }
+
+        // Prevent form submission - use button click only
+        const form = document.getElementById('notificationForm');
+        if (form) {
+            form.addEventListener('submit', (e) => {
+                console.debug('Form submit prevented');
+                e.preventDefault();
+                e.stopPropagation();
+                return false;
+            });
+        }
+
+        fetchTemplates().then(populateTemplates);
+        initNotificationsTable();
+
+        // Attach save button listener (remove old one first to prevent duplicates)
+        const saveBtn = document.getElementById('btn-save-notification');
+        if (saveBtn) {
+            saveBtn.removeEventListener('click', handleSaveNotification);
+            saveBtn.addEventListener('click', handleSaveNotification);
+            console.debug('Save button listener attached');
+        }
+
+        document.getElementById('btn-add-notification')?.addEventListener('click', () => {
+            document.getElementById('notificationModal').dataset.editId = '';
+            showModal();
+        });
+
+        document.getElementById('templateSelect')?.addEventListener('change', (e) => {
+            e.target.classList.remove('is-invalid');
+            updatePreview();
+        });
+        ['dateType', 'statusSelect'].forEach(id => {
+            document.getElementById(id)?.addEventListener('change', (e) => {
+                e.target.classList.remove('is-invalid');
+            });
+        });
+        document.getElementById('recipientSelect')?.addEventListener('change', (e) => {
+            e.target.classList.remove('is-invalid');
+        });
+        document.getElementById('triggerType')?.addEventListener('change', (e) => {
+            const val = e.target.value;
+            const dateOptionsEl = document.getElementById('dateOptions');
+            const eventOptionsEl = document.getElementById('eventOptions');
+            const recipientOptionsEl = document.getElementById('recipientOptions');
+            
+            // Show/hide sections based on trigger type using classes
+            if (val === 'Date') {
+                dateOptionsEl?.classList.remove('hidden-section');
+                eventOptionsEl?.classList.add('hidden-section');
+                recipientOptionsEl?.classList.remove('hidden-section');
+            } else if (val === 'Event') {
+                dateOptionsEl?.classList.add('hidden-section');
+                eventOptionsEl?.classList.remove('hidden-section');
+                recipientOptionsEl?.classList.remove('hidden-section');
+            } else {
+                dateOptionsEl?.classList.add('hidden-section');
+                eventOptionsEl?.classList.add('hidden-section');
+                recipientOptionsEl?.classList.add('hidden-section');
+            }
+            
+            e.target.classList.remove('is-invalid');
+        });
+
+        document.getElementById('recipientCategory')?.addEventListener('change', (e) => {
+            const cat = e.target.value;
+            e.target.classList.remove('is-invalid');
+            if (cat) fetchRecipients(cat).then(populateRecipients);
+        });
+
+    function handleSaveNotification(e) {
+        if (e) {
+            e.preventDefault();
+            e.stopPropagation();
+            e.stopImmediatePropagation();
+        }
+        
+        console.debug('handleSaveNotification called', { isSaving, timestamp: Date.now() });
+        
+        // Prevent duplicate submissions
+        if (isSaving) {
+            console.warn('Save already in progress, ignoring duplicate click');
+            return;
+        }
+
+        const triggerType = document.getElementById('triggerType').value;
+
+        if (!formId) {
+            abp.notify.error('Form identifier not found on page. Cannot create notification.');
+            console.error('Missing formId for notification POST', { formId });
+            return;
+        }
+
+        if (!validateForm(triggerType)) return;
+
+        const templateId = (document.getElementById('templateSelect').value || '').trim();
+        const dateType = document.getElementById('dateType').value;
+        const applicationStatusId = document.getElementById('statusSelect')?.value;
+        const recipientCategory = document.getElementById('recipientCategory')?.value;
+        
+        // Collect multiple selected recipients as comma-separated string
+        const recipientIdentifier = getSelectedRecipients().join(',');
+
+        const resolvedStatusId = triggerType === 'Event' ? (applicationStatusId || null) : null;
+
+        const bodyObj = {
+            templateId: templateId,
+            triggerType: triggerType,
+            dateType: triggerType === 'Date' ? dateType : null,
+            applicationStatusId: resolvedStatusId,
+            recipientCategory: recipientCategory,
+            recipientIdentifier: recipientIdentifier
+        };
+
+        const editId = document.getElementById('notificationModal').dataset.editId;
+        const isEdit = !!editId;
+        const url = isEdit
+            ? '/api/form-notifications/' + encodeURIComponent(formId) + '/' + encodeURIComponent(editId)
+            : '/api/form-notifications/' + encodeURIComponent(formId);
+        const method = isEdit ? 'PUT' : 'POST';
+
+        isSaving = true;
+        console.debug('isSaving set to TRUE - Starting fetch', { method, isEdit, url, timestamp: Date.now() });
+        
+        fetch(url, {
+            method: method,
+            headers: { 'Content-Type': 'application/json', 'Accept': 'application/json', 'RequestVerificationToken': abp.security.antiForgery.getToken() },
+            body: JSON.stringify(bodyObj)
+        }).then(async (r) => {
+            console.debug('Fetch response received', { status: r.status, timestamp: Date.now() });
+            if (!r.ok) {
+                const text = await r.text();
+                console.warn('Create notification failed', r.status, text);
+                throw new Error(text || ('HTTP ' + r.status));
+            }
+            return r.json();
+        }).then(() => {
+            console.debug('Save completed, closing modal and reloading table', { timestamp: Date.now() });
+            let modalEl = document.getElementById('notificationModal');
+            bootstrap.Modal.getInstance(modalEl)?.hide();
+            reloadTable();
+        }).catch(err => {
+            console.error('Save error:', err);
+            abp.notify.error('Failed to save notification: ' + err.message);
+        }).finally(() => {
+            console.debug('isSaving set to FALSE - Save cycle complete', { timestamp: Date.now() });
+            isSaving = false;
+        });
+    }
+    }
+
+    document.addEventListener('DOMContentLoaded', () => {
+        // Initialize Select2 immediately - don't wait for applicationFormId
+        initSelect2WhenReady();
+        
+        // Initialize the rest of the component
+        init();
+        
+        // Load statuses and initial recipients
+        fetchStatuses().then(populateStatuses);
+    });
+
+    function configureSubmitOnlyValidation() {
+        if (globalThis.jQuery === undefined) return;
+        const form = getNotificationForm();
+        if (!form) return;
+        const $form = globalThis.jQuery(form);
+        if (typeof $form.validate !== 'function') return;
+        const validator = $form.data('validator') || $form.validate();
+        validator.settings.onfocusout = false;
+        validator.settings.onkeyup = false;
+        validator.settings.onclick = false;
+    }
+
+    function resetValidationState() {
+        const form = document.getElementById('notificationForm');
+        if (!form) return;
+
+        // Remove all invalid states from all form fields
+        form.querySelectorAll('.is-invalid').forEach(el => el.classList.remove('is-invalid'));
+        form.classList.remove('was-validated');
+
+        if (globalThis.jQuery !== undefined) {
+            const $form = globalThis.jQuery(form);
+            const validator = $form.data('validator');
+            if (validator && typeof validator.resetForm === 'function') {
+                validator.resetForm();
+            }
+        }
+    }
+
+    function getNotificationForm() {
+        const modalEl = document.getElementById('notificationModal');
+        return modalEl ? modalEl.querySelector('form') : null;
+    }
+
+    const responseCallback = function (result) {
+        return { recordsTotal: result.length, recordsFiltered: result.length, data: result };
+    };
+})();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.cs
new file mode 100644
index 0000000000..ac945ebb12
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.cs
@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
+
+namespace Unity.GrantManager.Web.Views.Shared.Components.Notifications;
+
+[ViewComponent(Name = "Notifications")]
+[Widget(
+    ScriptFiles = ["/Views/Shared/Components/Notifications/Default.js"],
+    StyleFiles = ["/Views/Shared/Components/Notifications/Default.css"],
+    RefreshUrl = "Widgets/Notifications/Refresh",
+    AutoInitialize = true
+)]
+public class Notifications : AbpViewComponent
+{
+    public async Task<IViewComponentResult> InvokeAsync(string? formid)
+    {
+        await Task.CompletedTask;
+
+        var viewModel = new NotificationsViewModel()
+        {
+            FormId = formid
+        };
+
+        return View(viewModel);
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.js
new file mode 100644
index 0000000000..1e647c841a
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/Notifications.js
@@ -0,0 +1,210 @@
+(function () {
+    const formId = document.getElementById('applicationFormId')?.value || null;
+
+    const $table = $('#NotificationsTable');
+    let dataTable;
+
+    function fetchList() {
+        return fetch('/api/form-notifications/' + encodeURIComponent(formId ?? 'global')).then(r => r.json());
+    }
+
+    function loadTemplates() {
+        return fetch('/api/form-notifications/templates').then(r => r.json()).then(handleTemplatesList);
+    }
+
+    function loadStatuses() {
+        return fetch('/api/form-notifications/statuses').then(r => r.json()).then(list => {
+            const sel = document.getElementById('cf_appStatus');
+            sel.innerHTML = '';
+            // Expecting list of status DTOs { id, internalStatus }
+            list.forEach(s => {
+                const opt = document.createElement('option');
+                opt.value = s.id;
+                opt.text = s.internalStatus;
+                sel.appendChild(opt);
+            });
+            return list;
+        });
+    }
+
+    function loadRecipients(category) {
+        return fetch('/api/form-notifications/recipients?category=' + encodeURIComponent(category)).then(r => r.json()).then(list => {
+            const sel = document.getElementById('cf_recipient');
+            sel.innerHTML = '';
+            list.forEach(rp => {
+                const opt = document.createElement('option');
+                opt.value = rp.id;
+                opt.text = rp.displayName;
+                sel.appendChild(opt);
+            });
+            return list;
+        });
+    }
+
+    function updatePreview() {
+        const sel = document.getElementById('cf_template');
+        const preview = document.getElementById('previewCard');
+        if (!sel || !preview) return;
+        fetch('/api/form-notifications/templates').then(r => r.json()).then(list => {
+            const t = list.find(x => String(x.id) === sel.value);
+            globalThis.renderNotificationTemplatePreview(preview, t);
+        });
+    }
+
+    function renderTable(items) {
+        if (dataTable) {
+            dataTable.clear();
+            dataTable.rows.add(items);
+            dataTable.draw();
+            return;
+        }
+
+        dataTable = $table.DataTable(abp.libs.datatables.normalizeConfiguration({
+            serverSide: false,
+            paging: true,
+            searching: true,
+            responsive: true,
+            data: items,
+            columns: [
+                { data: 'templateName', title: 'Template' },
+                { data: 'triggerType', title: 'Trigger Type' },
+                { data: 'eventStatus', title: 'Trigger Detail', render: function (d, t, r) {
+                    return formatTriggerDetail(r);
+                } },
+                { data: 'isActive', title: 'Status', render: function (d) { return d ? '<span class="badge bg-success">Active</span>' : '<span class="badge bg-secondary">Inactive</span>'; } },
+                {
+                    data: null,
+                    orderable: false,
+                    render: function (data, type, row) {
+                        return `<div class="btn-group">
+                                    <button class="btn btn-sm btn-outline-primary btn-edit" data-id="${row.id}">Edit</button>
+                                    <button class="btn btn-sm btn-outline-danger btn-delete" data-id="${row.id}">Delete</button>
+                                </div>`;
+                    }
+                }
+            ]
+        }));
+    }
+
+    function init() {
+        loadTemplates();
+        loadStatuses();
+        loadRecipients(document.getElementById('cf_recipientCategory')?.value || 'Internal');
+
+        document.getElementById('cf_template')?.addEventListener('change', updatePreview);
+        document.getElementById('cf_recipientCategory')?.addEventListener('change', (e) => loadRecipients(e.target.value));
+
+        document.getElementById('triggerEvent')?.addEventListener('change', () => toggleTriggerSections());
+        document.getElementById('triggerDate')?.addEventListener('change', () => toggleTriggerSections());
+        toggleTriggerSections();
+
+        document.getElementById('btn-open-create')?.addEventListener('click', () => {
+            document.getElementById('cf_template').focus();
+            window.scrollTo({ top: document.getElementById('cf_template').offsetTop - 100, behavior: 'smooth' });
+        });
+
+        document.getElementById('btn-save')?.addEventListener('click', onSave);
+        document.getElementById('btn-cancel')?.addEventListener('click', onCancel);
+
+        $table.on('click', '.btn-delete', onDeleteButtonClick);
+
+        loadList();
+    }
+
+    function toggleTriggerSections() {
+        const isDate = document.getElementById('triggerDate').checked;
+        document.getElementById('dateSection').style.display = isDate ? 'block' : 'none';
+        document.getElementById('eventSection').style.display = isDate ? 'none' : 'block';
+    }
+
+    function formatTriggerDetail(r) {
+        if (!r) return '';
+        const offset = Number(r.offsetDays) || 0;
+        const offsetDisplay = offset > 0 ? ('+' + offset) : offset;
+        return r.triggerType === 'Date' ? `${r.dateType} ${offsetDisplay}` : (r.eventStatus || '');
+    }
+
+    function handleTemplatesList(list) {
+        const sel = document.getElementById('cf_template');
+        sel.innerHTML = '';
+        list.forEach(t => {
+            const opt = document.createElement('option');
+            opt.value = String(t.id);
+            opt.text = `${t.name} — ${t.subject}`;
+            sel.appendChild(opt);
+        });
+        updatePreview();
+        return list;
+    }
+
+    function loadList() {
+        fetchList().then(renderTable).catch(err => console.error(err));
+    }
+
+        function onSave() {
+        const btn = document.getElementById('btn-save');
+        btn.disabled = true;
+
+        const templateId = document.getElementById('cf_template').value;
+        const triggerType = document.querySelector('input[name="triggerType"]:checked').value;
+        const dateType = document.getElementById('cf_dateField').value;
+        const offset = Number.parseInt(document.getElementById('cf_offset').value || '0', 10);
+        const offsetType = document.getElementById('cf_offsetType').value;
+        const appStatusId = document.getElementById('cf_appStatus').value;
+        const recipientCategory = document.getElementById('cf_recipientCategory').value;
+        const recipient = document.getElementById('cf_recipient').value;
+
+        const absOffset = offsetType === 'Before' ? -Math.abs(offset) : Math.abs(offset);
+        const offsetDays = triggerType === 'Date' ? absOffset : 0;
+
+        const dateTypeValue = triggerType === 'Date' ? dateType : null;
+        const applicationStatusId = triggerType === 'Event' ? (appStatusId || null) : null;
+        const notificationRecipientCategory = triggerType === 'Event' ? recipientCategory : null;
+        const notificationRecipientIdentifier = triggerType === 'Event' ? recipient : null;
+
+        const body = {
+            templateId: templateId,
+            triggerType: triggerType,
+            dateType: dateTypeValue,
+            offsetDays: offsetDays,
+            applicationStatusId: applicationStatusId,
+            eventStatus: null,
+            recipientCategory: notificationRecipientCategory,
+            recipientIdentifier: notificationRecipientIdentifier
+        };
+
+        fetch('/api/form-notifications/' + encodeURIComponent(formId ?? 'global'), {
+            method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body)
+        }).then(r => {
+            if (!r.ok) throw new Error('Save failed');
+            return r.json();
+        }).then(() => {
+            abp.notify.success('Notification saved');
+            loadList();
+        }).catch(err => { console.error(err); abp.notify.error('Save failed'); }).finally(() => btn.disabled = false);
+    }
+
+    function onCancel() {
+        // reset form
+        document.getElementById('cf_offset').value = '0';
+    }
+
+    function handleDeleteConfirmed(id) {
+        fetch('/api/form-notifications/' + encodeURIComponent(formId ?? 'global') + '/' + id, { method: 'DELETE' }).then(r => {
+            if (!r.ok) throw new Error('Delete failed');
+            abp.notify.success('Deleted');
+            loadList();
+        }).catch(err => { console.error(err); abp.notify.error('Delete failed'); });
+    }
+
+    function onDeleteButtonClick(event) {
+        const id = $(this).data('id');
+        if (!id) return;
+        abp.message.confirm(`Delete this notification?`).then(function (confirmed) {
+            if (!confirmed) return;
+            handleDeleteConfirmed(id);
+        });
+    }
+
+    document.addEventListener('DOMContentLoaded', init);
+})();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/NotificationsController.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/NotificationsController.cs
new file mode 100644
index 0000000000..abd84a2168
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/NotificationsController.cs
@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace Unity.GrantManager.Web.Views.Shared.Components.Notifications;
+
+[ApiExplorerSettings(IgnoreApi = true)]
+[Route("GrantApplications/Widgets/Notifications")]
+public class NotificationsController : AbpController
+{
+    [HttpGet]
+    [Route("Refresh")]
+    public IActionResult Refresh(string? formid)
+    {
+        if (!ModelState.IsValid)
+        {
+            return ViewComponent("Notifications");
+        }
+        return ViewComponent(typeof(Notifications), new { formid });
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/NotificationsViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/NotificationsViewModel.cs
new file mode 100644
index 0000000000..c0574fac61
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/Notifications/NotificationsViewModel.cs
@@ -0,0 +1,6 @@
+namespace Unity.GrantManager.Web.Views.Shared.Components.Notifications;
+
+public class NotificationsViewModel
+{
+    public string? FormId { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
index 03873fff76..a8653662a7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
@@ -14,10 +14,29 @@
 <abp-input asp-for="@Model.HasEditFormPaymentConfiguration" type="hidden" />
 
 <form id="PaymentThresholdForm" class="payment-configuration-container px-3 pb-2">
+    <div class="configuration-action-bar row">
+        <div class="col-12 col-md-8">
+            <h5>Payment Configuration</h5>
+        </div>
+        <div class="col-12 col-md-4 btn-wrapper">
+            <abp-button id="btn-save-payment-configuration"
+                        text="Save"
+                        type="button"
+                        icon-type="Other"
+                        icon="fl fl-save"
+                        class="btn unt-btn-primary btn-primary"
+                        style="pointer-events: all;"
+                        button-type="Primary" />
+            <abp-button id="btn-back-payment-configuration"
+                        text="Back"
+                        class="btn unt-btn-outline-primary btn-outline-primary"
+                        abp-tooltip="Navigate back to the Forms" />
+        </div>
+    </div>
     <div class="payment-configuration-scroll flex-grow-1">
         <fieldset name="Unity_GrantManager_ApplicationForms_Mapping_PaymentConfiguration" 
             class="unity-zone" @(Model.HasEditFormPaymentConfiguration ? string.Empty : "disabled")>
-            <legend class="h6 ps-1 pb-2 pt-2 mt-3 fw-bold">Payment Configuration</legend>
+            <legend class="h6 ps-1 pb-2 pt-2 mt-3 fw-bold visually-hidden">Payment Configuration</legend>
     <div>
         <abp-row class="m-0 payment-configuration-form">
             <abp-column size="_12" class="px-0">
@@ -56,7 +75,7 @@
                             The individual Approval Thresholds assigned to each l2_approver will still take precedence if they are lower 
                             than the threshold specified in this form.
                         </p>
-                    </abp-column>                    
+                    </abp-column>
                 </abp-row>
             </abp-column>
             <hr />
@@ -122,12 +141,5 @@
         </abp-row>
     </div>
         </fieldset>
-        <div class="d-flex justify-content-start">
-            <abp-button id="btn-save-payment-configuration" button-type="Primary" text="Save" icon-type="Other" icon="fl fl-save"
-                class="btn unt-btn-primary btn-primary"></abp-button>
-            <abp-button id="btn-back-payment-configuration" class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                abp-tooltip="Navigate back to the Forms">Back</abp-button>
-        </div>
     </div>
-    
 </form>
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.js
index a52d5b6467..e1d5a50564 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.js
@@ -471,25 +471,24 @@ function generateAiButtonAction(e, dt, button, config) {
         globalThis.AIGenerationButtonState?.setGenerating($button);
     }
 
-    unity.grantManager.grantApplications.grantApplication.queueApplicationScoring(pageApplicationId)
-        .done(function (request) {
-            const status = globalThis.AIGenerationButtonState?.resolveStatus(request?.status) ?? '';
+    globalThis.AIGenerationApi.queueApplicationScoring(pageApplicationId)
+        .done(function (generationStatus) {
+            const request = generationStatus?.generationRequest;
+            const status = String(request?.status ?? '').trim();
 
             if (status === 'Completed') {
                 restoreReviewListAiButtonForCooldownCheck($button);
+                globalThis.AIGenerationButtonState?.applyStatusState(generationStatus);
                 refreshReviewListAfterAiScoring();
-                globalThis.syncAIRateLimitButtons?.();
                 return;
             }
-
             pollReviewListAiButton($button);
         })
         .fail(function () {
             abp.message.error('Failed to queue AI scoring. Please try again.');
             restoreReviewListAiButton($button);
             globalThis.syncAIRateLimitButtons?.();
-        })
-        ;
+        });
 }
 
 function restoreReviewListAiButton($button) {
@@ -516,24 +515,21 @@ function resumeActiveReviewListAiButton(reviewListTable) {
     }
 
     const $button = $(button.node());
-    unity.grantManager.grantApplications.grantApplication
-        .getAIGenerationStatus(pageApplicationId, 'application-scoring')
-        .done(function(request) {
-            if (request?.isActive !== true) {
-                return;
-            }
+    globalThis.AIGenerationApi.getStatus(pageApplicationId, 'application-scoring').done(function(generationStatus) {
+        if (generationStatus?.generationRequest?.isActive !== true) {
+            return;
+        }
 
-            globalThis.AIGenerationButtonState?.setGenerating($button);
-            pollReviewListAiButton($button);
-        });
+        globalThis.AIGenerationButtonState?.setGenerating($button);
+        pollReviewListAiButton($button);
+    });
 }
 
 function pollReviewListAiButton($button) {
     globalThis.AIGenerationButtonState.monitor({
         $button,
         originalHtml: generateAiButtonText(null, null, null),
-        getStatus: () => unity.grantManager.grantApplications.grantApplication
-            .getAIGenerationStatus(pageApplicationId, 'application-scoring'),
+        getStatus: () => globalThis.AIGenerationApi.getStatus(pageApplicationId, 'application-scoring'),
         onComplete: refreshReviewListAfterAiScoring,
         onFailed: (request) => abp.message.error(request?.failureReason || 'AI scoring failed.')
     });
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/_Shared/Attachments.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/_Shared/Attachments.js
index 7e9c4e7134..57b8f419d8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/_Shared/Attachments.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/_Shared/Attachments.js
@@ -21,8 +21,8 @@ function generateAttachmentButtonContent(data, type, full, meta, attachmentType)
                 <i class="fl fl-attachment-more"></i>
             </button>
             <div class="dropdown-content">
-                <button class="btn fullWidth js-preview-attachment" style="margin:10px" type="button" data-attachment-type="${escapedAttachmentType}" data-owner-id="${escapedOwnerId}" data-file-name="${escapedFileName}" data-display-name="${escapedDisplayName}">
-                    <i class="fa fa-eye"></i><span>Preview Attachment</span>
+                <button class="btn fullWidth js-preview-attachment" style="margin:10px;margin-left:8px;" type="button" data-attachment-type="${escapedAttachmentType}" data-owner-id="${escapedOwnerId}" data-file-name="${escapedFileName}" data-display-name="${escapedDisplayName}">
+                    <i class="fa fa-eye p-0"></i><span>Preview Attachment</span>
                 </button>
                 <a href="${downloadUrl}" target="_blank" download="${data}" class="fullwidth">
                     <button class="btn fullWidth" style="margin:10px" type="button">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/_Shared/string-utils.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/_Shared/string-utils.js
index 39dd64a601..f3763f8aa1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/_Shared/string-utils.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/_Shared/string-utils.js
@@ -34,3 +34,50 @@ function compareStrings(str1, str2) {
     if (union === 0) return 0;
     return Math.round(Math.min(2 * intersection * 100 / union, 100) * 100) / 100;
 }
+
+/**
+ * Strips HTML tags from a string using textContent (safe DOM API)
+ * Safely extracts plain text content without interpreting HTML meta-characters
+ * @param {string} html - HTML string to strip
+ * @returns {string} Plain text content (safe for all contexts)
+ */
+function stripHtml(html) {
+    if (!html) return '';
+    // Use textContent which is inherently safe - never interprets HTML
+    if (typeof document !== 'undefined') {
+        try {
+            const temp = document.createElement('div');
+            temp.textContent = String(html);
+            return temp.textContent;
+        } catch {
+            // Fall through to regex fallback if DOM is unavailable
+        }
+    }
+    
+    // Server-side or DOM unavailable: remove HTML tag delimiters directly.
+    // Character-level replacement avoids incomplete multi-character sanitization bypasses.
+    return String(html).replace(/[<>]/g, '');
+}
+
+/**
+ * Escapes HTML meta-characters in a string for safe use in HTML attributes
+ * @param {string} value - String to escape
+ * @returns {string} Escaped string safe for use in HTML attributes
+ */
+function escapeHtmlAttribute(value) {
+    return String(value ?? '')
+        .replaceAll('&', '&amp;')
+        .replaceAll('"', '&quot;')
+        .replaceAll("'", '&#39;')
+        .replaceAll('<', '&lt;')
+        .replaceAll('>', '&gt;');
+}
+
+/**
+ * Validates GUID format
+ * @param {string} textString - String to validate as GUID
+ * @returns {boolean} True if valid GUID format
+ */
+function validateGuid(textString) {
+    return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(textString);
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/abp.resourcemapping.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/abp.resourcemapping.js
index 64aa4b4ce6..baeec276aa 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/abp.resourcemapping.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/abp.resourcemapping.js
@@ -24,6 +24,8 @@ module.exports = {
         '@node_modules/bootstrap-4/dist': '@libs/bootstrap-4/dist/',
         '@node_modules/popper.js/dist': '@libs/popper.js/dist/',
         '@node_modules/bootstrap-select/dist': '@libs/bootstrap-select/dist',
+        '@node_modules/select2/dist': '@libs/select2/dist',
+        '@node_modules/select2-bootstrap-5-theme/dist': '@libs/select2-bootstrap-5-theme/dist',
         '@node_modules/sortablejs': '@libs/sortablejs',
         '@node_modules/jszip': '@libs/jszip',
         '@node_modules/tributejs': '@libs/tributejs',
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.Development.json b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.Development.json
index 7529e8a24c..f317444a18 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.Development.json
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.Development.json
@@ -136,10 +136,10 @@
     "JWTSecret": ""
   },
   
-  "Azure": {
-    "OpenAI": {
-      "ApiKey": "",
-      "Endpoint": ""
-    }
-  }
-}
+  "Azure": {
+    "OpenAI": {
+      "ApiKey": "",
+      "Endpoint": ""
+    }
+  }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.json b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.json
index aca4528f2b..4dcd3cf17d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.json
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.json
@@ -174,18 +174,20 @@
       "ApiKey": "",
       "Endpoint": "",
       "Profiles": {
-        "Gpt4oMini": {
-          "ApiUrl": "/openai/deployments/gpt-4o-mini/chat/completions?api-version=2024-02-01",
-          "MaxTokensParameter": "max_tokens",
-          "Temperature": 0.3
-        },
-        "Gpt5Mini": {
-          "ApiUrl": "/openai/deployments/gpt-5-mini/chat/completions?api-version=2024-10-01-preview",
-          "MaxTokensParameter": "max_completion_tokens",
-          "ReasoningEffort": "minimal",
-          "Verbosity": "low"
-        }
-      }
+        "Gpt4oMini": {
+          "DeploymentName": "gpt-4o-mini",
+          "MaxOutputTokenCountSupported": true,
+          "Temperature": 0.3
+        },
+        "Gpt5Mini": {
+          "DeploymentName": "gpt-5-mini",
+          "MaxOutputTokenCountSupported": false
+        },
+        "Gpt5Nano": {
+          "DeploymentName": "gpt-5-nano",
+          "MaxOutputTokenCountSupported": false
+        }
+      }
     },
     "Logging": {
       "EnablePromptFileLog": false
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/package.json b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/package.json
index f641052812..67af0468e2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/package.json
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/package.json
@@ -17,15 +17,17 @@
     "datatables.net-staterestore": "~1.4.2",
     "datatables.net-staterestore-dt": "~1.4.2",
     "dompurify": "~3.4.1",
-    "echarts": "~6.0.0",
+    "echarts": "~6.1.0",
     "formiojs": "4.21.7",
     "handlebars": "~4.7.9",
     "jquery-maskmoney": "~3.0.2",
     "jszip": "~3.10.1",
     "popper.js": "~1.16.1",
     "pubsub-js": "~1.9.5",
+    "select2": "~4.1.0",
+    "select2-bootstrap-5-theme": "~1.3.0",
     "sortablejs": "~1.15.7",
-    "tinymce": "~8.4.0",
+    "tinymce": "~8.6.0",
     "tributejs": "~5.1.3"
   },
   "devDependencies": {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/Notifications.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/Notifications.js
new file mode 100644
index 0000000000..811d084201
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/Notifications.js
@@ -0,0 +1,228 @@
+(function () {
+    const formId = document.getElementById('applicationFormId')?.value || null;
+
+    const $table = $('#NotificationsTable');
+    let dataTable;
+
+    function fetchList() {
+        return fetch('/api/form-notifications/' + encodeURIComponent(formId ?? 'global')).then(r => r.json());
+    }
+
+    function loadTemplates() {
+        return fetch('/api/form-notifications/templates').then(r => r.json()).then(handleTemplatesList);
+    }
+
+    function loadStatuses() {
+        return fetch('/api/form-notifications/statuses').then(r => r.json()).then(list => {
+            const sel = document.getElementById('cf_appStatus');
+            sel.innerHTML = '';
+            // Expecting list of status DTOs { id, internalStatus }
+            list.forEach(s => {
+                const opt = document.createElement('option');
+                opt.value = s.id;
+                opt.text = s.internalStatus;
+                sel.appendChild(opt);
+            });
+            return list;
+        });
+    }
+
+    function loadRecipients(category) {
+        return fetch('/api/form-notifications/recipients?category=' + encodeURIComponent(category)).then(r => r.json()).then(list => {
+            const sel = document.getElementById('cf_recipient');
+            sel.innerHTML = '';
+            list.forEach(rp => {
+                const opt = document.createElement('option');
+                opt.value = rp.id;
+                opt.text = rp.displayName;
+                sel.appendChild(opt);
+            });
+            return list;
+        });
+    }
+
+    function updatePreview() {
+        const sel = document.getElementById('cf_template');
+        const preview = document.getElementById('previewCard');
+        if (!sel || !preview) return;
+        fetch('/api/form-notifications/templates').then(r => r.json()).then(list => {
+            const t = list.find(x => String(x.id) === sel.value);
+            globalThis.renderNotificationTemplatePreview(preview, t);
+        });
+    }
+
+    function renderTable(items) {
+        if (dataTable) {
+            dataTable.clear();
+            dataTable.rows.add(items);
+            dataTable.draw();
+            return;
+        }
+
+        dataTable = $table.DataTable(abp.libs.datatables.normalizeConfiguration({
+            serverSide: false,
+            paging: true,
+            searching: true,
+            responsive: true,
+            data: items,
+            columns: [
+                { data: 'templateName', title: 'Template' },
+                { data: 'triggerType', title: 'Trigger Type' },
+                { data: 'eventStatus', title: 'Trigger Detail', render: function (d, t, r) {
+                    return formatTriggerDetail(r);
+                } },
+                { data: 'isActive', title: 'Status', render: function (d) { return d ? '<span class="badge bg-success">Active</span>' : '<span class="badge bg-secondary">Inactive</span>'; } },
+                {
+                    data: null,
+                    orderable: false,
+                    render: function (data, type, row) {
+                        return `<div class="btn-group">
+                                    <button class="btn btn-sm btn-outline-primary btn-edit" data-id="${row.id}">Edit</button>
+                                    <button class="btn btn-sm btn-outline-danger btn-delete" data-id="${row.id}">Delete</button>
+                                </div>`;
+                    }
+                }
+            ]
+        }));
+    }
+
+    function init() {
+        loadTemplates();
+        loadStatuses();
+        loadRecipients(document.getElementById('cf_recipientCategory')?.value || 'Internal');
+
+        document.getElementById('cf_template')?.addEventListener('change', updatePreview);
+        document.getElementById('cf_recipientCategory')?.addEventListener('change', (e) => loadRecipients(e.target.value));
+
+        document.getElementById('triggerEvent')?.addEventListener('change', () => toggleTriggerSections());
+        document.getElementById('triggerDate')?.addEventListener('change', () => toggleTriggerSections());
+        toggleTriggerSections();
+
+        document.getElementById('btn-open-create')?.addEventListener('click', () => {
+            document.getElementById('cf_template').focus();
+            window.scrollTo({ top: document.getElementById('cf_template').offsetTop - 100, behavior: 'smooth' });
+        });
+
+        document.getElementById('btn-save')?.addEventListener('click', onSave);
+        document.getElementById('btn-cancel')?.addEventListener('click', onCancel);
+
+        $table.on('click', '.btn-delete', onDeleteButtonClick);
+
+        loadList();
+    }
+
+    function toggleTriggerSections() {
+        const isDate = document.getElementById('triggerDate').checked;
+        document.getElementById('dateSection').style.display = isDate ? 'block' : 'none';
+        document.getElementById('eventSection').style.display = isDate ? 'none' : 'block';
+    }
+
+    function getApplicationStatusId(triggerType, appStatusId) {
+        if (triggerType !== 'Event') {
+            return null;
+        }
+        return appStatusId || null;
+    }
+
+    function calculateOffsetDays(triggerType, offsetType, offset) {
+        if (triggerType !== 'Date') {
+            return 0;
+        }
+        return offsetType === 'Before' ? -Math.abs(offset) : Math.abs(offset);
+    }
+
+    function formatTriggerDetail(r) {
+        if (!r) return '';
+        if (r.triggerType === 'Date') {
+            const offset = Number(r.offsetDays) || 0;
+            const offsetDisplay = offset > 0 ? ('+' + offset) : offset;
+            let detail = `${r.dateType} ${offsetDisplay}`;
+            // Include recipient category and identifier for date triggers
+            if (r.recipientCategory && r.recipientIdentifier) {
+                detail += ` → ${r.recipientCategory}: ${r.recipientIdentifier}`;
+            }
+            return detail;
+        }
+        return r.eventStatus || '';
+    }
+
+    function handleTemplatesList(list) {
+        const sel = document.getElementById('cf_template');
+        sel.innerHTML = '';
+        list.forEach(t => {
+            const opt = document.createElement('option');
+            opt.value = String(t.id);
+            opt.text = `${t.name} — ${t.subject}`;
+            sel.appendChild(opt);
+        });
+        updatePreview();
+        return list;
+    }
+
+    function loadList() {
+        fetchList().then(renderTable).catch(err => console.error(err));
+    }
+
+    function onSave() {
+        const btn = document.getElementById('btn-save');
+        btn.disabled = true;
+
+        const templateId = document.getElementById('cf_template').value;
+        const triggerType = document.querySelector('input[name="triggerType"]:checked').value;
+        const dateType = document.getElementById('cf_dateField').value;
+        const offset = Number.parseInt(document.getElementById('cf_offset').value || '0', 10);
+        const offsetType = document.getElementById('cf_offsetType').value;
+        const appStatusId = document.getElementById('cf_appStatus').value;
+        const recipientCategory = document.getElementById('cf_recipientCategory').value;
+        
+        // Get all selected recipients and join with comma for multiple selections
+        const recipientSelect = document.getElementById('cf_recipient');
+        const recipients = Array.from(recipientSelect.selectedOptions || []).map(opt => opt.value);
+        const recipient = recipients.length > 0 ? recipients.join(',') : null;
+
+        const body = {
+            templateId: templateId,
+            triggerType: triggerType,
+            dateType: triggerType === 'Date' ? dateType : null,
+            offsetDays: calculateOffsetDays(triggerType, offsetType, offset),
+            applicationStatusId: getApplicationStatusId(triggerType, appStatusId),
+            eventStatus: null,
+            recipientCategory: recipientCategory || null,
+            recipientIdentifier: recipient
+        };
+
+        fetch('/api/form-notifications/' + encodeURIComponent(formId ?? 'global'), {
+            method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body)
+        }).then(r => {
+            if (!r.ok) throw new Error('Save failed');
+            return r.json();
+        }).then(() => {
+            abp.notify.success('Notification saved');
+            loadList();
+        }).catch(err => { console.error(err); abp.notify.error('Save failed'); }).finally(() => btn.disabled = false);
+    }
+
+    function onCancel() {
+        // reset form
+        document.getElementById('cf_offset').value = '0';
+    }
+
+    function handleDeleteConfirmed(id) {
+        fetch('/api/form-notifications/' + encodeURIComponent(formId ?? 'global') + '/' + id, { method: 'DELETE' }).then(r => {
+            if (!r.ok) throw new Error('Delete failed');
+            abp.notify.success('Deleted');
+            loadList();
+        }).catch(err => { console.error(err); abp.notify.error('Delete failed'); });
+    }
+
+    function onDeleteButtonClick(event) {
+        const id = $(this).data('id');
+        if (!id) return;
+        abp.message.confirm(`Delete this notification?`).then(function (confirmed) {
+            if (!confirmed) return;
+            handleDeleteConfirmed(id);
+        });
+    }
+
+    document.addEventListener('DOMContentLoaded', init);
+})();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/NotificationsPreview.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/NotificationsPreview.js
new file mode 100644
index 0000000000..6e12dea3ab
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/wwwroot/js/formConfiguration/NotificationsPreview.js
@@ -0,0 +1,89 @@
+(function () {
+    function decodeHtmlEntities(value) {
+        if (!value || typeof value !== 'string') {
+            return '';
+        }
+
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(value, 'text/html');
+        return doc.documentElement.textContent || '';
+    }
+
+    function decodeHtmlEntitiesRecursively(value, maxPasses = 3) {
+        let current = value || '';
+
+        for (let pass = 0; pass < maxPasses; pass++) {
+            const decoded = decodeHtmlEntities(current);
+            if (!decoded || decoded === current) {
+                break;
+            }
+            current = decoded;
+
+            if (/<[a-z][\s\S]*>/i.test(current)) {
+                break;
+            }
+        }
+
+        return current;
+    }
+
+    function resolveTemplateBodyHtml(template) {
+        const rawBody =
+            template.body ||
+            template.bodyHtml ||
+            template.bodyHTML ||
+            template.Body ||
+            template.BodyHtml ||
+            template.BodyHTML ||
+            '';
+
+        if (/<[a-z][\s\S]*>/i.test(rawBody)) {
+            return rawBody;
+        }
+
+        if (
+            rawBody.includes('&lt;') ||
+            rawBody.includes('&#60;') ||
+            rawBody.includes('&amp;lt;') ||
+            rawBody.includes('&amp;#60;')
+        ) {
+            return decodeHtmlEntitiesRecursively(rawBody);
+        }
+
+        return rawBody;
+    }
+
+    function resolveTemplateSubject(template) {
+        return (
+            template.subject ||
+            template.Subject ||
+            ''
+        );
+    }
+
+    function renderNotificationTemplatePreview(previewElement, template) {
+        if (!previewElement) {
+            return;
+        }
+
+        previewElement.replaceChildren();
+
+        if (!template) {
+            return;
+        }
+
+        const subjectRow = document.createElement('div');
+        const subjectLabel = document.createElement('strong');
+        subjectLabel.textContent = 'Subject: ';
+        const subjectValue = document.createElement('span');
+        subjectValue.textContent = resolveTemplateSubject(template);
+        subjectRow.append(subjectLabel, subjectValue);
+
+        const bodyRow = document.createElement('div');
+        bodyRow.innerHTML = resolveTemplateBodyHtml(template);
+
+        previewElement.append(subjectRow, document.createElement('br'), bodyRow);
+    }
+
+    globalThis.renderNotificationTemplatePreview = renderNotificationTemplatePreview;
+})();
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/yarn.lock b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/yarn.lock
index 1bd868b675..1876c79a32 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/yarn.lock
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/yarn.lock
@@ -194,9 +194,9 @@
     just-compare "^2.3.0"
 
 "@babel/runtime@^7.20.6", "@babel/runtime@^7.9.2":
-  version "7.28.6"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz"
-  integrity sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==
+  version "7.29.7"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz"
+  integrity sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==
 
 "@eslint-community/eslint-utils@^4.8.0":
   version "4.9.1"
@@ -219,10 +219,10 @@
     debug "^4.3.1"
     minimatch "^10.2.4"
 
-"@eslint/config-helpers@^0.5.5":
-  version "0.5.5"
-  resolved "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.5.tgz"
-  integrity sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==
+"@eslint/config-helpers@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.6.0.tgz"
+  integrity sha512-ii6Bw9jJ2zi2cWA2Z+9/QZ/+3DX6kwaV5Q986D/CdP3Lap3w/pgQZ373FV7byY/i7L4IRH/G43I5dz1ClsCbpA==
   dependencies:
     "@eslint/core" "^1.2.1"
 
@@ -238,10 +238,10 @@
   resolved "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz"
   integrity sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==
 
-"@eslint/plugin-kit@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.1.tgz"
-  integrity sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==
+"@eslint/plugin-kit@^0.7.2":
+  version "0.7.2"
+  resolved "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz"
+  integrity sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==
   dependencies:
     "@eslint/core" "^1.2.1"
     levn "^0.4.1"
@@ -282,19 +282,27 @@
   resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz"
   integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==
 
-"@humanfs/core@^0.19.1":
-  version "0.19.1"
-  resolved "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz"
-  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
+"@humanfs/core@^0.19.2":
+  version "0.19.2"
+  resolved "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz"
+  integrity sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==
+  dependencies:
+    "@humanfs/types" "^0.15.0"
 
 "@humanfs/node@^0.16.6":
-  version "0.16.7"
-  resolved "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz"
-  integrity sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==
+  version "0.16.8"
+  resolved "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz"
+  integrity sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==
   dependencies:
-    "@humanfs/core" "^0.19.1"
+    "@humanfs/core" "^0.19.2"
+    "@humanfs/types" "^0.15.0"
     "@humanwhocodes/retry" "^0.4.0"
 
+"@humanfs/types@^0.15.0":
+  version "0.15.0"
+  resolved "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz"
+  integrity sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==
+
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"
@@ -338,9 +346,9 @@
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/sizzle@*":
-  version "2.3.3"
-  resolved "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"
-  integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==
+  version "2.3.10"
+  resolved "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.10.tgz"
+  integrity sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==
 
 "@types/trusted-types@^2.0.7":
   version "2.0.7"
@@ -358,14 +366,14 @@ acorn-jsx@^5.3.2:
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn@^8.16.0:
-  version "8.16.0"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz"
-  integrity sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==
+  version "8.17.0"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz"
+  integrity sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==
 
 ajv@^6.14.0:
-  version "6.14.0"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz"
-  integrity sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==
+  version "6.15.0"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz"
+  integrity sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -373,9 +381,9 @@ ajv@^6.14.0:
     uri-js "^4.2.2"
 
 animation-frame-polyfill@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/animation-frame-polyfill/-/animation-frame-polyfill-1.0.2.tgz"
-  integrity sha512-PvO5poSMoHhaoNNgHPo+oqs/0L9UqjsUbqv0iOXVqLh6HX85fsOVQTUrzSBvjdZz7hydARlgLELyzJJKIrPJAQ==
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/animation-frame-polyfill/-/animation-frame-polyfill-1.1.0.tgz"
+  integrity sha512-ix9fY7tjhq+MLO/sBltxWzJHET+KWBgir2IOcEkFTcsoHH5a64c8gqe90+PS+qMSgfXd9PG5BAjrANvX12/Ckw==
 
 ansi-colors@^4.1.3:
   version "4.1.3"
@@ -427,10 +435,10 @@ bootstrap-select@~1.13.18:
   resolved "https://registry.npmjs.org/bootstrap-select/-/bootstrap-select-1.13.18.tgz"
   integrity sha512-V1IzK4rxBq5FrJtkzSH6RmFLFBsjx50byFbfAf8jYyXROWs7ZpprGjdHeoyq2HSsHyjJhMMwjsQhRoYAfxCGow==
 
-bootstrap@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz"
-  integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==
+bootstrap@^5.1.3, bootstrap@^5.3.3:
+  version "5.3.8"
+  resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz"
+  integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==
 
 brace-expansion@^5.0.5:
   version "5.0.6"
@@ -465,9 +473,9 @@ contra@1.9.4:
     ticky "1.0.1"
 
 core-js@^3.26.1:
-  version "3.33.2"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz"
-  integrity sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ==
+  version "3.49.0"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz"
+  integrity sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -550,11 +558,11 @@ datatables.net-colreorder@2.1.2, datatables.net-colreorder@~2.1.1:
     jquery ">=1.7"
 
 "datatables.net-dt@1.11 - 2":
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-2.2.1.tgz"
-  integrity sha512-ca2hFyyuwkLnZxa8hGuSP5oD+r9gQitOrbXRwuT0bPSnIR5qx39KTHbK7QayUjl2iXTUdYah7PnQT8A80RuTXw==
+  version "2.3.8"
+  resolved "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-2.3.8.tgz"
+  integrity sha512-GD4on0YvNlUS/l+mrXeA1OC2JDzF2/GGbehVv4AacwtiFaoTwqxZseiR0cED6w59u/lgpVrZRC2RwuubUX996Q==
   dependencies:
-    datatables.net "2.2.1"
+    datatables.net "2.3.8"
     jquery ">=1.7"
 
 datatables.net-fixedheader-bs5@~4.0.6:
@@ -615,13 +623,6 @@ datatables.net-staterestore@1.4.3, datatables.net-staterestore@~1.4.2:
   dependencies:
     jquery ">=1.7"
 
-datatables.net@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/datatables.net/-/datatables.net-2.2.1.tgz"
-  integrity sha512-Hz7f+a77xGdroAzej88aobT5nkQIJ2Oy1JI7yh2cl0QAXQSJDXOKkOLknu+nphVP8CP8w9MtLCmwMst/F8niiQ==
-  dependencies:
-    jquery ">=1.7"
-
 debug@^4.3.1, debug@^4.3.2:
   version "4.4.3"
   resolved "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz"
@@ -678,9 +679,9 @@ dom-set@^1.0.1:
     iselement "^1.1.4"
 
 dompurify@^3.0.5, dompurify@~3.4.1:
-  version "3.4.3"
-  resolved "https://registry.npmjs.org/dompurify/-/dompurify-3.4.3.tgz"
-  integrity sha512-VVwJidIJcp1hpg2OMXML3ZVRPYSZiq4aX7qBh83BSIpOaRDqI+qxhXjjIWnpzkOXhmp0L81lnoME1mnCc9H48A==
+  version "3.4.9"
+  resolved "https://registry.npmjs.org/dompurify/-/dompurify-3.4.9.tgz"
+  integrity sha512-4dPSRMRDqHvs0V4YDFCsaIZo4if5u0xM+llyxiM2fwuZFdKArUBAF3VtI2+n8NKg9P870WMdYk0UhqQNoWXbfQ==
   optionalDependencies:
     "@types/trusted-types" "^2.0.7"
 
@@ -697,13 +698,13 @@ dragula@^3.7.3:
     contra "1.9.4"
     crossvent "1.5.5"
 
-echarts@~6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/echarts/-/echarts-6.0.0.tgz"
-  integrity sha512-Tte/grDQRiETQP4xz3iZWSvoHrkCQtwqd6hs+mifXcjrCuo2iKWbajFObuLJVBlDIJlOzgQPd1hsaKt/3+OMkQ==
+echarts@~6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/echarts/-/echarts-6.1.0.tgz#ae0f68590f5ebbd728d900907c27acde7c5456d1"
+  integrity sha512-q0yaFPggC9FUdsWH4blavRWFmxdrIodbkoKNAjJudAI6CA9gNPxHtV2RcZNEepZVlk4yvBYkOkbk6HIVpIyHZA==
   dependencies:
     tslib "2.3.0"
-    zrender "6.0.0"
+    zrender "6.1.0"
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
@@ -731,16 +732,16 @@ eslint-visitor-keys@^5.0.1:
   integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==
 
 eslint@^10.3.0:
-  version "10.3.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-10.3.0.tgz"
-  integrity sha512-XbEXaRva5cF0ZQB8w6MluHA0kZZfV2DuCMJ3ozyEOHLwDpZX2Lmm/7Pp0xdJmI0GL1W05VH5VwIFHEm1Vcw2gw==
+  version "10.4.1"
+  resolved "https://registry.npmjs.org/eslint/-/eslint-10.4.1.tgz"
+  integrity sha512-AyIKhnOBuOAdueD7RB3xB+YeAWScb9jHsJBgH2Hcde8InP5JYhqrRR6iTMHyTEwgENK54Cp44e4v8BwNhsuHuw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.8.0"
     "@eslint-community/regexpp" "^4.12.2"
     "@eslint/config-array" "^0.23.5"
-    "@eslint/config-helpers" "^0.5.5"
+    "@eslint/config-helpers" "^0.6.0"
     "@eslint/core" "^1.2.1"
-    "@eslint/plugin-kit" "^0.7.1"
+    "@eslint/plugin-kit" "^0.7.2"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@humanwhocodes/retry" "^0.4.2"
@@ -805,9 +806,9 @@ eventemitter3@^4.0.7:
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 eventemitter3@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz"
-  integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
+  version "5.0.4"
+  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz"
+  integrity sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
@@ -865,9 +866,9 @@ flat-cache@^4.0.0:
     keyv "^4.5.4"
 
 flatted@^3.2.9:
-  version "3.3.3"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz"
-  integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
+  version "3.4.2"
+  resolved "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz"
+  integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==
 
 formiojs@4.21.7:
   version "4.21.7"
@@ -1041,9 +1042,9 @@ jquery-validation-unobtrusive@^4.0.0:
     jquery-validation ">=1.19"
 
 jquery-validation@>=1.19, jquery-validation@^1.21.0:
-  version "1.21.0"
-  resolved "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.21.0.tgz"
-  integrity sha512-xNot0rlUIgu7duMcQ5qb6MGkGL/Z1PQaRJQoZAURW9+a/2PGOUxY36o/WyNeP2T9R6jvWB8Z9lUVvvQWI/Zs5w==
+  version "1.22.1"
+  resolved "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.22.1.tgz"
+  integrity sha512-ePLXLWK7Rh5eR652YsuIu7YPeGlCXrsJUteVw5iZopiU17yaMd3FaDggs6yyNMl56p8TYVeDRmKGK3fPZrMeQw==
 
 jquery@>=1.10, jquery@>=1.12.0, jquery@>=1.2.6, "jquery@>=1.5.0 <4.0", jquery@>=1.6, jquery@>=1.7, jquery@>=1.7.2, "jquery@>=3.4.0 <4.0.0", jquery@^3.6.0, jquery@~3.7.1:
   version "3.7.1"
@@ -1056,9 +1057,9 @@ json-buffer@3.0.1:
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
 json-logic-js@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/json-logic-js/-/json-logic-js-2.0.2.tgz"
-  integrity sha512-ZBtBdMJieqQcH7IX/LaBsr5pX+Y5JIW+EhejtM3Ffg2jdN9Iwf+Ht6TbHnvAZ/YtwyuhPaCBlnvzrwVeWdvGDQ==
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/json-logic-js/-/json-logic-js-2.0.5.tgz"
+  integrity sha512-rTT2+lqcuUmj4DgWfmzupZqQDA64AdmYqizzMPWj3DxGdfFNsxPpcNVSaTj4l8W2tG/+hg7/mQhxjU3aPacO6g==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -1125,9 +1126,9 @@ locate-path@^6.0.0:
     p-locate "^5.0.0"
 
 lodash-es@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"
-  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+  version "4.18.1"
+  resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz"
+  integrity sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==
 
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
@@ -1140,9 +1141,9 @@ lodash.isequal@^4.5.0:
   integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
 
 lodash@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+  version "4.18.1"
+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 luxon@^3.5.0:
   version "3.7.2"
@@ -1169,9 +1170,9 @@ minimist@^1.2.5:
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 moment-timezone@^0.5.40:
-  version "0.5.43"
-  resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz"
-  integrity sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==
+  version "0.5.48"
+  resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.48.tgz"
+  integrity sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==
   dependencies:
     moment "^2.29.4"
 
@@ -1327,10 +1328,17 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-select2@^4.0.13:
-  version "4.0.13"
-  resolved "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz"
-  integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw==
+select2-bootstrap-5-theme@~1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/select2-bootstrap-5-theme/-/select2-bootstrap-5-theme-1.3.0.tgz"
+  integrity sha512-uEJDruP4tmwyKcs3V0oP7CIsyC45PGF5ddo8unwTp8OucJ1PSuTOBr+xbWaHTQPGnvp7N96psVQ5UBMQvFCcHA==
+  dependencies:
+    bootstrap "^5.1.3"
+
+select2@^4.0.13, select2@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/select2/-/select2-4.1.0.tgz"
+  integrity sha512-i9KalWOP4/LRRGc8+rj2krNm0ZqP14cV+j1TRCEBSsOhCPkKH8rYZ2MCRXcgvqIqN+llqGci0hj9aVkCMvL0+g==
 
 setimmediate@^1.0.5:
   version "1.0.5"
@@ -1350,9 +1358,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 signature_pad@^4.1.4:
-  version "4.1.6"
-  resolved "https://registry.npmjs.org/signature_pad/-/signature_pad-4.1.6.tgz"
-  integrity sha512-eoZB8qFPfCs7o00weajp5roNnE2gY2kTNjZsh805L8V+lYPagxoZi9qrBFS3A6sgbVq++ukdzgruK7tuv3JFXQ==
+  version "4.2.0"
+  resolved "https://registry.npmjs.org/signature_pad/-/signature_pad-4.2.0.tgz"
+  integrity sha512-YLWysmaUBaC5wosAKkgbX7XI+LBv2w5L0QUcI6Jc4moHYzv9BUBJtAyNLpWzHjtjKTeWOH6bfP4a4pzf0UinfQ==
 
 sortablejs@~1.15.7:
   version "1.15.7"
@@ -1382,9 +1390,9 @@ string_decoder@~1.1.1:
     safe-buffer "~5.1.0"
 
 sweetalert2@^11.14.1:
-  version "11.26.17"
-  resolved "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.26.17.tgz"
-  integrity sha512-kkaySn1IRfwNlf9AkZVqDmBINDWw9NRR6Ij0O5dBRBOD1+mbtZJWxxR9/pA90nce9E5tIIkJ7SWij4rMWXtA1g==
+  version "11.26.25"
+  resolved "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.26.25.tgz"
+  integrity sha512-+hunCOJdJ6FLj04T9YSLvvZXRjsvIkTeTKP2e4VF8CaBias961BTnWiSFAy7F/CM5eq3QK2Rraoc5Gzftslvkg==
 
 ticky@1.0.1:
   version "1.0.1"
@@ -1398,10 +1406,10 @@ timeago@^1.6.7:
   dependencies:
     jquery ">=1.5.0 <4.0"
 
-tinymce@~8.4.0:
-  version "8.4.0"
-  resolved "https://registry.npmjs.org/tinymce/-/tinymce-8.4.0.tgz"
-  integrity sha512-Q/0/iLycB7hgSkOBoRqfceOz/7Obs9zIo0DwTRuvrReLxb6qdz/1vI7aVJMcW2BAuW80QqZiTyYdVM2amBkqIg==
+tinymce@~8.6.0:
+  version "8.6.0"
+  resolved "https://registry.npmjs.org/tinymce/-/tinymce-8.6.0.tgz"
+  integrity sha512-qODYoNL4cPIzNFpkEEQDm3DWI78I/nQXIPwUMHRN+q/LyT9Wzt7xis2Nfhk88kV6sibp6MJXPSaUDVNe02ZB/w==
 
 tippy.js@^6.3.7:
   version "6.3.7"
@@ -1462,14 +1470,14 @@ util-deprecate@~1.0.1:
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 uuid@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"
-  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+  version "9.0.1"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz"
+  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
 
 vanilla-picker@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.12.1.tgz"
-  integrity sha512-2qrEP9VYylKXbyzXKsbu2dferBTvqnlsr29XjHwFE+/MEp0VNj6oEUESLDtKZ7DWzGdSv1x/+ujqFZF+KsO3cg==
+  version "2.12.3"
+  resolved "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.12.3.tgz"
+  integrity sha512-qVkT1E7yMbUsB2mmJNFmaXMWE2hF8ffqzMMwe9zdAikd8u2VfnsVY2HQcOUi2F38bgbxzlJBEdS1UUhOXdF9GQ==
   dependencies:
     "@sphinxxxx/color-conversion" "^2.2.2"
 
@@ -1508,9 +1516,9 @@ yocto-queue@^0.1.0:
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-zrender@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/zrender/-/zrender-6.0.0.tgz"
-  integrity sha512-41dFXEEXuJpNecuUQq6JlbybmnHaqqpGlbH1yxnA5V9MMP4SbohSVZsJIwz+zdjQXSSlR1Vc34EgH1zxyTDvhg==
+zrender@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/zrender/-/zrender-6.1.0.tgz#c3ef06e6426d5c28865b7183035680d685e00136"
+  integrity sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ==
   dependencies:
     tslib "2.3.0"
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIModelDataSeederTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIModelDataSeederTests.cs
new file mode 100644
index 0000000000..f0a66345d1
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/DataSeed/AIModelDataSeederTests.cs
@@ -0,0 +1,62 @@
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.AI.DataSeed;
+using Unity.AI.Domain;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Repositories;
+using Xunit;
+
+namespace Unity.GrantManager.AI.DataSeed;
+
+public class AIModelDataSeederTests
+{
+    [Fact]
+    public async Task Should_Seed_All_Configured_Profiles()
+    {
+        var modelRepository = Substitute.For<IRepository<AIModel, Guid>>();
+        var insertedModels = new List<AIModel>();
+        modelRepository
+            .FirstOrDefaultAsync(Arg.Any<System.Linq.Expressions.Expression<Func<AIModel, bool>>>())
+            .Returns((AIModel?)null);
+        modelRepository
+            .InsertAsync(Arg.Any<AIModel>(), Arg.Any<bool>(), Arg.Any<System.Threading.CancellationToken>())
+            .Returns(callInfo =>
+            {
+                var model = callInfo.Arg<AIModel>();
+                insertedModels.Add(model);
+                return Task.FromResult(model);
+            });
+
+        var seeder = new AIModelDataSeeder(modelRepository);
+
+        await seeder.SeedAsync(new DataSeedContext());
+
+        insertedModels.Count.ShouldBe(3);
+        insertedModels.ShouldContain(model => model.Name == "Gpt4oMini" && model.IsActive);
+        insertedModels.ShouldContain(model => model.Name == "Gpt5Mini" && model.IsActive);
+        insertedModels.ShouldContain(model => model.Name == "Gpt5Nano" && model.IsActive);
+
+        var gpt4oMini = insertedModels.Single(model => model.Name == "Gpt4oMini");
+        var gpt5Mini = insertedModels.Single(model => model.Name == "Gpt5Mini");
+        var gpt5Nano = insertedModels.Single(model => model.Name == "Gpt5Nano");
+
+        DeserializeSettings(gpt4oMini.SettingsJson).MaxOutputTokenCountSupported.ShouldBeTrue();
+        DeserializeSettings(gpt4oMini.SettingsJson).Temperature.ShouldBe(0.3);
+        DeserializeSettings(gpt5Mini.SettingsJson).MaxOutputTokenCountSupported.ShouldBeFalse();
+        DeserializeSettings(gpt5Mini.SettingsJson).Temperature.ShouldBeNull();
+        DeserializeSettings(gpt5Nano.SettingsJson).MaxOutputTokenCountSupported.ShouldBeFalse();
+        DeserializeSettings(gpt5Nano.SettingsJson).Temperature.ShouldBeNull();
+    }
+
+    private static AIModelSettings DeserializeSettings(string settingsJson)
+    {
+        var settings = JsonSerializer.Deserialize<AIModelSettings>(settingsJson);
+        settings.ShouldNotBeNull();
+        return settings;
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/AIApplicationInputBuilderTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/AIApplicationInputBuilderTests.cs
new file mode 100644
index 0000000000..0c7e0bb0d8
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/AIApplicationInputBuilderTests.cs
@@ -0,0 +1,174 @@
+using Microsoft.Extensions.Logging.Abstractions;
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.AI.Models;
+using Unity.AI.Operations;
+using Unity.Flex.Scoresheets.Enums;
+using Unity.GrantManager.Applications;
+using Xunit;
+
+namespace Unity.GrantManager.AI.Operations;
+
+public class AIApplicationInputBuilderTests
+{
+    [Fact]
+    public async Task BuildApplicationAnalysisInputAsync_Uses_Shared_Prompt_Mapping_And_Attachments()
+    {
+        var applicationId = Guid.NewGuid();
+        var formVersionId = Guid.NewGuid();
+        var builder = CreateBuilder(out var dataProvider);
+
+        dataProvider.GetApplicationSubmissionAsync(applicationId).Returns(new ApplicationSubmissionSnapshot
+        {
+            ApplicationFormVersionId = formVersionId,
+            Submission = JsonSerializer.Serialize(new
+            {
+                data = new
+                {
+                    project_name = "Submitted project",
+                    ignored_field = "drop me"
+                }
+            })
+        });
+        dataProvider.GetApplicationFormVersionAsync(formVersionId).Returns(new ApplicationFormVersionSnapshot
+        {
+            FormSchema = JsonSerializer.Serialize(new
+            {
+                components = new[]
+                {
+                    new
+                    {
+                        key = "project_name",
+                        label = "Project Name",
+                        type = "textfield",
+                        input = true,
+                        validate = new { required = true }
+                    }
+                }
+            })
+        });
+        dataProvider.GetAttachmentSummariesAsync(applicationId).Returns(Task.FromResult(new List<AttachmentSummarySnapshot>
+        {
+            new("summary.pdf", "Summary text")
+        }));
+
+        var input = await builder.BuildApplicationAnalysisInputAsync(CreatePromptData(applicationId), "v1");
+
+        input.ApplicationId.ShouldBe(applicationId);
+        input.PromptVersion.ShouldBe("v1");
+        input.Attachments.Count.ShouldBe(1);
+        input.Attachments[0].Name.ShouldBe("summary.pdf");
+        input.Attachments[0].Summary.ShouldBe("Summary text");
+        input.Data.GetProperty("project_name").GetString().ShouldBe("Submitted project");
+        input.Data.TryGetProperty("ignored_field", out _).ShouldBeFalse();
+        input.Schema.GetProperty("required_fields")[0].GetString().ShouldBe("Project Name (project_name)");
+    }
+
+    [Fact]
+    public async Task BuildApplicationScoringInputAsync_Uses_Shared_Input_Data_And_Builds_Section_Schema()
+    {
+        var applicationId = Guid.NewGuid();
+        var formVersionId = Guid.NewGuid();
+        var scoresheetId = Guid.NewGuid();
+        var builder = CreateBuilder(out var dataProvider);
+
+        dataProvider.GetApplicationFormAsync(applicationId).Returns(new ApplicationFormSnapshot
+        {
+            ScoresheetId = scoresheetId
+        });
+        dataProvider.GetApplicationSubmissionAsync(applicationId).Returns(new ApplicationSubmissionSnapshot
+        {
+            ApplicationFormVersionId = formVersionId,
+            Submission = JsonSerializer.Serialize(new { data = new { project_name = "Submitted project" } })
+        });
+        dataProvider.GetApplicationFormVersionAsync(formVersionId).Returns(new ApplicationFormVersionSnapshot
+        {
+            FormSchema = JsonSerializer.Serialize(new
+            {
+                components = new[]
+                {
+                    new
+                    {
+                        key = "project_name",
+                        label = "Project Name",
+                        type = "textfield",
+                        input = true,
+                        validate = new { required = true }
+                    }
+                }
+            })
+        });
+        dataProvider.GetAttachmentSummariesAsync(applicationId).Returns(Task.FromResult(new List<AttachmentSummarySnapshot>
+        {
+            new("summary.pdf", "Summary text")
+        }));
+        dataProvider.GetScoresheetAsync(scoresheetId).Returns(new ScoresheetSnapshot
+        {
+            Sections =
+            [
+                new ScoresheetSectionSnapshot
+                {
+                    Name = "Section A",
+                    Order = 1,
+                    Fields =
+                    [
+                        new ScoresheetFieldSnapshot
+                        {
+                            Id = Guid.NewGuid(),
+                            Label = "Question 1",
+                            Description = "Description",
+                            Type = QuestionType.Text.ToString(),
+                            Order = 1,
+                            Definition = null
+                        }
+                    ]
+                }
+            ]
+        });
+
+        var input = await builder.BuildApplicationScoringInputAsync(CreatePromptData(applicationId), "v2");
+
+        input.ApplicationId.ShouldBe(applicationId);
+        input.PromptVersion.ShouldBe("v2");
+        input.Attachments.Count.ShouldBe(1);
+        input.Attachments[0].Name.ShouldBe("summary.pdf");
+        input.Sections.Count.ShouldBe(1);
+        input.Sections[0].SectionName.ShouldBe("Section A");
+        input.Sections[0].SectionSchema.ValueKind.ShouldBe(JsonValueKind.Array);
+        input.Sections[0].SectionSchema.GetArrayLength().ShouldBe(1);
+        input.Data.GetProperty("project_name").GetString().ShouldBe("Submitted project");
+    }
+
+    private static AIApplicationInputBuilder CreateBuilder(out IAIApplicationInputDataProvider applicationInputDataProvider)
+    {
+        applicationInputDataProvider = Substitute.For<IAIApplicationInputDataProvider>();
+
+        return new AIApplicationInputBuilder(
+            applicationInputDataProvider,
+            NullLogger<AIApplicationInputBuilder>.Instance);
+    }
+
+    private static AIApplicationPromptDataDto CreatePromptData(Guid applicationId, Guid? applicationFormId = null)
+    {
+        return new AIApplicationPromptDataDto
+        {
+            ApplicationId = applicationId,
+            ApplicationFormId = applicationFormId ?? Guid.NewGuid(),
+            ProjectName = "Project Alpha",
+            ReferenceNo = "REF-001",
+            RequestedAmount = 15000m,
+            TotalProjectBudget = 40000m,
+            EconomicRegion = "Vancouver Island",
+            City = "Victoria",
+            SubmissionDate = new DateTime(2026, 6, 12),
+            ProjectSummary = "Project summary",
+            ProjectStartDate = new DateTime(2026, 7, 1),
+            ProjectEndDate = new DateTime(2026, 12, 31),
+            Community = "Community name"
+        };
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/ApplicationAnalysisServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/ApplicationAnalysisServiceTests.cs
new file mode 100644
index 0000000000..c13a000025
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/ApplicationAnalysisServiceTests.cs
@@ -0,0 +1,96 @@
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.AI;
+using Unity.AI.Models;
+using Unity.AI.Operations;
+using Unity.AI.Requests;
+using Unity.AI.Responses;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.AI.Operations;
+
+public class ApplicationAnalysisServiceTests : GrantManagerApplicationTestBase
+{
+    public ApplicationAnalysisServiceTests(ITestOutputHelper outputHelper) : base(outputHelper)
+    {
+    }
+
+    [Fact]
+    public async Task RegenerateAsync_Uses_Input_Dto_And_Returns_Serialized_Response()
+    {
+        var applicationId = Guid.NewGuid();
+        ApplicationAnalysisRequest? capturedRequest = null;
+
+        var aiService = Substitute.For<IAIService>();
+        aiService.GenerateApplicationAnalysisAsync(Arg.Do<ApplicationAnalysisRequest>(request => capturedRequest = request))
+            .Returns(new ApplicationAnalysisResponse { Decision = "ok" });
+        var prerequisiteValidator = Substitute.For<IAIGenerationPrerequisiteValidator>();
+
+        var service = new ApplicationAnalysisService(
+            aiService,
+            prerequisiteValidator);
+
+        var result = await service.RegenerateAsync(new ApplicationAnalysisOperationInputDto
+        {
+            ApplicationId = applicationId,
+            Schema = JsonSerializer.SerializeToElement(new { projectName = "Project Name" }),
+            Data = JsonSerializer.SerializeToElement(new { projectName = "Submitted project" }),
+            Attachments = new List<AIAttachmentItem>
+            {
+                new()
+                {
+                    Name = "summary.pdf",
+                    Summary = "Summary text"
+                }
+            },
+            PromptVersion = "v1"
+        });
+
+        result.ShouldContain("\"Decision\": \"ok\"");
+        capturedRequest.ShouldNotBeNull();
+        capturedRequest.PromptVersion.ShouldBe("v1");
+        capturedRequest.Attachments.Count.ShouldBe(1);
+        capturedRequest.Attachments[0].Name.ShouldBe("summary.pdf");
+        capturedRequest.Attachments[0].Summary.ShouldBe("Summary text");
+        capturedRequest.Data.GetProperty("projectName").GetString().ShouldBe("Submitted project");
+        capturedRequest.Schema.GetProperty("projectName").GetString().ShouldBe("Project Name");
+
+        await prerequisiteValidator.Received(1).EnsureApplicationAnalysisAvailableAsync(applicationId);
+        await aiService.Received(1).GenerateApplicationAnalysisAsync(Arg.Any<ApplicationAnalysisRequest>(), Arg.Any<System.Threading.CancellationToken>());
+    }
+
+    [Fact]
+    public async Task RegenerateAsync_Flows_Api_Request_To_The_Runtime_Without_Repository_Dependencies()
+    {
+        var applicationId = Guid.NewGuid();
+        ApplicationAnalysisRequest? capturedRequest = null;
+
+        var aiService = Substitute.For<IAIService>();
+        aiService.GenerateApplicationAnalysisAsync(Arg.Do<ApplicationAnalysisRequest>(request => capturedRequest = request))
+            .Returns(new ApplicationAnalysisResponse());
+        var prerequisiteValidator = Substitute.For<IAIGenerationPrerequisiteValidator>();
+
+        var service = new ApplicationAnalysisService(
+            aiService,
+            prerequisiteValidator);
+
+        await service.RegenerateAsync(new ApplicationAnalysisOperationInputDto
+        {
+            ApplicationId = applicationId,
+            Schema = JsonSerializer.SerializeToElement(new { }),
+            Data = JsonSerializer.SerializeToElement(new { project_name = "Fallback project" }),
+            Attachments = [],
+            PromptVersion = null
+        });
+
+        capturedRequest.ShouldNotBeNull();
+        capturedRequest.Data.GetProperty("project_name").GetString().ShouldBe("Fallback project");
+        capturedRequest.Attachments.ShouldBeEmpty();
+        capturedRequest.PromptVersion.ShouldBeNull();
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/ApplicationScoringServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/ApplicationScoringServiceTests.cs
new file mode 100644
index 0000000000..a2fed03287
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/ApplicationScoringServiceTests.cs
@@ -0,0 +1,152 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging.Abstractions;
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Unity.AI;
+using Unity.AI.Models;
+using Unity.AI.Operations;
+using Unity.AI.Requests;
+using Unity.AI.Responses;
+using Unity.AI.Runtime;
+using Xunit;
+
+namespace Unity.GrantManager.AI.Operations;
+
+public class ApplicationScoringServiceTests
+{
+    [Fact]
+    public async Task RegenerateAsync_Sequential_Mode_Uses_Per_Section_Requests()
+    {
+        var capturedRequests = new List<ApplicationScoringRequest>();
+        var aiService = Substitute.For<IAIService>();
+        aiService.GenerateApplicationScoringAsync(Arg.Do<ApplicationScoringRequest>(request => capturedRequests.Add(request)))
+            .Returns(new ApplicationScoringResponse
+            {
+                Answers = new Dictionary<string, ApplicationScoringAnswer>
+                {
+                    ["q1"] = new()
+                    {
+                        Answer = JsonSerializer.SerializeToElement("Yes"),
+                        Rationale = "ok",
+                        Confidence = 80
+                    }
+                }
+            });
+
+        var service = CreateService(aiService, "Sequential");
+
+        var result = await service.RegenerateAsync(new ApplicationScoringOperationInputDto
+        {
+            ApplicationId = Guid.NewGuid(),
+            Data = JsonSerializer.SerializeToElement(new { project_name = "Project Alpha" }),
+            Attachments = [new AIAttachmentItem { Name = "summary.pdf", Summary = "Summary text" }],
+            Sections =
+            [
+                CreateSection("Section A", "q1")
+            ]
+        });
+
+        result.ShouldContain("\"q1\"");
+        capturedRequests.Count.ShouldBe(1);
+        capturedRequests[0].SectionName.ShouldBe("Section A");
+        capturedRequests[0].Attachments.Count.ShouldBe(1);
+        capturedRequests[0].PromptVersion.ShouldBeNull();
+    }
+
+    [Fact]
+    public async Task RegenerateAsync_Batch_Mode_Uses_Aggregated_Section_Schema()
+    {
+        var capturedRequests = new List<ApplicationScoringRequest>();
+        var aiService = Substitute.For<IAIService>();
+        aiService.GenerateApplicationScoringAsync(Arg.Do<ApplicationScoringRequest>(request => capturedRequests.Add(request)))
+            .Returns(new ApplicationScoringResponse
+            {
+                Answers = new Dictionary<string, ApplicationScoringAnswer>
+                {
+                    ["q1"] = new()
+                    {
+                        Answer = JsonSerializer.SerializeToElement("No"),
+                        Rationale = "batch",
+                        Confidence = 70
+                    }
+                }
+            });
+
+        var service = CreateService(aiService, "Batch");
+
+        var result = await service.RegenerateAsync(new ApplicationScoringOperationInputDto
+        {
+            ApplicationId = Guid.NewGuid(),
+            Data = JsonSerializer.SerializeToElement(new { project_name = "Project Beta" }),
+            Attachments = [],
+            Sections =
+            [
+                CreateSection("Section A", "q1"),
+                CreateSection("Section B", "q2")
+            ]
+        });
+
+        result.ShouldContain("\"q1\"");
+        capturedRequests.Count.ShouldBe(1);
+        capturedRequests[0].SectionName.ShouldBe("All Sections");
+        capturedRequests[0].SectionSchema.ValueKind.ShouldBe(JsonValueKind.Array);
+        capturedRequests[0].SectionSchema.GetArrayLength().ShouldBe(2);
+    }
+
+    [Fact]
+    public async Task RegenerateAsync_Batch_Mode_Rejects_Non_Array_Section_Schemas()
+    {
+        var aiService = Substitute.For<IAIService>();
+        var service = CreateService(aiService, "Batch");
+
+        var result = await service.RegenerateAsync(new ApplicationScoringOperationInputDto
+        {
+            ApplicationId = Guid.NewGuid(),
+            Data = JsonSerializer.SerializeToElement(new { project_name = "Project Gamma" }),
+            Attachments = [],
+            Sections =
+            [
+                new ApplicationScoringSectionOperationInputDto
+                {
+                    SectionName = "Broken Section",
+                    SectionSchema = JsonSerializer.SerializeToElement(new { q1 = "bad" })
+                }
+            ]
+        });
+
+        result.ShouldBe("{}");
+        await aiService.DidNotReceive().GenerateApplicationScoringAsync(Arg.Any<ApplicationScoringRequest>(), Arg.Any<CancellationToken>());
+    }
+
+    private static ApplicationScoringService CreateService(IAIService aiService, string executionMode)
+    {
+        var configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                ["Azure:Operations:Defaults:ExecutionMode"] = executionMode
+            })
+            .Build();
+
+        return new ApplicationScoringService(
+            aiService,
+            new AIExecutionModeResolver(configuration),
+            NullLogger<ApplicationScoringService>.Instance);
+    }
+
+    private static ApplicationScoringSectionOperationInputDto CreateSection(string name, string questionId)
+    {
+        return new ApplicationScoringSectionOperationInputDto
+        {
+            SectionName = name,
+            SectionSchema = JsonSerializer.SerializeToElement(new[]
+            {
+                new { id = questionId }
+            })
+        };
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/ApplicationToAIApplicationPromptDataDtoMapperTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/ApplicationToAIApplicationPromptDataDtoMapperTests.cs
new file mode 100644
index 0000000000..4a9233a9a1
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/ApplicationToAIApplicationPromptDataDtoMapperTests.cs
@@ -0,0 +1,52 @@
+using Shouldly;
+using System;
+using Unity.AI.Operations;
+using Unity.GrantManager.Applications;
+using Volo.Abp.Domain.Entities;
+using Xunit;
+
+namespace Unity.GrantManager.AI.Operations;
+
+public class ApplicationToAIApplicationPromptDataDtoMapperTests
+{
+    [Fact]
+    public void Map_Copies_Application_Data_Into_Prompt_Snapshot()
+    {
+        var applicationId = Guid.NewGuid();
+        var formId = Guid.NewGuid();
+
+        var mapper = new ApplicationToAIApplicationPromptDataDtoMapper();
+        var application = new Application
+        {
+            ApplicationFormId = formId,
+            ProjectName = "Project Alpha",
+            ReferenceNo = "REF-001",
+            RequestedAmount = 15000m,
+            TotalProjectBudget = 40000m,
+            EconomicRegion = "Vancouver Island",
+            City = "Victoria",
+            SubmissionDate = new DateTime(2026, 6, 12),
+            ProjectSummary = "Project summary",
+            ProjectStartDate = new DateTime(2026, 7, 1),
+            ProjectEndDate = new DateTime(2026, 12, 31),
+            Community = "Community name"
+        };
+        EntityHelper.TrySetId(application, () => applicationId);
+
+        var dto = mapper.Map(application);
+
+        dto.ApplicationId.ShouldBe(applicationId);
+        dto.ApplicationFormId.ShouldBe(formId);
+        dto.ProjectName.ShouldBe("Project Alpha");
+        dto.ReferenceNo.ShouldBe("REF-001");
+        dto.RequestedAmount.ShouldBe(15000m);
+        dto.TotalProjectBudget.ShouldBe(40000m);
+        dto.EconomicRegion.ShouldBe("Vancouver Island");
+        dto.City.ShouldBe("Victoria");
+        dto.SubmissionDate.ShouldBe(new DateTime(2026, 6, 12));
+        dto.ProjectSummary.ShouldBe("Project summary");
+        dto.ProjectStartDate.ShouldBe(new DateTime(2026, 7, 1));
+        dto.ProjectEndDate.ShouldBe(new DateTime(2026, 12, 31));
+        dto.Community.ShouldBe("Community name");
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/AttachmentSummaryServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/AttachmentSummaryServiceTests.cs
index 0a5c618e2a..85510abda3 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/AttachmentSummaryServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Operations/AttachmentSummaryServiceTests.cs
@@ -1,18 +1,23 @@
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging.Abstractions;
 using NSubstitute;
 using Shouldly;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Unity.AI;
 using Unity.AI.Extraction;
+using Unity.AI.Localization;
 using Unity.AI.Operations;
 using Unity.AI.Requests;
 using Unity.AI.Responses;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Intakes;
+using Volo.Abp;
+using Volo.Abp.Uow;
 using Xunit;
 
 namespace Unity.GrantManager.AI.Operations;
@@ -28,36 +33,21 @@ public async Task GenerateAndSaveAsync_Uses_Streamed_Attachment_Text()
         var stream = new MemoryStream([1, 2, 3]);
         AttachmentSummaryRequest? capturedRequest = null;
 
-        var attachment = new ApplicationChefsFileAttachment
-        {
-            ApplicationId = Guid.NewGuid(),
-            FileName = "test.txt",
-            ChefsSubmissionId = submissionId.ToString(),
-            ChefsFileId = fileId.ToString()
-        };
-
-        var attachmentRepository = Substitute.For<IApplicationChefsFileAttachmentRepository>();
-        attachmentRepository.GetAsync(attachmentId).Returns(attachment);
+        var provider = CreateProvider(attachmentId, "test.txt", submissionId, fileId);
 
         var streamProvider = Substitute.For<IChefsFileAttachmentStreamProvider>();
         streamProvider.OpenAsync(submissionId, fileId, "test.txt")
             .Returns(new ChefsFileAttachmentStream(stream, "text/plain"));
 
         var textExtractionService = Substitute.For<ITextExtractionService>();
-        textExtractionService.ExtractTextAsync("test.txt", stream, "text/plain")
+        textExtractionService.ExtractTextAsync("test.txt", stream, "text/plain", Arg.Any<CancellationToken>())
             .Returns("extracted text");
 
         var aiService = Substitute.For<IAIService>();
-        aiService.GenerateAttachmentSummaryAsync(Arg.Do<AttachmentSummaryRequest>(request => capturedRequest = request))
+        aiService.GenerateAttachmentSummaryAsync(Arg.Do<AttachmentSummaryRequest>(request => capturedRequest = request), Arg.Any<CancellationToken>())
             .Returns(new AttachmentSummaryResponse { Summary = "summary text" });
 
-        var service = new AttachmentSummaryService(
-            attachmentRepository,
-            streamProvider,
-            textExtractionService,
-            aiService,
-            new AIExecutionModeResolver(new ConfigurationBuilder().Build()),
-            NullLogger<AttachmentSummaryService>.Instance);
+        var service = CreateService(provider, streamProvider, textExtractionService, aiService);
 
         var result = await service.GenerateAndSaveAsync(attachmentId, "v1");
 
@@ -67,9 +57,7 @@ public async Task GenerateAndSaveAsync_Uses_Streamed_Attachment_Text()
         capturedRequest.ContentType.ShouldBe("text/plain");
         capturedRequest.ExtractedText.ShouldBe("extracted text");
         capturedRequest.PromptVersion.ShouldBe("v1");
-        attachment.AISummary.ShouldBe("summary text");
-
-        await attachmentRepository.Received(1).UpdateAsync(attachment);
+        await provider.Received(1).UpdateAttachmentSummaryAsync(attachmentId, "summary text");
         stream.CanRead.ShouldBeFalse();
     }
 
@@ -83,30 +71,136 @@ public async Task GenerateAndSaveAsync_Should_Propagate_Cancellation()
         using var cancellationTokenSource = new CancellationTokenSource();
         await cancellationTokenSource.CancelAsync();
 
-        var attachment = new ApplicationChefsFileAttachment
-        {
-            ApplicationId = Guid.NewGuid(),
-            FileName = "test.txt",
-            ChefsSubmissionId = submissionId.ToString(),
-            ChefsFileId = fileId.ToString()
-        };
-
-        var attachmentRepository = Substitute.For<IApplicationChefsFileAttachmentRepository>();
-        attachmentRepository.GetAsync(attachmentId).Returns(attachment);
+        var provider = CreateProvider(attachmentId, "test.txt", submissionId, fileId);
 
         var streamProvider = Substitute.For<IChefsFileAttachmentStreamProvider>();
         streamProvider.OpenAsync(submissionId, fileId, "test.txt")
             .Returns(new ChefsFileAttachmentStream(stream, "text/plain"));
 
+        var service = CreateService(provider, streamProvider, Substitute.For<ITextExtractionService>(), Substitute.For<IAIService>());
+
+        await Should.ThrowAsync<OperationCanceledException>(() =>
+            service.GenerateAndSaveAsync(attachmentId, "v1", cancellationTokenSource.Token));
+    }
+
+    [Fact]
+    public async Task GenerateAndSaveAsync_Should_Reject_Empty_Attachment_List()
+    {
+        var provider = Substitute.For<IAttachmentSummaryDataProvider>();
+        var service = CreateService(provider, Substitute.For<IChefsFileAttachmentStreamProvider>(), Substitute.For<ITextExtractionService>(), Substitute.For<IAIService>());
+
+        await Should.ThrowAsync<UserFriendlyException>(() => service.GenerateAndSaveAsync([], "v1"));
+    }
+
+    [Fact]
+    public async Task GenerateAndSaveAsync_Should_Use_Batch_Mode_When_Configured()
+    {
+        var firstAttachmentId = Guid.NewGuid();
+        var secondAttachmentId = Guid.NewGuid();
+        var submissionId = Guid.NewGuid();
+        var fileId1 = Guid.NewGuid();
+        var fileId2 = Guid.NewGuid();
+        var stream1 = new MemoryStream([1, 2, 3]);
+        var stream2 = new MemoryStream([4, 5, 6]);
+        var applicationId = Guid.NewGuid();
+
+        var provider = Substitute.For<IAttachmentSummaryDataProvider>();
+        provider.GetAttachmentAsync(firstAttachmentId).Returns(new AttachmentSummarySource(firstAttachmentId, "first.txt", submissionId.ToString(), fileId1.ToString()));
+        provider.GetAttachmentAsync(secondAttachmentId).Returns(new AttachmentSummarySource(secondAttachmentId, "second.txt", submissionId.ToString(), fileId2.ToString()));
+        provider.GetApplicationAttachmentIdsAsync(applicationId).Returns(new List<Guid> { firstAttachmentId, secondAttachmentId });
+        provider.GetApplicationAttachmentIdsAsync(Arg.Is<Guid>(id => id != applicationId)).Returns(new List<Guid>());
+
+        var streamProvider = Substitute.For<IChefsFileAttachmentStreamProvider>();
+        streamProvider.OpenAsync(submissionId, fileId1, "first.txt")
+            .Returns(new ChefsFileAttachmentStream(stream1, "text/plain"));
+        streamProvider.OpenAsync(submissionId, fileId2, "second.txt")
+            .Returns(new ChefsFileAttachmentStream(stream2, "text/plain"));
+
+        var textExtractionService = Substitute.For<ITextExtractionService>();
+        textExtractionService.ExtractTextAsync("first.txt", stream1, "text/plain", Arg.Any<CancellationToken>())
+            .Returns("first extracted");
+        textExtractionService.ExtractTextAsync("second.txt", stream2, "text/plain", Arg.Any<CancellationToken>())
+            .Returns("second extracted");
+
+        var aiService = Substitute.For<IAIService>();
+        aiService.GenerateAttachmentSummaryBatchAsync(Arg.Any<AttachmentSummaryBatchRequest>(), Arg.Any<CancellationToken>())
+            .Returns(new AttachmentSummaryBatchResponse
+            {
+                Attachments =
+                {
+                    new AttachmentSummaryBatchItemResponse { AttachmentId = firstAttachmentId.ToString(), Summary = "first summary" },
+                    new AttachmentSummaryBatchItemResponse { AttachmentId = secondAttachmentId.ToString(), Summary = "second summary" }
+                }
+            });
+
+        var configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string?>
+            {
+                [$"Azure:Operations:{AIExecutionModeResolver.AttachmentSummaryOperation}:ExecutionMode"] = "Batch"
+            })
+            .Build();
+
         var service = new AttachmentSummaryService(
-            attachmentRepository,
+            provider,
             streamProvider,
-            Substitute.For<ITextExtractionService>(),
-            Substitute.For<IAIService>(),
+            textExtractionService,
+            aiService,
+            Substitute.For<IAIGenerationPrerequisiteValidator>(),
+            new AIExecutionModeResolver(configuration),
+            CreateUnitOfWorkManager(),
+            NullLogger<AttachmentSummaryService>.Instance,
+            Substitute.For<IStringLocalizer<AIResource>>());
+
+        var summaries = await service.GenerateAndSaveAsync([firstAttachmentId, secondAttachmentId], "v1");
+
+        summaries.ShouldBe(["first summary", "second summary"]);
+        await aiService.Received(1).GenerateAttachmentSummaryBatchAsync(Arg.Any<AttachmentSummaryBatchRequest>(), Arg.Any<CancellationToken>());
+        await provider.Received(1).UpdateAttachmentSummaryAsync(firstAttachmentId, "first summary");
+        await provider.Received(1).UpdateAttachmentSummaryAsync(secondAttachmentId, "second summary");
+    }
+
+    private static AttachmentSummaryService CreateService(
+        IAttachmentSummaryDataProvider provider,
+        IChefsFileAttachmentStreamProvider streamProvider,
+        ITextExtractionService textExtractionService,
+        IAIService aiService)
+    {
+        return new AttachmentSummaryService(
+            provider,
+            streamProvider,
+            textExtractionService,
+            aiService,
+            Substitute.For<IAIGenerationPrerequisiteValidator>(),
             new AIExecutionModeResolver(new ConfigurationBuilder().Build()),
-            NullLogger<AttachmentSummaryService>.Instance);
+            CreateUnitOfWorkManager(),
+            NullLogger<AttachmentSummaryService>.Instance,
+            Substitute.For<IStringLocalizer<AIResource>>());
+    }
 
-        await Should.ThrowAsync<OperationCanceledException>(() =>
-            service.GenerateAndSaveAsync(attachmentId, "v1", cancellationTokenSource.Token));
+    private static IAttachmentSummaryDataProvider CreateProvider(
+        Guid attachmentId,
+        string fileName,
+        Guid submissionId,
+        Guid fileId,
+        Action<string>? savedSummary = null)
+    {
+        var provider = Substitute.For<IAttachmentSummaryDataProvider>();
+        provider.GetAttachmentAsync(attachmentId).Returns(new AttachmentSummarySource(attachmentId, fileName, submissionId.ToString(), fileId.ToString()));
+        provider.GetApplicationAttachmentIdsAsync(Arg.Any<Guid>()).Returns(new List<Guid> { attachmentId });
+        provider.UpdateAttachmentSummaryAsync(attachmentId, Arg.Any<string>()).Returns(callInfo =>
+        {
+            savedSummary?.Invoke(callInfo.ArgAt<string>(1));
+            return Task.CompletedTask;
+        });
+        return provider;
+    }
+
+    private static IUnitOfWorkManager CreateUnitOfWorkManager()
+    {
+        var unitOfWork = Substitute.For<IUnitOfWork>();
+        var unitOfWorkManager = Substitute.For<IUnitOfWorkManager>();
+        unitOfWorkManager.Begin(Arg.Any<AbpUnitOfWorkOptions>(), Arg.Any<bool>())
+            .Returns(unitOfWork);
+        return unitOfWorkManager;
     }
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/RateLimit/AIRateLimiterTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/RateLimit/AIRateLimiterTests.cs
index 85fae0d005..ab35d12f62 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/RateLimit/AIRateLimiterTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/RateLimit/AIRateLimiterTests.cs
@@ -57,6 +57,17 @@ public async Task GetStateAsync_Returns_Generating_When_ActivityProvider_HasActi
         state.IsGenerating.ShouldBeTrue();
     }
 
+    [Fact]
+    public async Task GetStateAsync_Does_Not_Acquire_Cooldown_Lock()
+    {
+        var lockProvider = new CountingDistributedLockProvider();
+        var limiter = new AIRateLimiter(_cache, _currentUser, _configuration, lockProvider, []);
+
+        await limiter.GetStateAsync();
+
+        lockProvider.CreatedLockCount.ShouldBe(0);
+    }
+
     [Fact]
     public async Task EnsureAsync_AllowsThrough_When_NoCooldown()
     {
@@ -167,6 +178,17 @@ private sealed class TestDistributedLockProvider : IDistributedLockProvider
         public IDistributedLock CreateLock(string name) => new TestDistributedLock(name);
     }
 
+    private sealed class CountingDistributedLockProvider : IDistributedLockProvider
+    {
+        public int CreatedLockCount { get; private set; }
+
+        public IDistributedLock CreateLock(string name)
+        {
+            CreatedLockCount++;
+            return new TestDistributedLock(name);
+        }
+    }
+
     private sealed class TestDistributedLock(string name) : IDistributedLock
     {
         private static readonly SemaphoreSlim Gate = new(1, 1);
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIOperationResultTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIOperationResultTests.cs
new file mode 100644
index 0000000000..5383ed9f58
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIOperationResultTests.cs
@@ -0,0 +1,27 @@
+using Shouldly;
+using Unity.AI.Runtime;
+using Xunit;
+
+namespace Unity.GrantManager.AI.Runtime;
+
+public class AIOperationResultTests
+{
+    [Fact]
+    public void Failure_Factories_Should_Set_Consistent_Failure_Categories()
+    {
+        AIOperationResult.Success().FailureCategory.ShouldBe(AIFailureCategory.None);
+        AIOperationResult.ProviderUnavailable().FailureCategory.ShouldBe(AIFailureCategory.ProviderUnavailable);
+        AIOperationResult.TransientFailure().FailureCategory.ShouldBe(AIFailureCategory.TransientProviderFailure);
+        AIOperationResult.PermanentFailure().FailureCategory.ShouldBe(AIFailureCategory.PermanentProviderFailure);
+        AIOperationResult.InvalidOutput().FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+    }
+
+    [Fact]
+    public void WithOutcome_Should_Resolve_Category_When_Not_Explicit()
+    {
+        var result = AIOperationResult.Success().WithOutcome(AIOperationOutcome.InvalidOutput);
+
+        result.Outcome.ShouldBe(AIOperationOutcome.InvalidOutput);
+        result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIPromptTemplateProviderTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIPromptTemplateProviderTests.cs
new file mode 100644
index 0000000000..d638562085
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIPromptTemplateProviderTests.cs
@@ -0,0 +1,93 @@
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Unity.AI.Prompts;
+using Unity.AI.Runtime;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
+using Xunit;
+
+namespace Unity.GrantManager.AI.Runtime;
+
+public class AIPromptTemplateProviderTests
+{
+    [Fact]
+    public async Task GetRequiredPromptAsync_Should_Delegate_To_Store()
+    {
+        var store = Substitute.For<IAIPromptTemplateStore>();
+        store.GetRequiredPromptAsync(AIPromptTypes.ApplicationAnalysis, "v1", default)
+            .Returns(new AIPromptTemplateSnapshot("v1", "SYSTEM", "USER", "{\"RULES\":\"- rule\"}"));
+
+        var provider = new AIPromptTemplateProvider(store);
+
+        var snapshot = await provider.GetRequiredPromptAsync(AIPromptTypes.ApplicationAnalysis, "v1");
+
+        snapshot.PromptVersion.ShouldBe("v1");
+        snapshot.SystemPrompt.ShouldBe("SYSTEM");
+        snapshot.UserPrompt.ShouldBe("USER");
+        snapshot.MetadataJson.ShouldBe("{\"RULES\":\"- rule\"}");
+        await store.Received(1).GetRequiredPromptAsync(AIPromptTypes.ApplicationAnalysis, "v1", default);
+    }
+
+    [Fact]
+    public async Task GetRequiredPromptAsync_Should_Return_Prompt_Definition_From_Store()
+    {
+        var prompt = new AIPrompt(
+            Guid.NewGuid(),
+            AIPromptTypes.ApplicationAnalysis,
+            1,
+            "SYSTEM",
+            "USER")
+        {
+            MetadataJson = "{\"operationName\":\"ApplicationAnalysis\",\"promptVersion\":\"v1\",\"inputContractName\":\"ApplicationAnalysisOperationInputDto\",\"outputContractName\":\"ApplicationAnalysisResponse\"}",
+            IsActive = true
+        };
+
+        var provider = CreateProvider(prompt);
+
+        var snapshot = await provider.GetRequiredPromptAsync(AIPromptTypes.ApplicationAnalysis, "v1");
+
+        snapshot.PromptVersion.ShouldBe("v1");
+        snapshot.SystemPrompt.ShouldBe("SYSTEM");
+        snapshot.UserPrompt.ShouldBe("USER");
+        snapshot.MetadataJson.ShouldContain("ApplicationAnalysis");
+        snapshot.Manifest.ShouldNotBeNull();
+        snapshot.Manifest!.OperationName.ShouldBe("ApplicationAnalysis");
+        snapshot.Manifest.PromptVersion.ShouldBe("v1");
+        snapshot.Manifest.InputContractName.ShouldBe("ApplicationAnalysisOperationInputDto");
+        snapshot.Manifest.OutputContractName.ShouldBe("ApplicationAnalysisResponse");
+    }
+
+    [Fact]
+    public async Task GetRequiredPromptAsync_Should_Throw_When_Prompt_Is_Missing()
+    {
+        var provider = CreateProvider();
+
+        var exception = await Should.ThrowAsync<InvalidOperationException>(
+            () => provider.GetRequiredPromptAsync(AIPromptTypes.ApplicationAnalysis, "v1"));
+
+        exception.Message.ShouldContain("ApplicationAnalysis");
+    }
+
+    private static AIPromptTemplateProvider CreateProvider(
+        AIPrompt? prompt = null)
+    {
+        var promptRepository = Substitute.For<IRepository<AIPrompt, Guid>>();
+        var multiTenantDataFilter = Substitute.For<IDataFilter<IMultiTenant>>();
+        multiTenantDataFilter.Disable().Returns(Substitute.For<IDisposable>());
+
+        promptRepository.FindAsync(Arg.Any<Expression<Func<AIPrompt, bool>>>())
+            .Returns(callInfo =>
+            {
+                var predicate = callInfo.Arg<Expression<Func<AIPrompt, bool>>>();
+                return Task.FromResult(prompt != null && predicate.Compile()(prompt) ? prompt : null);
+            });
+
+        var store = new AIPromptTemplateStore(promptRepository, multiTenantDataFilter);
+        return new AIPromptTemplateProvider(store);
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIPromptTemplateRendererTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIPromptTemplateRendererTests.cs
new file mode 100644
index 0000000000..2e24629bed
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIPromptTemplateRendererTests.cs
@@ -0,0 +1,149 @@
+using Shouldly;
+using System;
+using Unity.AI.Runtime;
+using Xunit;
+
+namespace Unity.GrantManager.AI.Runtime;
+
+public class AIPromptTemplateRendererTests
+{
+    [Fact]
+    public void BuildApplicationAnalysisUserPrompt_Should_Render_Metadata_And_Preserve_FormIo_Data()
+    {
+        const string template = """
+            SCHEMA
+            {{SCHEMA}}
+
+            DATA
+            {{DATA}}
+
+            ATTACHMENTS
+            {{ATTACHMENTS}}
+
+            RULES
+            {{RULES}}
+            {{COMMON_RULES}}
+            """;
+
+        const string metadataJson = """
+            {
+              "RULES": "- Use only provided input sections as evidence.",
+              "COMMON_RULES": "- If ATTACHMENTS is empty, use DATA only and do not mention missing attachments unless their absence is material."
+            }
+            """;
+
+        const string data = """
+            {
+              "template": "<span>{{ item.label }}</span>",
+              "fileNameTemplate": "{{fileName}}",
+              "uppercaseTemplateValue": "{{FORMIO_VALUE}}"
+            }
+            """;
+
+        var result = AIPromptTemplateRenderer.BuildApplicationAnalysisUserPrompt(
+            template,
+            "{}",
+            data,
+            "[]",
+            metadataJson);
+
+        result.ShouldContain("{{ item.label }}");
+        result.ShouldContain("{{fileName}}");
+        result.ShouldContain("{{FORMIO_VALUE}}");
+        result.ShouldContain("If ATTACHMENTS is empty, use DATA only");
+        result.ShouldContain("Use only provided input sections as evidence.");
+    }
+
+    [Fact]
+    public void BuildApplicationScoringUserPrompt_Should_Render_Metadata_Sections()
+    {
+        const string template = """
+            DATA
+            {{DATA}}
+
+            ATTACHMENTS
+            {{ATTACHMENTS}}
+
+            SECTION
+            {{SECTION}}
+
+            RESPONSE
+            {{RESPONSE}}
+
+            RULES
+            {{RULES}}
+            {{COMMON_RULES}}
+            """;
+
+        const string metadataJson = """
+            {
+              "RULES": "- Use only DATA and ATTACHMENTS as evidence.",
+              "COMMON_RULES": "- Return valid JSON only."
+            }
+            """;
+
+        var result = AIPromptTemplateRenderer.BuildApplicationScoringUserPrompt(
+            template,
+            "{}",
+            "[]",
+            "{\"name\":\"Test\",\"questions\":[]}",
+            "{}",
+            metadataJson);
+
+        result.ShouldContain("Use only DATA and ATTACHMENTS as evidence.");
+        result.ShouldContain("Return valid JSON only.");
+    }
+
+    [Fact]
+    public void BuildApplicationAnalysisUserPrompt_Should_Map_Output_Metadata_To_Response_Placeholder()
+    {
+        const string template = """
+            RESPONSE
+            {{RESPONSE}}
+            """;
+
+        const string metadataJson = """
+            {
+              "OUTPUT": "{ \"decision\": \"PROCEED\" }"
+            }
+            """;
+
+        var result = AIPromptTemplateRenderer.BuildApplicationAnalysisUserPrompt(
+            template,
+            "{}",
+            "{}",
+            "[]",
+            metadataJson);
+
+        result.ShouldContain("{ \"decision\": \"PROCEED\" }");
+    }
+
+    [Fact]
+    public void BuildApplicationAnalysisUserPrompt_Should_Throw_When_Template_Contains_NonPrompt_Placeholders()
+    {
+        const string template = "Bad template token: {{ item.label }}";
+
+        var exception = Should.Throw<InvalidOperationException>(() =>
+            AIPromptTemplateRenderer.BuildApplicationAnalysisUserPrompt(template, "{}", "{}", "[]"));
+
+        exception.Message.ShouldContain("Invalid prompt placeholders");
+        exception.Message.ShouldContain("item.label");
+    }
+
+    [Fact]
+    public void BuildApplicationAnalysisUserPrompt_Should_Throw_When_Metadata_Is_Invalid_Json()
+    {
+        const string template = "{{DATA}}";
+        const string invalidMetadataJson = "{ invalid json";
+
+        var exception = Should.Throw<InvalidOperationException>(() =>
+            AIPromptTemplateRenderer.BuildApplicationAnalysisUserPrompt(
+                template,
+                "{}",
+                "{}",
+                "[]",
+                invalidMetadataJson));
+
+        exception.Message.ShouldContain("Invalid prompt metadata JSON.");
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIProviderPayloadValidatorTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIProviderPayloadValidatorTests.cs
index d84d2e55a8..87636a292d 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIProviderPayloadValidatorTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/AIProviderPayloadValidatorTests.cs
@@ -1,4 +1,5 @@
 using Shouldly;
+using System.Text.Json;
 using Unity.AI.Runtime;
 using Xunit;
 
@@ -6,118 +7,203 @@ namespace Unity.GrantManager.AI.Runtime;
 
 public class AIProviderPayloadValidatorTests
 {
-    [Theory]
-    [InlineData(null, false)]
-    [InlineData("", false)]
-    [InlineData("   ", false)]
-    [InlineData("Some summary text", true)]
-    public void IsValidAttachmentSummaryText_Should_RejectBlankAndAcceptContent(string? input, bool expected)
+    [Fact]
+    public void ValidateApplicationAnalysisJson_Should_Return_InvalidOutput_For_InvalidJson()
     {
-        AIProviderPayloadValidator.IsValidAttachmentSummaryText(input!).ShouldBe(expected);
+        var result = AIProviderPayloadValidator.ValidateApplicationAnalysisJson("not-json");
+
+        result.IsValid.ShouldBeFalse();
+        result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+        var reason = result.Reason;
+        reason.ShouldNotBeNull();
+        reason.ShouldContain("not valid JSON");
     }
 
     [Fact]
-    public void IsValidApplicationAnalysisJson_Should_ReturnTrue_ForWellFormedPayload()
+    public void ValidateApplicationAnalysisJson_Should_Return_InvalidOutput_When_Decision_Is_Missing()
     {
-        var json = """
+        var result = AIProviderPayloadValidator.ValidateApplicationAnalysisJson(
+            """
             {
-              "decision": "Approved",
               "errors": [],
               "warnings": [],
               "summaries": [],
               "recommendations": []
             }
-            """;
-        AIProviderPayloadValidator.IsValidApplicationAnalysisJson(json).ShouldBeTrue();
-    }
+            """);
 
-    [Theory]
-    [InlineData(null)]
-    [InlineData("")]
-    [InlineData("not json")]
-    [InlineData("[]")]
-    public void IsValidApplicationAnalysisJson_Should_ReturnFalse_ForInvalidInput(string? input)
-    {
-        AIProviderPayloadValidator.IsValidApplicationAnalysisJson(input!).ShouldBeFalse();
+        result.IsValid.ShouldBeFalse();
+        result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+        var reason = result.Reason;
+        reason.ShouldNotBeNull();
+        reason.ShouldContain("decision");
     }
 
     [Fact]
-    public void IsValidApplicationAnalysisJson_Should_ReturnFalse_WhenDecisionMissing()
+    public void ValidateApplicationScoringJson_Should_Return_InvalidOutput_When_Answer_Is_Missing()
     {
-        var json = """{"errors":[],"warnings":[],"summaries":[],"recommendations":[]}""";
-        AIProviderPayloadValidator.IsValidApplicationAnalysisJson(json).ShouldBeFalse();
-    }
+        var sectionJson = JsonSerializer.Serialize(new[]
+        {
+            new { id = "q1" }
+        });
 
-    [Fact]
-    public void IsValidApplicationAnalysisJson_Should_ReturnFalse_WhenErrorsIsNotArray()
-    {
-        var json = """{"decision":"ok","errors":"bad","warnings":[],"summaries":[],"recommendations":[]}""";
-        AIProviderPayloadValidator.IsValidApplicationAnalysisJson(json).ShouldBeFalse();
+        var result = AIProviderPayloadValidator.ValidateApplicationScoringJson("{}", sectionJson);
+
+        result.IsValid.ShouldBeFalse();
+        result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+        result.Reason.ShouldContain("q1");
     }
 
     [Fact]
-    public void IsValidApplicationAnalysisJson_Should_AcceptMarkdownWrappedJson()
+    public void ValidateApplicationScoringJson_Should_Return_Success_For_Decimal_Confidence()
     {
-        var json = "```json\n{\"decision\":\"ok\",\"errors\":[],\"warnings\":[],\"summaries\":[],\"recommendations\":[]}\n```";
-        AIProviderPayloadValidator.IsValidApplicationAnalysisJson(json).ShouldBeTrue();
+        var sectionJson = JsonSerializer.Serialize(new[]
+        {
+            new { id = "q1" }
+        });
+
+        var result = AIProviderPayloadValidator.ValidateApplicationScoringJson(
+            """
+            {
+              "q1": {
+                "answer": "No",
+                "rationale": "The record does not directly confirm the condition.",
+                "confidence": 0.30
+              }
+            }
+            """,
+            sectionJson);
+
+        result.IsValid.ShouldBeTrue();
     }
 
     [Fact]
-    public void IsValidApplicationScoringJson_Should_ReturnTrue_ForWellFormedPayload()
+    public void ValidateApplicationAnalysisJson_Should_Return_InvalidOutput_When_Decision_Is_Not_Proceed_Or_Hold()
     {
-        var sectionJson = """[{"id":"q1"},{"id":"q2"}]""";
-        var response = """
+        var result = AIProviderPayloadValidator.ValidateApplicationAnalysisJson(
+            """
             {
-              "q1": {"answer": "Yes", "confidence": 85},
-              "q2": {"answer": "No",  "confidence": 42}
+              "decision": "unknown",
+              "errors": [],
+              "warnings": [],
+              "summaries": [
+                { "title": "Summary", "detail": "Content" }
+              ],
+              "recommendations": []
             }
-            """;
-        AIProviderPayloadValidator.IsValidApplicationScoringJson(response, sectionJson).ShouldBeTrue();
+            """);
+
+        result.IsValid.ShouldBeFalse();
+        result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+        result.Reason.ShouldContain("Expected 'PROCEED' or 'HOLD'");
     }
 
     [Fact]
-    public void IsValidApplicationScoringJson_Should_ReturnFalse_WhenSectionJsonIsEmpty()
+    public void ValidateApplicationAnalysisJson_Should_Return_InvalidOutput_When_All_Findings_Are_Empty()
     {
-        AIProviderPayloadValidator.IsValidApplicationScoringJson("{}", "[]").ShouldBeFalse();
+        var result = AIProviderPayloadValidator.ValidateApplicationAnalysisJson(
+            """
+            {
+              "decision": "PROCEED",
+              "errors": [],
+              "warnings": [],
+              "summaries": [],
+              "recommendations": []
+            }
+            """);
+
+        result.IsValid.ShouldBeFalse();
+        result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+        var reason = result.Reason;
+        reason.ShouldNotBeNull();
+        reason.ShouldContain("summaries");
     }
 
     [Fact]
-    public void IsValidApplicationScoringJson_Should_ReturnFalse_WhenAnswerMissing()
+    public void ValidateApplicationAnalysisJson_Should_Return_InvalidOutput_When_Recommendations_Are_Empty()
     {
-        var sectionJson = """[{"id":"q1"}]""";
-        var response = """{"q1": {"confidence": 50}}""";
-        AIProviderPayloadValidator.IsValidApplicationScoringJson(response, sectionJson).ShouldBeFalse();
+        var result = AIProviderPayloadValidator.ValidateApplicationAnalysisJson(
+            """
+            {
+              "decision": "PROCEED",
+              "errors": [],
+              "warnings": [],
+              "summaries": [
+                { "title": "Summary", "detail": "Looks complete." }
+              ],
+              "recommendations": []
+            }
+            """);
+
+        result.IsValid.ShouldBeFalse();
+        result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+        var reason = result.Reason;
+        reason.ShouldNotBeNull();
+        reason.ShouldContain("recommendations");
     }
 
     [Fact]
-    public void IsValidApplicationScoringJson_Should_ReturnFalse_WhenConfidenceOutOfRange()
+    public void ValidateApplicationAnalysisJson_Should_Return_Success_For_Proceed_With_Findings()
     {
-        var sectionJson = """[{"id":"q1"}]""";
-        var response = """{"q1": {"answer": "Yes", "confidence": 150}}""";
-        AIProviderPayloadValidator.IsValidApplicationScoringJson(response, sectionJson).ShouldBeFalse();
+        var result = AIProviderPayloadValidator.ValidateApplicationAnalysisJson(
+            """
+            {
+              "decision": "PROCEED",
+              "errors": [],
+              "warnings": [],
+              "summaries": [
+                { "title": "Summary", "detail": "Looks complete." }
+              ],
+              "recommendations": [
+                { "title": "Proceed", "detail": "No blocking issues remain." }
+              ]
+            }
+            """);
+
+        result.IsValid.ShouldBeTrue();
     }
 
     [Fact]
-    public void IsValidApplicationScoringJson_Should_ReturnFalse_WhenQuestionMissingFromResponse()
+    public void ValidateAttachmentSummaryText_Should_Return_InvalidOutput_For_Empty_Text()
     {
-        var sectionJson = """[{"id":"q1"},{"id":"q2"}]""";
-        var response = """{"q1": {"answer": "Yes", "confidence": 80}}""";
-        AIProviderPayloadValidator.IsValidApplicationScoringJson(response, sectionJson).ShouldBeFalse();
+        var result = AIProviderPayloadValidator.ValidateAttachmentSummaryText(string.Empty);
+
+        result.IsValid.ShouldBeFalse();
+        result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+        var reason = result.Reason;
+        reason.ShouldNotBeNull();
+        reason.ShouldContain("empty");
     }
 
     [Fact]
-    public void IsValidApplicationScoringJson_Should_AcceptQuestionsWrappedInObject()
+    public void ValidateAttachmentSummaryBatchJson_Should_Return_Success_For_Valid_Items()
     {
-        var sectionJson = """{"questions":[{"id":"q1"}]}""";
-        var response = """{"q1": {"answer": "Yes", "confidence": 75}}""";
-        AIProviderPayloadValidator.IsValidApplicationScoringJson(response, sectionJson).ShouldBeTrue();
+        var result = AIProviderPayloadValidator.ValidateAttachmentSummaryBatchJson(
+            """
+            {
+              "attachments": [
+                {
+                  "attachmentId": "a1",
+                  "summary": "One"
+                },
+                {
+                  "attachmentId": "a2",
+                  "summary": "Two"
+                }
+              ]
+            }
+            """);
+
+        result.IsValid.ShouldBeTrue();
     }
 
     [Fact]
-    public void IsValidApplicationScoringJson_Should_ReturnFalse_WhenConfidenceIsNegative()
+    public void ValidateAttachmentSummaryBatchJson_Should_Return_InvalidOutput_When_Attachments_Are_Missing()
     {
-        var sectionJson = """[{"id":"q1"}]""";
-        var response = """{"q1": {"answer": "Yes", "confidence": -1}}""";
-        AIProviderPayloadValidator.IsValidApplicationScoringJson(response, sectionJson).ShouldBeFalse();
+        var result = AIProviderPayloadValidator.ValidateAttachmentSummaryBatchJson("{}");
+
+        result.IsValid.ShouldBeFalse();
+        result.FailureCategory.ShouldBe(AIFailureCategory.InvalidOutput);
+        result.Reason.ShouldContain("attachments");
     }
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIConfigurationResolverTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIConfigurationResolverTests.cs
index 98b8aa1fb9..c40c2f076e 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIConfigurationResolverTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIConfigurationResolverTests.cs
@@ -1,8 +1,20 @@
 using Microsoft.Extensions.Configuration;
+using NSubstitute;
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Unity.AI.Operations;
+using Unity.AI.Prompts;
 using Unity.AI.Runtime;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
 using Xunit;
 
 namespace Unity.GrantManager.AI.Runtime;
@@ -10,219 +22,334 @@ namespace Unity.GrantManager.AI.Runtime;
 public class OpenAIConfigurationResolverTests
 {
     [Fact]
-    public void ResolveApiUrl_Should_CombineEndpointWithLeadingSlashProfilePath()
+    public async Task Should_Throw_When_No_Operations_Are_Configured()
     {
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>
-            {
-                ["Azure:Operations:Defaults:Provider"] = "OpenAI",
-                ["Azure:Operations:Defaults:Profile"] = "Gpt4oMini",
-                ["Azure:OpenAI:Endpoint"] = "https://d837ad-test-recap-webapp.azurewebsites.net",
-                ["Azure:OpenAI:Profiles:Gpt4oMini:ApiUrl"] = "/openai/deployments/gpt-4o-mini/chat/completions?api-version=2024-02-01"
-            })
-            .Build();
+        var resolver = CreateResolver();
 
-        var resolver = new OpenAIConfigurationResolver(configuration);
-
-        resolver.ResolveApiUrl().ShouldBe(
-            "https://d837ad-test-recap-webapp.azurewebsites.net/openai/deployments/gpt-4o-mini/chat/completions?api-version=2024-02-01");
+        var ex = await Should.ThrowAsync<InvalidOperationException>(() => resolver.ResolveOperationSettingsAsync(AIPromptTypes.ApplicationAnalysis));
+        ex.Message.ShouldContain("AI operation");
     }
 
     [Fact]
-    public void ResolveProviderName_Should_Throw_When_DefaultProvider_Is_Missing()
+    public async Task Should_Resolve_Operation_Strictly_From_Database()
     {
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>())
-            .Build();
-
-        var resolver = new OpenAIConfigurationResolver(configuration);
+        var modelRepository = Substitute.For<IRepository<AIModel, Guid>>();
+        var operationRepository = Substitute.For<IRepository<AIOperation, Guid>>();
+        var promptRepository = Substitute.For<IRepository<AIPrompt, Guid>>();
 
-        var ex = Should.Throw<InvalidOperationException>(() => resolver.ResolveProviderName());
-        ex.Message.ShouldContain("Azure:Operations:Defaults:Provider");
-    }
+        var modelId = Guid.NewGuid();
+        var promptId = Guid.NewGuid();
 
-    [Fact]
-    public void ResolveApiUrl_Should_Throw_When_Endpoint_Is_Missing()
-    {
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>
+        modelRepository
+            .GetAsync(modelId, cancellationToken: Arg.Any<CancellationToken>())
+            .Returns(new AIModel(modelId, "Gpt5Mini")
             {
-                ["Azure:Operations:Defaults:Provider"] = "OpenAI",
-                ["Azure:Operations:Defaults:Profile"] = "Gpt4oMini",
-                ["Azure:OpenAI:Profiles:Gpt4oMini:ApiUrl"] = "/openai/deployments/gpt-4o-mini/chat/completions?api-version=2024-02-01"
-            })
-            .Build();
-
-        var resolver = new OpenAIConfigurationResolver(configuration);
-
-        var ex = Should.Throw<InvalidOperationException>(() => resolver.ResolveApiUrl());
-        ex.Message.ShouldContain("Azure:OpenAI:Endpoint");
-    }
-
-    [Fact]
-    public void ResolveMaxTokensParameterNameForOperation_Should_Return_Configured_Profile_Parameter()
-    {
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>
+                IsActive = true,
+                SettingsJson = JsonSerializer.Serialize(new AIModelSettings
+                {
+                    MaxOutputTokenCountSupported = true,
+                    Temperature = 0.25
+                })
+            });
+
+        operationRepository
+            .GetListAsync(Arg.Any<Expression<Func<AIOperation, bool>>>())
+            .Returns(callInfo =>
             {
-                ["Azure:Operations:Defaults:Provider"] = "OpenAI",
-                ["Azure:Operations:Defaults:Profile"] = "Gpt4oMini",
-                ["Azure:OpenAI:Profiles:Gpt4oMini:MaxTokensParameter"] = "max_tokens"
-            })
-            .Build();
-
-        var resolver = new OpenAIConfigurationResolver(configuration);
+                var predicate = callInfo.Arg<Expression<Func<AIOperation, bool>>>();
+                return Task.FromResult(new List<AIOperation>
+                {
+                    new(Guid.NewGuid(), AIPromptTypes.ApplicationAnalysis, modelId, promptId)
+                    {
+                        ExecutionMode = AIExecutionMode.Sequential,
+                        CompletionTokens = 2222,
+                        IsActive = true
+                    }
+                }.Where(predicate.Compile()).ToList());
+            });
+
+        promptRepository
+            .GetAsync(promptId, cancellationToken: Arg.Any<CancellationToken>())
+            .Returns(Task.FromResult(new AIPrompt(promptId, AIPromptTypes.ApplicationAnalysis, 1, "system", "user")
+            {
+                MetadataJson = "{}",
+                IsActive = true
+            }));
 
-        resolver.ResolveMaxTokensParameterNameForOperation().ShouldBe("max_tokens");
+        var resolver = CreateResolver(
+            new Dictionary<string, string?>
+            {
+                ["Azure:OpenAI:ApiKey"] = "secret",
+                ["Azure:OpenAI:Profiles:Gpt5Mini:DeploymentName"] = "gpt-5-mini"
+            },
+            modelRepository,
+            operationRepository,
+            promptRepository);
+
+        var settings = await resolver.ResolveOperationSettingsAsync(AIPromptTypes.ApplicationAnalysis);
+
+        settings.ProviderName.ShouldBe("OpenAI");
+        settings.ProfileName.ShouldBe("Gpt5Mini");
+        settings.Endpoint.ShouldBe(new Uri("https://example.test"));
+        settings.DeploymentName.ShouldBe("gpt-5-mini");
+        settings.Temperature.ShouldBe(0.25);
+        settings.CompletionTokens.ShouldBe(2222);
+        settings.PromptVersion.ShouldBe("v1");
     }
 
     [Fact]
-    public void ResolveCompletionTokens_Should_Throw_When_Operation_And_Default_Are_Missing()
+    public async Task Should_Throw_When_Operation_Is_Missing()
     {
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>())
-            .Build();
+        var modelRepository = Substitute.For<IRepository<AIModel, Guid>>();
+        var operationRepository = Substitute.For<IRepository<AIOperation, Guid>>();
+        var promptRepository = Substitute.For<IRepository<AIPrompt, Guid>>();
 
-        var resolver = new OpenAIConfigurationResolver(configuration);
+        var modelId = Guid.NewGuid();
+        var promptId = Guid.NewGuid();
 
-        var ex = Should.Throw<InvalidOperationException>(() => resolver.ResolveCompletionTokens("ApplicationAnalysis"));
-        ex.Message.ShouldContain("ApplicationAnalysis");
-    }
+        modelRepository
+            .GetAsync(modelId, cancellationToken: Arg.Any<CancellationToken>())
+            .Returns(new AIModel(modelId, "Gpt5Mini")
+            {
+                IsActive = true,
+                SettingsJson = JsonSerializer.Serialize(new AIModelSettings
+                {
+                    Temperature = 0.2
+                })
+            });
+
+        operationRepository
+            .GetListAsync(Arg.Any<Expression<Func<AIOperation, bool>>>())
+            .Returns(callInfo =>
+            {
+                var predicate = callInfo.Arg<Expression<Func<AIOperation, bool>>>();
+                return Task.FromResult(new List<AIOperation>
+                {
+                    new(Guid.NewGuid(), "Default", modelId, promptId)
+                    {
+                        ExecutionMode = AIExecutionMode.Sequential,
+                        CompletionTokens = 2000,
+                        IsActive = true
+                    }
+                }.Where(predicate.Compile()).ToList());
+            });
+
+        promptRepository
+            .GetAsync(promptId, cancellationToken: Arg.Any<CancellationToken>())
+            .Returns(Task.FromResult(new AIPrompt(promptId, AIPromptTypes.ApplicationAnalysis, 1, "system", "user")
+            {
+                MetadataJson = "{}",
+                IsActive = true
+            }));
 
-    [Fact]
-    public void ResolvePromptVersion_Should_Use_Operation_Override_Before_Default()
-    {
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>
+        var resolver = CreateResolver(
+            new Dictionary<string, string?>
             {
-                ["Azure:Operations:Defaults:PromptVersion"] = "v0",
-                ["Azure:Operations:ApplicationAnalysis:PromptVersion"] = "v1"
-            })
-            .Build();
+                ["Azure:OpenAI:ApiKey"] = "secret",
+                ["Azure:OpenAI:Profiles:Gpt5Mini:DeploymentName"] = "gpt-5-mini"
+            },
+            modelRepository,
+            operationRepository,
+            promptRepository);
 
-        var resolver = new OpenAIConfigurationResolver(configuration);
+        var exception = await Should.ThrowAsync<InvalidOperationException>(
+            () => resolver.ResolveOperationSettingsAsync(AIPromptTypes.ApplicationAnalysis));
 
-        resolver.ResolvePromptVersion("ApplicationAnalysis").ShouldBe("v1");
+        exception.Message.ShouldContain("AI operation 'ApplicationAnalysis' is not configured.");
     }
 
     [Fact]
-    public void ResolvePromptVersion_Should_Throw_When_Default_Is_Missing()
+    public async Task Should_Resolve_Model_Values_Strictly_From_Database()
     {
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>())
-            .Build();
-
-        var resolver = new OpenAIConfigurationResolver(configuration);
-
-        var ex = Should.Throw<InvalidOperationException>(() => resolver.ResolvePromptVersion("ApplicationAnalysis"));
-        ex.Message.ShouldContain("Azure:Operations:Defaults:PromptVersion");
+        var modelRepository = Substitute.For<IRepository<AIModel, Guid>>();
+        modelRepository
+            .GetListAsync(Arg.Any<Expression<Func<AIModel, bool>>>())
+            .Returns(callInfo =>
+            {
+                var predicate = callInfo.Arg<Expression<Func<AIModel, bool>>>();
+                return Task.FromResult(new List<AIModel>
+                {
+                    new(Guid.NewGuid(), "Gpt5Mini")
+                    {
+                        IsActive = true,
+                        SettingsJson = JsonSerializer.Serialize(new AIModelSettings
+                        {
+                            MaxOutputTokenCountSupported = true,
+                            Temperature = 0.35
+                        })
+                    }
+                }.Where(predicate.Compile()).ToList());
+            });
+
+        var resolver = CreateResolver(modelRepository: modelRepository);
+
+        resolver.ResolveProviderName().ShouldBe("OpenAI");
+        (await resolver.ResolveDeploymentNameAsync()).ShouldBe("gpt-5-mini");
+        (await resolver.ResolveEndpointAsync()).ShouldBe(new Uri("https://example.test"));
+        (await resolver.ResolveConfiguredTemperatureAsync()).ShouldBe(0.35);
+        (await resolver.ResolveMaxOutputTokenCountSupportedAsync()).ShouldBeTrue();
     }
 
     [Fact]
-    public void ResolveApiKey_Should_Throw_When_Configured_Key_Is_Missing()
+    public async Task Should_Resolve_ApiKey_From_Provider_Secret()
     {
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>
+        var modelRepository = Substitute.For<IRepository<AIModel, Guid>>();
+        modelRepository
+            .GetListAsync(Arg.Any<Expression<Func<AIModel, bool>>>())
+            .Returns(callInfo =>
             {
-                ["Azure:Operations:Defaults:Provider"] = "OpenAI"
-            })
-            .Build();
-
-        var resolver = new OpenAIConfigurationResolver(configuration);
+                var predicate = callInfo.Arg<Expression<Func<AIModel, bool>>>();
+                return Task.FromResult(new List<AIModel>
+                {
+                    new(Guid.NewGuid(), "Default")
+                    {
+                        IsActive = true,
+                        SettingsJson = JsonSerializer.Serialize(new AIModelSettings
+                        {
+                            MaxOutputTokenCountSupported = true
+                        })
+                    }
+                }.Where(predicate.Compile()).ToList());
+            });
+
+        var resolver = CreateResolver(
+            new Dictionary<string, string?>
+            {
+                ["Azure:OpenAI:ApiKey"] = "secret"
+            },
+            modelRepository);
 
-        var ex = Should.Throw<InvalidOperationException>(() => resolver.ResolveApiKey());
-        ex.Message.ShouldContain("Azure:OpenAI:ApiKey");
+        (await resolver.ResolveApiKeyAsync()).ShouldBe("secret");
     }
 
     [Fact]
-    public void ResolveConfiguredTemperature_Should_Return_Profile_Temperature()
+    public async Task Should_Resolve_Operation_Settings_From_Host_Context()
     {
-        var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>
+        var modelRepository = Substitute.For<IRepository<AIModel, Guid>>();
+        var operationRepository = Substitute.For<IRepository<AIOperation, Guid>>();
+        var promptRepository = Substitute.For<IRepository<AIPrompt, Guid>>();
+        var multiTenantDataFilter = Substitute.For<IDataFilter<IMultiTenant>>();
+        multiTenantDataFilter.Disable().Returns(Substitute.For<IDisposable>());
+
+        var modelId = Guid.NewGuid();
+        var promptId = Guid.NewGuid();
+
+        modelRepository
+            .GetAsync(modelId, cancellationToken: Arg.Any<CancellationToken>())
+            .Returns(new AIModel(modelId, "Gpt5Mini")
             {
-                ["Azure:Operations:Defaults:Provider"] = "OpenAI",
-                ["Azure:Operations:Defaults:Profile"] = "Gpt4oMini",
-                ["Azure:OpenAI:Profiles:Gpt4oMini:Temperature"] = "0.3"
-            })
-            .Build();
+                IsActive = true,
+                SettingsJson = JsonSerializer.Serialize(new AIModelSettings
+                {
+                    Temperature = 0.1
+                })
+            });
+
+        operationRepository
+            .GetListAsync(Arg.Any<Expression<Func<AIOperation, bool>>>())
+            .Returns(callInfo =>
+            {
+                var predicate = callInfo.Arg<Expression<Func<AIOperation, bool>>>();
+                return Task.FromResult(new List<AIOperation>
+                {
+                    new(Guid.NewGuid(), AIPromptTypes.ApplicationAnalysis, modelId, promptId)
+                    {
+                        IsActive = true,
+                        CompletionTokens = 2000
+                    }
+                }.Where(predicate.Compile()).ToList());
+            });
+
+        promptRepository
+            .GetAsync(promptId, cancellationToken: Arg.Any<CancellationToken>())
+            .Returns(Task.FromResult(new AIPrompt(promptId, AIPromptTypes.ApplicationAnalysis, 1, "system", "user")
+            {
+                MetadataJson = "{}",
+                IsActive = true
+            }));
+
+        var resolver = CreateResolver(
+            new Dictionary<string, string?>
+            {
+                ["Azure:OpenAI:ApiKey"] = "secret"
+            },
+            modelRepository,
+            operationRepository,
+            promptRepository,
+            multiTenantDataFilter);
 
-        var resolver = new OpenAIConfigurationResolver(configuration);
+        var settings = await resolver.ResolveOperationSettingsAsync(AIPromptTypes.ApplicationAnalysis);
 
-        resolver.ResolveConfiguredTemperature().ShouldBe(0.3);
+        settings.PromptVersion.ShouldBe("v1");
+        multiTenantDataFilter.Received().Disable();
     }
 
-    [Theory]
-    [InlineData(null)]
-    [InlineData("not-a-number")]
-    public void ResolveConfiguredTemperature_Should_Return_Null_When_Profile_Temperature_Is_Missing_Or_Invalid(string? temperature)
+    private static OpenAIConfigurationResolver CreateResolver(
+        IReadOnlyDictionary<string, string?>? values = null,
+        IRepository<AIModel, Guid>? modelRepository = null,
+        IRepository<AIOperation, Guid>? operationRepository = null,
+        IRepository<AIPrompt, Guid>? promptRepository = null,
+        IDataFilter<IMultiTenant>? multiTenantDataFilter = null)
     {
-        var values = new Dictionary<string, string?>
+        var configurationValues = new Dictionary<string, string?>
         {
             ["Azure:Operations:Defaults:Provider"] = "OpenAI",
-            ["Azure:Operations:Defaults:Profile"] = "Gpt4oMini"
+            ["Azure:Operations:Defaults:Profile"] = "Gpt5Mini",
+            ["Azure:OpenAI:Endpoint"] = "https://example.test",
+            ["Azure:OpenAI:ApiKey"] = "secret",
+            ["Azure:OpenAI:Profiles:Gpt5Mini:DeploymentName"] = "gpt-5-mini",
+            ["Azure:OpenAI:Profiles:Gpt5Mini:MaxOutputTokenCountSupported"] = "true"
         };
 
-        if (temperature != null)
+        if (values != null)
         {
-            values["Azure:OpenAI:Profiles:Gpt4oMini:Temperature"] = temperature;
+            foreach (var pair in values)
+            {
+                configurationValues[pair.Key] = pair.Value;
+            }
         }
 
         var configuration = new ConfigurationBuilder()
-            .AddInMemoryCollection(values)
+            .AddInMemoryCollection(configurationValues)
             .Build();
 
-        var resolver = new OpenAIConfigurationResolver(configuration);
-
-        resolver.ResolveConfiguredTemperature().ShouldBeNull();
-    }
-
-    [Fact]
-    public void ResolveConfiguredReasoningEffort_Should_Return_ProfileValue()
-    {
-        var configuration = BuildProfileConfiguration("ReasoningEffort", "minimal");
-        var resolver = new OpenAIConfigurationResolver(configuration);
-
-        resolver.ResolveConfiguredReasoningEffort().ShouldBe("minimal");
-    }
-
-    [Fact]
-    public void ResolveConfiguredVerbosity_Should_Return_ProfileValue()
-    {
-        var configuration = BuildProfileConfiguration("Verbosity", "low");
-        var resolver = new OpenAIConfigurationResolver(configuration);
-
-        resolver.ResolveConfiguredVerbosity().ShouldBe("low");
+        var filter = multiTenantDataFilter ?? Substitute.For<IDataFilter<IMultiTenant>>();
+        filter.Disable().Returns(Substitute.For<IDisposable>());
+        return new OpenAIConfigurationResolver(
+            modelRepository ?? CreateEmptyModelRepository(),
+            operationRepository ?? CreateEmptyOperationRepository(),
+            promptRepository ?? CreateEmptyPromptRepository(),
+            configuration,
+            filter);
     }
 
-    [Fact]
-    public void ResolveConfiguredReasoningEffort_Should_ReturnNull_WhenProfileSettingMissing()
+    private static IRepository<AIModel, Guid> CreateEmptyModelRepository()
     {
-        var configuration = BuildProfileConfiguration("Temperature", "0.3");
-        var resolver = new OpenAIConfigurationResolver(configuration);
-
-        resolver.ResolveConfiguredReasoningEffort().ShouldBeNull();
+        var modelRepository = Substitute.For<IRepository<AIModel, Guid>>();
+        modelRepository
+            .GetListAsync(Arg.Any<Expression<Func<AIModel, bool>>>())
+            .Returns(Task.FromResult(new List<AIModel>()));
+        return modelRepository;
     }
 
-    [Fact]
-    public void ResolveConfiguredVerbosity_Should_RejectUnsupportedValue()
+    private static IRepository<AIOperation, Guid> CreateEmptyOperationRepository()
     {
-        var configuration = BuildProfileConfiguration("Verbosity", "verbose");
-        var resolver = new OpenAIConfigurationResolver(configuration);
-
-        var exception = Should.Throw<System.InvalidOperationException>(() => resolver.ResolveConfiguredVerbosity());
-        exception.Message.ShouldContain("Verbosity");
-        exception.Message.ShouldContain("low, medium, high");
+        var operationRepository = Substitute.For<IRepository<AIOperation, Guid>>();
+        operationRepository
+            .GetListAsync(Arg.Any<Expression<Func<AIOperation, bool>>>())
+            .Returns(Task.FromResult(new List<AIOperation>()));
+        return operationRepository;
     }
 
-    private static IConfiguration BuildProfileConfiguration(string settingName, string settingValue)
+    private static IRepository<AIPrompt, Guid> CreateEmptyPromptRepository()
     {
-        return new ConfigurationBuilder()
-            .AddInMemoryCollection(new Dictionary<string, string?>
+        var promptRepository = Substitute.For<IRepository<AIPrompt, Guid>>();
+        promptRepository
+            .GetAsync(Arg.Any<Guid>(), cancellationToken: Arg.Any<CancellationToken>())
+            .Returns(callInfo => Task.FromResult(new AIPrompt(callInfo.Arg<Guid>(), "Default", 1, "system", "user")
             {
-                ["Azure:Operations:Defaults:Provider"] = "OpenAI",
-                ["Azure:Operations:Defaults:Profile"] = "Gpt5Mini",
-                [$"Azure:OpenAI:Profiles:Gpt5Mini:{settingName}"] = settingValue
-            })
-            .Build();
+                MetadataJson = "{}"
+            }));
+        return promptRepository;
     }
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIPromptRendererTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIPromptRendererTests.cs
index 7d7258808b..b30aead173 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIPromptRendererTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIPromptRendererTests.cs
@@ -10,6 +10,7 @@ public class OpenAIPromptRendererTests
     [Theory]
     [InlineData("v0")]
     [InlineData("v1")]
+    [InlineData("v2")]
     [InlineData(" v1 ")]
     public void ResolvePromptVersion_Should_Return_Supported_Version(string version)
     {
@@ -22,8 +23,10 @@ public void ResolvePromptVersion_Should_Return_Supported_Version(string version)
     [InlineData("")]
     [InlineData("V1")]
     [InlineData("vNext")]
+    [InlineData("version2")]
     public void ResolvePromptVersion_Should_Throw_When_Version_Is_Missing_Or_Unsupported(string? version)
     {
         Should.Throw<InvalidOperationException>(() => OpenAIPromptRenderer.ResolvePromptVersion(version));
     }
+
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIResponseParserTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIResponseParserTests.cs
new file mode 100644
index 0000000000..ce8d01059f
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIResponseParserTests.cs
@@ -0,0 +1,173 @@
+using Shouldly;
+using System.Collections.Generic;
+using System.Text.Json;
+using Unity.AI.Runtime;
+using Xunit;
+
+namespace Unity.GrantManager.AI.Runtime;
+
+public class OpenAIResponseParserTests
+{
+    [Fact]
+    public void ParseApplicationScoringResponse_Should_Preserve_All_Answer_Keys_From_Section_Output()
+    {
+        var raw = """
+        {
+          "q1": {
+            "answer": "No",
+            "rationale": "There is no direct evidence in DATA or ATTACHMENTS that the lead applicant meets any stated program eligibility criteria; eligibility is not explicitly confirmed.",
+            "confidence": 0.2
+          },
+          "q2": {
+            "answer": "2",
+            "rationale": "Although a facility partner (Riverbend Rec Center) is mentioned in CustomField3, there is no direct evidence that any project partner is explicitly eligible under program rules, so eligibility cannot be confirmed.",
+            "confidence": 0.2
+          },
+          "q3": {
+            "answer": "No",
+            "rationale": "The application materials describe a Community Kitchen Expansion but there is no statement or evidence showing this specific project is within the program scope, so scope compliance cannot be confirmed.",
+            "confidence": 0.2
+          },
+          "q4": {
+            "answer": "No",
+            "rationale": "Project location details (Riverbend, BC) are provided, but there is no evidence confirming the location meets any program-specific eligibility requirements, so location eligibility is not demonstrated.",
+            "confidence": 0.2
+          },
+          "q5": {
+            "answer": "2",
+            "rationale": "The submission does not explicitly identify an appropriate owner for the kitchen infrastructure in the provided DATA or ATTACHMENTS, and the Project Risk and Feasibility section is not present to confirm ownership.",
+            "confidence": 0.2
+          },
+          "q6": {
+            "answer": "No",
+            "rationale": "The set of attachments is provided, but there is no checklist or statement of mandatory supporting documents in DATA or ATTACHMENTS to confirm all required documents are included.",
+            "confidence": 0.2
+          },
+          "q7": {
+            "answer": "The submission lacks direct, explicit evidence for eligibility, scope, location, ownership, and required documents.",
+            "rationale": "DATA shows organizational and project descriptions and several inconsistent attachment profiles, but none directly confirm lead applicant eligibility, partner eligibility, program scope fit, site eligibility, infrastructure ownership, or inclusion of mandatory supporting documents.",
+            "confidence": 0.2
+          }
+        }
+        """;
+
+        var result = OpenAIResponseParser.ParseApplicationScoringResponse(raw);
+
+        result.Answers.Count.ShouldBe(7);
+        result.Answers.Keys.ShouldBe(new[]
+        {
+            "q1",
+            "q2",
+            "q3",
+            "q4",
+            "q5",
+            "q6",
+            "q7"
+        });
+
+        result.Answers["q1"].Answer.GetString().ShouldBe("No");
+        result.Answers["q7"].Answer.GetString().ShouldBe("The submission lacks direct, explicit evidence for eligibility, scope, location, ownership, and required documents.");
+    }
+
+    [Fact]
+    public void ParseApplicationScoringResponse_Should_Ignore_Non_Object_Properties()
+    {
+        var raw = """
+        {
+          "q1": {
+            "answer": "Yes",
+            "rationale": "ok",
+            "confidence": 0.9
+          },
+          "note": "should be ignored"
+        }
+        """;
+
+        var result = OpenAIResponseParser.ParseApplicationScoringResponse(raw);
+
+        result.Answers.Count.ShouldBe(1);
+        result.Answers.ShouldContainKey("q1");
+        result.Answers.ShouldNotContainKey("note");
+    }
+
+    [Fact]
+    public void ParseApplicationScoringResponse_Should_Parse_Mixed_Answer_Types_From_Project_Need_Output()
+    {
+        var raw = """
+        {
+          "q1": {
+            "answer": 0,
+            "rationale": "No CAT score is present in the provided DATA or any ATTACHMENTS. There is no direct evidence of a community CAT value for Riverbend, so the most conservative numeric response is 0.",
+            "confidence": 0.2
+          },
+          "q2": {
+            "answer": "4",
+            "rationale": "The ProjectSummary in DATA explicitly identifies expanding the community kitchen to support meal programs, volunteer training, and food security initiatives, which indicates multiple community needs with moderate detail. However, there is no supporting data, needs assessment, or quantitative evidence, so a score reflecting moderate information for multiple needs is appropriate.",
+            "confidence": 0.6
+          },
+          "q3": {
+            "answer": "The submission names food security, meal programs, and volunteer training as community needs but provides only brief descriptive information without supporting data, needs assessments, or stakeholder consultation evidence.",
+            "rationale": "Evidence is limited to the one-line ProjectSummary in DATA stating the project purpose. Attachments describe different mock projects and do not provide supporting documentation for this kitchen project, so the identified needs are described but not substantiated.",
+            "confidence": 0.6
+          }
+        }
+        """;
+
+        var result = OpenAIResponseParser.ParseApplicationScoringResponse(raw);
+
+        result.Answers.Count.ShouldBe(3);
+        result.Answers.ShouldContainKey("q1");
+        result.Answers.ShouldContainKey("q2");
+        result.Answers.ShouldContainKey("q3");
+        result.Answers["q1"].Answer.GetInt32().ShouldBe(0);
+        result.Answers["q2"].Answer.GetString().ShouldBe("4");
+        var q3Answer = result.Answers["q3"].Answer.GetString();
+        q3Answer.ShouldNotBeNull();
+        q3Answer.ShouldContain("food security");
+    }
+
+    [Fact]
+    public void ParseApplicationScoringResponse_Should_Round_Decimal_Confidence_To_Nearest_Ten()
+    {
+        var raw = """
+        {
+          "q1": {
+            "answer": "No",
+            "rationale": "The record does not directly confirm the condition.",
+            "confidence": 0.33
+          },
+          "q2": {
+            "answer": "No",
+            "rationale": "The record does not directly confirm the condition.",
+            "confidence": 0.86
+          }
+        }
+        """;
+
+        var result = OpenAIResponseParser.ParseApplicationScoringResponse(raw);
+
+        result.Answers["q1"].Confidence.ShouldBe(30);
+        result.Answers["q2"].Confidence.ShouldBe(90);
+    }
+
+    [Fact]
+    public void ParseAttachmentSummaryBatchResponse_Should_Map_Attachment_Ids_To_Summaries()
+    {
+        var raw = """
+        {
+          "attachments": [
+            { "attachmentId": "a1", "summary": "One" },
+            { "attachmentId": "a2", "summary": "Two" }
+          ]
+        }
+        """;
+
+        var result = OpenAIResponseParser.ParseAttachmentSummaryBatchResponse(raw);
+
+        result.Attachments.Count.ShouldBe(2);
+        result.Attachments[0].AttachmentId.ShouldBe("a1");
+        result.Attachments[0].Summary.ShouldBe("One");
+        result.Attachments[1].AttachmentId.ShouldBe("a2");
+        result.Attachments[1].Summary.ShouldBe("Two");
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIRuntimeServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIRuntimeServiceTests.cs
new file mode 100644
index 0000000000..f6777935b1
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIRuntimeServiceTests.cs
@@ -0,0 +1,55 @@
+using Microsoft.Extensions.Logging;
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Unity.AI.Operations;
+using Unity.AI.Prompts;
+using Unity.AI.Runtime;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
+using Xunit;
+
+namespace Unity.GrantManager.AI.Runtime;
+
+public class OpenAIRuntimeServiceTests
+{
+    [Fact]
+    public async Task Should_Throw_When_Analysis_Operation_Is_Not_Configured()
+    {
+        var resolver = CreateResolverWithNoOperations();
+
+        await Should.ThrowAsync<InvalidOperationException>(() =>
+            resolver.ResolveOperationSettingsAsync(AIPromptTypes.ApplicationAnalysis));
+    }
+
+    private static OpenAIConfigurationResolver CreateResolverWithNoOperations()
+    {
+        var modelRepository = Substitute.For<IRepository<AIModel, Guid>>();
+        modelRepository
+            .GetListAsync(Arg.Any<Expression<Func<AIModel, bool>>>())
+            .Returns(Task.FromResult(new List<AIModel>()));
+
+        var operationRepository = Substitute.For<IRepository<AIOperation, Guid>>();
+        operationRepository
+            .GetListAsync(Arg.Any<Expression<Func<AIOperation, bool>>>())
+            .Returns(Task.FromResult(new List<AIOperation>()));
+
+        var promptRepository = Substitute.For<IRepository<AIPrompt, Guid>>();
+        var configuration = new Microsoft.Extensions.Configuration.ConfigurationBuilder().Build();
+        var multiTenantDataFilter = Substitute.For<IDataFilter<IMultiTenant>>();
+        multiTenantDataFilter.Disable().Returns(Substitute.For<IDisposable>());
+        return new OpenAIConfigurationResolver(
+            modelRepository,
+            operationRepository,
+            promptRepository,
+            configuration,
+            multiTenantDataFilter);
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAITransportServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAITransportServiceTests.cs
index 8a0c272301..6193f8abc7 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAITransportServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAITransportServiceTests.cs
@@ -1,12 +1,5 @@
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging.Abstractions;
 using Shouldly;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
 using Unity.AI.Runtime;
 using Xunit;
@@ -16,116 +9,26 @@ namespace Unity.GrantManager.AI.Runtime;
 public class OpenAITransportServiceTests
 {
     [Fact]
-    public async Task GenerateSummaryAsync_Should_Include_ProfileReasoningEffortAndVerbosity()
+    public async Task GenerateSummaryAsync_Should_ReturnPermanentFailure_When_ProviderNotSupported()
     {
-        var handler = new CaptureRequestHandler();
-        var resolver = CreateResolver(new Dictionary<string, string?>
-        {
-            ["Azure:OpenAI:Profiles:Gpt5Mini:ReasoningEffort"] = "minimal",
-            ["Azure:OpenAI:Profiles:Gpt5Mini:Verbosity"] = "low"
-        });
-
-        var service = new OpenAITransportService(
-            new HttpClient(handler),
-            resolver,
-            NullLogger<OpenAITransportService>.Instance);
-
-        await service.GenerateSummaryAsync("content", "system", 100);
-
-        using var payload = JsonDocument.Parse(handler.RequestContent);
-        payload.RootElement.GetProperty("reasoning_effort").GetString().ShouldBe("minimal");
-        payload.RootElement.GetProperty("verbosity").GetString().ShouldBe("low");
-        payload.RootElement.TryGetProperty("temperature", out _).ShouldBeFalse();
-    }
-
-    [Fact]
-    public async Task GenerateSummaryAsync_Should_Omit_RequestTemperature_When_ProfileDoesNotSupportTemperature()
-    {
-        var handler = new CaptureRequestHandler();
         var service = new OpenAITransportService(
-            new HttpClient(handler),
-            CreateResolver(),
+            new OpenAIChatClientFactory(),
             NullLogger<OpenAITransportService>.Instance);
 
-        await service.GenerateSummaryAsync("content", "system", 100, temperature: 0.2);
-
-        using var payload = JsonDocument.Parse(handler.RequestContent);
-        payload.RootElement.TryGetProperty("temperature", out _).ShouldBeFalse();
-    }
-
-    [Fact]
-    public async Task GenerateSummaryAsync_Should_ReturnPermanentFailure_When_ProfileOptionIsInvalid()
-    {
-        var handler = new CaptureRequestHandler();
-        var service = new OpenAITransportService(
-            new HttpClient(handler),
-            CreateResolver(new Dictionary<string, string?>
-            {
-                ["Azure:OpenAI:Profiles:Gpt5Mini:Verbosity"] = "verbose"
-            }),
-            NullLogger<OpenAITransportService>.Instance);
+        var settings = new OpenAIOperationSettings(
+            "UnsupportedProvider",
+            "Gpt5Mini",
+            "test-key",
+            new System.Uri("https://example.test"),
+            "gpt-5-mini",
+            true,
+            null,
+            100,
+            "v1");
 
-        var result = await service.GenerateSummaryAsync("content", "system", 100);
+        var result = await service.GenerateSummaryAsync("content", "system", settings, 100);
 
         result.Outcome.ShouldBe(AIOperationOutcome.PermanentFailure);
-        handler.SendCount.ShouldBe(0);
-    }
-
-    private static OpenAIConfigurationResolver CreateResolver(Dictionary<string, string?>? overrides = null)
-    {
-        var values = new Dictionary<string, string?>
-        {
-            ["Azure:Operations:Defaults:Provider"] = "OpenAI",
-            ["Azure:Operations:Defaults:Profile"] = "Gpt5Mini",
-            ["Azure:OpenAI:ApiKey"] = "test-key",
-            ["Azure:OpenAI:Endpoint"] = "https://example.test",
-            ["Azure:OpenAI:Profiles:Gpt5Mini:ApiUrl"] = "/openai/deployments/gpt-5-mini/chat/completions",
-            ["Azure:OpenAI:Profiles:Gpt5Mini:MaxTokensParameter"] = "max_completion_tokens"
-        };
-
-        if (overrides != null)
-        {
-            foreach (var item in overrides)
-            {
-                values[item.Key] = item.Value;
-            }
-        }
-
-        return new OpenAIConfigurationResolver(new ConfigurationBuilder()
-            .AddInMemoryCollection(values)
-            .Build());
-    }
-
-    private sealed class CaptureRequestHandler : HttpMessageHandler
-    {
-        public string RequestContent { get; private set; } = string.Empty;
-
-        public int SendCount { get; private set; }
-
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            SendCount++;
-            RequestContent = request.Content == null
-                ? string.Empty
-                : await request.Content.ReadAsStringAsync(cancellationToken);
-
-            const string response = """
-                {
-                  "choices": [
-                    {
-                      "message": {
-                        "content": "generated"
-                      },
-                      "finish_reason": "stop"
-                    }
-                  ]
-                }
-                """;
-
-            return new HttpResponseMessage(HttpStatusCode.OK)
-            {
-                Content = new StringContent(response, Encoding.UTF8, "application/json")
-            };
-        }
+        result.Response?.Content.ShouldContain("Unsupported provider");
     }
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantPaymentsAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantPaymentsAppServiceTests.cs
new file mode 100644
index 0000000000..9003ccf05d
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/ApplicantProfile/AppServices/ApplicantPaymentsAppServiceTests.cs
@@ -0,0 +1,191 @@
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Unity.Payments.Enums;
+using Unity.Payments.PaymentRequests;
+using Volo.Abp.Domain.Entities;
+using Xunit;
+
+namespace Unity.GrantManager.ApplicantProfile
+{
+    public class ApplicantPaymentsAppServiceTests
+    {
+        private readonly IApplicationRepository _applicationRepository;
+        private readonly IPaymentRequestAppService _paymentRequestAppService;
+        private readonly ApplicantPaymentsAppService _service;
+
+        public ApplicantPaymentsAppServiceTests()
+        {
+            _applicationRepository = Substitute.For<IApplicationRepository>();
+            _paymentRequestAppService = Substitute.For<IPaymentRequestAppService>();
+
+            _service = new ApplicantPaymentsAppService(
+                _applicationRepository,
+                _paymentRequestAppService);
+
+            _paymentRequestAppService
+                .GetListByApplicationIdsAsync(Arg.Any<List<Guid>>())
+                .Returns([]);
+        }
+
+        private static Application CreateApplication(decimal approvedAmount, Collection<ApplicationLink>? links = null)
+        {
+            var application = new Application
+            {
+                ApprovedAmount = approvedAmount,
+                ApplicationLinks = links
+            };
+            EntityHelper.TrySetId(application, () => Guid.NewGuid());
+            return application;
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_WithNoLinks_ShouldSumAllApplications()
+        {
+            // Arrange
+            var applicantId = Guid.NewGuid();
+            var applications = new List<Application>
+            {
+                CreateApplication(1000m),
+                CreateApplication(500m)
+            };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(1500m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_ShouldExcludeChildApplications_FromTotalApprovedAmount()
+        {
+            // Arrange
+            var applicantId = Guid.NewGuid();
+            var parentApplication = CreateApplication(1000m);
+            var childApplication = CreateApplication(400m, [
+                new ApplicationLink
+                {
+                    ApplicationId = Guid.NewGuid(),
+                    LinkedApplicationId = parentApplication.Id,
+                    LinkType = ApplicationLinkType.Parent
+                }
+            ]);
+            var applications = new List<Application> { parentApplication, childApplication };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(1000m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_WithChildTypeLink_ShouldNotExcludeParentApplication()
+        {
+            // Arrange
+            // A "Child"-type link on an application's own ApplicationLinks means the linked
+            // application is ITS child - i.e. this application is the parent, and should still
+            // be included in the total.
+            var applicantId = Guid.NewGuid();
+            var parentApplication = CreateApplication(1000m, [
+                new ApplicationLink
+                {
+                    ApplicationId = Guid.NewGuid(),
+                    LinkedApplicationId = Guid.NewGuid(),
+                    LinkType = ApplicationLinkType.Child
+                }
+            ]);
+            var applications = new List<Application> { parentApplication };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(1000m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_WithRelatedTypeLink_ShouldNotExcludeApplication()
+        {
+            // Arrange
+            var applicantId = Guid.NewGuid();
+            var relatedApplication = CreateApplication(750m, [
+                new ApplicationLink
+                {
+                    ApplicationId = Guid.NewGuid(),
+                    LinkedApplicationId = Guid.NewGuid(),
+                    LinkType = ApplicationLinkType.Related
+                }
+            ]);
+            var applications = new List<Application> { relatedApplication };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(750m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_ShouldStillIncludePaymentsForChildApplications_InTotalPaidAmount()
+        {
+            // Arrange: TotalPaidAmount/TotalRemainingAmount are unaffected by the child-exclusion
+            // change - they remain based on payments across all applications, including children.
+            var applicantId = Guid.NewGuid();
+            var parentApplication = CreateApplication(1000m);
+            var childApplication = CreateApplication(400m, [
+                new ApplicationLink
+                {
+                    ApplicationId = Guid.NewGuid(),
+                    LinkedApplicationId = parentApplication.Id,
+                    LinkType = ApplicationLinkType.Parent
+                }
+            ]);
+            var applications = new List<Application> { parentApplication, childApplication };
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns(applications);
+
+            _paymentRequestAppService
+                .GetListByApplicationIdsAsync(Arg.Any<List<Guid>>())
+                .Returns(
+                [
+                    new PaymentDetailsDto
+                    {
+                        CorrelationId = childApplication.Id,
+                        Amount = 400m,
+                        Status = PaymentRequestStatus.HistoricalPayment
+                    }
+                ]);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(1000m);
+            result.TotalPaidAmount.ShouldBe(400m);
+            result.TotalRemainingAmount.ShouldBe(600m);
+        }
+
+        [Fact]
+        public async Task GetPaymentSummaryByApplicantIdAsync_WithNoApplications_ShouldReturnZeroApproved()
+        {
+            // Arrange
+            var applicantId = Guid.NewGuid();
+            _applicationRepository.GetByApplicantIdAsync(applicantId).Returns([]);
+
+            // Act
+            var result = await _service.GetPaymentSummaryByApplicantIdAsync(applicantId);
+
+            // Assert
+            result.TotalApprovedAmount.ShouldBe(0m);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Applicants/OrgInfoDataProviderTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Applicants/OrgInfoDataProviderTests.cs
index fa7c5420e2..6df0cb0b67 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Applicants/OrgInfoDataProviderTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Applicants/OrgInfoDataProviderTests.cs
@@ -138,7 +138,7 @@ public async Task GetDataAsync_ShouldMapAllApplicantFields()
                     a.NonRegOrgName = "Acme Trading";
                     a.FiscalMonth = "April";
                     a.FiscalDay = 1;
-                    a.OrganizationSize = "51-100";
+                    a.ApproxNumberOfEmployees = "51-100";
                     a.Sector = "Technology";
                     a.SubSector = "Software";
                 })]);
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Applicants/SubmissionInfoDataProviderTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Applicants/SubmissionInfoDataProviderTests.cs
index 57ae23fe50..effd117a15 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Applicants/SubmissionInfoDataProviderTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Applicants/SubmissionInfoDataProviderTests.cs
@@ -106,9 +106,13 @@ private static Application CreateApplication(Guid id, Guid statusId, Action<Appl
             return entity;
         }
 
-        private static ApplicationStatus CreateStatus(Guid id, string externalStatus)
+        private static ApplicationStatus CreateStatus(Guid id, string externalStatus, string? notifiedStatus = null)
         {
-            var entity = new ApplicationStatus { ExternalStatus = externalStatus };
+            var entity = new ApplicationStatus
+            {
+                ExternalStatus = externalStatus,
+                NotifiedStatus = notifiedStatus
+            };
             EntityHelper.TrySetId(entity, () => id);
             return entity;
         }
@@ -199,6 +203,62 @@ public async Task GetDataAsync_ShouldMapSubmissionFields()
             sub.Status.ShouldBe("Submitted");
         }
 
+        [Fact]
+        public async Task GetDataAsync_ShouldUseNotifiedStatus_WhenSubStatusIsNotified()
+        {
+            // Arrange
+            var request = CreateRequest();
+            var applicationId = Guid.NewGuid();
+            var formId = Guid.NewGuid();
+            var statusId = Guid.NewGuid();
+
+            SetupQueryables(
+                [CreateSubmission(applicationId, "TESTUSER")],
+                [CreateApplication(applicationId, statusId, a =>
+                {
+                    a.ApplicationFormId = formId;
+                    a.ExternalStatusVisibility = true;
+                })],
+                [CreateForm(formId, "Form")],
+                [CreateStatus(statusId, "Under Review", "Approved")]);
+
+            // Act
+            var result = await _provider.GetDataAsync(request);
+
+            // Assert
+            var dto = result.ShouldBeOfType<ApplicantSubmissionInfoDto>();
+            dto.Submissions.Count.ShouldBe(1);
+            dto.Submissions[0].Status.ShouldBe("Approved");
+        }
+
+        [Fact]
+        public async Task GetDataAsync_ShouldUseExternalStatus_WhenSubStatusIsNotNotified()
+        {
+            // Arrange
+            var request = CreateRequest();
+            var applicationId = Guid.NewGuid();
+            var formId = Guid.NewGuid();
+            var statusId = Guid.NewGuid();
+
+            SetupQueryables(
+                [CreateSubmission(applicationId, "TESTUSER")],
+                [CreateApplication(applicationId, statusId, a =>
+                {
+                    a.ApplicationFormId = formId;
+                    a.ExternalStatusVisibility = false;
+                })],
+                [CreateForm(formId, "Form")],
+                [CreateStatus(statusId, "Under Review", "Approved")]);
+
+            // Act
+            var result = await _provider.GetDataAsync(request);
+
+            // Assert
+            var dto = result.ShouldBeOfType<ApplicantSubmissionInfoDto>();
+            dto.Submissions.Count.ShouldBe(1);
+            dto.Submissions[0].Status.ShouldBe("Under Review");
+        }
+
         [Fact]
         public async Task GetDataAsync_ShouldResolveSubmissionTimeFromJson()
         {
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Assessments/FindUserIdirIdTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Assessments/FindUserIdirIdTests.cs
new file mode 100644
index 0000000000..8c0caf808e
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Assessments/FindUserIdirIdTests.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Security.Claims;
+using Shouldly;
+using Unity.GrantManager.Assessments;
+using Volo.Abp.Security.Claims;
+using Xunit;
+
+namespace Unity.GrantManager.Assessments;
+
+public class FindUserIdirIdTests
+{
+    private static ClaimsPrincipal CreatePrincipal(params Claim[] claims)
+    {
+        var identity = new ClaimsIdentity("TestAuth");
+        identity.AddClaims(claims);
+        return new ClaimsPrincipal(identity);
+    }
+
+    [Fact]
+    public void ShouldReturnGuid_WhenAbpUserIdClaimPresent()
+    {
+        // Arrange
+        var userId = Guid.NewGuid();
+        var principal = CreatePrincipal(
+            new Claim(AbpClaimTypes.UserId, userId.ToString()));
+
+        // Act
+        var result = AssessmentAuthorizationHandler.FindUserIdirId(principal);
+
+        // Assert
+        result.ShouldBe(userId);
+    }
+
+    [Fact]
+    public void ShouldReturnGuid_WhenLegacyUserIdClaimPresent()
+    {
+        // Arrange
+        var userId = Guid.NewGuid();
+        var principal = CreatePrincipal(
+            new Claim("UserId", userId.ToString()));
+
+        // Act
+        var result = AssessmentAuthorizationHandler.FindUserIdirId(principal);
+
+        // Assert
+        result.ShouldBe(userId);
+    }
+
+    [Fact]
+    public void ShouldPreferAbpClaim_WhenBothPresent()
+    {
+        // Arrange
+        var abpUserId = Guid.NewGuid();
+        var legacyUserId = Guid.NewGuid();
+        var principal = CreatePrincipal(
+            new Claim(AbpClaimTypes.UserId, abpUserId.ToString()),
+            new Claim("UserId", legacyUserId.ToString()));
+
+        // Act
+        var result = AssessmentAuthorizationHandler.FindUserIdirId(principal);
+
+        // Assert
+        result.ShouldBe(abpUserId);
+    }
+
+    [Fact]
+    public void ShouldFallbackToLegacy_WhenAbpClaimMissing()
+    {
+        // Arrange
+        var legacyUserId = Guid.NewGuid();
+        var principal = CreatePrincipal(
+            new Claim("DisplayName", "Test User"),
+            new Claim("UserId", legacyUserId.ToString()));
+
+        // Act
+        var result = AssessmentAuthorizationHandler.FindUserIdirId(principal);
+
+        // Assert
+        result.ShouldBe(legacyUserId);
+    }
+
+    [Fact]
+    public void ShouldReturnNull_WhenNeitherClaimPresent()
+    {
+        // Arrange
+        var principal = CreatePrincipal(
+            new Claim("DisplayName", "Test User"));
+
+        // Act
+        var result = AssessmentAuthorizationHandler.FindUserIdirId(principal);
+
+        // Assert
+        result.ShouldBeNull();
+    }
+
+    [Fact]
+    public void ShouldReturnNull_WhenClaimValueIsEmpty()
+    {
+        // Arrange
+        var principal = CreatePrincipal(
+            new Claim(AbpClaimTypes.UserId, ""),
+            new Claim("UserId", ""));
+
+        // Act
+        var result = AssessmentAuthorizationHandler.FindUserIdirId(principal);
+
+        // Assert
+        result.ShouldBeNull();
+    }
+
+    [Fact]
+    public void ShouldReturnNull_WhenClaimValueIsNotValidGuid()
+    {
+        // Arrange
+        var principal = CreatePrincipal(
+            new Claim(AbpClaimTypes.UserId, "not-a-guid"));
+
+        // Act
+        var result = AssessmentAuthorizationHandler.FindUserIdirId(principal);
+
+        // Assert
+        result.ShouldBeNull();
+    }
+
+    [Fact]
+    public void ShouldThrow_WhenPrincipalIsNull()
+    {
+        Should.Throw<ArgumentNullException>(() =>
+            AssessmentAuthorizationHandler.FindUserIdirId(null!));
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Events/ChefsEventSubscriptionServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Events/ChefsEventSubscriptionServiceTests.cs
index 32ba5366fa..06227f065d 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Events/ChefsEventSubscriptionServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Events/ChefsEventSubscriptionServiceTests.cs
@@ -104,6 +104,11 @@ Task<JObject> IFormsApiService.GetForm(Guid? formId, string chefsApplicationForm
             {
                 throw new NotImplementedException();
             }
+
+            Task<JObject?> IFormsApiService.GetFormVersionDataAsync(Guid applicationFormId, string chefsFormVersionId)
+            {
+                throw new NotImplementedException();
+            }
         }
 
         public class IntakeFormSubmissionMapperMock : IIntakeFormSubmissionMapper
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/ApplicationListRecordAlignmentTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/ApplicationListRecordAlignmentTests.cs
index 6229d9ef08..c749f09b28 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/ApplicationListRecordAlignmentTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/ApplicationListRecordAlignmentTests.cs
@@ -142,8 +142,8 @@ public async Task GetApplicationListRecordsAsync_ApplicantFields_Match_WithFullD
                 $"ApplicantSubSector mismatch for Id={app.Id}");
             rec.ApplicantOrganizationType.ShouldBe(applicant.OrganizationType,
                 $"ApplicantOrganizationType mismatch for Id={app.Id}");
-            rec.ApplicantOrganizationSize.ShouldBe(applicant.OrganizationSize,
-                $"ApplicantOrganizationSize mismatch for Id={app.Id}");
+            rec.ApplicantApproxNumberOfEmployees.ShouldBe(applicant.ApproxNumberOfEmployees,
+                $"ApplicantApproxNumberOfEmployees mismatch for Id={app.Id}");
             rec.ApplicantIndigenousOrgInd.ShouldBe(applicant.IndigenousOrgInd,
                 $"ApplicantIndigenousOrgInd mismatch for Id={app.Id}");
             rec.ApplicantRedStop.ShouldBe(applicant.RedStop,
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationAppServiceTests.cs
new file mode 100644
index 0000000000..237df9ab86
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationAppServiceTests.cs
@@ -0,0 +1,138 @@
+using Microsoft.Extensions.Localization;
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Unity.AI.Automation;
+using Unity.AI.Domain;
+using Unity.AI.Localization;
+using Unity.AI.Generation;
+using Unity.AI.Operations;
+using Unity.AI.RateLimit;
+using Unity.AI.Settings;
+using Unity.GrantManager.GrantApplications;
+using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
+using Volo.Abp;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Local;
+using Volo.Abp.Features;
+using Volo.Abp.MultiTenancy;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.GrantApplications.Automation;
+
+public class AIGenerationAppServiceTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
+{
+    [Fact]
+    public async Task GenerateAttachmentSummariesAsync_Should_Validate_Against_Application_Ownership()
+    {
+        var featureChecker = Substitute.For<IFeatureChecker>();
+        featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries").Returns(true);
+        var localizer = Substitute.For<IStringLocalizer<AIResource>>();
+        var featureGuard = new AIFeatureGuard(featureChecker, localizer);
+
+        var applicationId = Guid.NewGuid();
+        var attachmentIds = new List<Guid> { Guid.NewGuid(), Guid.NewGuid() };
+
+        var service = new AIGenerationAppService(
+            Substitute.For<IApplicationAIGenerationQueue>(),
+            Substitute.For<IAIGenerationStatusAppService>(),
+            Substitute.For<IAIRateLimiter>(),
+            featureGuard,
+            Substitute.For<ICurrentTenant>());
+        service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
+
+        var result = await service.GenerateAttachmentSummariesAsync(new GenerateAttachmentSummariesInputDto
+        {
+            ApplicationId = applicationId,
+            AttachmentIds = attachmentIds,
+            PromptVersion = "v1"
+        });
+
+        result.Count.ShouldBe(2);
+        result.ShouldAllBe(x => x.Completed == false);
+    }
+
+    [Fact]
+    public async Task GetStatusAsync_Should_Map_Request_And_Rate_Limit_State()
+    {
+        var applicationId = Guid.NewGuid();
+        var operationType = AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType;
+        var tenantId = Guid.NewGuid();
+        var operationId = Guid.NewGuid();
+        var requestId = Guid.NewGuid();
+
+        var statusService = Substitute.For<IAIGenerationStatusAppService>();
+        statusService.GetLatestAsync(applicationId, operationType, tenantId).Returns(new AIGenerationRequestDto
+        {
+            Id = requestId,
+            ApplicationId = applicationId,
+            OperationId = operationId,
+            OperationType = operationType,
+            Status = AIGenerationRequestStatus.Running,
+            StartedAt = new DateTime(2026, 7, 1, 12, 0, 0),
+            FailureReason = "not used",
+            IsActive = true
+        });
+
+        var rateLimiter = Substitute.For<IAIRateLimiter>();
+        rateLimiter.GetStateAsync().Returns(new AIRateLimitStateDto
+        {
+            IsGenerating = true,
+            RetryAfterSeconds = 17
+        });
+
+        var currentTenant = Substitute.For<ICurrentTenant>();
+        currentTenant.Id.Returns(tenantId);
+
+        var service = new AIGenerationAppService(
+            Substitute.For<IApplicationAIGenerationQueue>(),
+            statusService,
+            rateLimiter,
+            CreateFeatureGuard(),
+            currentTenant);
+        service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
+
+        var result = await service.GetStatusAsync(applicationId, operationType);
+
+        result.GenerationRequest.ShouldNotBeNull();
+        result.GenerationRequest!.Id.ShouldBe(requestId);
+        result.GenerationRequest.ApplicationId.ShouldBe(applicationId);
+        result.GenerationRequest.OperationId.ShouldBe(operationId);
+        result.GenerationRequest.OperationType.ShouldBe(operationType);
+        result.GenerationRequest.Status.ShouldBe(AIGenerationRequestStatus.Running.ToString());
+        result.GenerationRequest.StartedAt.ShouldBe(new DateTime(2026, 7, 1, 12, 0, 0));
+        result.GenerationRequest.FailureReason.ShouldBe("not used");
+        result.GenerationRequest.IsActive.ShouldBeTrue();
+        result.IsGenerating.ShouldBeTrue();
+        result.RetryAfterSeconds.ShouldBe(17);
+    }
+
+    [Fact]
+    public async Task GetStatusAsync_Should_Reject_Unsupported_Operation_Type()
+    {
+        var service = new AIGenerationAppService(
+            Substitute.For<IApplicationAIGenerationQueue>(),
+            Substitute.For<IAIGenerationStatusAppService>(),
+            Substitute.For<IAIRateLimiter>(),
+            CreateFeatureGuard(),
+            Substitute.For<ICurrentTenant>());
+        service.LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>();
+
+        var exception = await Should.ThrowAsync<UserFriendlyException>(
+            () => service.GetStatusAsync(Guid.NewGuid(), "unsupported-operation"));
+
+        exception.Message.ShouldContain("Unsupported AI generation operation type");
+    }
+
+    private static AIFeatureGuard CreateFeatureGuard()
+    {
+        var featureChecker = Substitute.For<IFeatureChecker>();
+        featureChecker.IsEnabledAsync(Arg.Any<string>()).Returns(true);
+
+        var localizer = Substitute.For<IStringLocalizer<AIResource>>();
+        return new AIFeatureGuard(featureChecker, localizer);
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationQueueTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationQueueTests.cs
index f499604bc3..a1668c20b9 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationQueueTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationQueueTests.cs
@@ -1,4 +1,5 @@
 using Medallion.Threading;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using NSubstitute;
 using Shouldly;
@@ -7,13 +8,20 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Unity.AI.Features;
+using Unity.AI.Localization;
+using Unity.AI.Operations;
 using Unity.AI.RateLimit;
 using Unity.GrantManager.GrantApplications;
-using Unity.GrantManager.GrantApplications.Automation;
 using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
+using Volo.Abp;
 using Volo.Abp.BackgroundJobs;
-using Volo.Abp.Domain.Repositories;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.DistributedLocking;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Features;
+using Volo.Abp.Linq;
 using Volo.Abp.Users;
 using Xunit;
 using Xunit.Abstractions;
@@ -22,74 +30,110 @@ namespace Unity.GrantManager.GrantApplications.Automation;
 
 public class AIGenerationQueueTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
 {
+    private static readonly Guid AttachmentSummaryOperationId = Guid.Parse("11111111-1111-1111-1111-111111111111");
+    private static readonly Guid ApplicationAnalysisOperationId = Guid.Parse("22222222-2222-2222-2222-222222222222");
+    private static readonly Guid ApplicationScoringOperationId = Guid.Parse("33333333-3333-3333-3333-333333333333");
     [Fact]
     public async Task QueueAllAIStagesAsync_Should_Enqueue_Pipeline_Job_When_None_Exists()
     {
         var applicationId = Guid.NewGuid();
         var tenantId = Guid.NewGuid();
-        var repository = Substitute.For<IRepository<AIGenerationRequest, Guid>>();
-        repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(Array.Empty<AIGenerationRequest>().AsQueryable()));
-        repository.InsertAsync(Arg.Any<AIGenerationRequest>(), Arg.Any<bool>(), Arg.Any<CancellationToken>())
-            .Returns(callInfo => Task.FromResult(callInfo.Arg<AIGenerationRequest>()));
-
-        RunApplicationAIPipelineJobArgs? capturedArgs = null;
         var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
-        backgroundJobManager.EnqueueAsync<RunApplicationAIPipelineJobArgs>(
-                Arg.Any<RunApplicationAIPipelineJobArgs>(),
-                Arg.Any<BackgroundJobPriority>(),
-                Arg.Any<TimeSpan?>())
+        var attachmentJobs = new List<GenerateAttachmentSummaryBackgroundJobArgs>();
+        var analysisJobs = new List<GenerateApplicationAnalysisBackgroundJobArgs>();
+        var scoringJobs = new List<GenerateApplicationScoringBackgroundJobArgs>();
+        backgroundJobManager.EnqueueAsync(Arg.Any<GenerateAttachmentSummaryBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>())
+            .Returns(callInfo =>
+            {
+                attachmentJobs.Add(callInfo.Arg<GenerateAttachmentSummaryBackgroundJobArgs>());
+                return Task.FromResult(string.Empty);
+            });
+        backgroundJobManager.EnqueueAsync(Arg.Any<GenerateApplicationAnalysisBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>())
+            .Returns(callInfo =>
+            {
+                analysisJobs.Add(callInfo.Arg<GenerateApplicationAnalysisBackgroundJobArgs>());
+                return Task.FromResult(string.Empty);
+            });
+        backgroundJobManager.EnqueueAsync(Arg.Any<GenerateApplicationScoringBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>())
             .Returns(callInfo =>
             {
-                capturedArgs = callInfo.Arg<RunApplicationAIPipelineJobArgs>();
+                scoringJobs.Add(callInfo.Arg<GenerateApplicationScoringBackgroundJobArgs>());
                 return Task.FromResult(string.Empty);
             });
 
-        var queue = CreateQueue(backgroundJobManager, repository);
+        var queue = CreateQueue(backgroundJobManager);
 
         await queue.QueueAllAIStagesAsync(applicationId, tenantId, "v1");
 
-        capturedArgs.ShouldNotBeNull();
-        capturedArgs!.ApplicationId.ShouldBe(applicationId);
-        capturedArgs.TenantId.ShouldBe(tenantId);
-        capturedArgs.PromptVersion.ShouldBe("v1");
-        capturedArgs.RequestedByUserId.ShouldBe(CreateQueueCurrentUserId);
-        capturedArgs.RequestKey.ShouldBe(AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.PipelineOperationType));
-        await backgroundJobManager.Received(1).EnqueueAsync(Arg.Any<RunApplicationAIPipelineJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>());
-        await repository.Received(1).InsertAsync(Arg.Is<AIGenerationRequest>(r =>
-            r.ApplicationId == applicationId &&
-            r.TenantId == tenantId &&
-            r.OperationType == AIGenerationRequestKeyHelper.PipelineOperationType &&
-            r.RequestKey == capturedArgs.RequestKey &&
-            r.Status == AIGenerationRequestStatus.Queued), Arg.Any<bool>(), Arg.Any<CancellationToken>());
+        attachmentJobs.Single().ApplicationId.ShouldBe(applicationId);
+        analysisJobs.Single().ApplicationId.ShouldBe(applicationId);
+        scoringJobs.Single().ApplicationId.ShouldBe(applicationId);
+        attachmentJobs.Single().TenantId.ShouldBe(tenantId);
+        analysisJobs.Single().TenantId.ShouldBe(tenantId);
+        scoringJobs.Single().TenantId.ShouldBe(tenantId);
     }
 
     [Fact]
-    public async Task QueueApplicationAnalysisAsync_Should_Not_Enqueue_When_An_Active_Request_Already_Exists()
+    public async Task QueueAllAIStagesAsync_Should_Enqueue_When_Any_Enabled_Stage_Has_Required_Input()
     {
-        var tenantId = Guid.NewGuid();
         var applicationId = Guid.NewGuid();
-        var promptVersion = "v1";
-        var requestKey = AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType);
-        var request = new AIGenerationRequest(
-            Guid.NewGuid(),
-            tenantId,
-            AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType,
-            applicationId,
-            requestKey);
+        var tenantId = Guid.NewGuid();
+        var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
+        var attachmentJobs = new List<GenerateAttachmentSummaryBackgroundJobArgs>();
+        var analysisJobs = new List<GenerateApplicationAnalysisBackgroundJobArgs>();
+        var scoringJobs = new List<GenerateApplicationScoringBackgroundJobArgs>();
+        backgroundJobManager.EnqueueAsync(Arg.Any<GenerateAttachmentSummaryBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>())
+            .Returns(callInfo =>
+            {
+                attachmentJobs.Add(callInfo.Arg<GenerateAttachmentSummaryBackgroundJobArgs>());
+                return Task.FromResult(string.Empty);
+            });
+        backgroundJobManager.EnqueueAsync(Arg.Any<GenerateApplicationAnalysisBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>())
+            .Returns(callInfo =>
+            {
+                analysisJobs.Add(callInfo.Arg<GenerateApplicationAnalysisBackgroundJobArgs>());
+                return Task.FromResult(string.Empty);
+            });
+        backgroundJobManager.EnqueueAsync(Arg.Any<GenerateApplicationScoringBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>())
+            .Returns(callInfo =>
+            {
+                scoringJobs.Add(callInfo.Arg<GenerateApplicationScoringBackgroundJobArgs>());
+                return Task.FromResult(string.Empty);
+            });
 
-        var repository = Substitute.For<IRepository<AIGenerationRequest, Guid>>();
-        repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(new[] { request }.AsQueryable()));
+        var queue = CreateQueue(backgroundJobManager);
+
+        await queue.QueueAllAIStagesAsync(applicationId, tenantId);
 
+        attachmentJobs.Count.ShouldBe(1);
+        analysisJobs.Count.ShouldBe(1);
+        scoringJobs.Count.ShouldBe(1);
+    }
+
+    [Fact]
+    public async Task QueueAllAIStagesAsync_Should_Not_Enqueue_When_No_Enabled_Stage_Has_Required_Input()
+    {
+        var applicationId = Guid.NewGuid();
+        var tenantId = Guid.NewGuid();
         var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
-        var rateLimiter = Substitute.For<Unity.AI.RateLimit.IAIRateLimiter>();
+        var rateLimiter = Substitute.For<IAIRateLimiter>();
         rateLimiter.EnsureAsync().Returns(Task.CompletedTask);
-        var queue = CreateQueue(backgroundJobManager, repository, rateLimiter);
+        var prerequisiteValidator = Substitute.For<IAIGenerationPrerequisiteValidator>();
+        prerequisiteValidator.EnsureAttachmentSummaryAvailableAsync(applicationId)
+            .Returns<Task>(_ => throw new UserFriendlyException("No attachments are available to summarize."));
+        prerequisiteValidator.EnsureApplicationAnalysisAvailableAsync(applicationId)
+            .Returns<Task>(_ => throw new UserFriendlyException("AI application analysis requires application submission data."));
+        prerequisiteValidator.EnsureApplicationScoringAvailableAsync(applicationId)
+            .Returns<Task>(_ => throw new UserFriendlyException("AI scoring requires a configured scoresheet."));
 
-        await queue.QueueApplicationAnalysisAsync(applicationId, tenantId, promptVersion);
+        var queue = CreateQueue(backgroundJobManager, rateLimiter: rateLimiter, prerequisiteValidator: prerequisiteValidator);
+
+        await Should.ThrowAsync<UserFriendlyException>(() => queue.QueueAllAIStagesAsync(applicationId, tenantId));
 
-        await backgroundJobManager.DidNotReceive().EnqueueAsync(Arg.Any<GenerateApplicationAnalysisBackgroundJobArgs>());
-        await repository.DidNotReceive().InsertAsync(Arg.Any<AIGenerationRequest>(), Arg.Any<bool>(), Arg.Any<CancellationToken>());
         await rateLimiter.DidNotReceive().EnsureAsync();
+        await backgroundJobManager.DidNotReceive().EnqueueAsync(Arg.Any<GenerateAttachmentSummaryBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>());
+        await backgroundJobManager.DidNotReceive().EnqueueAsync(Arg.Any<GenerateApplicationAnalysisBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>());
+        await backgroundJobManager.DidNotReceive().EnqueueAsync(Arg.Any<GenerateApplicationScoringBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>());
     }
 
     [Fact]
@@ -105,10 +149,7 @@ public async Task QueueApplicationAnalysisAsync_Should_Enqueue_New_Request_When_
 
         GenerateApplicationAnalysisBackgroundJobArgs? capturedArgs = null;
         var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
-        backgroundJobManager.EnqueueAsync<GenerateApplicationAnalysisBackgroundJobArgs>(
-                Arg.Any<GenerateApplicationAnalysisBackgroundJobArgs>(),
-                Arg.Any<BackgroundJobPriority>(),
-                Arg.Any<TimeSpan?>())
+        backgroundJobManager.EnqueueAsync<GenerateApplicationAnalysisBackgroundJobArgs>(Arg.Any<GenerateApplicationAnalysisBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>())
             .Returns(callInfo =>
             {
                 capturedArgs = callInfo.Arg<GenerateApplicationAnalysisBackgroundJobArgs>();
@@ -124,12 +165,9 @@ public async Task QueueApplicationAnalysisAsync_Should_Enqueue_New_Request_When_
         capturedArgs.TenantId.ShouldBe(tenantId);
         capturedArgs.PromptVersion.ShouldBe(promptVersion);
         capturedArgs.RequestedByUserId.ShouldBe(CreateQueueCurrentUserId);
-        capturedArgs.RequestKey.ShouldBe(AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType));
         await repository.Received(1).InsertAsync(Arg.Is<AIGenerationRequest>(r =>
             r.ApplicationId == applicationId &&
             r.TenantId == tenantId &&
-            r.OperationType == AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType &&
-            r.RequestKey == capturedArgs.RequestKey &&
             r.Status == AIGenerationRequestStatus.Queued), Arg.Any<bool>(), Arg.Any<CancellationToken>());
     }
 
@@ -146,7 +184,7 @@ public async Task QueueApplicationAnalysisAsync_Should_Check_Rate_Limit_Before_E
         var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
         var rateLimiter = Substitute.For<IAIRateLimiter>();
         rateLimiter.EnsureAsync().Returns(Task.CompletedTask);
-        var queue = CreateQueue(backgroundJobManager, repository, rateLimiter);
+        var queue = CreateQueue(backgroundJobManager, repository, rateLimiter: rateLimiter);
 
         await queue.QueueApplicationAnalysisAsync(applicationId, tenantId);
 
@@ -166,7 +204,7 @@ public async Task QueueApplicationAnalysisAsync_Should_Not_Insert_Or_Enqueue_Whe
         var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
         var rateLimiter = Substitute.For<IAIRateLimiter>();
         rateLimiter.EnsureAsync().Returns<Task>(_ => throw new InvalidOperationException("rate limited"));
-        var queue = CreateQueue(backgroundJobManager, repository, rateLimiter);
+        var queue = CreateQueue(backgroundJobManager, repository, rateLimiter: rateLimiter);
 
         await Should.ThrowAsync<InvalidOperationException>(() => queue.QueueApplicationAnalysisAsync(applicationId, tenantId));
 
@@ -176,29 +214,26 @@ public async Task QueueApplicationAnalysisAsync_Should_Not_Insert_Or_Enqueue_Whe
     }
 
     [Fact]
-    public async Task QueueAttachmentSummaryAsync_Should_Not_Enqueue_When_An_Active_Request_Already_Exists()
+    public async Task QueueAttachmentSummaryAsync_Should_Not_Insert_Or_Enqueue_When_No_Attachments_Are_Available()
     {
-        var tenantId = Guid.NewGuid();
         var applicationId = Guid.NewGuid();
-        var promptVersion = "v1";
-        var requestKey = AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.AttachmentSummaryOperationType);
-        var request = new AIGenerationRequest(
-            Guid.NewGuid(),
-            tenantId,
-            AIGenerationRequestKeyHelper.AttachmentSummaryOperationType,
-            applicationId,
-            requestKey);
-
+        var tenantId = Guid.NewGuid();
         var repository = Substitute.For<IRepository<AIGenerationRequest, Guid>>();
-        repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(new[] { request }.AsQueryable()));
+        repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(Array.Empty<AIGenerationRequest>().AsQueryable()));
 
         var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
-        var queue = CreateQueue(backgroundJobManager, repository);
+        var rateLimiter = Substitute.For<IAIRateLimiter>();
+        rateLimiter.EnsureAsync().Returns(Task.CompletedTask);
+        var prerequisiteValidator = Substitute.For<IAIGenerationPrerequisiteValidator>();
+        prerequisiteValidator.EnsureAttachmentSummaryAvailableAsync(applicationId)
+            .Returns<Task>(_ => throw new UserFriendlyException("No attachments are available to summarize."));
+        var queue = CreateQueue(backgroundJobManager, repository, rateLimiter: rateLimiter, prerequisiteValidator: prerequisiteValidator);
 
-        await queue.QueueAttachmentSummaryAsync(applicationId, tenantId, promptVersion);
+        await Should.ThrowAsync<UserFriendlyException>(() => queue.QueueAttachmentSummaryAsync(applicationId, tenantId));
 
-        await backgroundJobManager.DidNotReceive().EnqueueAsync(Arg.Any<GenerateAttachmentSummaryBackgroundJobArgs>());
+        await rateLimiter.DidNotReceive().EnsureAsync();
         await repository.DidNotReceive().InsertAsync(Arg.Any<AIGenerationRequest>(), Arg.Any<bool>(), Arg.Any<CancellationToken>());
+        await backgroundJobManager.DidNotReceive().EnqueueAsync(Arg.Any<GenerateAttachmentSummaryBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>());
     }
 
     [Fact]
@@ -214,10 +249,7 @@ public async Task QueueAttachmentSummaryAsync_Should_Enqueue_New_Request_When_No
 
         GenerateAttachmentSummaryBackgroundJobArgs? capturedArgs = null;
         var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
-        backgroundJobManager.EnqueueAsync<GenerateAttachmentSummaryBackgroundJobArgs>(
-                Arg.Any<GenerateAttachmentSummaryBackgroundJobArgs>(),
-                Arg.Any<BackgroundJobPriority>(),
-                Arg.Any<TimeSpan?>())
+        backgroundJobManager.EnqueueAsync<GenerateAttachmentSummaryBackgroundJobArgs>(Arg.Any<GenerateAttachmentSummaryBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>())
             .Returns(callInfo =>
             {
                 capturedArgs = callInfo.Arg<GenerateAttachmentSummaryBackgroundJobArgs>();
@@ -233,41 +265,12 @@ public async Task QueueAttachmentSummaryAsync_Should_Enqueue_New_Request_When_No
         capturedArgs.TenantId.ShouldBe(tenantId);
         capturedArgs.PromptVersion.ShouldBe(promptVersion);
         capturedArgs.RequestedByUserId.ShouldBe(CreateQueueCurrentUserId);
-        capturedArgs.RequestKey.ShouldBe(AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.AttachmentSummaryOperationType));
         await repository.Received(1).InsertAsync(Arg.Is<AIGenerationRequest>(r =>
             r.ApplicationId == applicationId &&
             r.TenantId == tenantId &&
-            r.OperationType == AIGenerationRequestKeyHelper.AttachmentSummaryOperationType &&
-            r.RequestKey == capturedArgs.RequestKey &&
             r.Status == AIGenerationRequestStatus.Queued), Arg.Any<bool>(), Arg.Any<CancellationToken>());
     }
 
-    [Fact]
-    public async Task QueueApplicationScoringAsync_Should_Not_Enqueue_When_An_Active_Request_Already_Exists()
-    {
-        var tenantId = Guid.NewGuid();
-        var applicationId = Guid.NewGuid();
-        var promptVersion = "v1";
-        var requestKey = AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.ApplicationScoringOperationType);
-        var request = new AIGenerationRequest(
-            Guid.NewGuid(),
-            tenantId,
-            AIGenerationRequestKeyHelper.ApplicationScoringOperationType,
-            applicationId,
-            requestKey);
-
-        var repository = Substitute.For<IRepository<AIGenerationRequest, Guid>>();
-        repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(new[] { request }.AsQueryable()));
-
-        var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
-        var queue = CreateQueue(backgroundJobManager, repository);
-
-        await queue.QueueApplicationScoringAsync(applicationId, tenantId, promptVersion);
-
-        await backgroundJobManager.DidNotReceive().EnqueueAsync(Arg.Any<GenerateApplicationScoringBackgroundJobArgs>());
-        await repository.DidNotReceive().InsertAsync(Arg.Any<AIGenerationRequest>(), Arg.Any<bool>(), Arg.Any<CancellationToken>());
-    }
-
     [Fact]
     public async Task QueueApplicationScoringAsync_Should_Enqueue_New_Request_When_None_Exists()
     {
@@ -281,10 +284,7 @@ public async Task QueueApplicationScoringAsync_Should_Enqueue_New_Request_When_N
 
         GenerateApplicationScoringBackgroundJobArgs? capturedArgs = null;
         var backgroundJobManager = Substitute.For<IBackgroundJobManager>();
-        backgroundJobManager.EnqueueAsync<GenerateApplicationScoringBackgroundJobArgs>(
-                Arg.Any<GenerateApplicationScoringBackgroundJobArgs>(),
-                Arg.Any<BackgroundJobPriority>(),
-                Arg.Any<TimeSpan?>())
+        backgroundJobManager.EnqueueAsync<GenerateApplicationScoringBackgroundJobArgs>(Arg.Any<GenerateApplicationScoringBackgroundJobArgs>(), Arg.Any<BackgroundJobPriority>(), Arg.Any<TimeSpan?>())
             .Returns(callInfo =>
             {
                 capturedArgs = callInfo.Arg<GenerateApplicationScoringBackgroundJobArgs>();
@@ -300,12 +300,10 @@ public async Task QueueApplicationScoringAsync_Should_Enqueue_New_Request_When_N
         capturedArgs.TenantId.ShouldBe(tenantId);
         capturedArgs.PromptVersion.ShouldBe(promptVersion);
         capturedArgs.RequestedByUserId.ShouldBe(CreateQueueCurrentUserId);
-        capturedArgs.RequestKey.ShouldBe(AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.ApplicationScoringOperationType));
         await repository.Received(1).InsertAsync(Arg.Is<AIGenerationRequest>(r =>
             r.ApplicationId == applicationId &&
             r.TenantId == tenantId &&
-            r.OperationType == AIGenerationRequestKeyHelper.ApplicationScoringOperationType &&
-            r.RequestKey == capturedArgs.RequestKey &&
+            r.OperationId != Guid.Empty &&
             r.Status == AIGenerationRequestStatus.Queued), Arg.Any<bool>(), Arg.Any<CancellationToken>());
     }
 
@@ -348,26 +346,76 @@ public ValueTask DisposeAsync()
 
     private static ApplicationAIGenerationQueue CreateQueue(
         IBackgroundJobManager backgroundJobManager,
-        IRepository<AIGenerationRequest, Guid> repository,
-        Unity.AI.RateLimit.IAIRateLimiter? rateLimiter = null)
+        IRepository<AIGenerationRequest, Guid>? repository = null,
+        IAIRateLimiter? rateLimiter = null,
+        IAIGenerationPrerequisiteValidator? prerequisiteValidator = null,
+        IFeatureChecker? featureChecker = null,
+        IRepository<AIOperation, Guid>? operationRepository = null,
+        IAsyncQueryableExecuter? asyncQueryableExecuter = null)
     {
+        repository ??= Substitute.For<IRepository<AIGenerationRequest, Guid>>();
+        repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(Array.Empty<AIGenerationRequest>().AsQueryable()));
+
         if (rateLimiter == null)
         {
-            rateLimiter = Substitute.For<Unity.AI.RateLimit.IAIRateLimiter>();
+            rateLimiter = Substitute.For<IAIRateLimiter>();
             rateLimiter.EnsureAsync().Returns(Task.CompletedTask);
         }
 
+        if (prerequisiteValidator == null)
+        {
+            prerequisiteValidator = Substitute.For<IAIGenerationPrerequisiteValidator>();
+            prerequisiteValidator.EnsureAttachmentSummaryAvailableAsync(Arg.Any<Guid>()).Returns(Task.CompletedTask);
+            prerequisiteValidator.EnsureApplicationAnalysisAvailableAsync(Arg.Any<Guid>()).Returns(Task.CompletedTask);
+            prerequisiteValidator.EnsureApplicationScoringAvailableAsync(Arg.Any<Guid>()).Returns(Task.CompletedTask);
+        }
+
+        if (featureChecker == null)
+        {
+            featureChecker = Substitute.For<IFeatureChecker>();
+            featureChecker.IsEnabledAsync(AIFeatures.AttachmentSummaries).Returns(Task.FromResult(true));
+            featureChecker.IsEnabledAsync(AIFeatures.ApplicationAnalysis).Returns(Task.FromResult(true));
+            featureChecker.IsEnabledAsync(AIFeatures.Scoring).Returns(Task.FromResult(true));
+        }
+
+        asyncQueryableExecuter ??= Substitute.For<IAsyncQueryableExecuter>();
+        asyncQueryableExecuter.ToListAsync(Arg.Any<IQueryable<AIOperation>>(), Arg.Any<CancellationToken>())
+            .Returns(callInfo => Task.FromResult(callInfo.Arg<IQueryable<AIOperation>>().ToList()));
+        asyncQueryableExecuter.FirstOrDefaultAsync(Arg.Any<IQueryable<AIOperation>>(), Arg.Any<CancellationToken>())
+            .Returns(callInfo => Task.FromResult(callInfo.Arg<IQueryable<AIOperation>>().FirstOrDefault()));
+        asyncQueryableExecuter.FirstOrDefaultAsync(Arg.Any<IQueryable<AIGenerationRequest>>(), Arg.Any<CancellationToken>())
+            .Returns(callInfo => Task.FromResult(callInfo.Arg<IQueryable<AIGenerationRequest>>().FirstOrDefault()));
+
         return new ApplicationAIGenerationQueue(
             backgroundJobManager,
             repository,
+            operationRepository ?? CreateOperationRepository(),
             new TestDistributedLockProvider(),
+            prerequisiteValidator,
+            featureChecker,
             rateLimiter,
+            asyncQueryableExecuter,
             CreateCurrentUser(),
-            Substitute.For<ILogger<ApplicationAIGenerationQueue>>());
+            Substitute.For<ILogger<ApplicationAIGenerationQueue>>(),
+            Substitute.For<IStringLocalizer<AIResource>>());
     }
 
     private static readonly Guid CreateQueueCurrentUserId = Guid.NewGuid();
 
+    private static IRepository<AIOperation, Guid> CreateOperationRepository()
+    {
+        var operations = new List<AIOperation>
+        {
+            new(AttachmentSummaryOperationId, "AttachmentSummary", Guid.NewGuid(), Guid.NewGuid()) { IsActive = true },
+            new(ApplicationAnalysisOperationId, "ApplicationAnalysis", Guid.NewGuid(), Guid.NewGuid()) { IsActive = true },
+            new(ApplicationScoringOperationId, "ApplicationScoring", Guid.NewGuid(), Guid.NewGuid()) { IsActive = true }
+        };
+
+        var repository = Substitute.For<IRepository<AIOperation, Guid>>();
+        repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIOperation>>(operations.AsQueryable()));
+        return repository;
+    }
+
     private static ICurrentUser CreateCurrentUser()
     {
         var currentUser = Substitute.For<ICurrentUser>();
@@ -375,3 +423,4 @@ private static ICurrentUser CreateCurrentUser()
         return currentUser;
     }
 }
+
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationStatusAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationStatusAppServiceTests.cs
index 432dfae6aa..ad724b3dd6 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationStatusAppServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AIGenerationStatusAppServiceTests.cs
@@ -3,8 +3,10 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Unity.AI.Domain;
 using Unity.GrantManager.GrantApplications;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Linq;
 using Volo.Abp.MultiTenancy;
 using Xunit;
 using Xunit.Abstractions;
@@ -19,25 +21,107 @@ public async Task GetLatestAsync_Should_Respect_Current_Tenant()
         var applicationId = Guid.NewGuid();
         var tenantId = Guid.NewGuid();
         var otherTenantId = Guid.NewGuid();
-        var requestKey = AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType);
+        var operationId = Guid.NewGuid();
+
+        var operations = new[]
+        {
+            new AIOperation(operationId, "ApplicationAnalysis", Guid.NewGuid(), Guid.NewGuid())
+            {
+                IsActive = true
+            }
+        };
+
+        var requests = new[]
+        {
+            new AIGenerationRequest(Guid.NewGuid(), otherTenantId, operationId, applicationId),
+            new AIGenerationRequest(Guid.NewGuid(), tenantId, operationId, applicationId)
+        };
+
+        var repository = Substitute.For<IRepository<AIGenerationRequest, Guid>>();
+        repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(requests.AsQueryable()));
+        var operationRepository = Substitute.For<IRepository<AIOperation, Guid>>();
+        operationRepository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIOperation>>(operations.AsQueryable()));
+        var asyncQueryableExecuter = new AsyncQueryableExecuter(Array.Empty<IAsyncQueryableProvider>());
+
+        var currentTenant = Substitute.For<ICurrentTenant>();
+        currentTenant.Id.Returns(tenantId);
+
+        var service = new AIGenerationStatusAppService(repository, operationRepository, currentTenant, asyncQueryableExecuter);
+
+        var result = await service.GetLatestAsync(applicationId, AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType);
+
+        result.ShouldNotBeNull();
+        result.ApplicationId.ShouldBe(applicationId);
+    }
+
+    [Fact]
+    public async Task GetLatestAsync_Should_Return_History_For_Inactive_Operation()
+    {
+        var applicationId = Guid.NewGuid();
+        var tenantId = Guid.NewGuid();
+        var operationId = Guid.NewGuid();
+
+        var operations = new[]
+        {
+            new AIOperation(operationId, "ApplicationAnalysis", Guid.NewGuid(), Guid.NewGuid())
+            {
+                IsActive = false
+            }
+        };
 
         var requests = new[]
         {
-            new AIGenerationRequest(Guid.NewGuid(), otherTenantId, AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType, applicationId, requestKey),
-            new AIGenerationRequest(Guid.NewGuid(), tenantId, AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType, applicationId, requestKey)
+            new AIGenerationRequest(Guid.NewGuid(), tenantId, operationId, applicationId)
         };
 
         var repository = Substitute.For<IRepository<AIGenerationRequest, Guid>>();
         repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(requests.AsQueryable()));
+        var operationRepository = Substitute.For<IRepository<AIOperation, Guid>>();
+        operationRepository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIOperation>>(operations.AsQueryable()));
+        var asyncQueryableExecuter = new AsyncQueryableExecuter(Array.Empty<IAsyncQueryableProvider>());
 
         var currentTenant = Substitute.For<ICurrentTenant>();
         currentTenant.Id.Returns(tenantId);
 
-        var service = new AIGenerationStatusAppService(repository, currentTenant);
+        var service = new AIGenerationStatusAppService(repository, operationRepository, currentTenant, asyncQueryableExecuter);
 
         var result = await service.GetLatestAsync(applicationId, AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType);
 
         result.ShouldNotBeNull();
+        result!.OperationId.ShouldBe(operationId);
         result.ApplicationId.ShouldBe(applicationId);
     }
+
+    [Fact]
+    public async Task GetLatestAsync_Should_Reject_Legacy_Operation_Name()
+    {
+        var applicationId = Guid.NewGuid();
+        var tenantId = Guid.NewGuid();
+        var operationId = Guid.NewGuid();
+
+        var operations = new[]
+        {
+            new AIOperation(operationId, "ApplicationAnalysis", Guid.NewGuid(), Guid.NewGuid())
+        };
+
+        var requests = new[]
+        {
+            new AIGenerationRequest(Guid.NewGuid(), tenantId, operationId, applicationId)
+        };
+
+        var repository = Substitute.For<IRepository<AIGenerationRequest, Guid>>();
+        repository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(requests.AsQueryable()));
+        var operationRepository = Substitute.For<IRepository<AIOperation, Guid>>();
+        operationRepository.GetQueryableAsync().Returns(Task.FromResult<IQueryable<AIOperation>>(operations.AsQueryable()));
+        var asyncQueryableExecuter = new AsyncQueryableExecuter(Array.Empty<IAsyncQueryableProvider>());
+
+        var currentTenant = Substitute.For<ICurrentTenant>();
+        currentTenant.Id.Returns(tenantId);
+
+        var service = new AIGenerationStatusAppService(repository, operationRepository, currentTenant, asyncQueryableExecuter);
+
+        var result = await service.GetLatestAsync(applicationId, "legacy-operation-name");
+
+        result.ShouldBeNull();
+    }
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationContentAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationContentAppServiceTests.cs
deleted file mode 100644
index 84a14dfe30..0000000000
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationContentAppServiceTests.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Microsoft.Extensions.Localization;
-using NSubstitute;
-using Shouldly;
-using System;
-using System.Threading.Tasks;
-using Unity.AI.Localization;
-using Unity.AI.Settings;
-using Unity.GrantManager.GrantApplications;
-using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
-using Unity.AI.Automation;
-using Volo.Abp.Features;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Unity.GrantManager.GrantApplications.Automation;
-
-public class ApplicationContentAppServiceTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
-{
-    [Fact]
-    public async Task GenerateContentAsync_Should_Return_Completed_Result()
-    {
-        var featureChecker = Substitute.For<IFeatureChecker>();
-        featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries").Returns(true);
-        featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis").Returns(true);
-        featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(true);
-        var localizer = Substitute.For<IStringLocalizer<AIResource>>();
-        var featureGuard = new AIFeatureGuard(featureChecker, localizer);
-
-        var queue = Substitute.For<IApplicationAIGenerationQueue>();
-        queue.QueueAllAIStagesAsync(Arg.Any<Guid>(), Arg.Any<Guid?>(), Arg.Any<string?>())
-            .Returns(Task.CompletedTask);
-        var currentTenant = Substitute.For<Volo.Abp.MultiTenancy.ICurrentTenant>();
-        currentTenant.Id.Returns(Guid.NewGuid());
-
-        var service = new ApplicationContentAppService(queue, featureGuard, currentTenant);
-
-        var result = await service.GenerateContentAsync(Guid.NewGuid());
-
-        result.ShouldNotBeNull();
-        result.Completed.ShouldBeTrue();
-        await queue.Received(1).QueueAllAIStagesAsync(Arg.Any<Guid>(), Arg.Any<Guid?>(), Arg.Any<string?>());
-    }
-}
-
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs
deleted file mode 100644
index bc24754ba3..0000000000
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using Microsoft.Extensions.Logging.Abstractions;
-using NSubstitute;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Unity.GrantManager.Applications;
-using Unity.GrantManager.Attachments;
-using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
-using Unity.AI.RateLimit;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.EventBus.Local;
-using Volo.Abp.Features;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.Uow;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Unity.GrantManager.GrantApplications.Automation;
-
-public class RunApplicationAIPipelineJobTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
-{
-    [Fact]
-    public async Task ExecuteAsync_Should_Mark_Request_Completed_When_Features_Disabled()
-    {
-        var featureChecker = Substitute.For<IFeatureChecker>();
-        featureChecker.IsEnabledAsync(Arg.Any<string>()).Returns(false);
-
-        var repository = BuildRequestRepository(out var requests);
-        var request = CreateRequest();
-        requests.Add(request);
-
-        var job = BuildJob(featureChecker, repository);
-        var requestedByUserId = Guid.NewGuid();
-
-        await job.ExecuteAsync(new RunApplicationAIPipelineJobArgs
-        {
-            ApplicationId = request.ApplicationId!.Value,
-            RequestKey = request.RequestKey,
-            RequestedByUserId = requestedByUserId,
-            TenantId = request.TenantId
-        });
-
-        request.Status.ShouldBe(AIGenerationRequestStatus.Completed);
-    }
-
-    [Fact]
-    public async Task ExecuteAsync_Should_Publish_Event_When_Pipeline_Scoring_Completes()
-    {
-        var featureChecker = Substitute.For<IFeatureChecker>();
-        featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries").Returns(false);
-        featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis").Returns(false);
-        featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(true);
-
-        var repository = BuildRequestRepository(out var requests);
-        var request = CreateRequest();
-        requests.Add(request);
-
-        var scoringAppService = Substitute.For<IApplicationScoringAppService>();
-        scoringAppService.GenerateApplicationScoringForPipelineAsync(Arg.Any<Guid>(), Arg.Any<string?>())
-            .Returns(new ApplicationScoringResultDto { Completed = true });
-
-        var localEventBus = Substitute.For<ILocalEventBus>();
-        var rateLimiter = Substitute.For<IAIRateLimiter>();
-        var requestedByUserId = Guid.NewGuid();
-
-        var job = BuildJob(
-            featureChecker,
-            repository,
-            localEventBus: localEventBus,
-            rateLimiter: rateLimiter,
-            applicationScoringAppService: scoringAppService);
-
-        await job.ExecuteAsync(new RunApplicationAIPipelineJobArgs
-        {
-            ApplicationId = request.ApplicationId!.Value,
-            RequestKey = request.RequestKey,
-            RequestedByUserId = requestedByUserId,
-            TenantId = request.TenantId
-        });
-
-        request.Status.ShouldBe(AIGenerationRequestStatus.Completed);
-        await rateLimiter.Received(1).StampAsync(requestedByUserId);
-        await localEventBus.Received(1).PublishAsync(
-            Arg.Is<Automation.Events.ApplicationAIScoringGeneratedEvent>(x => x.ApplicationId == request.ApplicationId));
-    }
-
-    private RunApplicationAIPipelineJob BuildJob(
-        IFeatureChecker featureChecker,
-        IRepository<AIGenerationRequest, Guid> generationRequestRepository,
-        ILocalEventBus? localEventBus = null,
-        IAttachmentSummaryAppService? attachmentSummaryAppService = null,
-        IApplicationAnalysisAppService? applicationAnalysisAppService = null,
-        IApplicationScoringAppService? applicationScoringAppService = null,
-        IAIRateLimiter? rateLimiter = null)
-    {
-        return new RunApplicationAIPipelineJob(
-            Substitute.For<IApplicationChefsFileAttachmentRepository>(),
-            attachmentSummaryAppService ?? Substitute.For<IAttachmentSummaryAppService>(),
-            applicationAnalysisAppService ?? Substitute.For<IApplicationAnalysisAppService>(),
-            applicationScoringAppService ?? Substitute.For<IApplicationScoringAppService>(),
-            featureChecker,
-            localEventBus ?? Substitute.For<ILocalEventBus>(),
-            generationRequestRepository,
-            Substitute.For<ICurrentTenant>(),
-            GetRequiredService<IUnitOfWorkManager>(),
-            rateLimiter ?? Substitute.For<IAIRateLimiter>(),
-            NullLogger<RunApplicationAIPipelineJob>.Instance);
-    }
-
-    private static IRepository<AIGenerationRequest, Guid> BuildRequestRepository(out List<AIGenerationRequest> requests)
-    {
-        var requestList = new List<AIGenerationRequest>();
-        requests = requestList;
-        var repository = Substitute.For<IRepository<AIGenerationRequest, Guid>>();
-
-        repository.GetQueryableAsync()
-            .Returns(Task.FromResult<IQueryable<AIGenerationRequest>>(requestList.AsQueryable()));
-        repository.UpdateAsync(Arg.Any<AIGenerationRequest>(), Arg.Any<bool>(), Arg.Any<CancellationToken>())
-            .Returns(callInfo => Task.FromResult(callInfo.Arg<AIGenerationRequest>()));
-
-        return repository;
-    }
-
-    private static AIGenerationRequest CreateRequest()
-    {
-        var applicationId = Guid.NewGuid();
-        var tenantId = Guid.NewGuid();
-        return new AIGenerationRequest(
-            Guid.NewGuid(),
-            tenantId,
-            AIGenerationRequestKeyHelper.PipelineOperationType,
-            applicationId,
-            AIGenerationRequestKeyHelper.BuildRequestKey(tenantId, applicationId, AIGenerationRequestKeyHelper.PipelineOperationType));
-    }
-}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestBase.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestBase.cs
index 138320e81d..e0ab7d0c1d 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestBase.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestBase.cs
@@ -1,35 +1,35 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.Features;
 using Volo.Abp.Users;
-using Xunit;
-using Xunit.Abstractions;
-
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
-
-namespace Unity.GrantManager;
-
+using Xunit;
+using Xunit.Abstractions;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
+
+namespace Unity.GrantManager;
+
 public abstract class GrantManagerApplicationTestBase : GrantManagerTestBase<GrantManagerApplicationTestModule>, IAsyncLifetime
 {
     protected ICurrentUser? _currentUser;
     protected IFeatureChecker? _featureChecker;
-
-    protected GrantManagerApplicationTestBase(ITestOutputHelper _)
-    {        
-    }
-
-    public virtual async Task InitializeAsync()
-    {
-        await Task.CompletedTask;
-    }
-
-    public virtual async Task DisposeAsync()
-    {
-        await Task.Delay(15);        
-    }
-
+
+    protected GrantManagerApplicationTestBase(ITestOutputHelper _)
+    {        
+    }
+
+    public virtual async Task InitializeAsync()
+    {
+        await Task.CompletedTask;
+    }
+
+    public virtual async Task DisposeAsync()
+    {
+        await Task.Delay(15);        
+    }
+
     protected override void AfterAddApplication(IServiceCollection services)
     {
         _currentUser = Substitute.For<ICurrentUser>();
@@ -38,7 +38,7 @@ protected override void AfterAddApplication(IServiceCollection services)
         services.AddSingleton(_currentUser);
         services.AddSingleton(_featureChecker);
     }
-
+
     protected void Login(Guid userId)
     {
         _currentUser?.Id.Returns(userId);
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/OrganizationEditHandlerTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/OrganizationEditHandlerTests.cs
index f30098b8c4..81791f8809 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/OrganizationEditHandlerTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/OrganizationEditHandlerTests.cs
@@ -103,7 +103,7 @@ public async Task HandleAsync_ShouldUpdateAllApplicantFields()
         updatedApplicant.NonRegOrgName.ShouldBe("Friendly Name");
         updatedApplicant.FiscalMonth.ShouldBe("April");
         updatedApplicant.FiscalDay.ShouldBe(15);
-        updatedApplicant.OrganizationSize.ShouldBe("Medium");
+        updatedApplicant.ApproxNumberOfEmployees.ShouldBe("Medium");
     }
 
     [Fact]
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Handlers/TenantCreatedEventHandlerTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Handlers/TenantCreatedEventHandlerTests.cs
new file mode 100644
index 0000000000..68ad2398d1
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Handlers/TenantCreatedEventHandlerTests.cs
@@ -0,0 +1,45 @@
+using Shouldly;
+using Xunit;
+
+namespace Unity.GrantManager.Handlers;
+
+public class TenantCreatedEventHandlerTests
+{
+    [Fact]
+    public void BuildFeatureUpdates_NullInput_ReturnsEmpty()
+    {
+        var result = TenantCreatedEventHandler.BuildFeatureUpdates(null);
+
+        result.ShouldBeEmpty();
+    }
+
+    [Theory]
+    [InlineData("")]
+    [InlineData("   ")]
+    public void BuildFeatureUpdates_BlankInput_ReturnsEmpty(string featureKeysRaw)
+    {
+        var result = TenantCreatedEventHandler.BuildFeatureUpdates(featureKeysRaw);
+
+        result.ShouldBeEmpty();
+    }
+
+    [Fact]
+    public void BuildFeatureUpdates_CommaSeparatedKeys_ReturnsOneEnabledUpdatePerKey()
+    {
+        var result = TenantCreatedEventHandler.BuildFeatureUpdates("Unity.Payments, Unity.Reporting ,Unity.Notifications");
+
+        result.Count.ShouldBe(3);
+        result.ShouldAllBe(f => f.Value == "true");
+        result.ShouldContain(f => f.Name == "Unity.Payments");
+        result.ShouldContain(f => f.Name == "Unity.Reporting");
+        result.ShouldContain(f => f.Name == "Unity.Notifications");
+    }
+
+    [Fact]
+    public void BuildFeatureUpdates_EmptyEntriesBetweenDelimiters_AreIgnored()
+    {
+        var result = TenantCreatedEventHandler.BuildFeatureUpdates("Unity.Payments,,  ,Unity.Reporting");
+
+        result.Count.ShouldBe(2);
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Notifications/NotificationListAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Notifications/NotificationListAppServiceTests.cs
new file mode 100644
index 0000000000..73c870300f
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Notifications/NotificationListAppServiceTests.cs
@@ -0,0 +1,249 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Shouldly;
+using Unity.GrantManager.Applications;
+using Unity.Notifications.Emails;
+using Volo.Abp.Domain.Repositories;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.Notifications;
+
+public class NotificationListAppServiceTests : GrantManagerApplicationTestBase
+{
+    private readonly INotificationListAppService _notificationListAppService;
+    private readonly IEmailLogsRepository _emailLogsRepository;
+    private readonly IRepository<Application, Guid> _applicationRepository;
+
+    public NotificationListAppServiceTests(ITestOutputHelper outputHelper) : base(outputHelper)
+    {
+        _notificationListAppService = GetRequiredService<INotificationListAppService>();
+        _emailLogsRepository = GetRequiredService<IEmailLogsRepository>();
+        _applicationRepository = GetRequiredService<IRepository<Application, Guid>>();
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetListAsync_Should_Return_Notification_Joined_With_Application_ReferenceNo()
+    {
+        SetFeatureEnabled("Unity.Notifications", true);
+
+        // Arrange: use the known seeded application (ReferenceNo "TEST12345", Applicant1)
+        var application = await _applicationRepository.GetAsync(GrantManagerTestData.Application1_Id);
+        var emailLog = await _emailLogsRepository.InsertAsync(new EmailLog
+        {
+            ApplicationId = application.Id,
+            ApplicantId = application.ApplicantId,
+            Subject = "Test Notification Subject",
+            ToAddress = "applicant@example.com",
+            FromAddress = "noreply@gov.bc.ca",
+            Status = "Sent",
+            Recipient = RecipientType.External,
+            EmailType = EmailType.Manual
+        }, autoSave: true);
+
+        // Act
+        var result = await _notificationListAppService.GetListAsync(
+            new NotificationListInputDto { MaxResultCount = 1000 });
+
+        // Assert
+        var row = result.Items.FirstOrDefault(i => i.Id == emailLog.Id);
+        row.ShouldNotBeNull();
+        row.Subject.ShouldBe("Test Notification Subject");
+        row.SubmissionReferenceNo.ShouldBe("TEST12345");
+        row.Recipient.ShouldBe(RecipientType.External);
+        row.EmailType.ShouldBe(EmailType.Manual);
+        result.TotalCount.ShouldBeGreaterThanOrEqualTo(1);
+    }
+
+    [Theory]
+    [Trait("Category", "Integration")]
+    [InlineData(EmailType.Manual, "Manual")]
+    [InlineData(EmailType.DateBased, "Scheduled")]
+    [InlineData(EmailType.EventBased, "Event Based")]
+    [InlineData(EmailType.Delayed, "Delayed")]
+    public async Task GetListAsync_Should_Label_EmailType_Per_Taxonomy(EmailType emailType, string expectedLabel)
+    {
+        SetFeatureEnabled("Unity.Notifications", true);
+
+        // Arrange: Manual, Scheduled (DateBased), Event Based (EventBased), Delayed
+        var application = await _applicationRepository.GetAsync(GrantManagerTestData.Application1_Id);
+        var emailLog = await _emailLogsRepository.InsertAsync(new EmailLog
+        {
+            ApplicationId = application.Id,
+            ApplicantId = application.ApplicantId,
+            Subject = "Email Type Label Test",
+            ToAddress = "applicant@example.com",
+            FromAddress = "noreply@gov.bc.ca",
+            Status = "Sent",
+            Recipient = RecipientType.Internal,
+            EmailType = emailType
+        }, autoSave: true);
+
+        // Act
+        var result = await _notificationListAppService.GetListAsync(
+            new NotificationListInputDto { MaxResultCount = 1000 });
+
+        // Assert
+        var row = result.Items.FirstOrDefault(i => i.Id == emailLog.Id);
+        row.ShouldNotBeNull();
+        row.EmailType.ShouldBe(emailType);
+        row.EmailTypeText.ShouldBe(expectedLabel);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetListAsync_Should_Return_Row_Even_When_Application_Missing()
+    {
+        SetFeatureEnabled("Unity.Notifications", true);
+
+        // Arrange: email log whose ApplicationId does not match any application (legacy/deleted)
+        var orphanAppId = Guid.NewGuid();
+        var emailLog = await _emailLogsRepository.InsertAsync(new EmailLog
+        {
+            ApplicationId = orphanAppId,
+            ApplicantId = Guid.NewGuid(),
+            Subject = "Orphan Notification",
+            ToAddress = "x@example.com",
+            FromAddress = "noreply@gov.bc.ca",
+            Status = "Sent"
+        }, autoSave: true);
+
+        // Act
+        var result = await _notificationListAppService.GetListAsync(
+            new NotificationListInputDto { MaxResultCount = 1000 });
+
+        // Assert: row still present, with empty (not crashing) reference/applicant
+        var row = result.Items.FirstOrDefault(i => i.Id == emailLog.Id);
+        row.ShouldNotBeNull();
+        row.SubmissionReferenceNo.ShouldBe(string.Empty);
+        row.ApplicantName.ShouldBe(string.Empty);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetListAsync_Should_Only_Return_Rows_When_Sent_Within_The_Date_Range()
+    {
+        SetFeatureEnabled("Unity.Notifications", true);
+        var application = await _applicationRepository.GetAsync(GrantManagerTestData.Application1_Id);
+
+        var inRange = await _emailLogsRepository.InsertAsync(new EmailLog
+        {
+            ApplicationId = application.Id,
+            ApplicantId = application.ApplicantId,
+            Subject = "In Range",
+            Status = "Sent",
+            SentDateTime = new DateTime(2026, 3, 15, 12, 0, 0, DateTimeKind.Utc)
+        }, autoSave: true);
+
+        var outOfRange = await _emailLogsRepository.InsertAsync(new EmailLog
+        {
+            ApplicationId = application.Id,
+            ApplicantId = application.ApplicantId,
+            Subject = "Out Of Range",
+            Status = "Sent",
+            SentDateTime = new DateTime(2026, 1, 1, 12, 0, 0, DateTimeKind.Utc)
+        }, autoSave: true);
+
+        var result = await _notificationListAppService.GetListAsync(new NotificationListInputDto
+        {
+            DateFrom = new DateTime(2026, 3, 1, 0, 0, 0, DateTimeKind.Unspecified),
+            DateTo = new DateTime(2026, 3, 31, 0, 0, 0, DateTimeKind.Unspecified)
+        });
+
+        result.Items.ShouldContain(i => i.Id == inRange.Id);
+        result.Items.ShouldNotContain(i => i.Id == outOfRange.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetListAsync_Should_Include_Emails_Sent_Late_On_The_To_Date_Local_Time()
+    {
+        SetFeatureEnabled("Unity.Notifications", true);
+        var application = await _applicationRepository.GetAsync(GrantManagerTestData.Application1_Id);
+
+        // 2026-03-31 23:30 Vancouver (PDT, UTC-7) == 2026-04-01 06:30 UTC — still the 31st locally.
+        var lateOnToDate = await _emailLogsRepository.InsertAsync(new EmailLog
+        {
+            ApplicationId = application.Id,
+            ApplicantId = application.ApplicantId,
+            Subject = "Late On To Date",
+            Status = "Sent",
+            SentDateTime = new DateTime(2026, 4, 1, 6, 30, 0, DateTimeKind.Utc)
+        }, autoSave: true);
+
+        // 2026-04-01 00:30 Vancouver == 2026-04-01 07:30 UTC — the next local day.
+        var nextLocalDay = await _emailLogsRepository.InsertAsync(new EmailLog
+        {
+            ApplicationId = application.Id,
+            ApplicantId = application.ApplicantId,
+            Subject = "Next Local Day",
+            Status = "Sent",
+            SentDateTime = new DateTime(2026, 4, 1, 7, 30, 0, DateTimeKind.Utc)
+        }, autoSave: true);
+
+        var result = await _notificationListAppService.GetListAsync(new NotificationListInputDto
+        {
+            DateFrom = new DateTime(2026, 3, 1, 0, 0, 0, DateTimeKind.Unspecified),
+            DateTo = new DateTime(2026, 3, 31, 0, 0, 0, DateTimeKind.Unspecified)
+        });
+
+        result.Items.ShouldContain(i => i.Id == lateOnToDate.Id);
+        result.Items.ShouldNotContain(i => i.Id == nextLocalDay.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetListAsync_Should_Return_All_Rows_When_No_Date_Range_Provided()
+    {
+        SetFeatureEnabled("Unity.Notifications", true);
+        var application = await _applicationRepository.GetAsync(GrantManagerTestData.Application1_Id);
+
+        var veryOld = await _emailLogsRepository.InsertAsync(new EmailLog
+        {
+            ApplicationId = application.Id,
+            ApplicantId = application.ApplicantId,
+            Subject = "Very Old",
+            Status = "Sent",
+            SentDateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc)
+        }, autoSave: true);
+
+        var result = await _notificationListAppService.GetListAsync(new NotificationListInputDto());
+
+        result.Items.ShouldContain(i => i.Id == veryOld.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetListAsync_Should_Include_Unsent_Rows_By_Creation_Date_Within_Range()
+    {
+        SetFeatureEnabled("Unity.Notifications", true);
+        var application = await _applicationRepository.GetAsync(GrantManagerTestData.Application1_Id);
+
+        // A draft / unsent notification has no SentDateTime. It must still appear in a bounded
+        // window based on when it was created (CreationTime is stamped on insert), not vanish.
+        var draft = await _emailLogsRepository.InsertAsync(new EmailLog
+        {
+            ApplicationId = application.Id,
+            ApplicantId = application.ApplicantId,
+            Subject = "Unsent Draft",
+            Status = "Draft",
+            SentDateTime = null
+        }, autoSave: true);
+
+        // Derive the window from the row's own CreationTime, converted to the Vancouver-local
+        // calendar the service filters on, so the test does not depend on the machine timezone.
+        var vancouver = TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time");
+        var creationDateLocal = TimeZoneInfo.ConvertTimeFromUtc(
+            DateTime.SpecifyKind(draft.CreationTime, DateTimeKind.Utc), vancouver).Date;
+
+        var result = await _notificationListAppService.GetListAsync(new NotificationListInputDto
+        {
+            DateFrom = creationDateLocal.AddDays(-1),
+            DateTo = creationDateLocal.AddDays(1)
+        });
+
+        result.Items.ShouldContain(i => i.Id == draft.Id);
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/SettingManagement/ProgramDetailsAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/SettingManagement/ProgramDetailsAppServiceTests.cs
new file mode 100644
index 0000000000..d498190cda
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/SettingManagement/ProgramDetailsAppServiceTests.cs
@@ -0,0 +1,161 @@
+using System;
+using System.Threading.Tasks;
+using NSubstitute;
+using Shouldly;
+using Volo.Abp.Authorization;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.TenantManagement;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.SettingManagement;
+
+public class ProgramDetailsAppServiceTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
+{
+    [Fact]
+    public async Task GetProgramDetailsAsync_WithinTenantContext_ShouldReturnMappedExtraProperties()
+    {
+        var tenantId = Guid.NewGuid();
+        var tenant = CreateTenant(tenantId);
+        tenant.SetProperty("DisplayName", "My Program");
+        tenant.SetProperty("Division", "Housing Division");
+        tenant.SetProperty("Branch", "Grants Branch");
+        tenant.SetProperty("Description", "Sample description");
+
+        var tenantRepository = Substitute.For<ITenantRepository>();
+        tenantRepository.FindAsync(tenantId).Returns(tenant);
+
+        var appService = CreateAppService(tenantRepository);
+        var currentTenant = GetRequiredService<ICurrentTenant>();
+
+        ProgramDetailsDto result;
+        using (currentTenant.Change(tenantId))
+        {
+            result = await appService.GetProgramDetailsAsync();
+        }
+
+        result.DisplayName.ShouldBe("My Program");
+        result.Division.ShouldBe("Housing Division");
+        result.Branch.ShouldBe("Grants Branch");
+        result.Description.ShouldBe("Sample description");
+    }
+
+    [Fact]
+    public async Task GetProgramDetailsAsync_WithMissingExtraProperties_ShouldReturnEmptyStrings()
+    {
+        var tenantId = Guid.NewGuid();
+        var tenant = CreateTenant(tenantId);
+
+        var tenantRepository = Substitute.For<ITenantRepository>();
+        tenantRepository.FindAsync(tenantId).Returns(tenant);
+
+        var appService = CreateAppService(tenantRepository);
+        var currentTenant = GetRequiredService<ICurrentTenant>();
+
+        ProgramDetailsDto result;
+        using (currentTenant.Change(tenantId))
+        {
+            result = await appService.GetProgramDetailsAsync();
+        }
+
+        result.DisplayName.ShouldBe(string.Empty);
+        result.Division.ShouldBe(string.Empty);
+        result.Branch.ShouldBe(string.Empty);
+        result.Description.ShouldBe(string.Empty);
+    }
+
+    [Fact]
+    public async Task GetProgramDetailsAsync_WithoutTenantContext_ShouldThrowAbpAuthorizationException()
+    {
+        var tenantRepository = Substitute.For<ITenantRepository>();
+        var appService = CreateAppService(tenantRepository);
+        var currentTenant = GetRequiredService<ICurrentTenant>();
+
+        using (currentTenant.Change(null))
+        {
+            await Should.ThrowAsync<AbpAuthorizationException>(() => appService.GetProgramDetailsAsync());
+        }
+    }
+
+    [Fact]
+    public async Task GetProgramDetailsAsync_WithUnknownTenant_ShouldThrowEntityNotFoundException()
+    {
+        var tenantId = Guid.NewGuid();
+        var tenantRepository = Substitute.For<ITenantRepository>();
+        tenantRepository.FindAsync(tenantId).Returns((Tenant?)null);
+
+        var appService = CreateAppService(tenantRepository);
+        var currentTenant = GetRequiredService<ICurrentTenant>();
+
+        using (currentTenant.Change(tenantId))
+        {
+            await Should.ThrowAsync<EntityNotFoundException>(() => appService.GetProgramDetailsAsync());
+        }
+    }
+
+    [Fact]
+    public async Task UpdateProgramDetailsAsync_ShouldNormalizeAndPersistTrimmedValues()
+    {
+        var tenantId = Guid.NewGuid();
+        var tenant = CreateTenant(tenantId);
+
+        var tenantRepository = Substitute.For<ITenantRepository>();
+        tenantRepository.FindAsync(tenantId).Returns(tenant);
+
+        var appService = CreateAppService(tenantRepository);
+        var currentTenant = GetRequiredService<ICurrentTenant>();
+
+        var input = new UpdateProgramDetailsDto
+        {
+            DisplayName = "  My Program  ",
+            Division = "  Housing Division  ",
+            Branch = null,
+            Description = "   "
+        };
+
+        using (currentTenant.Change(tenantId))
+        {
+            await appService.UpdateProgramDetailsAsync(input);
+        }
+
+        tenant.GetProperty("DisplayName")?.ToString().ShouldBe("My Program");
+        tenant.GetProperty("Division")?.ToString().ShouldBe("Housing Division");
+        tenant.GetProperty("Branch")?.ToString().ShouldBe(string.Empty);
+        tenant.GetProperty("Description")?.ToString().ShouldBe(string.Empty);
+        await tenantRepository.Received(1).UpdateAsync(tenant);
+    }
+
+    [Fact]
+    public async Task UpdateProgramDetailsAsync_WithoutTenantContext_ShouldThrowAbpAuthorizationException()
+    {
+        var tenantRepository = Substitute.For<ITenantRepository>();
+        var appService = CreateAppService(tenantRepository);
+        var currentTenant = GetRequiredService<ICurrentTenant>();
+
+        var input = new UpdateProgramDetailsDto { DisplayName = "Test" };
+
+        using (currentTenant.Change(null))
+        {
+            await Should.ThrowAsync<AbpAuthorizationException>(() => appService.UpdateProgramDetailsAsync(input));
+        }
+    }
+
+    private ProgramDetailsAppService CreateAppService(ITenantRepository tenantRepository)
+    {
+        var appService = new ProgramDetailsAppService(tenantRepository)
+        {
+            LazyServiceProvider = GetRequiredService<IAbpLazyServiceProvider>()
+        };
+        return appService;
+    }
+
+    private static Tenant CreateTenant(Guid id)
+    {
+        var tenant = (Tenant)Activator.CreateInstance(typeof(Tenant), nonPublic: true)!;
+        EntityHelper.TrySetId(tenant, () => id);
+        return tenant;
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/TenantManagement/GrantManagerOnboardingApplicationProviderTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/TenantManagement/GrantManagerOnboardingApplicationProviderTests.cs
new file mode 100644
index 0000000000..0ea0adf18a
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/TenantManagement/GrantManagerOnboardingApplicationProviderTests.cs
@@ -0,0 +1,491 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Shouldly;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.GrantApplications;
+using Unity.TenantManagement;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Uow;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.TenantManagement;
+
+public class GrantManagerOnboardingApplicationProviderTests : GrantManagerApplicationTestBase
+{
+    private readonly IOnboardingApplicationProvider _provider;
+    private readonly IRepository<Application, Guid> _applicationRepository;
+    private readonly IRepository<ApplicationForm, Guid> _applicationFormRepository;
+    private readonly IRepository<ApplicationFormVersion, Guid> _applicationFormVersionRepository;
+    private readonly IRepository<ApplicationStatus, Guid> _applicationStatusRepository;
+    private readonly IRepository<Applicant, Guid> _applicantRepository;
+    private readonly IUnitOfWorkManager _unitOfWorkManager;
+
+    public GrantManagerOnboardingApplicationProviderTests(ITestOutputHelper outputHelper) : base(outputHelper)
+    {
+        _provider = GetRequiredService<IOnboardingApplicationProvider>();
+        _applicationRepository = GetRequiredService<IRepository<Application, Guid>>();
+        _applicationFormRepository = GetRequiredService<IRepository<ApplicationForm, Guid>>();
+        _applicationFormVersionRepository = GetRequiredService<IRepository<ApplicationFormVersion, Guid>>();
+        _applicationStatusRepository = GetRequiredService<IRepository<ApplicationStatus, Guid>>();
+        _applicantRepository = GetRequiredService<IRepository<Applicant, Guid>>();
+        _unitOfWorkManager = GetRequiredService<IUnitOfWorkManager>();
+    }
+
+    private async Task<Guid> CreateFormAsync(string category)
+    {
+        var form = await _applicationFormRepository.InsertAsync(new ApplicationForm
+        {
+            IntakeId = GrantManagerTestData.Intake1_Id,
+            ApplicationFormName = "Onboarding Provider Test Form",
+            Category = category
+        }, autoSave: true);
+        return form.Id;
+    }
+
+    private async Task<Guid> CreateFormVersionAsync(
+        Guid applicationFormId, int? version, bool published, string? submissionHeaderMapping = null) =>
+        (await _applicationFormVersionRepository.InsertAsync(new ApplicationFormVersion
+        {
+            ApplicationFormId = applicationFormId,
+            Version = version,
+            Published = published,
+            SubmissionHeaderMapping = submissionHeaderMapping
+        }, autoSave: true)).Id;
+
+    private async Task<Guid> CreateStatusAsync(string internalStatus, GrantApplicationState statusCode) =>
+        (await _applicationStatusRepository.InsertAsync(new ApplicationStatus
+        {
+            InternalStatus = internalStatus,
+            ExternalStatus = internalStatus,
+            StatusCode = statusCode
+        }, autoSave: true)).Id;
+
+    private async Task<Guid> CreateApplicantAsync(string applicantName) =>
+        (await _applicantRepository.InsertAsync(new Applicant
+        {
+            ApplicantName = applicantName
+        }, autoSave: true)).Id;
+
+    private async Task<Application> CreateApplicationAsync(
+        Guid applicationFormId, Guid applicationStatusId, string referenceNo, DateTime submissionDate,
+        Guid? applicantId = null, string? projectName = null, decimal? requestedAmount = null) =>
+        await _applicationRepository.InsertAsync(new Application
+        {
+            ApplicationFormId = applicationFormId,
+            ApplicationStatusId = applicationStatusId,
+            ApplicantId = applicantId ?? GrantManagerTestData.Applicant1_Id,
+            ReferenceNo = referenceNo,
+            SubmissionDate = submissionDate,
+            ProjectName = projectName ?? string.Empty,
+            RequestedAmount = requestedAmount ?? 0
+        }, autoSave: true);
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_NoSorting_DefaultsToSubmissionDateDescending()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+
+        var older = await CreateApplicationAsync(formId, statusId, "REF-OLD", new DateTime(2023, 1, 1, 0, 0, 0, DateTimeKind.Utc));
+        var newer = await CreateApplicationAsync(formId, statusId, "REF-NEW", new DateTime(2024, 1, 1, 0, 0, 0, DateTimeKind.Utc));
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category);
+
+        result.Items[0].Id.ShouldBe(newer.Id);
+        result.Items[1].Id.ShouldBe(older.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_UnknownSortField_FallsBackToSubmissionDateDescending()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.WITHDRAWN);
+
+        var older = await CreateApplicationAsync(formId, statusId, "REF-OLD", new DateTime(2023, 1, 1, 0, 0, 0, DateTimeKind.Utc));
+        var newer = await CreateApplicationAsync(formId, statusId, "REF-NEW", new DateTime(2024, 1, 1, 0, 0, 0, DateTimeKind.Utc));
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: "notAField asc", category: category);
+
+        result.Items[0].Id.ShouldBe(newer.Id);
+        result.Items[1].Id.ShouldBe(older.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_StaticColumnFilters_AreCaseInsensitive()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var approvedStatusId = await CreateStatusAsync("Approved", GrantApplicationState.ON_HOLD);
+        var rejectedStatusId = await CreateStatusAsync("Rejected", GrantApplicationState.DEFER);
+
+        var approved = await CreateApplicationAsync(formId, approvedStatusId, "REF-A", DateTime.UtcNow);
+        await CreateApplicationAsync(formId, rejectedStatusId, "REF-B", DateTime.UtcNow);
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category,
+            staticColumnFilters: [new ColumnFilterDto { Name = "status", Value = "APPROVED" }]);
+
+        result.TotalCount.ShouldBe(1);
+        result.Items[0].Id.ShouldBe(approved.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_EmptyDynamicColumnMatchIds_ShortCircuitsToZeroResults()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.GRANT_APPROVED);
+        await CreateApplicationAsync(formId, statusId, "REF-A", DateTime.UtcNow);
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category,
+            dynamicColumnMatchIds: []);
+
+        result.TotalCount.ShouldBe(0);
+        result.Items.ShouldBeEmpty();
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_GlobalFilter_OrsStaticFieldMatchWithPrecomputedWorksheetMatchIds()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.GRANT_NOT_APPROVED);
+
+        // Matches via static ReferenceNo field
+        var staticMatch = await CreateApplicationAsync(formId, statusId, "ZEBRA-MATCH", DateTime.UtcNow);
+        // Doesn't match any static field, but is in the pre-computed worksheet match set
+        var worksheetMatch = await CreateApplicationAsync(formId, statusId, "REF-OTHER", DateTime.UtcNow);
+        // Matches neither
+        await CreateApplicationAsync(formId, statusId, "REF-EXCLUDED", DateTime.UtcNow);
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category,
+            filter: "ZEBRA",
+            globalDynamicMatchIds: [worksheetMatch.Id]);
+
+        result.TotalCount.ShouldBe(2);
+        result.Items.ShouldContain(i => i.Id == staticMatch.Id);
+        result.Items.ShouldContain(i => i.Id == worksheetMatch.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetFormVersionIdsAsync_IncludesEveryVersion_PerForm_RegardlessOfPublishedFlag()
+    {
+        // CHEFS sync auto-unpublishes a form's previous version the moment a new one is
+        // published, so in practice only one version is ever Published==true at a time. Column
+        // discovery must not filter on that flag or it would silently drop every prior version's
+        // mappings — see GetFormVersionsAsync.
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var oldUnpublished = await CreateFormVersionAsync(formId, version: 1, published: false);
+        var currentPublished = await CreateFormVersionAsync(formId, version: 2, published: true);
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetFormVersionIdsAsync(category);
+
+        result.ShouldBe([oldUnpublished, currentPublished], ignoreOrder: true);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetFormVersionIdsAsync_FormWithNoVersions_IsExcluded()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        await CreateFormAsync(category);
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetFormVersionIdsAsync(category);
+
+        result.ShouldBeEmpty();
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetFormVersionIdsAsync_UnknownCategory_ReturnsEmpty()
+    {
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetFormVersionIdsAsync($"OnboardingTest-{Guid.NewGuid()}");
+
+        result.ShouldBeEmpty();
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetMappedCoreFieldColumnsAsync_ReturnsOnlyFieldsWithASubmissionHeaderMapping()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        await CreateFormVersionAsync(formId, version: 1, published: true,
+            submissionHeaderMapping: """{"ProjectName": "projectName", "RequestedAmount": "requestedAmount"}""");
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetMappedCoreFieldColumnsAsync(category);
+
+        result.Select(c => c.Key).ShouldBe(["ProjectName", "RequestedAmount"], ignoreOrder: true);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetMappedCoreFieldColumnsAsync_CombinesMappingsAcrossAllVersions()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        // The older version got auto-unpublished when v2 went live (CHEFS sync behavior), and
+        // it maps a different core field than the current published version. Both should still
+        // surface — columns are combined by key across every version, published or not.
+        await CreateFormVersionAsync(formId, version: 1, published: false,
+            submissionHeaderMapping: """{"ProjectName": "projectName"}""");
+        await CreateFormVersionAsync(formId, version: 2, published: true,
+            submissionHeaderMapping: """{"RequestedAmount": "requestedAmount"}""");
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetMappedCoreFieldColumnsAsync(category);
+
+        result.Select(c => c.Key).ShouldBe(["ProjectName", "RequestedAmount"], ignoreOrder: true);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetMappedCoreFieldColumnsAsync_FieldNotInRegistry_IsExcluded()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        // TotalScore is grant-assessment workflow state, intentionally never added to the
+        // onboarding core-field registry — see OnboardingCoreFieldRegistry header comment.
+        await CreateFormVersionAsync(formId, version: 1, published: true,
+            submissionHeaderMapping: """{"TotalScore": "totalScore"}""");
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetMappedCoreFieldColumnsAsync(category);
+
+        result.ShouldBeEmpty();
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetMappedCoreFieldColumnsAsync_IncludesApplicantAgentBackedContactEmail()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        await CreateFormVersionAsync(formId, version: 1, published: true,
+            submissionHeaderMapping: """{"ContactEmail": "contactEmail"}""");
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetMappedCoreFieldColumnsAsync(category);
+
+        result.Select(c => c.Key).ShouldBe(["ContactEmail"]);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAndById_PopulateContactEmail_FromApplicantAgent()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        await CreateFormVersionAsync(formId, version: 1, published: true,
+            submissionHeaderMapping: """{"ContactEmail": "contactEmail"}""");
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+
+        var withAgent = await CreateApplicationAsync(formId, statusId, "REF-AGENT", DateTime.UtcNow);
+        var applicantAgentRepository = GetRequiredService<IRepository<ApplicantAgent, Guid>>();
+        await applicantAgentRepository.InsertAsync(new ApplicantAgent
+        {
+            ApplicantId = withAgent.ApplicantId,
+            ApplicationId = withAgent.Id,
+            Name = "Jane Contact",
+            Email = "jane.contact@example.com"
+        }, autoSave: true);
+
+        var withoutAgent = await CreateApplicationAsync(formId, statusId, "REF-NO-AGENT", DateTime.UtcNow);
+
+        using var uow = _unitOfWorkManager.Begin();
+
+        var paged = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category);
+        paged.Items.First(i => i.Id == withAgent.Id).CoreFieldValues["ContactEmail"].ShouldBe("jane.contact@example.com");
+        paged.Items.First(i => i.Id == withoutAgent.Id).CoreFieldValues["ContactEmail"].ShouldBeNull();
+
+        var byId = await _provider.GetByIdAsync(withAgent.Id);
+        byId!.CoreFieldValues["ContactEmail"].ShouldBe("jane.contact@example.com");
+
+        var byIdNoAgent = await _provider.GetByIdAsync(withoutAgent.Id);
+        byIdNoAgent!.CoreFieldValues["ContactEmail"].ShouldBeNull();
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAndById_PopulateCoreFieldValues_ForMappedFields()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        await CreateFormVersionAsync(formId, version: 1, published: true,
+            submissionHeaderMapping: """{"ProjectName": "projectName"}""");
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+        var applicantId = await CreateApplicantAsync("Test Applicant");
+
+        var application = await CreateApplicationAsync(formId, statusId, "REF-CORE", DateTime.UtcNow,
+            applicantId: applicantId, projectName: "Bridge Repair", requestedAmount: 5000m);
+
+        using var uow = _unitOfWorkManager.Begin();
+
+        var paged = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category);
+        paged.Items[0].CoreFieldValues.ShouldContainKey("ProjectName");
+        paged.Items[0].CoreFieldValues["ProjectName"].ShouldBe("Bridge Repair");
+        paged.Items[0].CoreFieldValues.ShouldNotContainKey("RequestedAmount"); // not mapped for this form
+
+        var byId = await _provider.GetByIdAsync(application.Id);
+        byId!.CoreFieldValues["ProjectName"].ShouldBe("Bridge Repair");
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_SortsByCoreField()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+
+        var bravo = await CreateApplicationAsync(formId, statusId, "REF-A", DateTime.UtcNow, projectName: "Bravo Project");
+        var alpha = await CreateApplicationAsync(formId, statusId, "REF-B", DateTime.UtcNow, projectName: "Alpha Project");
+
+        using var uow = _unitOfWorkManager.Begin();
+
+        var ascending = await _provider.GetPagedListAsync(0, 10, sorting: "ProjectName ASC", category: category);
+        ascending.Items[0].Id.ShouldBe(alpha.Id);
+        ascending.Items[1].Id.ShouldBe(bravo.Id);
+
+        var descending = await _provider.GetPagedListAsync(0, 10, sorting: "ProjectName DESC", category: category);
+        descending.Items[0].Id.ShouldBe(bravo.Id);
+        descending.Items[1].Id.ShouldBe(alpha.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_SortsByApplicantBackedCoreField()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+
+        var zooApplicantId = await CreateApplicantAsync("Zoo Org");
+        var acmeApplicantId = await CreateApplicantAsync("Acme Org");
+
+        var zoo = await CreateApplicationAsync(formId, statusId, "REF-A", DateTime.UtcNow, applicantId: zooApplicantId);
+        var acme = await CreateApplicationAsync(formId, statusId, "REF-B", DateTime.UtcNow, applicantId: acmeApplicantId);
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: "ApplicantName ASC", category: category);
+
+        result.Items[0].Id.ShouldBe(acme.Id);
+        result.Items[1].Id.ShouldBe(zoo.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_FiltersByCoreFieldContains()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+
+        var matching = await CreateApplicationAsync(formId, statusId, "REF-A", DateTime.UtcNow, projectName: "Bridge Repair");
+        await CreateApplicationAsync(formId, statusId, "REF-B", DateTime.UtcNow, projectName: "Road Resurfacing");
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category,
+            staticColumnFilters: [new ColumnFilterDto { Name = "ProjectName", Value = "bridge" }]);
+
+        result.TotalCount.ShouldBe(1);
+        result.Items[0].Id.ShouldBe(matching.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_FiltersByNonTextCoreField_HasNoEffect()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+        await CreateApplicationAsync(formId, statusId, "REF-A", DateTime.UtcNow, requestedAmount: 5000m);
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category,
+            staticColumnFilters: [new ColumnFilterDto { Name = "RequestedAmount", Value = "5000" }]);
+
+        // Currency/Number fields aren't text-filterable yet — the filter is a no-op rather than an error.
+        result.TotalCount.ShouldBe(1);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_GlobalFilter_MatchesMappedCoreFieldValue()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        await CreateFormVersionAsync(formId, version: 1, published: true,
+            submissionHeaderMapping: """{"ProjectName": "projectName"}""");
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+
+        var matching = await CreateApplicationAsync(formId, statusId, "REF-A", DateTime.UtcNow, projectName: "Bridge Repair");
+        await CreateApplicationAsync(formId, statusId, "REF-B", DateTime.UtcNow, projectName: "Road Resurfacing");
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category, filter: "bridge");
+
+        result.TotalCount.ShouldBe(1);
+        result.Items[0].Id.ShouldBe(matching.Id);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_GlobalFilter_UnmappedCoreField_DoesNotMatch()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        await CreateFormVersionAsync(formId, version: 1, published: true); // no SubmissionHeaderMapping
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+        await CreateApplicationAsync(formId, statusId, "REF-A", DateTime.UtcNow, projectName: "Bridge Repair");
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category, filter: "bridge");
+
+        result.TotalCount.ShouldBe(0);
+    }
+
+    [Fact]
+    [Trait("Category", "Integration")]
+    public async Task GetPagedListAsync_GlobalFilter_CombinesCoreFieldMatchesWithPrecomputedWorksheetMatchIds()
+    {
+        var category = $"OnboardingTest-{Guid.NewGuid()}";
+        var formId = await CreateFormAsync(category);
+        await CreateFormVersionAsync(formId, version: 1, published: true,
+            submissionHeaderMapping: """{"ProjectName": "projectName"}""");
+        var statusId = await CreateStatusAsync("Submitted", GrantApplicationState.ASSIGNED);
+
+        var coreMatch = await CreateApplicationAsync(formId, statusId, "REF-A", DateTime.UtcNow, projectName: "Bridge Repair");
+        var worksheetMatch = await CreateApplicationAsync(formId, statusId, "REF-B", DateTime.UtcNow);
+        await CreateApplicationAsync(formId, statusId, "REF-C", DateTime.UtcNow); // matches neither
+
+        using var uow = _unitOfWorkManager.Begin();
+        var result = await _provider.GetPagedListAsync(0, 10, sorting: null, category: category,
+            filter: "bridge",
+            globalDynamicMatchIds: [worksheetMatch.Id]);
+
+        result.TotalCount.ShouldBe(2);
+        result.Items.ShouldContain(i => i.Id == coreMatch.Id);
+        result.Items.ShouldContain(i => i.Id == worksheetMatch.Id);
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Domain.Tests/Unity.GrantManager.Domain.Tests.csproj b/applications/Unity.GrantManager/test/Unity.GrantManager.Domain.Tests/Unity.GrantManager.Domain.Tests.csproj
index 950674c8f6..c2230656c3 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Domain.Tests/Unity.GrantManager.Domain.Tests.csproj
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Domain.Tests/Unity.GrantManager.Domain.Tests.csproj
@@ -17,6 +17,7 @@
     <PackageReference Include="Npgsql" Version="10.0.2" />
     <!-- Explicit reference to fix vulnerable transitive dependency -->
     <PackageReference Include="System.IO.Packaging" Version="10.0.7" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.EntityFrameworkCore.Tests/Unity.GrantManager.EntityFrameworkCore.Tests.csproj b/applications/Unity.GrantManager/test/Unity.GrantManager.EntityFrameworkCore.Tests/Unity.GrantManager.EntityFrameworkCore.Tests.csproj
index a86e0eca24..0b86c87488 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.EntityFrameworkCore.Tests/Unity.GrantManager.EntityFrameworkCore.Tests.csproj
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.EntityFrameworkCore.Tests/Unity.GrantManager.EntityFrameworkCore.Tests.csproj
@@ -17,6 +17,7 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
 		<!-- Explicit reference to fix vulnerable transitive dependency -->
 		<PackageReference Include="System.IO.Packaging" Version="10.0.7" />
+		<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Identity/Authorization/PermissionOrAuthorizationHandlerTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Identity/Authorization/PermissionOrAuthorizationHandlerTests.cs
new file mode 100644
index 0000000000..afe984730c
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Identity/Authorization/PermissionOrAuthorizationHandlerTests.cs
@@ -0,0 +1,166 @@
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using NSubstitute;
+using Shouldly;
+using Unity.GrantManager.Web.Identity.Authorization;
+using Volo.Abp.Authorization.Permissions;
+using Xunit;
+
+namespace Unity.GrantManager.Identity.Authorization;
+
+public class PermissionOrAuthorizationHandlerTests
+{
+    private readonly IPermissionChecker _permissionChecker;
+    private readonly PermissionOrAuthorizationHandler _handler;
+
+    public PermissionOrAuthorizationHandlerTests()
+    {
+        _permissionChecker = Substitute.For<IPermissionChecker>();
+        _handler = new PermissionOrAuthorizationHandler(_permissionChecker);
+    }
+
+    private static AuthorizationHandlerContext CreateContext(
+        ClaimsPrincipal user,
+        PermissionOrRequirement requirement)
+    {
+        return new AuthorizationHandlerContext(
+            [requirement],
+            user,
+            resource: null);
+    }
+
+    private static ClaimsPrincipal CreateUser()
+    {
+        var identity = new ClaimsIdentity("TestAuth");
+        return new ClaimsPrincipal(identity);
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldSucceed_WhenAnyPermissionIsGranted()
+    {
+        // Arrange
+        var user = CreateUser();
+        var permissions = new[] { "Perm.A", "Perm.B", "Perm.C" };
+        var requirement = new PermissionOrRequirement(permissions);
+
+        var grantResult = new MultiplePermissionGrantResult();
+        grantResult.Result.Add("Perm.A", PermissionGrantResult.Prohibited);
+        grantResult.Result.Add("Perm.B", PermissionGrantResult.Granted);
+        grantResult.Result.Add("Perm.C", PermissionGrantResult.Prohibited);
+
+        _permissionChecker.IsGrantedAsync(user, permissions)
+            .Returns(grantResult);
+
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert
+        context.HasSucceeded.ShouldBeTrue();
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldNotSucceed_WhenNoPermissionsGranted()
+    {
+        // Arrange
+        var user = CreateUser();
+        var permissions = new[] { "Perm.A", "Perm.B" };
+        var requirement = new PermissionOrRequirement(permissions);
+
+        var grantResult = new MultiplePermissionGrantResult();
+        grantResult.Result.Add("Perm.A", PermissionGrantResult.Prohibited);
+        grantResult.Result.Add("Perm.B", PermissionGrantResult.Prohibited);
+
+        _permissionChecker.IsGrantedAsync(user, permissions)
+            .Returns(grantResult);
+
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert
+        context.HasSucceeded.ShouldBeFalse();
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldSucceed_WhenAllPermissionsGranted()
+    {
+        // Arrange
+        var user = CreateUser();
+        var permissions = new[] { "Perm.A", "Perm.B" };
+        var requirement = new PermissionOrRequirement(permissions);
+
+        var grantResult = new MultiplePermissionGrantResult();
+        grantResult.Result.Add("Perm.A", PermissionGrantResult.Granted);
+        grantResult.Result.Add("Perm.B", PermissionGrantResult.Granted);
+
+        _permissionChecker.IsGrantedAsync(user, permissions)
+            .Returns(grantResult);
+
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert
+        context.HasSucceeded.ShouldBeTrue();
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldUseBatchApi_NotIndividualCalls()
+    {
+        // Arrange
+        var user = CreateUser();
+        var permissions = new[] { "Perm.X", "Perm.Y", "Perm.Z" };
+        var requirement = new PermissionOrRequirement(permissions);
+
+        var grantResult = new MultiplePermissionGrantResult();
+        grantResult.Result.Add("Perm.X", PermissionGrantResult.Prohibited);
+        grantResult.Result.Add("Perm.Y", PermissionGrantResult.Prohibited);
+        grantResult.Result.Add("Perm.Z", PermissionGrantResult.Prohibited);
+
+        _permissionChecker.IsGrantedAsync(user, permissions)
+            .Returns(grantResult);
+
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert - single batch call, not individual calls
+        await _permissionChecker.Received(1).IsGrantedAsync(user, permissions);
+        await _permissionChecker.DidNotReceive().IsGrantedAsync(user, Arg.Any<string>());
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldNotSucceed_WhenResultIsEmpty()
+    {
+        // Arrange
+        var user = CreateUser();
+        var permissions = new[] { "Perm.A" };
+        var requirement = new PermissionOrRequirement(permissions);
+
+        var grantResult = new MultiplePermissionGrantResult();
+
+        _permissionChecker.IsGrantedAsync(user, permissions)
+            .Returns(grantResult);
+
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert
+        context.HasSucceeded.ShouldBeFalse();
+    }
+
+    [Fact]
+    public void Requirement_ShouldStorePermissions()
+    {
+        var requirement = new PermissionOrRequirement("A", "B", "C");
+        requirement.Permissions.ShouldBe(new[] { "A", "B", "C" });
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Identity/Authorization/RoleOrPermissionAuthorizationHandlerTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Identity/Authorization/RoleOrPermissionAuthorizationHandlerTests.cs
new file mode 100644
index 0000000000..ff25e4cee1
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Web.Tests/Identity/Authorization/RoleOrPermissionAuthorizationHandlerTests.cs
@@ -0,0 +1,162 @@
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using NSubstitute;
+using Shouldly;
+using Unity.GrantManager.Web.Identity.Authorization;
+using Volo.Abp.Authorization.Permissions;
+using Xunit;
+
+namespace Unity.GrantManager.Identity.Authorization;
+
+public class RoleOrPermissionAuthorizationHandlerTests
+{
+    private readonly IPermissionChecker _permissionChecker;
+    private readonly RoleOrPermissionAuthorizationHandler _handler;
+
+    public RoleOrPermissionAuthorizationHandlerTests()
+    {
+        _permissionChecker = Substitute.For<IPermissionChecker>();
+        _handler = new RoleOrPermissionAuthorizationHandler(_permissionChecker);
+    }
+
+    private static AuthorizationHandlerContext CreateContext(
+        ClaimsPrincipal user,
+        RoleOrPermissionRequirement requirement)
+    {
+        return new AuthorizationHandlerContext(
+            [requirement],
+            user,
+            resource: null);
+    }
+
+    private static ClaimsPrincipal CreateUserWithRole(string roleName)
+    {
+        var identity = new ClaimsIdentity("TestAuth");
+        identity.AddClaim(new Claim(ClaimTypes.Role, roleName));
+        return new ClaimsPrincipal(identity);
+    }
+
+    private static ClaimsPrincipal CreateUserWithoutRole()
+    {
+        var identity = new ClaimsIdentity("TestAuth");
+        return new ClaimsPrincipal(identity);
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldSucceed_WhenUserHasRole()
+    {
+        // Arrange
+        var user = CreateUserWithRole("ITAdministrator");
+        var requirement = new RoleOrPermissionRequirement(["ITAdministrator"], "Unity.ITAdmin");
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert
+        context.HasSucceeded.ShouldBeTrue();
+        await _permissionChecker.DidNotReceive().IsGrantedAsync(
+            Arg.Any<ClaimsPrincipal>(), Arg.Any<string>());
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldSucceed_WhenUserHasPermission()
+    {
+        // Arrange
+        var user = CreateUserWithoutRole();
+        var requirement = new RoleOrPermissionRequirement(["ITAdministrator"], "Unity.ITAdmin");
+
+        _permissionChecker.IsGrantedAsync(user, "Unity.ITAdmin")
+            .Returns(true);
+
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert
+        context.HasSucceeded.ShouldBeTrue();
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldNotSucceed_WhenNeitherRoleNorPermission()
+    {
+        // Arrange
+        var user = CreateUserWithoutRole();
+        var requirement = new RoleOrPermissionRequirement(["ITAdministrator"], "Unity.ITAdmin");
+
+        _permissionChecker.IsGrantedAsync(user, "Unity.ITAdmin")
+            .Returns(false);
+
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert
+        context.HasSucceeded.ShouldBeFalse();
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldShortCircuit_WhenRoleMatches()
+    {
+        // Arrange
+        var user = CreateUserWithRole("ITOperations");
+        var requirement = new RoleOrPermissionRequirement(["ITOperations"], "Unity.ITOperations");
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert - should not call permission checker at all
+        context.HasSucceeded.ShouldBeTrue();
+        await _permissionChecker.DidNotReceive().IsGrantedAsync(
+            Arg.Any<ClaimsPrincipal>(), Arg.Any<string>());
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldCheckPermission_WhenRoleDoesNotMatch()
+    {
+        // Arrange
+        var user = CreateUserWithRole("SomeOtherRole");
+        var requirement = new RoleOrPermissionRequirement(["ITAdministrator"], "Unity.ITAdmin");
+
+        _permissionChecker.IsGrantedAsync(user, "Unity.ITAdmin")
+            .Returns(false);
+
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert
+        context.HasSucceeded.ShouldBeFalse();
+        await _permissionChecker.Received(1).IsGrantedAsync(user, "Unity.ITAdmin");
+    }
+
+    [Fact]
+    public void Requirement_ShouldStoreRolesAndPermission()
+    {
+        var requirement = new RoleOrPermissionRequirement(["MyRole"], "MyPermission");
+        requirement.RoleNames.ShouldBe(["MyRole"]);
+        requirement.PermissionName.ShouldBe("MyPermission");
+    }
+
+    [Fact]
+    public async Task HandleAsync_ShouldSucceed_WhenUserHasAnyOfMultipleRoles()
+    {
+        // Arrange
+        var user = CreateUserWithRole("ITAdministrator");
+        var requirement = new RoleOrPermissionRequirement(["ITOperations", "ITAdministrator"], "Unity.ITOperations");
+        var context = CreateContext(user, requirement);
+
+        // Act
+        await _handler.HandleAsync(context);
+
+        // Assert
+        context.HasSucceeded.ShouldBeTrue();
+        await _permissionChecker.DidNotReceive().IsGrantedAsync(
+            Arg.Any<ClaimsPrincipal>(), Arg.Any<string>());
+    }
+}
diff --git a/applications/Unity.Tools/Unity.NginxData/404.html b/applications/Unity.Tools/Unity.NginxData/404.html
new file mode 100644
index 0000000000..38815d583c
--- /dev/null
+++ b/applications/Unity.Tools/Unity.NginxData/404.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Page Not Found</title>
+    <style>
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-Regular.woff2') format('woff2'), url('/fonts/BCSans/BCSans-Regular.woff') format('woff');
+            font-weight: 300 600;
+            font-style: normal;
+        }
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-Bold.woff2') format('woff2'), url('/fonts/BCSans/BCSans-Bold.woff') format('woff');
+            font-weight: 700 900;
+            font-style: normal;
+        }
+        body {
+            margin: 0;
+            min-height: 100vh;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-family: 'BCSans', 'BC Sans', 'Noto Sans', Verdana, Arial, sans-serif;
+            background-color: #ffffff;
+            color: #494949;
+            font-size: 16px;
+            line-height: 1.25;
+        }
+        .container {
+            text-align: center;
+            max-width: 600px;
+            padding: 2rem;
+        }
+        .accent {
+            width: 48px;
+            height: 4px;
+            background-color: #2A9546;
+            margin: 0 auto 1.5rem;
+            border-radius: 2px;
+        }
+        h1 {
+            font-size: 2rem;
+            font-weight: 700;
+            color: #2A9546;
+            margin: 0 0 1rem;
+        }
+        p {
+            font-size: 1rem;
+            color: #6b6b6b;
+            margin: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="accent"></div>
+        <h1>Page Not Found</h1>
+        <p>The page you requested is not available.</p>
+    </div>
+</body>
+</html>
diff --git a/applications/Unity.Tools/Unity.NginxData/50x.html b/applications/Unity.Tools/Unity.NginxData/50x.html
new file mode 100644
index 0000000000..65c6158c15
--- /dev/null
+++ b/applications/Unity.Tools/Unity.NginxData/50x.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Service Unavailable</title>
+    <style>
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-Regular.woff2') format('woff2'), url('/fonts/BCSans/BCSans-Regular.woff') format('woff');
+            font-weight: 300 600;
+            font-style: normal;
+        }
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-Bold.woff2') format('woff2'), url('/fonts/BCSans/BCSans-Bold.woff') format('woff');
+            font-weight: 700 900;
+            font-style: normal;
+        }
+        body {
+            margin: 0;
+            min-height: 100vh;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-family: 'BCSans', 'BC Sans', 'Noto Sans', Verdana, Arial, sans-serif;
+            background-color: #ffffff;
+            color: #494949;
+            font-size: 16px;
+            line-height: 1.25;
+        }
+        .container {
+            text-align: center;
+            max-width: 600px;
+            padding: 2rem;
+        }
+        .accent {
+            width: 48px;
+            height: 4px;
+            background-color: #2A9546;
+            margin: 0 auto 1.5rem;
+            border-radius: 2px;
+        }
+        h1 {
+            font-size: 2rem;
+            font-weight: 700;
+            color: #2A9546;
+            margin: 0 0 1rem;
+        }
+        p {
+            font-size: 1rem;
+            color: #6b6b6b;
+            margin: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="accent"></div>
+        <h1>Service Unavailable</h1>
+        <p>Internal errors, bad gateway, or timeout on this service.</p>
+    </div>
+</body>
+</html>
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Bold.woff b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Bold.woff
new file mode 100644
index 0000000000..0e2f8e3bd1
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Bold.woff differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Bold.woff2 b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Bold.woff2
new file mode 100644
index 0000000000..3db78138fb
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Bold.woff2 differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-BoldItalic.woff b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-BoldItalic.woff
new file mode 100644
index 0000000000..e466626bc6
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-BoldItalic.woff differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-BoldItalic.woff2 b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-BoldItalic.woff2
new file mode 100644
index 0000000000..ac32077e5b
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-BoldItalic.woff2 differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Italic.woff b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Italic.woff
new file mode 100644
index 0000000000..52af7b65f6
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Italic.woff differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Italic.woff2 b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Italic.woff2
new file mode 100644
index 0000000000..9468cec3a8
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Italic.woff2 differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Light.woff b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Light.woff
new file mode 100644
index 0000000000..02b3e85765
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Light.woff differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Light.woff2 b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Light.woff2
new file mode 100644
index 0000000000..29a4731501
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Light.woff2 differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-LightItalic.woff b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-LightItalic.woff
new file mode 100644
index 0000000000..e85ec2c993
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-LightItalic.woff differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-LightItalic.woff2 b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-LightItalic.woff2
new file mode 100644
index 0000000000..b2acc22199
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-LightItalic.woff2 differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Regular.woff b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Regular.woff
new file mode 100644
index 0000000000..58478e8c2c
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Regular.woff differ
diff --git a/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Regular.woff2 b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Regular.woff2
new file mode 100644
index 0000000000..7011f82b30
Binary files /dev/null and b/applications/Unity.Tools/Unity.NginxData/fonts/BCSans/BCSans-Regular.woff2 differ
diff --git a/applications/Unity.Tools/Unity.NginxData/grants.html b/applications/Unity.Tools/Unity.NginxData/grants.html
deleted file mode 100644
index 46330ef6ca..0000000000
--- a/applications/Unity.Tools/Unity.NginxData/grants.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Enterprise Grant</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="icon" type="image/x-icon" href="favicon.ico">
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            height: 100vh;
-            overflow: hidden;
-            position: relative;
-            background: #f0f0f0;
-            font-family: BCSans, "Noto Sans", Verdana, Arial, sans-serif;
-        }
-
-        /* Full screen background using CSS recreation */
-        .screenshot-background {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            background: linear-gradient(90deg, #003366 50%, #f0f0f0 50%);
-        }
-
-        /* Recreate the login card */
-        .login-card {
-            position: absolute;
-            left: 9%;
-            top: 35%;
-            width: 32%;
-            height: 35%;
-            background: white;
-            border-radius: 12px;
-            box-shadow: 0 4px 20px rgba(0,0,0,0.1);
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            align-items: center;
-            padding: 2rem;
-            text-align: center;
-            z-index: 1;
-        }
-
-        .login-title {
-            color: #003366;
-            font-size: 1.8rem;
-            font-weight: 600;
-            margin-bottom: 0.5rem;
-            line-height: 1.2;
-        }
-
-        .login-subtitle {
-            color: #666;
-            font-size: 1rem;
-            margin-bottom: 1.5rem;
-        }
-
-        .login-description {
-            color: #333;
-            font-size: 0.9rem;
-            margin-bottom: 2rem;
-            line-height: 1.4;
-        }
-
-        .login-button {
-            background: #003366;
-            color: white;
-            border: none;
-            padding: 0.8rem 2rem;
-            border-radius: 4px;
-            font-size: 1rem;
-            font-weight: 500;
-            cursor: pointer;
-            width: 100%;
-        }
-
-        /* Dashboard preview using actual image */
-        .dashboard-card {
-            position: absolute;
-            right: 8%;
-            top: 25%;
-            width: 35%;
-            height: 45%;
-            background-image: url('https://prod-grants.apps.silver.devops.gov.bc.ca/images/dashboard-preview.png');
-            background-size: contain;
-            background-repeat: no-repeat;
-            background-position: center;
-            border-radius: 8px;
-            box-shadow: 0 4px 15px rgba(0,0,0,0.15);
-            overflow: hidden;
-            z-index: 1;
-            cursor: pointer;
-        }
-
-        .dashboard-header {
-            display: none;
-        }
-
-        .dashboard-content {
-            display: none;
-        }
-
-        /* BC Logo */
-        .bc-logo {
-            position: absolute;
-            top: 2rem;
-            left: 75%;
-            transform: translateX(-50%);
-            width: 450px;
-            height: 135px;
-            background-image: url('https://prod-grants.apps.silver.devops.gov.bc.ca/images/logo/BCID_H_rgb_pos.png');
-            background-size: contain;
-            background-repeat: no-repeat;
-            background-position: center;
-            z-index: 10;
-        }
-
-        /* Grants URL */
-        .grants-url {
-            position: absolute;
-            bottom: 2rem;
-            left: 75%;
-            transform: translateX(-50%);
-            color: #003366;
-            font-size: 1rem;
-            font-weight: 500;
-            text-align: center;
-            z-index: 10;
-        }
-
-        /* Interactive overlay for the login button */
-        .login-button-overlay {
-            position: absolute;
-            left: 12%;
-            top: 63%;
-            width: 20%;
-            height: 5%;
-            background: transparent;
-            cursor: pointer;
-            border: none;
-            z-index: 10;
-            border-radius: 4px;
-        }
-
-        .login-button-overlay:hover {
-            background: rgba(255, 255, 255, 0.2);
-            border: 2px solid rgba(255, 255, 255, 0.5);
-            box-shadow: 0 0 10px rgba(255, 255, 255, 0.3);
-        }
-
-        .login-button-overlay:active {
-            background: rgba(255, 255, 255, 0.2);
-        }
-
-        /* Interactive overlay for dashboard elements */
-        .dashboard-overlay {
-            position: absolute;
-            right: 0;
-            top: 20%;
-            width: 50%;
-            height: 60%;
-            background: transparent;
-            cursor: pointer;
-            border: none;
-            z-index: 5;
-            border-radius: 8px;
-        }
-
-        .dashboard-overlay:hover {
-            background: rgba(255, 255, 255, 0.1);
-            border: 1px solid rgba(255, 255, 255, 0.3);
-            box-shadow: 0 0 5px rgba(255, 255, 255, 0.2);
-        }
-
-        /* Invisible overlays for other interactive elements */
-        .bc-logo-overlay {
-            position: absolute;
-            top: 6%;
-            right: 6%;
-            width: 20%;
-            height: 12%;
-            background: transparent;
-            cursor: pointer;
-            z-index: 10;
-        }
-
-        .grants-url-overlay {
-            position: absolute;
-            bottom: 6%;
-            right: 6%;
-            width: 15%;
-            height: 4%;
-            background: transparent;
-            cursor: pointer;
-            z-index: 10;
-        }
-
-        /* Tooltip styles */
-        .tooltip {
-            position: relative;
-        }
-
-        .tooltip::after {
-            content: attr(data-tooltip);
-            position: absolute;
-            bottom: 100%;
-            left: 50%;
-            transform: translateX(-50%);
-            background: rgba(0, 0, 0, 0.8);
-            color: white;
-            padding: 5px 10px;
-            border-radius: 4px;
-            font-size: 12px;
-            white-space: nowrap;
-            opacity: 0;
-            pointer-events: none;
-            transition: opacity 0.3s;
-            z-index: 1000;
-        }
-
-        .tooltip:hover::after {
-            opacity: 1;
-        }
-
-        /* Responsive adjustments */
-        @media (max-width: 1024px) {
-            .login-button-overlay {
-                left: 10%;
-                top: 60%;
-                width: 22%;
-                height: 6%;
-            }
-            
-            .dashboard-overlay {
-                right: 0;
-                top: 18%;
-                width: 50%;
-                height: 65%;
-            }
-        }
-
-        @media (max-width: 768px) {
-            .login-button-overlay,
-            .dashboard-overlay,
-            .bc-logo-overlay,
-            .grants-url-overlay {
-                display: none; /* Hide interactive elements on small screens */
-            }
-        }
-
-        /* Ensure image always fits properly regardless of screen size */
-        @media (min-aspect-ratio: 16/9) {
-            .screenshot-background {
-                background-size: contain;
-            }
-        }
-
-        @media (max-aspect-ratio: 16/9) {
-            .screenshot-background {
-                background-size: contain;
-            }
-        }
-    </style>
-</head>
-<body>
-    <!-- Recreated background -->
-    <div class="screenshot-background"></div>
-    
-    <!-- BC Logo -->
-    <div class="bc-logo"></div>
-    
-    <!-- Grants URL -->
-    <div class="grants-url">grants.gov.bc.ca</div>
-    
-    <!-- Login Card -->
-    <div class="login-card">
-        <h1 class="login-title">Enterprise Grant</h1>
-        <p class="login-subtitle">Management System Portal</p>
-        <p class="login-description">Sign in to access your information and submission status.</p>
-        <button class="login-button" onclick="handleLogin()">Login</button>
-    </div>
-    
-    <!-- Dashboard Card -->
-    <div class="dashboard-card" onclick="handleDashboard()"></div>
-    
-    <!-- Interactive overlays for better coverage -->
-    <button class="login-button-overlay tooltip" data-tooltip="Click to simulate login" onclick="handleLogin()"></button>
-    
-    <div class="dashboard-overlay tooltip" data-tooltip="Dashboard preview" onclick="handleDashboard()"></div>
-    
-    <div class="bc-logo-overlay tooltip" data-tooltip="British Columbia Government" onclick="handleBCLogo()"></div>
-    
-    <div class="grants-url-overlay tooltip" data-tooltip="Visit grants.gov.bc.ca" onclick="handleGrantsUrl()"></div>
-
-    <script>
-        function handleLogin() {
-            alert('Login functionality - This is a mockup page for testing routes. In the real application, this would redirect to the authentication system.');
-        }
-
-        function handleDashboard() {
-            alert('Dashboard Landing Page Preview..');
-        }
-
-        function handleBCLogo() {
-            alert('British Columbia Government - This would normally link to the main BC Government website.');
-        }
-
-        function handleGrantsUrl() {
-            alert('grants.gov.bc.ca - This represents the actual grants portal.');
-        }
-
-        // Add keyboard navigation
-        document.addEventListener('keydown', function(e) {
-            if (e.key === 'Enter' || e.key === ' ') {
-                if (document.activeElement.classList.contains('login-button-overlay')) {
-                    handleLogin();
-                }
-            }
-        });
-
-        // Make overlays focusable for accessibility
-        document.addEventListener('DOMContentLoaded', function() {
-            const overlays = document.querySelectorAll('.login-button-overlay, .dashboard-overlay, .bc-logo-overlay, .grants-url-overlay');
-            overlays.forEach(overlay => {
-                overlay.setAttribute('tabindex', '0');
-            });
-        });
-    </script>
-    
-    <!-- Matomo -->
-    <script>
-    var _paq = window._paq = window._paq || [];
-    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-        var u="//dev-analytics-matomo.apps.silver.devops.gov.bc.ca/";
-        _paq.push(['setTrackerUrl', u+'matomo.php']);
-        _paq.push(['setSiteId', '1']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-    })();
-    </script>
-    <!-- End Matomo Code -->
-</body>
-</html>
\ No newline at end of file
diff --git a/applications/Unity.Tools/Unity.NginxData/index.html b/applications/Unity.Tools/Unity.NginxData/index.html
index d75313de84..c48d4a91a3 100644
--- a/applications/Unity.Tools/Unity.NginxData/index.html
+++ b/applications/Unity.Tools/Unity.NginxData/index.html
@@ -3,8 +3,44 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Unity Grant Management - Contact Information</title>
-    <link href="https://fonts.googleapis.com/css2?family=BC+Sans:wght@300;400;700&display=swap" rel="stylesheet">
+    <link rel="icon" type="image/svg+xml" href="/reference/common/images/unity.svg">
     <style>
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-Regular.woff2') format('woff2'), url('/fonts/BCSans/BCSans-Regular.woff') format('woff');
+            font-weight: 300 600;
+            font-style: normal;
+        }
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-Bold.woff2') format('woff2'), url('/fonts/BCSans/BCSans-Bold.woff') format('woff');
+            font-weight: 700 900;
+            font-style: normal;
+        }
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-Light.woff2') format('woff2'), url('/fonts/BCSans/BCSans-Light.woff') format('woff');
+            font-weight: 100 200;
+            font-style: normal;
+        }
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-Italic.woff2') format('woff2'), url('/fonts/BCSans/BCSans-Italic.woff') format('woff');
+            font-weight: 400 600;
+            font-style: italic;
+        }
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-BoldItalic.woff2') format('woff2'), url('/fonts/BCSans/BCSans-BoldItalic.woff') format('woff');
+            font-weight: 700 900;
+            font-style: italic;
+        }
+        @font-face {
+            font-family: 'BCSans';
+            src: url('/fonts/BCSans/BCSans-LightItalic.woff2') format('woff2'), url('/fonts/BCSans/BCSans-LightItalic.woff') format('woff');
+            font-weight: 100 300;
+            font-style: italic;
+        }
         body {
             margin: 0;
             padding: 0;
diff --git a/applications/Unity.Tools/Unity.NginxData/nginx.conf b/applications/Unity.Tools/Unity.NginxData/nginx.conf
index 90e146635b..e395b4a9eb 100644
--- a/applications/Unity.Tools/Unity.NginxData/nginx.conf
+++ b/applications/Unity.Tools/Unity.NginxData/nginx.conf
@@ -87,10 +87,19 @@ http {
         add_header X-Content-Type-Options "nosniff" always;
         add_header X-XSS-Protection "1; mode=block" always;
         add_header Referrer-Policy "no-referrer-when-downgrade" always;
-        add_header Content-Security-Policy "default-src 'self'; script-src 'self'; object-src 'none';" always;
+        add_header Content-Security-Policy "default-src 'self'; style-src 'self'; font-src 'self'; script-src 'self'; object-src 'none';" always;
+        # Cross-origin isolation headers (scan findings)
+        # COOP: restricts cross-origin window access
+        add_header Cross-Origin-Opener-Policy "same-origin" always;
+        # CORP: cross-origin used (not same-site) because /reference/common/images/ are
+        # intentionally publicly embeddable cross-origin and CORS * is already declared
+        add_header Cross-Origin-Resource-Policy "cross-origin" always;
+        # Cache: prevent responses being stored in shared/proxy caches
+        add_header Cache-Control "no-store" always;
+        add_header Pragma "no-cache" always;
 
         error_page 404 /404.html;
-            location = /40x.html {
+            location = /404.html {
         }
 
         error_page 500 502 503 504 /50x.html;
@@ -98,29 +107,7 @@ http {
         }
 
         location /grants {
-            alias /opt/app-root/src/grants.html;
-            add_header Content-Type text/html;
-        }
-    }
-
-    server {
-        listen       8080;
-        server_name  grants.gov.bc.ca;
-        root         /opt/app-root/src;
-
-        location /reference/common/images/ {
-            # Serve static image files
-            try_files $uri $uri/ =404;
-        }
-
-        location /grants {
-            try_files /grants.html =404;
-            add_header Content-Type text/html;
-        }
-
-        location = / {
-            try_files /grants.html =404;
-            add_header Content-Type text/html;
+            return 404;
         }
     }
 }
diff --git a/documentation/External Dependency Summary.md b/documentation/External Dependency Summary.md
new file mode 100644
index 0000000000..0aa235f552
--- /dev/null
+++ b/documentation/External Dependency Summary.md	
@@ -0,0 +1,39 @@
+# Unity Platform External Dependency Summary
+
+## Unity Grant Manager (UGM): 15 External Dependencies
+
+| # | Service | Key | URL | Purpose |
+|---|---|---|---|---|
+| 1 | Keycloak / LoginProxy | AuthServer__ServerAddress | loginproxy.gov.bc.ca/auth | OIDC user login |
+| 2 | CSS API | CSS_API_BASE | api.loginproxy.gov.bc.ca/api/v1 | IDIR staff directory lookup |
+| 3 | CSS Token | CSS_TOKEN_API_BASE | .../realms/standard/.../token | OAuth token for CSS |
+| 4 | CHES | NOTIFICATION_API_BASE | ches.api.gov.bc.ca/api/v1 | Send/status/cancel emails |
+| 5 | CHES Auth | NOTIFICATION_AUTH | .../realms/comsvcauth/.../token | OAuth token for CHES |
+| 6 | Teams Webhooks | DIRECT_MESSAGE_0...N | bcgov.webhook.office.com/... | Direct Teams channel messages |
+| 7 | CAS / CFS | PAYMENT_API_BASE | cfs-prodws.cas.gov.bc.ca:7121/ords/cas | Supplier lookup + invoice creation |
+| 8 | BC Geocoder | GEOCODER_LOCATION_API_BASE | geocoder.api.gov.bc.ca | Address/region lookups |
+| 9 | OpenMaps WFS | GEOCODER_API_BASE | openmaps.gov.bc.ca/geo/pub/ows?... | Geospatial boundary features |
+| 10 | OrgBook | ORGBOOK_API_BASE | orgbook.gov.bc.ca/api | Business registry search |
+| 11 | CHEFS | INTAKE_API_BASE | submit.digital.gov.bc.ca/app/api/v1 | Form definitions + submissions |
+| 12 | Azure OpenAI | OpenAI:Endpoint + OpenAI:ApiKey (Vault) | Azure-hosted (per env) | AI: AttachmentSummary, ApplicationAnalysis, ApplicationScoring |
+| 13 | Reporting AI | REPORTING_AI | prod-unity-ai-reporting-d18498-prod.apps.silver.devops.gov.bc.ca | iFrame embed only — no backend HTTP call |
+| 14 | Matomo Analytics | ANALYTICS_MATOMO_BASE | {env}-analytics-matomo.apps.silver.devops.gov.bc.ca | Browser-side page tracking |
+| 15 | HashiCorp Vault | (platform / ExternalSecrets) | vault.developer.gov.bc.ca | All API keys, OAuth secrets, DB credentials |
+
+## Unity Applicant Portal (UAP): 4 External Dependencies
+
+| # | Service | Config Key | URL | Purpose |
+|---|---|---|---|---|
+| 1 | Keycloak / LoginProxy | KEYCLOAK__AUTHSERVERURL | loginproxy.gov.bc.ca/auth | OIDC token exchange + userinfo |
+| 2 | OrgBook | orgbookApiUrl | orgbook.gov.bc.ca/api | Business registry - direct browser calls |
+| 3 | Matomo Analytics | MATOMO__URL | {env}-analytics-matomo.apps.silver.devops.gov.bc.ca/ | Browser-side page tracking |
+| 4 | Unity Grant Manager API | Plugins:UNITY:Configuration:BaseUrl | http://{env}-unity-grantmanager-web (in-cluster) | Profile/tenant reads (HTTP) + Contact/Address mutations (RabbitMQ) |
+
+---
+
+## Key Findings
+
+- Azure OpenAI is UGM's operational AI endpoint — makes live chat completion calls (analysis, scoring, attachment summaries). Endpoint URL and key come from Vault.
+- OrgBook is called by both apps: UGM from its backend, UAP directly from the Angular browser.
+- UAP to UGM use sync REST (profile reads via plugin HTTP client) and async RabbitMQ (contact/address mutations).
+- All secrets live in HashiCorp Vault and are pulled into OCP via the ExternalSecrets operator.
diff --git a/documentation/External-Dependency-Chart.md b/documentation/External-Dependency-Chart.md
new file mode 100644
index 0000000000..3874e4c446
--- /dev/null
+++ b/documentation/External-Dependency-Chart.md
@@ -0,0 +1,193 @@
+# Unity Platform – External Dependency Chart
+_Generated: 2026-06-25_
+
+---
+
+## Architecture Overview
+
+```mermaid
+graph TD
+    subgraph col1[" "]
+        Applicants(["Applicants"])
+    end
+
+    subgraph OCP["BC Government Platform · OCP Silver"]
+        UAP["Unity Applicant Portal<br/>Angular + .NET API"]
+        UGM["Unity Grant Manager<br/>ABP / Razor Pages"]
+
+        subgraph Shared["Shared Platform Services"]
+            DB[("PostgreSQL")]
+            MQ[("RabbitMQ")]
+            Cache[("Redis")]
+            Vault[("Vault")]
+        end
+    end
+
+    subgraph col2[" "]
+        IDIR(["Internal Staff · IDIR"])
+    end
+
+    CHEFS["CHEFS / Intake<br/>submit.digital.gov.bc.ca"]
+
+
+    Applicants -->|use portal| UAP
+    Applicants -->|submit forms| CHEFS
+    IDIR -->|manage grants| UGM
+    UAP -->|REST: profile & tenant reads| UGM
+    UGM -->|profile & tenant data| UAP
+    UAP -->|async commands| MQ
+    MQ -->|contact/address events| UGM
+    UGM -->|GET forms & submissions| CHEFS
+
+    style col1 fill:none,stroke:none
+    style col2 fill:none,stroke:none
+```
+
+---
+
+## Dependency Matrix
+
+### Unity Grant Manager (UGM) — External Calls
+
+| # | Service | Friendly Name | Config Key | Production URL | Protocol | Operations | Module |
+|---|---------|---------------|------------|----------------|----------|------------|--------|
+| 1 | **Keycloak / LoginProxy** | Authentication (SSO) | `AuthServer__ServerAddress` | `https://loginproxy.gov.bc.ca/auth` | OIDC | User login, token validation, session | Core / Identity.Web |
+| 2 | **CSS API** | Common Single Sign-On (IDIR Lookup) | `CSS_API_BASE` | `https://api.loginproxy.gov.bc.ca/api/v1` | REST | GET users by IDIR, search directory | Application / CssApiService |
+| 3 | **CSS Token** | CSS OAuth Token | `CSS_TOKEN_API_BASE` | `https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/token` | OAuth2 client_credentials | POST token for CSS API auth | Application / CssApiService |
+| 4 | **CHES** | Notification Email Service | `NOTIFICATION_API_BASE` | `https://ches.api.gov.bc.ca/api/v1` | REST | POST /email, GET /status, DELETE /cancel | Unity.Notifications / ChesClientService |
+| 5 | **CHES Auth** | CHES OAuth Token | `NOTIFICATION_AUTH` | `https://loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token` | OAuth2 client_credentials | POST token for CHES API auth | Unity.Notifications / ChesClientService |
+| 6 | **MS Teams Webhooks** | Direct Messages (Teams) | `DIRECT_MESSAGE_0`, `DIRECT_MESSAGE_1`, … | `https://bcgov.webhook.office.com/webhookb2/…` | HTTPS POST | POST adaptive card / message payloads | Unity.Notifications / TeamsNotificationService |
+| 7 | **CAS / CFS** | Payment System (Payments) | `PAYMENT_API_BASE` | `https://cfs-prodws.cas.gov.bc.ca:7121/ords/cas` | REST/OAuth | POST /oauth/token, GET supplier, POST invoice | Unity.Payments / CasTokenService, SupplierService, InvoiceService |
+| 8 | **BC Geocoder** | Address Lookup | `GEOCODER_LOCATION_API_BASE` | `https://geocoder.api.gov.bc.ca` | REST | GET address search, district/region lookups | Application / GeocoderApiService |
+| 9 | **OpenMaps / WFS** | Geospatial Features | `GEOCODER_API_BASE` | `https://openmaps.gov.bc.ca/geo/pub/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=` | WFS/OGC | GET geographic boundary features | Application / GeocoderApiService |
+| 10 | **OrgBook** | Business Registry Lookup | `ORGBOOK_API_BASE` | `https://orgbook.gov.bc.ca/api` | REST | GET search/autocomplete, GET topic/credential details | Application / OrgBookService |
+| 11 | **CHEFS / Intake** | Form Submissions (CHEFS) | `INTAKE_API_BASE` | `https://submit.digital.gov.bc.ca/app/api/v1` | REST | GET forms, GET versions, GET submissions | Application / FormsApiService, SubmissionAppService |
+| 12 | **Azure OpenAI** | AI Analysis & Scoring | `OpenAI:Endpoint` + `OpenAI:ApiKey` (Vault) | Azure-hosted endpoint (configured per env) | HTTPS / Azure SDK | Chat completions for AttachmentSummary, ApplicationAnalysis, ApplicationScoring | Unity.AI / OpenAITransportService |
+| 13 | **Reporting AI Dashboard** | AI Reporting (Metabase-based) | `REPORTING_AI` | `https://prod-unity-ai-reporting-d18498-prod.apps.silver.devops.gov.bc.ca` | iFrame embed only (no backend HTTP call) | Embedded analytics dashboard | Unity.AI / AIReporting page |
+| 14 | **Matomo Analytics** | Web Analytics | `ANALYTICS_MATOMO_BASE` | `https://prod-analytics-matomo.apps.silver.devops.gov.bc.ca` | Browser JS tag | Page views, user events | Web (frontend JS) |
+| 15 | **HashiCorp Vault** | Secrets Management | (platform) | `https://vault.developer.gov.bc.ca` | Vault API / ExternalSecrets operator | API keys, DB credentials, OAuth secrets | Platform |
+
+---
+
+### Unity Applicant Portal (UAP) — External Calls
+
+| # | Service | Friendly Name | Config Key | Production URL | Protocol | Operations | Layer |
+|---|---------|---------------|------------|----------------|----------|------------|-------|
+| 1 | **Keycloak / LoginProxy** | Authentication (SSO) | `KEYCLOAK__AUTHSERVERURL` / `KEYCLOAK__REALM` | `https://loginproxy.gov.bc.ca/auth` | OIDC | POST token exchange (code → token), GET /userinfo | Backend / AuthCallback |
+| 2 | **OrgBook** | Business Registry Lookup | `orgbookApiUrl` | `https://orgbook.gov.bc.ca/api` | REST | GET /v3/search/autocomplete, GET /v4/search/topic | Frontend / organization.component.ts |
+| 3 | **Matomo Analytics** | Web Analytics | `MATOMO__URL` / `MATOMO__SITEID` | `https://prod-analytics-matomo.apps.silver.devops.gov.bc.ca/` | Browser JS tag | Page views, user events | Frontend |
+| 4 | **Unity Grant Manager API** | Internal Portal→UGM calls | `Plugins:UNITY:Configuration:BaseUrl` | `http://{env}-unity-grantmanager-web` (in-cluster) | REST (HTTP, in-cluster) | GET /api/app/applicant-profiles/tenants, GET /api/app/applicant-profiles/profile | Backend / UnityPlugin, Unity.Profile |
+
+---
+
+### UAP → UGM Internal Communication (Async)
+
+| Mechanism | Direction | Operations |
+|-----------|-----------|------------|
+| **RabbitMQ messages** (MassTransit) | UAP → UGM | Create/Edit/Delete Contacts, Addresses, set-primary; applicant workspace events |
+| **REST HTTP** (in-cluster) | UAP → UGM | GET applicant profile, GET tenant list (synchronous reads via plugin) |
+
+---
+
+## Service Dependency Graph
+
+```
+Unity Grant Manager (UGM)
+│
+├── AUTH ──────────────────► Keycloak / LoginProxy
+│                            (OIDC login + CSS token + CHES token)
+│
+├── CSS ───────────────────► api.loginproxy.gov.bc.ca    [IDIR user search]
+│
+├── NOTIFICATIONS ─────────► ches.api.gov.bc.ca          [Email via CHES]
+│                └─────────► bcgov.webhook.office.com     [Teams direct messages]
+│
+├── PAYMENTS ──────────────► cfs-prodws.cas.gov.bc.ca     [CFS/CAS invoices & suppliers]
+│
+├── GEOCODER ──────────────► geocoder.api.gov.bc.ca       [Address lookup]
+│                └─────────► openmaps.gov.bc.ca            [WFS geospatial features]
+│
+├── ORGBOOK ───────────────► orgbook.gov.bc.ca             [Business registry]
+│
+├── INTAKE ────────────────► submit.digital.gov.bc.ca      [CHEFS form submissions]
+│
+├── AI (operational) ──────► Azure OpenAI endpoint         [Chat completions: analysis, scoring, summaries]
+│
+├── AI (reporting) ────────► unity-ai-reporting (OCP)      [iFrame embed only — no backend HTTP]
+│
+├── ANALYTICS ─────────────► analytics-matomo (OCP)        [Browser-side page tracking]
+│
+└── SECRETS ───────────────► vault.developer.gov.bc.ca     [All credentials via ExternalSecrets operator]
+
+
+Unity Applicant Portal (UAP)
+│
+├── AUTH ──────────────────► Keycloak / LoginProxy         [OIDC token exchange + userinfo]
+│
+├── ORGBOOK ───────────────► orgbook.gov.bc.ca             [Business registry — frontend direct]
+│
+├── ANALYTICS ─────────────► analytics-matomo (OCP)        [Browser-side page tracking]
+│
+├── UGM (sync HTTP) ───────► Unity Grant Manager API        [Profile & tenant reads — in-cluster]
+│
+└── UGM (async) ──────────► RabbitMQ ──► Unity Grant Manager [Contact/Address/Workspace mutations]
+```
+
+---
+
+## Environment URL Variants
+
+| Service | Dev | Test/UAT | Production |
+|---------|-----|----------|------------|
+| Keycloak | `dev.loginproxy.gov.bc.ca/auth` | `test.loginproxy.gov.bc.ca/auth` | `loginproxy.gov.bc.ca/auth` |
+| Matomo | `dev-analytics-matomo.apps.silver.devops.gov.bc.ca` | `test-analytics-matomo.apps.silver.devops.gov.bc.ca` | `prod-analytics-matomo.apps.silver.devops.gov.bc.ca` |
+| UGM ingress | `dev-unity.apps.silver.devops.gov.bc.ca` | `test-unity.apps.silver.devops.gov.bc.ca` | `prod-unity.apps.silver.devops.gov.bc.ca` |
+| CHEFS (dev) | `chefs-test.apps.silver.devops.gov.bc.ca/app/api/v1` | — | `submit.digital.gov.bc.ca/app/api/v1` |
+| CSS Env | `dev` | — | `prod` |
+| Azure OpenAI | Per-env endpoint (Vault) | Per-env endpoint (Vault) | Per-env endpoint (Vault) |
+
+---
+
+## Config Key → URL Reference
+
+| Config Key | URL | Consumer |
+|------------|-----|----------|
+| `CSS_API_BASE` | `https://api.loginproxy.gov.bc.ca/api/v1` | UGM |
+| `CSS_TOKEN_API_BASE` | `https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/token` | UGM |
+| `NOTIFICATION_API_BASE` | `https://ches.api.gov.bc.ca/api/v1` | UGM |
+| `NOTIFICATION_AUTH` | `https://loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token` | UGM |
+| `DIRECT_MESSAGE_0` | `https://bcgov.webhook.office.com/webhookb2/d7f6b10c-…` | UGM |
+| `PAYMENT_API_BASE` | `https://cfs-prodws.cas.gov.bc.ca:7121/ords/cas` | UGM |
+| `GEOCODER_LOCATION_API_BASE` | `https://geocoder.api.gov.bc.ca` | UGM |
+| `GEOCODER_API_BASE` | `https://openmaps.gov.bc.ca/geo/pub/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=` | UGM |
+| `ORGBOOK_API_BASE` | `https://orgbook.gov.bc.ca/api` | UGM + UAP frontend |
+| `ANALYTICS_MATOMO_BASE` | `https://prod-analytics-matomo.apps.silver.devops.gov.bc.ca` | UGM + UAP |
+| `REPORTING_AI` | `https://prod-unity-ai-reporting-d18498-prod.apps.silver.devops.gov.bc.ca` | UGM (iFrame only) |
+| `INTAKE_API_BASE` | `https://submit.digital.gov.bc.ca/app/api/v1` | UGM |
+| `OpenAI:Endpoint` + `OpenAI:ApiKey` | Azure OpenAI (per env, from Vault) | UGM |
+| `KEYCLOAK__AUTHSERVERURL` | `https://loginproxy.gov.bc.ca/auth` | UAP |
+| `MATOMO__URL` | `https://prod-analytics-matomo.apps.silver.devops.gov.bc.ca/` | UAP |
+| `Plugins:UNITY:Configuration:BaseUrl` | `http://{env}-unity-grantmanager-web` (in-cluster) | UAP |
+
+---
+
+## Key Findings
+
+- Azure OpenAI is UGM's operational AI endpoint — makes live chat completion calls (analysis, scoring, attachment summaries). Endpoint URL and key come from Vault.
+- OrgBook is called by both apps: UGM from its backend, UAP directly from the Angular browser.
+- UAP to UGM use sync REST (profile reads via plugin HTTP client) and async RabbitMQ (contact/address mutations).
+- All secrets live in HashiCorp Vault and are pulled into OCP via the ExternalSecrets operator.
+
+---
+
+## Notes
+
+- **CSS** = Common Single Sign-On — used by UGM only for IDIR staff directory lookups; OIDC login itself goes directly through Keycloak.
+- **CHES** = Common Hosted Email Service — all notification emails route through CHES; it has its own OAuth realm (`comsvcauth`), separate from the standard user-auth realm.
+- **Teams** = Multiple webhook URLs supported (`DIRECT_MESSAGE_0`, `DIRECT_MESSAGE_1`, …) stored as dynamic URL settings in the database, seeded by `DynamicUrlDataSeeder`.
+- **CAS/CFS** = Corporate Accounting System / Common Financial System — handles supplier registration and invoice creation for grant payments.
+- **CHEFS** = Common Hosted Examination and Form Service — UGM pulls form definitions and submission data from CHEFS to populate intake records.
+- **Azure OpenAI** = UGM's operational AI (NOT the Reporting AI). Makes live chat completion calls for: AttachmentSummary, ApplicationAnalysis, ApplicationScoring. Configured via `OpenAI:Endpoint` + `OpenAI:ApiKey` stored in Vault/secrets. Models: `gpt-4o-mini`, `gpt-5-mini`.
+- **Reporting AI** = A separate Metabase-based analytics app deployed in OCP (`REPORTING_AI`). UGM only embeds it as an iFrame — there is NO backend HTTP API call to it.
+- **OrgBook** = UAP makes direct browser-to-OrgBook calls from the Angular frontend. UGM also calls OrgBook from its backend service.
+- **Secrets** = All sensitive values (API keys, OAuth secrets, DB passwords) are stored in HashiCorp Vault (`vault.developer.gov.bc.ca`) and pulled via the Kubernetes ExternalSecrets operator into OCP Secrets.
diff --git a/documentation/applicant-portal/applicant-profile-data-providers.md b/documentation/applicant-portal/applicant-profile-data-providers.md
index 6cc8d3db98..816d9be7c8 100644
--- a/documentation/applicant-portal/applicant-profile-data-providers.md
+++ b/documentation/applicant-portal/applicant-profile-data-providers.md
@@ -389,6 +389,7 @@ flowchart LR
       "fiscalMonth": "April",
       "fiscalDay": 1,
       "organizationSize": "51-100",
+      "approxNumberOfEmployees": "51-100",
       "sector": "Technology",
       "subSector": "Software"
     }
@@ -410,13 +411,14 @@ flowchart LR
 | `NonRegOrgName` | `Applicant.NonRegOrgName` | `string?` | Non-registered organization name |
 | `FiscalMonth` | `Applicant.FiscalMonth` | `string?` | Fiscal year start month |
 | `FiscalDay` | `Applicant.FiscalDay` | `int?` | Fiscal year start day |
-| `OrganizationSize` | `Applicant.OrganizationSize` | `string?` | Size category |
+| `OrganizationSize` | `Applicant.ApproxNumberOfEmployees` | `string?` | Sourced from `ApproxNumberOfEmployees` for backward portal compatibility; `Applicant.OrganizationSize` column retained in DB pending migration but no longer read or displayed |
+| `ApproxNumberOfEmployees` | `Applicant.ApproxNumberOfEmployees` | `string?` | Approximate number of employees (replaces OrganizationSize in UI) |
 | `Sector` | `Applicant.Sector` | `string?` | Industry sector |
 | `SubSector` | `Applicant.SubSector` | `string?` | Industry sub-sector |
 
 **Multiple Applicants**: It is possible for a single OIDC subject to be linked to multiple distinct `Applicant` records (via different `ApplicationFormSubmission` rows). The provider returns all of them. When the same applicant is linked by multiple submissions, each join result is returned — the UI handles presentation and any eventual deduplication is a process-level concern.
 
-**Relationship to OrganizationEditHandler**: The `ORGANIZATION_EDIT_COMMAND` handler (see [RabbitMQ integration](./grants-portal-rabbitmq-integration.md)) updates a single `Applicant` entity by its ID. The `Id` field in the org info response corresponds to the `organizationId` expected by the edit command payload.
+**Relationship to OrganizationEditHandler**: The `ORGANIZATION_EDIT_COMMAND` handler (see [RabbitMQ integration](./grants-portal-rabbitmq-integration.md)) updates a single `Applicant` entity by its ID. The `Id` field in the org info response corresponds to the `organizationId` expected by the edit command payload. The inbound JSON field `organizationSize` is kept for external API compatibility but is now stored in `Applicant.ApproxNumberOfEmployees`, not `Applicant.OrganizationSize`.
 
 ---
 
diff --git a/documentation/reporting/get_consolidated_formversion_data_specification.md b/documentation/reporting/get_consolidated_formversion_data_specification.md
new file mode 100644
index 0000000000..ea13d31dd2
--- /dev/null
+++ b/documentation/reporting/get_consolidated_formversion_data_specification.md
@@ -0,0 +1,189 @@
+# get_consolidated_formversion_data.sql Function Specification
+
+## Overview
+
+`get_consolidated_formversion_data` is a PostgreSQL PL/pgSQL function that generates a dynamic SQL query spanning **all versions** of a CHEFS form. It is called by `generate_consolidated_formversion_view`. Rather than targeting a single form version, it iterates over every version recorded in the mapping metadata and generates a query per version, combining them with `UNION ALL`. Each output row includes a `form_version_label` column identifying which version it came from.
+
+## Function Signature
+
+```sql
+CREATE OR REPLACE FUNCTION "Reporting".get_consolidated_formversion_data(
+    form_id uuid,
+    report_map_id uuid
+)
+RETURNS text
+LANGUAGE plpgsql
+```
+
+## Purpose
+
+- Generates a multi-version UNION ALL query covering all form versions for a given form
+- Reads version IDs and labels from the mapping's `Metadata.Info` dictionary
+- Applies **version gating** — fields that belong to specific versions produce NULLs for other versions
+- Inherits the dual-schema (legacy/current) UNION ALL pattern from `get_formversion_data`
+- Supports both root fields and DataGrid fields
+- Returns a complete SQL query string ready for use as a consolidated view body
+
+## Input Parameters
+
+- **form_id** — UUID of the application form (not a form version ID). Determines which versions to include via the metadata keys.
+- **report_map_id** — UUID of the `ReportColumnsMaps` record containing the consolidated mapping configuration.
+
+## Return Value
+
+Returns a `TEXT` string containing a UNION ALL query across all form versions and field types.
+
+---
+
+## Version Iteration
+
+Form version IDs and labels are stored in the mapping's `Metadata.Info` dictionary at save time, keyed as `formversion_{versionId}` with the version label as the value (e.g., `v1`, `v2`).
+
+The function reads these at query time:
+
+```sql
+SELECT replace(kv.key, 'formversion_', '')::uuid, kv.value
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+WHERE rcm."Id" = report_map_id
+  AND kv.key LIKE 'formversion_%'
+ORDER BY kv.value
+```
+
+For each version, one or more query pairs (root + DataGrid, each legacy + current) are generated and accumulated. All are combined into a final `UNION ALL`.
+
+---
+
+## Version Gating
+
+Fields in a consolidated mapping carry a `VersionLabel` that indicates which versions they belong to:
+
+| VersionLabel | Meaning |
+| ------------ | ------- |
+| `NULL` | Field is present and identical in **all** versions — always emit the real value |
+| `'v1'` | Field exists only in version 1 — emit real value for v1, NULL for other versions |
+| `'v1, v3'` | Field exists in v1 and v3 — emit real value for those, NULL for others |
+
+When processing a specific version, any field whose `VersionLabel` is non-null and does not contain the current `version_lbl` is **skipped** — its NULL placeholder is left in place rather than replaced with a data extraction expression.
+
+---
+
+## Dual-Schema Design
+
+Identical to `get_formversion_data`: each version generates two query branches (legacy and current submission schema), split by whether `submission->'submission'->'submission'` IS NULL:
+
+- **Legacy**: `afs."Submission"->'submission'->'data'`
+- **Current**: `afs."Submission"->'submission'->'submission'->'data'`
+
+Each pair is combined with `UNION ALL` before the per-version UNION ALL accumulation.
+
+---
+
+## Core Processing Logic
+
+### Pass 1 — Column inventory and DataGrid detection
+
+Same as `get_formversion_data`: collect all unique column names, types, and DataGrid names.
+
+No type-conflict fallback — the consolidated function uses the first occurrence of each column name's type and does not emit TEXT fallback for conflicts (fields from different versions with different types are handled via version gating instead).
+
+### Pass 2 — NULL column list construction
+
+Builds a typed NULL placeholder list ordered by column name, same as other functions.
+
+### Pass 3 — Per-version query generation
+
+For each version (ordered by label):
+
+1. Initialise SELECT with fixed columns + typed NULL placeholders
+2. Add `form_version_label` as a literal string constant
+3. For each field in the mapping, check version gating — skip if this version is not in the field's `VersionLabel`
+4. Replace NULL placeholders with JSON extraction expressions for applicable fields
+5. Emit a legacy + current UNION ALL pair for root fields
+6. Emit a legacy + current UNION ALL pair per DataGrid
+7. Append all version queries to the accumulation array
+
+### Final assembly
+
+All accumulated queries are combined with `UNION ALL`.
+
+---
+
+## Data Sources
+
+- `public."ApplicationFormSubmissions"` — filtered by `ApplicationFormVersionId = version_id` for each version in the loop
+
+---
+
+## Output Columns
+
+| Column | Source | Description |
+| ------ | ------ | ----------- |
+| `submission_id` | `afs."Id"` | UUID of the form submission record |
+| `application_id` | `afs."ApplicationId"` | UUID of the parent application |
+| `row_identifier` | `'root'` or `'{datagrid}_r{n}'` | Row type identifier |
+| `form_version_label` | literal from metadata | Version label (e.g., `'v1'`, `'v2'`) |
+| *(dynamic columns)* | Extracted from JSON | One column per mapped field; NULL for versions where the field doesn't exist |
+
+---
+
+## Field Type Handling
+
+Same as `get_formversion_data`:
+
+| Type | SQL Type |
+| ---- | -------- |
+| `textfield` / `textarea` / `email` / `select` / `phoneNumber` | TEXT |
+| `number` | NUMERIC |
+| `currency` | DECIMAL(18,2) |
+| `option` / `checkbox` | BOOLEAN |
+
+---
+
+## Differences from get_formversion_data
+
+| Aspect | `get_consolidated_formversion_data` | `get_formversion_data` |
+| ------ | ----------------------------------- | ---------------------- |
+| Parameter | `form_id` (all versions) | `correlation_id` (one version) |
+| Version loop | Iterates over metadata keys | No loop — single version |
+| Version gating | Yes — per-field NULL for other versions | Not applicable |
+| Extra output column | `form_version_label` | Not present |
+| Type conflict handling | First-occurrence wins (no TEXT fallback) | TEXT fallback for conflicts |
+
+---
+
+## Common Use Cases
+
+### 1. Field present in all versions (VersionLabel = null)
+
+The field produces a real value for every version's query — no NULLs due to version gating.
+
+### 2. Field exclusive to one version
+
+Produces a real value only in that version's query; all other version queries leave it as a typed NULL.
+
+### 3. Field with type conflict across versions
+
+The first occurrence's type is used for the NULL column list. The field may be a NULL for versions where it doesn't apply, avoiding the conflict at query time.
+
+---
+
+## Debugging Queries
+
+```sql
+-- Check what versions are stored in the mapping metadata
+SELECT kv.key, kv.value
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+WHERE rcm."Id" = '<report_map_id>'
+  AND kv.key LIKE 'formversion_%';
+
+-- Check field VersionLabels in the mapping
+SELECT row_data->>'ColumnName', row_data->>'VersionLabel'
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_array_elements(rcm."Mapping"->'Rows') row_data
+WHERE rcm."Id" = '<report_map_id>';
+
+-- Test function output
+SELECT "Reporting".get_consolidated_formversion_data('<form_id>', '<report_map_id>');
+```
diff --git a/documentation/reporting/get_consolidated_worksheet_data_specification.md b/documentation/reporting/get_consolidated_worksheet_data_specification.md
new file mode 100644
index 0000000000..19806706c0
--- /dev/null
+++ b/documentation/reporting/get_consolidated_worksheet_data_specification.md
@@ -0,0 +1,198 @@
+# get_consolidated_worksheet_data.sql Function Specification
+
+## Overview
+
+`get_consolidated_worksheet_data` is a PostgreSQL PL/pgSQL function (implemented as pure CTE-based SQL) that generates a dynamic SQL query spanning **all form versions** for a consolidated worksheet view. It is called by `generate_consolidated_worksheet_view`. Like `get_worksheet_data`, it reads from `Flex.WorksheetInstances`, but iterates over every form version recorded in the mapping metadata, applying version gating per field, and adds a `form_version_label` column to each output row.
+
+## Function Signature
+
+```sql
+CREATE OR REPLACE FUNCTION "Reporting".get_consolidated_worksheet_data(
+    form_id uuid,
+    report_map_id uuid
+)
+RETURNS text
+LANGUAGE plpgsql
+```
+
+## Purpose
+
+- Generates a multi-version UNION ALL query covering worksheet data from all form versions for a given form
+- Reads version IDs and labels from the mapping's `Metadata.Info` dictionary
+- Reads worksheet link IDs from the same metadata (`ws_{versionId}_{worksheetId}` keys)
+- Applies **version gating** — fields for specific versions produce NULLs in queries for other versions
+- Supports both root fields and DataGrid fields per worksheet per version
+- Implemented as a CTE-based approach (like `get_worksheet_data`), not imperative PL/pgSQL loops
+- Returns a complete SQL query string ready for use as a view body
+
+## Input Parameters
+
+- **form_id** — UUID of the application form. Determines which versions and worksheets to include via the metadata.
+- **report_map_id** — UUID of the `ReportColumnsMaps` record containing the consolidated mapping configuration.
+
+## Return Value
+
+Returns a `TEXT` string containing a UNION ALL query across all (version, worksheet, field-group) combinations.
+
+---
+
+## Version and Worksheet Iteration
+
+### Version info
+
+Version IDs and labels are stored in `Metadata.Info` keyed as `formversion_{versionId}` → `v1`, `v2`, etc.:
+
+```sql
+-- version_info CTE
+SELECT replace(kv.key, 'formversion_', '')::uuid AS version_id, kv.value AS version_label
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+WHERE rcm."Id" = report_map_id
+  AND kv.key LIKE 'formversion_%'
+```
+
+### Worksheet links
+
+Worksheet link IDs are stored keyed as `ws_{versionId}_{worksheetId}` → worksheet display info. These are used to scope worksheet instance queries to specific versions.
+
+---
+
+## Version Gating
+
+Fields carry a `VersionLabel` indicating which versions they belong to (same semantics as the consolidated formversion function):
+
+| VersionLabel | Meaning |
+| ------------ | ------- |
+| `NULL` | Field present and identical in **all** versions — always emit the real value |
+| `'v1'` | Field exclusive to version 1 |
+| `'v1, v3'` | Field present in v1 and v3 only |
+
+When generating a query for a specific version, fields whose `VersionLabel` does not include the current version label are left as typed NULL placeholders.
+
+---
+
+## CTE-Based Implementation
+
+Unlike `get_consolidated_formversion_data` (which uses PL/pgSQL loops), this function uses a nested CTE structure to build and assemble query fragments. The key CTEs are:
+
+| CTE | Purpose |
+| --- | ------- |
+| `mapping_data` | Extracts all mapping rows from `ReportColumnsMaps`, parses worksheet name and clean DataPath |
+| `unique_mappings` | `DISTINCT ON (column_name)` — one mapping per column |
+| `version_info` | Reads form version IDs and labels from metadata |
+| `unique_worksheet_names` | Distinct worksheet names from the mapping |
+| `unique_datagrid_combinations` | Distinct `(worksheet_name, datagrid_name)` pairs for DataGrid fields |
+| `datagrid_queries` | One query fragment per `(version, worksheet, datagrid)` triple |
+| `root_queries` | One query fragment per `(version, worksheet)` for root-level fields |
+| *(final assembly)* | `UNION ALL` of datagrid and root query fragments |
+
+---
+
+## Data Sources
+
+| Table | Schema | Purpose |
+| ----- | ------ | ------- |
+| `WorksheetInstances` | `Flex` | Worksheet data per application; `CorrelationId` = application ID |
+| `Worksheets` | `Flex` | Worksheet metadata (name, title) |
+| `ReportColumnsMaps` | `Reporting` | Mapping configuration and metadata |
+
+---
+
+## Output Columns
+
+| Column | Source | Description |
+| ------ | ------ | ----------- |
+| `worksheet_instance_id` | `wi."Id"` | UUID of the worksheet instance |
+| `application_id` | `wi."CorrelationId"` | UUID of the parent application |
+| `worksheet_name` | `w."Name"` | Worksheet name from definition |
+| `row_identifier` | `'root'` or `'{datagrid}_r{n}'` | Row type identifier |
+| `form_version_label` | literal from metadata | Version label (e.g., `'v1'`, `'v2'`) |
+| *(dynamic columns)* | Extracted from `CurrentValue` | One column per mapped field; NULL for non-applicable versions |
+
+---
+
+## DataPath and Worksheet Name Parsing
+
+The CTE extracts `worksheet_name` and `clean_data_path` from the stored `DataPath` and `Path` fields:
+
+```sql
+CASE
+  WHEN data_path_raw ~ '^\('         -- starts with (worksheet_name)
+  THEN substring(data_path_raw from '^\(([^)]+)\)')  -- extract from parentheses
+  ELSE split_part(path, '->', 1)     -- first segment of Path
+END AS worksheet_name,
+
+CASE
+  WHEN data_path_raw ~ '^\('
+  THEN regexp_replace(data_path_raw, '^\([^)]+\)', '')  -- strip leading (name)
+  ELSE data_path_raw
+END AS clean_data_path
+```
+
+DataPath format for worksheet fields: `(WorksheetName)FieldName` or `(WorksheetName)DataGridName->FieldName`.
+
+---
+
+## Field Type Handling
+
+Same as `get_worksheet_data`:
+
+| Type | SQL Type | Extraction |
+| ---- | -------- | ---------- |
+| `text` / `textarea` | TEXT | Direct string from `CurrentValue` |
+| `currency` | DECIMAL(18,2) | Locale commas stripped, numeric validated |
+| `number` | NUMERIC | Numeric validated |
+| `date` | TIMESTAMP | Date validated |
+| `checkbox` | BOOLEAN | True/false value list |
+| `checkboxgroup` | BOOLEAN per option | JSON array parsed, individual option extracted |
+| `radio` | TEXT | Selected option value |
+
+---
+
+## Differences from get_worksheet_data
+
+| Aspect | `get_consolidated_worksheet_data` | `get_worksheet_data` |
+| ------ | --------------------------------- | -------------------- |
+| Parameter | `form_id` (all versions) | `correlation_id` (one form version) |
+| Version loop | Yes — all versions from metadata | No loop — single version |
+| Version gating | Yes — per-field NULL for other versions | Not applicable |
+| Extra output column | `form_version_label` | Not present |
+| Worksheet scope | Per-(version, worksheet) | Per-worksheet for one version |
+
+---
+
+## Differences from get_consolidated_formversion_data
+
+| Aspect | `get_consolidated_worksheet_data` | `get_consolidated_formversion_data` |
+| ------ | --------------------------------- | ------------------------------------ |
+| Data source | `Flex.WorksheetInstances` | `ApplicationFormSubmissions` |
+| Implementation | CTE-based SQL | Procedural PL/pgSQL loops |
+| Dual-schema | No (single worksheet JSON schema) | Yes (legacy + current CHEFS schema) |
+| Worksheet identity | Worksheet name from DataPath | Not applicable |
+
+---
+
+## Debugging Queries
+
+```sql
+-- Check versions and worksheet links stored in mapping metadata
+SELECT kv.key, kv.value
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+WHERE rcm."Id" = '<report_map_id>';
+
+-- Check VersionLabels in the mapping
+SELECT row_data->>'ColumnName', row_data->>'VersionLabel', row_data->>'DataPath'
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_array_elements(rcm."Mapping"->'Rows') row_data
+WHERE rcm."Id" = '<report_map_id>';
+
+-- Inspect worksheet instances linked to a form (via WorksheetLinkCorrelationId matching form version IDs)
+SELECT wi."Id", wi."WorksheetId", wi."CorrelationId", w."Name"
+FROM "Flex"."WorksheetInstances" wi
+JOIN "Flex"."Worksheets" w ON wi."WorksheetId" = w."Id"
+LIMIT 10;
+
+-- Test function output
+SELECT "Reporting".get_consolidated_worksheet_data('<form_id>', '<report_map_id>');
+```
diff --git a/documentation/reporting/get_formversion_data_specification.md b/documentation/reporting/get_formversion_data_specification.md
new file mode 100644
index 0000000000..e55e59e9ac
--- /dev/null
+++ b/documentation/reporting/get_formversion_data_specification.md
@@ -0,0 +1,233 @@
+# get_formversion_data.sql Function Specification
+
+## Overview
+
+`get_formversion_data` is a PostgreSQL PL/pgSQL function that generates a dynamic SQL query for extracting CHEFS form submission data from a specific form version. It is called by the `generate_formversion_view` stored procedure to create flat, queryable database views from raw CHEFS JSON submission blobs.
+
+## Function Signature
+
+```sql
+CREATE OR REPLACE FUNCTION "Reporting".get_formversion_data(
+    correlation_id uuid,
+    report_map_id uuid
+)
+RETURNS text
+LANGUAGE plpgsql
+```
+
+## Purpose
+
+- Generates a dynamic SQL SELECT query based on the report column mappings for a form version
+- Extracts individual field values from CHEFS JSON submission data
+- Handles both root fields and DataGrid (repeating row) fields
+- Supports the two CHEFS submission JSON schemas (legacy and current) via UNION ALL
+- Detects type conflicts and applies TEXT fallback for affected columns
+- Returns a complete SQL query string ready for execution as a view body
+
+## Input Parameters
+
+- **correlation_id** — UUID of the form version (`ApplicationFormVersionId`). Used to filter `ApplicationFormSubmissions`.
+- **report_map_id** — UUID of the `ReportColumnsMaps` record containing the field-to-column mapping configuration.
+
+## Return Value
+
+Returns a `TEXT` string containing a complete SQL query (or UNION ALL of queries) that can be executed or used as a view definition.
+
+---
+
+## Dual-Schema Design
+
+CHEFS form submissions are stored in two different JSON structures depending on when the submission was created. The function detects which schema applies to each row and generates queries for both, combined with `UNION ALL`.
+
+### Legacy schema
+
+Used for older submissions where `submission->'submission'->'submission'` **IS NULL**:
+
+```sql
+afs."Submission"->'submission'->'data'->'fieldKey'
+```
+
+### Current schema
+
+Used for newer submissions where `submission->'submission'->'submission'` **IS NOT NULL**:
+
+```sql
+afs."Submission"->'submission'->'submission'->'data'->'fieldKey'
+```
+
+### Detection
+
+Each generated query pair is split into two branches combined with `UNION ALL`:
+
+```sql
+(SELECT ... FROM ApplicationFormSubmissions afs
+ WHERE afs."ApplicationFormVersionId" = '<id>'
+   AND afs."Submission"->'submission'->'submission' IS NULL)      -- legacy
+UNION ALL
+(SELECT ... FROM ApplicationFormSubmissions afs
+ WHERE afs."ApplicationFormVersionId" = '<id>'
+   AND afs."Submission"->'submission'->'submission' IS NOT NULL)  -- current
+```
+
+Both branches select identical columns so their types are always consistent across the UNION.
+
+---
+
+## Core Processing Logic
+
+### Pass 1 — Column inventory and type-conflict detection
+
+Iterates all mapping rows to:
+- Collect unique column names and their declared types
+- Detect **type conflicts**: if the same column name appears in two rows with different types, the column is flagged for TEXT fallback (`use_text_fallback = true`)
+- Identify DataGrid fields (TypePath contains `'datagrid'`) and collect unique DataGrid names
+- Identify root-level fields (TypePath does not contain `'datagrid'`)
+
+### Pass 2 — NULL column list construction
+
+Builds a typed NULL placeholder list ordered by column name, used as a consistent column template in all UNION ALL branches:
+
+```sql
+NULL::TEXT AS first_name, NULL::NUMERIC AS budget, NULL::BOOLEAN AS consent_given
+```
+
+This ensures all UNION ALL branches have identical column sets and types.
+
+### Pass 3 — Query generation
+
+For each unique DataGrid and for root fields, generates a UNION ALL pair (legacy + current) substituting NULL placeholders with actual JSON extraction expressions.
+
+---
+
+## Data Sources
+
+- `public."ApplicationFormSubmissions"` — contains the raw CHEFS submission JSON and the `ApplicationFormVersionId` foreign key
+
+---
+
+## Field Type Handling
+
+| Type | SQL Type | Extraction |
+| ---- | -------- | ---------- |
+| `textfield` / `textarea` / `email` / `select` / `phoneNumber` | TEXT | `->>` operator on JSON path |
+| `number` | NUMERIC | Numeric regex validation → cast, or NULL |
+| `currency` | DECIMAL(18,2) | Numeric regex validation → cast, or NULL |
+| `option` / `checkbox` | BOOLEAN | `true/t/1/yes` → true, `false/f/0/no` → false, else NULL |
+| *(type conflict fallback)* | TEXT | All values cast to TEXT with type-aware formatting |
+
+### Type conflict TEXT fallback
+
+When a column has conflicting types across mapping rows, the function converts values to TEXT and emits them as strings rather than typed values. This prevents UNION ALL type mismatches in the generated view.
+
+---
+
+## DataGrid Handling
+
+DataGrid fields are identified by TypePath containing `'datagrid'`. For each unique DataGrid:
+
+1. A `CROSS JOIN LATERAL jsonb_array_elements(...)` expands the DataGrid JSON array into individual rows
+2. Row numbers are tracked with `row_number() OVER()` to generate row identifiers: `{datagrid_name}_r{n}`
+3. A separate UNION ALL pair (legacy + current) is generated for each DataGrid
+
+DataPath format for DataGrid fields: `(DKn)dataGridKey->fieldKey` or `dataGridKey->fieldKey`.
+
+---
+
+## Output Columns
+
+| Column | Source | Description |
+| ------ | ------ | ----------- |
+| `submission_id` | `afs."Id"` | UUID of the form submission record |
+| `application_id` | `afs."ApplicationId"` | UUID of the parent application |
+| `row_identifier` | `'root'` or `'{datagrid}_r{n}'` | `root` for flat fields; `{datagrid_name}_r{n}` for DataGrid rows |
+| *(dynamic columns)* | Extracted from JSON | One column per mapped field, typed per mapping |
+
+---
+
+## Path Parsing Logic
+
+### DataPath format
+
+- **Root field**: `fieldKey` or `panel->fieldKey` (containers stripped)
+- **DataGrid field**: `dataGridName->fieldName` or `(DK1)dataGridName->fieldName`
+
+The function splits DataPath on `'->'` to build the JSONB navigation path. The final segment uses the `->>` text-extract operator; intermediate segments use `->`.
+
+### DK prefix handling
+
+If DataPath begins with `(DK{n})`, the prefix is stripped before extracting the DataGrid name, and the stripped path is used for navigation. The prefix itself is not used for data extraction.
+
+---
+
+## Data Type Mapping
+
+| Field Type | Normal SQL Type | Type-Conflict SQL Type |
+| ---------- | --------------- | ---------------------- |
+| `textfield` / `textarea` / `email` / `select` / `phoneNumber` | TEXT | TEXT |
+| `number` | NUMERIC | TEXT (as string representation) |
+| `currency` | DECIMAL(18,2) | TEXT (as string representation) |
+| `option` / `checkbox` | BOOLEAN | TEXT (`'true'` / `'false'`) |
+
+---
+
+## Relationship to `get_worksheet_data`
+
+Both functions serve the same role (query generation), but differ in data source and schema:
+
+| Aspect | `get_formversion_data` | `get_worksheet_data` |
+| ------ | ---------------------- | -------------------- |
+| Data source | `ApplicationFormSubmissions` | `Flex.WorksheetInstances` |
+| JSON location | `submission->'submission'->'data'` (dual-schema) | `CurrentValue->'values'` array |
+| Schema handling | Dual legacy/current UNION ALL | Single schema |
+| Implementation style | Procedural PL/pgSQL | CTE-based SQL |
+| Correlation ID | Form Version ID | Form Version ID |
+| DataGrid support | Yes | Yes |
+
+---
+
+## Common Use Cases
+
+### 1. Flat submission with root fields only
+
+Generates two branches (legacy + current), each returning one row per submission with all field values as flat columns. `row_identifier` = `'root'` for all rows.
+
+### 2. Submission with DataGrid fields
+
+Generates a separate UNION ALL pair per DataGrid, expanding each DataGrid array entry into its own row. `row_identifier` = `'{datagrid_name}_r1'`, `'{datagrid_name}_r2'`, etc.
+
+### 3. Mixed root and DataGrid fields
+
+One root query pair + one query pair per DataGrid, all combined with `UNION ALL`. Root columns are NULL in DataGrid rows and vice versa.
+
+### 4. Type conflict (field mapped with different types)
+
+Affected columns fall back to TEXT for both value and NULL type, allowing the UNION ALL to be well-typed.
+
+---
+
+## Debugging Queries
+
+```sql
+-- Check the mapping configuration
+SELECT "Mapping"->'Rows' FROM "Reporting"."ReportColumnsMaps" WHERE "Id" = '<report_map_id>';
+
+-- Inspect raw submissions for a form version
+SELECT "Id", "ApplicationId", "Submission"->'submission' FROM public."ApplicationFormSubmissions"
+WHERE "ApplicationFormVersionId" = '<correlation_id>'
+LIMIT 5;
+
+-- Detect which schema variant a submission uses
+SELECT "Id",
+  CASE WHEN "Submission"->'submission'->'submission' IS NULL THEN 'legacy' ELSE 'current' END AS schema_version
+FROM public."ApplicationFormSubmissions"
+WHERE "ApplicationFormVersionId" = '<correlation_id>';
+
+-- Test function output
+SELECT "Reporting".get_formversion_data('<correlation_id>', '<report_map_id>');
+```
+
+---
+
+## Version Notes
+
+This function uses the same column-name generation and type-handling patterns as `get_worksheet_data`. Key differences are the dual-schema UNION ALL approach and the procedural (rather than CTE-based) implementation style.
diff --git a/documentation/reporting/get_scoresheet_data_specification.md b/documentation/reporting/get_scoresheet_data_specification.md
new file mode 100644
index 0000000000..8e0df49255
--- /dev/null
+++ b/documentation/reporting/get_scoresheet_data_specification.md
@@ -0,0 +1,230 @@
+# get_scoresheet_data.sql Function Specification
+
+## Overview
+
+`get_scoresheet_data` is a PostgreSQL PL/pgSQL function that generates a dynamic SQL query for extracting Unity.Flex scoresheet answer data. It is called by the `generate_scoresheet_view` stored procedure. Unlike the form version and worksheet equivalents, scoresheet field values are read from the normalised `Flex.Answers` table via a correlated subquery per field — not from a JSON blob on the scoresheet instance itself.
+
+## Function Signature
+
+```sql
+CREATE OR REPLACE FUNCTION "Reporting".get_scoresheet_data(
+    correlation_id uuid,
+    report_map_id uuid
+)
+RETURNS text
+LANGUAGE plpgsql
+```
+
+## Purpose
+
+- Generates a dynamic SQL SELECT query for scoresheet instance data
+- Reads field values from `Flex.Answers` joined to `Flex.Questions` (one correlated subquery per mapped field)
+- Always includes a `total_score` column calculated via `calculate_scoresheet_total_score()`
+- Handles scoresheet-specific field types (`number`, `yesno`, text variants)
+- No DataGrid support — scoresheets are flat (one row per scoresheet instance)
+- Returns a complete SQL query string ready for use as a view body
+
+## Input Parameters
+
+- **correlation_id** — UUID of the application form (`ApplicationFormId`). Used to filter applications linked to scoresheet instances.
+- **report_map_id** — UUID of the `ReportColumnsMaps` record containing the field-to-column mapping configuration.
+
+## Return Value
+
+Returns a `TEXT` string containing a complete SQL SELECT query.
+
+---
+
+## Data Sources
+
+| Table | Schema | Purpose |
+| ----- | ------ | ------- |
+| `ScoresheetInstances` | `Flex` | One row per assessor's completed scoresheet; CorrelationId → Assessment |
+| `Assessments` | *(public)* | Links scoresheet instances to applications via `ApplicationId` |
+| `Applications` | *(public)* | Application record; filtered by `ApplicationFormId = correlation_id` |
+| `Answers` | `Flex` | Normalised answer rows; one per question per scoresheet instance |
+| `Questions` | `Flex` | Question definitions including `Name` used to match answers |
+
+### Join path
+
+```
+ScoresheetInstances (si)
+  JOIN Assessments (a)   ON si."CorrelationId" = a."Id"
+  JOIN Applications (ap) ON a."ApplicationId"  = ap."Id"
+```
+
+Filtered by: `ap."ApplicationFormId" = correlation_id`
+
+---
+
+## Field Value Extraction
+
+Each mapped field's value is retrieved via a **correlated subquery** embedded directly in the SELECT clause:
+
+```sql
+(
+  SELECT a_1."CurrentValue"->>'value'
+  FROM "Flex"."Answers" a_1
+  JOIN "Flex"."Questions" q ON a_1."QuestionId" = q."Id"
+  WHERE a_1."ScoresheetInstanceId" = si."Id"
+    AND q."Name" = '<field_key>'
+  LIMIT 1
+)
+```
+
+The `<field_key>` value is resolved using the following priority:
+
+1. **Key** (`row_data->>'Key'`) — used if non-empty
+2. **PropertyName** (`row_data->>'PropertyName'`) — used if Key is empty
+3. **DataPath** (`row_data->>'DataPath'`) — used if PropertyName is also empty
+4. **ColumnName** — final fallback
+
+---
+
+## Core Processing Logic
+
+### Pass 1 — Column inventory and type-conflict detection
+
+Iterates all mapping rows to collect unique column names and their types (normalised to lowercase). Detects type conflicts (same column name with different types) and marks them for TEXT fallback.
+
+### Pass 2 — NULL column list construction
+
+Builds a typed NULL placeholder list ordered by column name, using scoresheet-specific types:
+
+- `number` → `NULL::NUMERIC`
+- `yesno` → `NULL::BOOLEAN`
+- All other types → `NULL::TEXT`
+
+### Pass 3 — Query construction
+
+Initialises a base SELECT with fixed columns, then iterates mapping rows to replace each NULL placeholder with the appropriate correlated subquery + type cast.
+
+### Final query shape
+
+```sql
+SELECT
+    si."Id"                                    AS scoresheet_instance_id,
+    ap."Id"                                    AS application_id,
+    si."CorrelationId"                         AS assessment_id,
+    si."ScoresheetId"                          AS scoresheet_id,
+    "Reporting".calculate_scoresheet_total_score(si."Id") AS total_score,
+    <field_subquery>::<type>                   AS <column_name>,
+    ...
+FROM "Flex"."ScoresheetInstances" si
+JOIN "Assessments" a  ON si."CorrelationId" = a."Id"
+JOIN "Applications" ap ON a."ApplicationId" = ap."Id"
+WHERE ap."ApplicationFormId" = '<correlation_id>'
+```
+
+---
+
+## Fixed Output Columns
+
+Every generated query includes these columns regardless of the field mapping:
+
+| Column | Source | Description |
+| ------ | ------ | ----------- |
+| `scoresheet_instance_id` | `si."Id"` | UUID of the scoresheet instance |
+| `application_id` | `ap."Id"` | UUID of the parent application |
+| `assessment_id` | `si."CorrelationId"` | UUID of the assessment linking instance to application |
+| `scoresheet_id` | `si."ScoresheetId"` | UUID of the scoresheet definition |
+| `total_score` | `calculate_scoresheet_total_score(si."Id")` | Computed total score for the instance |
+
+---
+
+## Field Type Handling
+
+Scoresheet question types differ from Forms.io types. The function normalises all types to lowercase before comparison.
+
+| Type | SQL Type | Extraction |
+| ---- | -------- | ---------- |
+| `number` | NUMERIC | Numeric regex validation → cast, or NULL |
+| `yesno` | BOOLEAN | `true/t/1/yes` → true, `false/f/0/no` → false, else NULL |
+| `text` / `textarea` / `selectlist` / *(any other)* | TEXT | Direct string value |
+| *(type conflict fallback)* | TEXT | Cast to TEXT |
+
+---
+
+## No DataGrid Support
+
+Scoresheets do not have DataGrid (repeating row) components. The function generates a single flat query — one output row per scoresheet instance. There is no `row_identifier` column.
+
+---
+
+## calculate_scoresheet_total_score
+
+This companion function (`Reporting.calculate_scoresheet_total_score(instance_id)`) is always called as part of the generated query. It iterates all answers for the given instance and applies scoring logic:
+
+- **Number questions**: uses the numeric answer value directly
+- **YesNo questions**: applies the `yes_value` or `no_value` from the question definition
+- **SelectList questions**: applies the `numeric_value` from the selected option
+- **Text / TextArea questions**: contributes 0 to the total
+
+---
+
+## Data Type Mapping
+
+| Question Type | Normal SQL Type | Type-Conflict SQL Type |
+| ------------- | --------------- | ---------------------- |
+| `number` | NUMERIC | TEXT |
+| `yesno` | BOOLEAN | TEXT |
+| `text` / `textarea` / `selectlist` / others | TEXT | TEXT |
+
+---
+
+## Differences from get_worksheet_data and get_formversion_data
+
+| Aspect | `get_scoresheet_data` | `get_worksheet_data` | `get_formversion_data` |
+| ------ | --------------------- | -------------------- | ---------------------- |
+| Data source | `Flex.Answers` (normalised rows) | `Flex.WorksheetInstances` (JSON blob) | `ApplicationFormSubmissions` (JSON blob) |
+| Field extraction | Correlated subquery per field | JSONB path expression | JSONB path expression |
+| Total score | Always included | Not applicable | Not applicable |
+| DataGrid support | No | Yes | Yes |
+| Row identifier | Not present | `root` or `{grid}_r{n}` | `root` or `{grid}_r{n}` |
+| Types | `number`, `yesno`, text | CHEFS types | CHEFS types |
+| Correlation ID | Form ID | Form Version ID | Form Version ID |
+
+---
+
+## Common Use Cases
+
+### 1. Standard scoresheet with number and text questions
+
+Generates one row per scoresheet instance with NUMERIC and TEXT columns, plus `total_score`.
+
+### 2. YesNo questions (boolean)
+
+`yesno` fields are extracted as BOOLEAN using a simple true/false lookup.
+
+### 3. SelectList questions
+
+`selectlist` fields are returned as TEXT (the selected option's label or value).
+
+---
+
+## Debugging Queries
+
+```sql
+-- Check the mapping configuration
+SELECT "Mapping"->'Rows' FROM "Reporting"."ReportColumnsMaps" WHERE "Id" = '<report_map_id>';
+
+-- List scoresheet instances linked to a form
+SELECT si."Id", si."ScoresheetId", si."CorrelationId", ap."Id" AS application_id
+FROM "Flex"."ScoresheetInstances" si
+JOIN "Assessments" a ON si."CorrelationId" = a."Id"
+JOIN "Applications" ap ON a."ApplicationId" = ap."Id"
+WHERE ap."ApplicationFormId" = '<correlation_id>'
+LIMIT 10;
+
+-- Inspect answers for a scoresheet instance
+SELECT q."Name", a."CurrentValue"->>'value' AS answer_value
+FROM "Flex"."Answers" a
+JOIN "Flex"."Questions" q ON a."QuestionId" = q."Id"
+WHERE a."ScoresheetInstanceId" = '<instance_id>';
+
+-- Test function output
+SELECT "Reporting".get_scoresheet_data('<correlation_id>', '<report_map_id>');
+
+-- Test total score calculation
+SELECT "Reporting".calculate_scoresheet_total_score('<scoresheet_instance_id>');
+```
diff --git a/documentation/reporting/reporting-architecture.md b/documentation/reporting/reporting-architecture.md
index 063a15e266..422ce2f0fa 100644
--- a/documentation/reporting/reporting-architecture.md
+++ b/documentation/reporting/reporting-architecture.md
@@ -96,8 +96,9 @@ sequenceDiagram
     Service->>Job: Enqueue GenerateViewBackgroundJob
     Job->>DB: CALL Reporting.generate_*_view(correlationId)
     DB-->>Job: View created/updated
-    Job->>DB: GRANT SELECT ON view TO reporting_role
-    Job-->>Config: Status → SUCCESS
+    Job->>DB: Update ViewStatus → SUCCESS
+    Job->>RoleJob: Enqueue AssignViewRoleBackgroundJob
+    RoleJob->>DB: GRANT SELECT ON view TO reporting_role
 ```
 
 **Provider types and data characteristics:**
diff --git a/documentation/reporting/reporting-configuration.md b/documentation/reporting/reporting-configuration.md
index 846023fb3f..9d607119b1 100644
--- a/documentation/reporting/reporting-configuration.md
+++ b/documentation/reporting/reporting-configuration.md
@@ -2,13 +2,19 @@
 
 ## Overview
 
-The Reporting Configuration system allows administrators to define how source field data maps to PostgreSQL database columns for generated reporting views. It supports three correlation providers, each sourcing field metadata from a different system:
+The Reporting Configuration system allows administrators to define how source field data maps to PostgreSQL database columns for generated reporting views. It supports five correlation providers, each sourcing field metadata from a different system:
 
-| Provider | Source | Correlation ID | Description |
-|----------|--------|----------------|-------------|
-| `formversion` | CHEFS form submissions | Form Version ID | Immutable form schema fields |
-| `worksheet` | Unity.Flex worksheets | Form Version ID | Dynamic worksheet fields |
-| `scoresheet` | Unity.Flex scoresheets | Form ID | Evaluation/scoring fields |
+| Provider                   | Source                                | Correlation ID  | Description                                                |
+| -------------------------- | ------------------------------------- | --------------- | ---------------------------------------------------------- |
+| `formversion`              | CHEFS form submissions                | Form Version ID | Static field schema for a specific form version            |
+| `formversion_consolidated` | CHEFS form submissions (all versions) | Form ID         | Merged submission fields across all versions of a form     |
+| `worksheet`                | Unity.Flex worksheets                 | Form Version ID | Dynamic worksheet fields linked to a specific form version |
+| `worksheet_consolidated`   | Unity.Flex worksheets (all versions)  | Form ID         | Merged worksheet fields across all versions of a form      |
+| `scoresheet`               | Unity.Flex scoresheets                | Form ID         | Evaluation/scoring fields linked to a form                 |
+
+> **Key distinction:** Per-version providers (`formversion`, `worksheet`) use a **Form Version ID** as the CorrelationId. Consolidated and scoresheet providers (`formversion_consolidated`, `worksheet_consolidated`, `scoresheet`) use the **Form ID**.
+
+---
 
 ## Architecture
 
@@ -16,7 +22,7 @@ The Reporting Configuration system allows administrators to define how source fi
 
 - **`ReportMappingUtils`** (`Unity.Reporting.Application`) — Static utility methods for column name sanitization, validation, uniqueness enforcement, and mapping creation/update logic.
 - **`ReportMappingService`** (`Unity.Reporting.Application`) — Application service orchestrating CRUD operations, field metadata retrieval, view generation, and provider resolution.
-- **`IFieldsProvider`** (`Unity.Reporting.Application`) — Interface for correlation-specific field metadata extraction and change detection.
+- **`IFieldsProvider`** (`Unity.Reporting.Application`) — Interface for correlation-specific field metadata extraction and change detection. Each provider registers itself by its `CorrelationProvider` string identifier.
 - **`ReportingConfigurationController`** (`Unity.Reporting.Web`) — MVC controller providing AJAX API endpoints for the UI.
 - **`Default.js`** (`Unity.Reporting.Web`) — Client-side DataTable configuration, validation, and provider-aware UI logic.
 
@@ -24,9 +30,36 @@ The Reporting Configuration system allows administrators to define how source fi
 
 Each provider implements `IFieldsProvider`:
 
-- **`FormVersionFieldsProvider`** — Retrieves field metadata from immutable CHEFS form version schemas. Change detection always returns null since form versions are immutable.
-- **`WorksheetFieldsProvider`** — Retrieves field metadata from Unity.Flex worksheet definitions. Supports change detection for dynamic schema evolution.
-- **`ScoresheetFieldsProvider`** — Retrieves field metadata from Unity.Flex scoresheet definitions. Supports change detection for scoring structure changes.
+- **`FormVersionFieldsProvider`** — Retrieves field metadata from immutable CHEFS form version schemas via `IFormMetadataService`. Change detection always returns null since form versions cannot change after creation.
+- **`ConsolidatedFormVersionFieldsProvider`** — Retrieves and merges submission field metadata across **all versions** of a form (CorrelationId = Form ID). Change detection tracks added/removed form versions.
+- **`WorksheetFieldsProvider`** — Retrieves field metadata from Unity.Flex worksheet definitions linked to a specific form version. Stamps duplicate DataPaths within a version with `(DK1)`, `(DK2)`, etc. to ensure uniqueness before returning. Change detection tracks worksheet link additions/removals.
+- **`ConsolidatedWorksheetFieldsProvider`** — Retrieves and merges worksheet field metadata across **all versions** of a form (CorrelationId = Form ID). Applies the same DataPath uniqueification per version before merging. Change detection tracks added/removed form versions and worksheets within versions.
+- **`ScoresheetFieldsProvider`** — Retrieves field metadata from the Unity.Flex scoresheet linked to a form via `IApplicationFormAppService`. CorrelationId is the Form ID. Change detection compares the stored scoresheet ID against the form's current scoresheet.
+
+---
+
+## Consolidated Providers
+
+The `formversion_consolidated` and `worksheet_consolidated` providers create a single unified view that spans all versions of a form. Because the CorrelationId is the Form ID (not a version ID), one mapping configuration covers the entire form history.
+
+### Field Merging Logic
+
+When multiple form versions each contribute fields, the provider merges them using the following rules based on (Label, Path, Type) matching:
+
+| Scenario                                                          | Outcome                         | VersionLabel                                                    |
+| ----------------------------------------------------------------- | ------------------------------- | --------------------------------------------------------------- |
+| Field has identical (Label, Path, Type) across **all** versions   | Single merged row               | None (field is universal across all versions)                   |
+| Field has identical (Label, Path, Type) in **some** versions only | Single row for that exact match | Comma-joined list of versions where it appears (e.g., `v1, v3`) |
+| Same (Label, Path) but **different Type** across versions         | One row **per distinct type**   | Comma-joined list of versions carrying that specific type       |
+
+The `VersionLabel` property on a field row is displayed in the mapping UI to help administrators understand which form versions contain that field. Fields with no VersionLabel are consistent across all versions.
+
+### Change Detection for Consolidated Providers
+
+- **`formversion_consolidated`** — A form version is added or removed. Tracked via `formversion_{versionId}` metadata keys stored in the mapping at save time.
+- **`worksheet_consolidated`** — A form version is added/removed, or a worksheet is linked/unlinked within a version. Tracked via both `formversion_{versionId}` and `ws_{versionId}_{worksheetId}` metadata keys.
+
+---
 
 ## Default Column Name Generation
 
@@ -36,24 +69,27 @@ When a user creates or saves a report configuration for the first time (or when
 
 The source used for generating default column names differs by provider:
 
-| Provider | Default Column Name Source | Rationale |
-|----------|---------------------------|-----------|
-| `formversion` | **Key** (CHEFS Property Name, e.g., `firstName`) | CHEFS property names are stable, developer-defined identifiers that produce clean, predictable column names (e.g., `firstname`). Labels can be verbose or contain special characters. |
-| `worksheet` | **Label** (e.g., `First Name`) | Worksheet labels are human-readable names configured by administrators, producing descriptive column names (e.g., `first_name`). |
-| `scoresheet` | **Label** (e.g., `Score One`) | Scoresheet labels provide meaningful, user-facing descriptions that map well to reporting column names. |
+- **`formversion`** — uses the field **Key** (CHEFS Property Name, e.g., `firstName`). CHEFS property names are stable, developer-defined identifiers that produce clean, predictable column names (e.g., `firstname`). Labels can be verbose or contain special characters.
+- **`formversion_consolidated`** — uses the field **Label**. Consolidated views span multiple versions; labels are the primary human-readable identifiers across versions.
+- **`worksheet`** — uses the field **Label**. Worksheet labels are human-readable names configured by administrators, producing descriptive column names (e.g., `first_name`).
+- **`worksheet_consolidated`** — uses the field **Label**. Same rationale as `worksheet`.
+- **`scoresheet`** — uses the field **Label**. Scoresheet labels provide meaningful, user-facing descriptions that map well to reporting column names.
+
+> **Note:** Only the `formversion` provider uses the field Key as its default source. All other providers use the field Label. The `GetDefaultColumnNameSource()` method checks for an exact case-insensitive match against the string `"formversion"` — the consolidated variant `"formversion_consolidated"` does **not** match and therefore uses Label.
 
 ### Column Name Sanitization
 
 All auto-generated column names go through the same sanitization pipeline regardless of provider:
 
-1. Convert to lowercase
-2. Replace spaces and hyphens with underscores
-3. Remove all non-alphanumeric characters (except underscores)
-4. Remove consecutive underscores
-5. Trim leading/trailing underscores
-6. Prefix with `col_` if name starts with a digit
-7. Truncate to 60 characters maximum
-8. Ensure uniqueness by appending numeric suffixes (`_1`, `_2`, etc.) when collisions occur
+1. Replace spaces and hyphens with underscores
+2. Remove all characters that are not letters, digits, or underscores
+3. Remove consecutive underscores (collapse `__` → `_`)
+4. Trim leading/trailing underscores
+5. Substitute `"col"` if nothing remains after trimming
+6. Prefix with `col_` if the name starts with a digit
+7. Truncate to 60 characters; trim any trailing underscore introduced by truncation
+8. Convert to lowercase
+9. Ensure uniqueness by appending numeric suffixes (`_1`, `_2`, etc.) when collisions occur — suffix length is accounted for during truncation to stay within the 60-character limit
 
 ### Implementation Details
 
@@ -62,42 +98,153 @@ The column name source selection is implemented identically on server and client
 - **Server-side** — `ReportMappingUtils.GetDefaultColumnNameSource()` returns `field.Key ?? ""` for `formversion`, or `field.Label ?? ""` for all other providers. Used by `CreateNewMap()` and `UpdateExistingMap()` when auto-generating column names for unmapped or newly discovered fields. The provider comparison is case-insensitive via `StringComparison.OrdinalIgnoreCase`.
 - **Client-side** — `getDefaultColumnNameSource()` in `Default.js` uses the same logic: `field.key || ''` when `currentProvider === 'formversion'`, otherwise `field.label || ''`. This is used by `transformFieldsMetadata()` to set initial column name values in the DataTable when no saved configuration exists.
 
-> **Important:** Neither implementation falls back from Key to Label or vice versa. If the source value is null/empty, an empty string is used, and the downstream sanitization produces `"col_1"` as a placeholder. This ensures client and server always produce identical defaults.
+> **Important:** Neither implementation falls back from Key to Label or vice versa. If the source value is null/empty, an empty string is used, and the downstream sanitization produces `"col_1"` as a placeholder (null/whitespace input returns `"col_1"` directly). This ensures client and server always produce identical defaults.
+
+### Column Name Priority During Updates
+
+When saving an updated configuration, column names are resolved using a three-tier priority system:
+
+1. **User-provided** — a column name explicitly set by the administrator in the current save operation
+2. **Existing** — the column name already persisted in the database for that field path
+3. **Auto-generated** — a new sanitized name derived from the field Key or Label, generated only for fields not covered by tiers 1 or 2
+
+This ensures established mappings are preserved and only genuinely new fields receive auto-generated names.
 
 ### Impact on Existing Configurations
 
 - **Existing saved configurations are not affected.** Column names are persisted in the database; the provider-specific logic only determines defaults for new/unsaved fields.
-- **Existing column names are preserved during updates.** The three-tier priority system (user-provided → existing → auto-generated) ensures established mappings are maintained.
+- **Existing column names are preserved during updates.** The three-tier priority system ensures established mappings are maintained.
+
+---
+
+## Field Column Definitions
+
+The configuration table displays one row per mappable field from the source. The first three column headers change depending on the active provider tab; the remaining three are constant across all providers.
+
+**Provider-specific headers (columns 1–3):**
+
+- `formversion` / `formversion_consolidated` — **CHEFS Label**, **CHEFS Property Name**, **CHEFS Type**
+- `worksheet` / `worksheet_consolidated` — **Worksheet Label**, **Worksheet Property Name**, **Worksheet Type**
+- `scoresheet` — **Scoresheet Label**, **Scoresheet Property Name**, **Scoresheet Type**
+
+**Constant headers (columns 4–6):** **Path**, **Report Column**, **Type Path**
+
+### Label *(CHEFS Label / Worksheet Label / Scoresheet Label)*
+
+The human-readable display name as it appears in the source form or worksheet UI. For checkbox group options this is the individual option's label (e.g., `Urban`, `Rural`). Used as the default column name source for all providers except `formversion`.
+
+### Property Name *(CHEFS Property Name / Worksheet Property Name / Scoresheet Property Name)*
+
+The developer-assigned key from the source schema (e.g., `firstName`, `projectBudget`). Stable and unique within a form component — it does not change when the label is edited. For checkbox group options the property name is `{parentKey}-{optionValue}` (e.g., `sector-urban`). Used as the default column name source for the `formversion` provider.
+
+### Type *(CHEFS Type / Worksheet Type / Scoresheet Type)*
+
+The component type from Forms.io or Unity.Flex that determines how the raw data is stored and how the view generation SQL extracts it. Common values:
+
+| Type | Description |
+| ---- | ----------- |
+| `textfield` / `textarea` | Free-text input — extracted as TEXT |
+| `number` | Numeric input — extracted as NUMERIC |
+| `currency` | Currency input — extracted as DECIMAL(18,2), locale commas stripped |
+| `datetime` | Date/time input — extracted as TIMESTAMP |
+| `radio` | Single-select radio group — extracted as TEXT (the selected value) |
+| `simplecheckboxes` | Multi-select checkbox group — each option becomes a separate row with type `option` |
+| `checkbox` | Single boolean checkbox — extracted as BOOLEAN |
+| `option` | An individual option within a checkbox group |
+| `datagrid` | Repeating data grid — each row becomes a separate view row with a row identifier |
+
+### Path *(UI column — displays DataPath)*
+
+> **Important naming note:** The UI column labelled **"Path"** actually displays the `DataPath` field from the data model — not the internal `path` field. The internal `path` is stored in the mapping for row-identity purposes but is not shown as its own column.
+
+The **Path** column shows the data-centric navigation path used by the PostgreSQL view generation SQL function to extract values from the JSON. Container segments that do not exist in the actual submitted JSON (panels, tabs, columns, fieldsets) are stripped from this path:
+
+| Internal `path` (not displayed) | Internal `typePath` | Displayed "Path" (DataPath) | Why |
+| -------------------------------- | ------------------- | --------------------------- | --- |
+| `panel1->firstName` | `panel->textfield` | `firstName` | `panel` is a container — stripped |
+| `tab1->firstName` | `tab->textfield` | `firstName` | `tab` is a container — stripped |
+| `datagrid1->itemName` | `datagrid->textfield` | `datagrid1->itemName` | `datagrid` is kept — it IS in the JSON |
+| `checkboxField->optionA` | `simplecheckboxes->option` | `checkboxField->optionA` | Both segments present in data |
+
+The internal `path` (the full key-based breadcrumb including container ancestors) is stored in the mapping and used as the stable identity key when matching rows across saves and updates. If two fields resolve to the same key chain, duplicates are prefixed with `(DK1)`, `(DK2)`, etc. on both `path` and `dataPath`.
+
+### Report Column
+
+The user-editable PostgreSQL column name this field will occupy in the generated database view. Auto-generated from the field Property Name or Label (depending on provider) using the sanitization pipeline. Must be unique within the configuration and conform to PostgreSQL identifier rules (see [Column Name Validation](#column-name-validation)).
+
+### Type Path
+
+The same schema hierarchy as the internal `path` but using component types instead of keys (e.g., `panel->textfield`, `datagrid->textarea`). Not user-editable. Used internally by the view generation SQL function to determine how to navigate the JSON structure — for example, a `datagrid` segment signals that `jsonb_array_elements` is needed. Also used to identify which segments are containers when computing the DataPath.
+
+### Version Label *(consolidated providers only)*
+
+Indicates which form versions contain this field. Only present when using `formversion_consolidated` or `worksheet_consolidated`:
+
+- Blank — field is present in all versions with the same type; merged into a single column
+- `v1` — field exists only in version 1
+- `v1, v3` — field exists in versions 1 and 3 but not in all versions
+
+---
 
 ## Column Name Validation
 
 Both client-side and server-side enforce PostgreSQL column name rules:
 
 - Maximum 60 characters
-- Must start with a letter or underscore
+- Must start with a letter or underscore (not a digit)
 - Contains only letters, digits, and underscores
-- Cannot be a PostgreSQL reserved word
+- Cannot be a PostgreSQL reserved word (enforced against a comprehensive built-in list)
 - Must be unique within the configuration
 
+---
+
 ## View Generation
 
 After saving a configuration, users can generate a PostgreSQL database view:
 
 1. User provides a view name (validated for availability and PostgreSQL compliance)
-2. A background job is queued to create/update the view in the `Reporting` schema
-3. View status is tracked and displayed via a widget
+2. The service normalises the view name to lowercase and checks availability for the given correlation
+3. The mapping's `ViewStatus` is set to `GENERATING` and persisted
+4. A `GenerateViewBackgroundJob` is queued to perform the actual view creation asynchronously
+5. The background job runs within the correct tenant context; if the view name has changed, the old view is deleted first
+6. On success, `ViewStatus` is updated to `SUCCESS` and a second job (`AssignViewRoleBackgroundJob`) is automatically queued to grant `SELECT` on the new view to the tenant's configured reporting role
+7. On failure, `ViewStatus` is set to `FAILED` and the error is logged
+8. View status is polled and displayed to the administrator via a widget
 
 View names follow similar sanitization rules with a 63-character maximum (PostgreSQL identifier limit).
 
+### View Name Availability
+
+Two availability checks exist:
+
+- **Global check** (`IsViewNameAvailableAsync(viewName)`) — Returns true if no view with that name exists in the Reporting schema. Used for name suggestions before a configuration is saved.
+- **Correlation-aware check** (`IsViewNameAvailableAsync(viewName, correlationId, correlationProvider)`) — Returns true if no view with that name exists, **or** if the existing view belongs to the same correlation. This allows regenerating a view under the same name without a false conflict error.
+
+---
+
+## Change Detection
+
+When an existing configuration is loaded, the provider's `DetectChangesAsync` method compares the current state of the source data against what was stored in the mapping's metadata at the time of the last save. Detected changes are surfaced as a human-readable description string in `ReportColumnsMapDto.DetectedChanges`, which the UI displays as an alert to the administrator.
+
+- **`formversion`** — No change detection. Form versions are immutable by design; always returns null.
+- **`formversion_consolidated`** — Compares stored `formversion_{versionId}` metadata keys against the current list of form versions with fields.
+- **`worksheet`** — Compares stored `worksheet_{worksheetId}` metadata keys against the current list of worksheet links for the form version.
+- **`worksheet_consolidated`** — Compares stored `formversion_{versionId}` and `ws_{versionId}_{worksheetId}` metadata keys against current worksheet links across all versions.
+- **`scoresheet`** — Compares stored `scoresheet_{scoresheetId}` metadata key against the form's current scoresheet assignment.
+
+---
+
 ## Configuration Lifecycle
 
-```
+```text
 Fields Metadata → [Save] → Configuration → [Generate View] → Database View
-                                ↓
-                          [Delete] → Removes configuration and optionally the view
+                                ↓                                   ↓
+                          [Delete]                         [Assign Role Job]
+                      Removes config                      Grants SELECT to
+                    and drops the view                    reporting role
 ```
 
-1. **Initial Load**: Field metadata is fetched from the appropriate provider; default column names are generated.
-2. **Save**: Creates or updates the mapping configuration with user-specified and auto-generated column names.
-3. **Generate View**: Creates a PostgreSQL view in the `Reporting` schema based on the saved mapping.
-4. **Delete**: Removes the configuration and optionally drops the associated database view.
+1. **Initial Load** — Field metadata is fetched from the appropriate provider; default column names are generated client-side for display.
+2. **Save** — Creates or updates the mapping configuration in the database with user-specified and auto-generated column names.
+3. **Generate View** — Queues a background job that creates or replaces a PostgreSQL view in the `Reporting` schema based on the saved mapping. Role assignment is queued automatically on success.
+4. **Delete** — Removes the mapping configuration record and drops the associated database view if it exists. View deletion failure is logged but does not prevent the mapping from being removed.