Remove Copilot package.json and tsconfig.json files as part of project cleanup

2026-04-06 08:42:13 +02:00 · 2025-08-18 10:57:56 +01:00
1183 changed files with 47834 additions and 136714 deletions
--- a/.github/instructions/instructions.md
+++ b/.github/instructions/instructions.md
@@ -1,17 +0,0 @@
---
-applyTo: '**'
---
-
-# Building and Compiling
-
-If you would like to compile or build any project. Please cd into the directory and run the following command:
-
-```
-npm run compile
-```
-
-Ths will make sure there are no type / syntax errors. 
-
-# Typescript Types.
-
-Please do not use "any" types. Please create proper types where required. 
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,19 +19,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
      
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Accounts/Dockerfile .
+        run: sudo docker build -f ./Accounts/Dockerfile .

  docker-build-isolated-vm:
    runs-on: ubuntu-latest
@@ -42,19 +34,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
      
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./IsolatedVM/Dockerfile .
+        run: sudo docker build -f ./IsolatedVM/Dockerfile .

  docker-build-home:
    runs-on: ubuntu-latest
@@ -65,19 +49,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
      
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Home/Dockerfile .
+        run: sudo docker build -f ./Home/Dockerfile .

  docker-build-worker:
    runs-on: ubuntu-latest
@@ -88,19 +64,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
      
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Worker/Dockerfile .
+        run: sudo docker build -f ./Worker/Dockerfile .

  docker-build-workflow:
    runs-on: ubuntu-latest
@@ -111,19 +79,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
      
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Workflow/Dockerfile .
+        run: sudo docker build -f ./Workflow/Dockerfile .

  docker-build-api-reference:
    runs-on: ubuntu-latest
@@ -134,19 +94,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
      
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./APIReference/Dockerfile .
+        run: sudo docker build -f ./APIReference/Dockerfile .

  docker-build-docs:
    runs-on: ubuntu-latest
@@ -157,19 +109,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
      
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Docs/Dockerfile .
+        run: sudo docker build -f ./Docs/Dockerfile .


  docker-build-otel-collector:
@@ -181,19 +125,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
      
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./OTelCollector/Dockerfile .
+        run: sudo docker build -f ./OTelCollector/Dockerfile .

  docker-build-app:
    runs-on: ubuntu-latest
@@ -204,20 +140,12 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun

        
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./App/Dockerfile .
+        run: sudo docker build -f ./App/Dockerfile .


  docker-build-copilot:
@@ -229,19 +157,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun

      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Copilot/Dockerfile .
+        run: sudo docker build -f ./Copilot/Dockerfile .

  docker-build-e2e:
    runs-on: ubuntu-latest
@@ -252,20 +172,12 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun

        
      # build image for accounts service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./E2E/Dockerfile .
+        run: sudo docker build -f ./E2E/Dockerfile .

  docker-build-admin-dashboard:
    runs-on: ubuntu-latest
@@ -276,19 +188,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun

      # build image for home
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./AdminDashboard/Dockerfile .
+        run: sudo docker build -f ./AdminDashboard/Dockerfile .

  docker-build-dashboard:
    runs-on: ubuntu-latest
@@ -299,19 +203,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun

      # build image for home
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Dashboard/Dockerfile .
+        run: sudo docker build -f ./Dashboard/Dockerfile .

  docker-build-probe:
    runs-on: ubuntu-latest
@@ -322,19 +218,11 @@ jobs:
        uses: actions/checkout@v4
      
      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
        
      # build image probe api
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Probe/Dockerfile .
+        run: sudo docker build -f ./Probe/Dockerfile .

  docker-build-probe-ingest:
    runs-on: ubuntu-latest
@@ -345,19 +233,11 @@ jobs:
        uses: actions/checkout@v4
      
      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
        
      # build image probe api
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./ProbeIngest/Dockerfile .
+        run: sudo docker build -f ./ProbeIngest/Dockerfile .

  docker-build-server-monitor-ingest:
    runs-on: ubuntu-latest
@@ -368,21 +248,13 @@ jobs:
        uses: actions/checkout@v4
      
      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
        
      # build image probe api
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./ServerMonitorIngest/Dockerfile .
+        run: sudo docker build -f ./ServerMonitorIngest/Dockerfile .

-  docker-build-telemetry:
+  docker-build-open-telemetry-ingest:
    runs-on: ubuntu-latest
    env:
      CI_PIPELINE_ID: ${{github.run_number}}
@@ -391,19 +263,11 @@ jobs:
        uses: actions/checkout@v4
      
      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
        
      # build image probe api
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Telemetry/Dockerfile .
+        run: sudo docker build -f ./OpenTelemetryIngest/Dockerfile .

  docker-build-incoming-request-ingest:
    runs-on: ubuntu-latest
@@ -414,19 +278,26 @@ jobs:
        uses: actions/checkout@v4
      
      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
        
      # build image probe api
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./IncomingRequestIngest/Dockerfile .
+        run: sudo docker build -f ./IncomingRequestIngest/Dockerfile .
+
+  docker-build-fluent-ingest:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v4
+      
+      - name: Preinstall 
+        run: npm run prerun
+        
+      # build image probe api
+      - name: build docker image
+        run: sudo docker build -f ./FluentIngest/Dockerfile .

  docker-build-status-page:
    runs-on: ubuntu-latest
@@ -437,19 +308,11 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun
        
      # build image for home
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./StatusPage/Dockerfile .
+        run: sudo docker build -f ./StatusPage/Dockerfile .

  docker-build-test-server:
    runs-on: ubuntu-latest
@@ -460,16 +323,8 @@ jobs:
        uses: actions/checkout@v4

      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
+        run: npm run prerun

      # build image for mail service
      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./TestServer/Dockerfile .
+        run: sudo docker build -f ./TestServer/Dockerfile .
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -20,12 +20,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Accounts
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Accounts && npm install && npm run compile && npm run dep-check
+      - run: cd Accounts && npm install && npm run compile && npm run dep-check

  compile-isolated-vm:
    runs-on: ubuntu-latest
@@ -37,12 +32,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile IsolatedVM
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd IsolatedVM && npm install && npm run compile && npm run dep-check
+      - run: cd IsolatedVM && npm install && npm run compile && npm run dep-check

  compile-common:
    runs-on: ubuntu-latest
@@ -53,12 +43,7 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version: latest
-      - name: Compile Common
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Common && npm install && npm run compile && npm run dep-check
+      - run: cd Common && npm install && npm run compile && npm run dep-check

  compile-app:
    runs-on: ubuntu-latest
@@ -70,12 +55,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile App
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd App && npm install && npm run compile && npm run dep-check
+      - run: cd App && npm install && npm run compile && npm run dep-check

  compile-home:
    runs-on: ubuntu-latest
@@ -87,12 +67,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Home
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Home && npm install && npm run compile && npm run dep-check
+      - run: cd Home && npm install && npm run compile && npm run dep-check

  compile-worker:
    runs-on: ubuntu-latest
@@ -104,12 +79,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Worker
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Worker && npm install && npm run compile && npm run dep-check
+      - run: cd Worker && npm install && npm run compile && npm run dep-check

  compile-workflow:
    runs-on: ubuntu-latest
@@ -121,12 +91,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Workflow
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Workflow && npm install && npm run compile && npm run dep-check
+      - run: cd Workflow && npm install && npm run compile && npm run dep-check

  compile-api-reference:
    runs-on: ubuntu-latest
@@ -138,12 +103,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile API Reference
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd APIReference && npm install && npm run compile && npm run dep-check
+      - run: cd APIReference && npm install && npm run compile && npm run dep-check

  compile-docs-reference:
    runs-on: ubuntu-latest
@@ -155,12 +115,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Docs Reference
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Docs && npm install && npm run compile && npm run dep-check
+      - run: cd Docs && npm install && npm run compile && npm run dep-check

  compile-copilot:
    runs-on: ubuntu-latest
@@ -172,12 +127,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Copilot
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Copilot && npm install && npm run compile && npm run dep-check
+      - run: cd Copilot && npm install && npm run compile && npm run dep-check

  compile-nginx:
    runs-on: ubuntu-latest
@@ -190,12 +140,7 @@ jobs:
          node-version: latest
      - run: cd Common && npm install
      
-      - name: Compile Nginx
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Nginx && npm install && npm run compile && npm run dep-check
+      - run: cd Nginx && npm install && npm run compile && npm run dep-check

  compile-infrastructure-agent:
    runs-on: ubuntu-latest
@@ -205,12 +150,7 @@ jobs:
      - uses: actions/checkout@v4
      # Setup Go
      - uses: actions/setup-go@v5
-      - name: Compile Infrastructure Agent
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd InfrastructureAgent && go build .
+      - run: cd InfrastructureAgent && go build .
  

  compile-admin-dashboard:
@@ -224,12 +164,7 @@ jobs:
          node-version: latest
      - run: cd Common && npm install
      
-      - name: Compile Admin Dashboard
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd AdminDashboard && npm install && npm run compile && npm run dep-check
+      - run: cd AdminDashboard && npm install && npm run compile && npm run dep-check

  compile-dashboard:
    runs-on: ubuntu-latest
@@ -242,12 +177,7 @@ jobs:
          node-version: latest
      - run: cd Common && npm install
      
-      - name: Compile Dashboard
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Dashboard && npm install && npm run compile && npm run dep-check
+      - run: cd Dashboard && npm install && npm run compile && npm run dep-check


  compile-e2e:
@@ -261,12 +191,7 @@ jobs:
          node-version: latest
      - run: sudo apt-get update
      - run: cd Common && npm install
-      - name: Compile E2E
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd E2E && npm install && npm run compile && npm run dep-check
+      - run: cd E2E && npm install && npm run compile && npm run dep-check

  compile-probe:
    runs-on: ubuntu-latest
@@ -278,12 +203,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Probe
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Probe && npm install && npm run compile && npm run dep-check
+      - run: cd Probe && npm install && npm run compile && npm run dep-check

  compile-probe-ingest:
    runs-on: ubuntu-latest
@@ -295,12 +215,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Probe Ingest
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd ProbeIngest && npm install && npm run compile && npm run dep-check
+      - run: cd ProbeIngest && npm install && npm run compile && npm run dep-check

  compile-server-monitor-ingest:
    runs-on: ubuntu-latest
@@ -312,14 +227,9 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Server Monitor Ingest
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd ServerMonitorIngest && npm install && npm run compile && npm run dep-check
+      - run: cd ServerMonitorIngest && npm install && npm run compile && npm run dep-check

-  compile-telemetry:
+  compile-open-telemetry-ingest:
    runs-on: ubuntu-latest
    env:
      CI_PIPELINE_ID: ${{github.run_number}}
@@ -329,12 +239,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Telemetry
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Telemetry && npm install && npm run compile && npm run dep-check
+      - run: cd OpenTelemetryIngest && npm install && npm run compile && npm run dep-check


  compile-incoming-request-ingest: 
@@ -347,12 +252,20 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Incoming Request Ingest
-        uses: nick-fields/retry@v3
+      - run: cd IncomingRequestIngest && npm install && npm run compile && npm run dep-check
+
+  compile-fluent-ingest:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd IncomingRequestIngest && npm install && npm run compile && npm run dep-check
+          node-version: latest
+      - run: cd Common && npm install
+      - run: cd FluentIngest && npm install && npm run compile && npm run dep-check
+  

  compile-status-page:
    runs-on: ubuntu-latest
@@ -365,12 +278,7 @@ jobs:
          node-version: latest
      - run: cd Common && npm install
      
-      - name: Compile Status Page
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd StatusPage && npm install && npm run compile && npm run dep-check
+      - run: cd StatusPage && npm install && npm run compile && npm run dep-check

  compile-test-server:
    runs-on: ubuntu-latest
@@ -382,12 +290,7 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile Test Server
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd TestServer && npm install && npm run compile && npm run dep-check
+      - run: cd TestServer && npm install && npm run compile && npm run dep-check

  compile-mcp:
    runs-on: ubuntu-latest
@@ -399,9 +302,4 @@ jobs:
        with:
          node-version: latest
      - run: cd Common && npm install
-      - name: Compile MCP
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd MCP && npm update @oneuptime/common && npm install && npm run compile && npm run dep-check
+      - run: cd MCP && npm install && npm run compile && npm run dep-check
--- a/.github/workflows/npm-audit-fix.yml
+++ b/.github/workflows/npm-audit-fix.yml
@@ -1,49 +0,0 @@
-name: NPM Audit Fix
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  npm-audit-fix:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Run npm audit fix across packages
-        run: npm run audit-fix
-
-      - name: Detect changes
-        id: changes
-        run: |
-          if git status --porcelain | grep .; then
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-          else
-            echo "has_changes=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Create pull request
-        if: steps.changes.outputs.has_changes == 'true'
-        uses: peter-evans/create-pull-request@v6
-        with:
-          commit-message: "chore: npm audit fix"
-          title: "chore: npm audit fix"
-          body: |
-            Automated npm audit fix run.
-            Workflow: ${{ github.workflow }}
-            Run ID: ${{ github.run_id }}
-          branch: chore/npm-audit-fix
-          delete-branch: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
--- a/.github/workflows/terraform-provider-generation.yml
+++ b/.github/workflows/terraform-provider-generation.yml
@@ -77,21 +77,17 @@ jobs:
          ls -la "$PROVIDER_DIR" || true

      - name: Test Go build
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: |
-            PROVIDER_DIR="./Terraform"
-            if [ -d "$PROVIDER_DIR" ] && [ -f "$PROVIDER_DIR/go.mod" ]; then
-              cd "$PROVIDER_DIR"
-              echo "🔨 Testing Go build..."
-              go mod tidy
-              go build -v ./...
-              echo "✅ Go build successful"
-            else
-              echo "⚠️ Cannot test build - missing go.mod or provider directory"
-            fi
+        run: |
+          PROVIDER_DIR="./Terraform"
+          if [ -d "$PROVIDER_DIR" ] && [ -f "$PROVIDER_DIR/go.mod" ]; then
+            cd "$PROVIDER_DIR"
+            echo "🔨 Testing Go build..."
+            go mod tidy
+            go build -v ./...
+            echo "✅ Go build successful"
+          else
+            echo "⚠️ Cannot test build - missing go.mod or provider directory"
+          fi

      - name: Upload Terraform provider as artifact
        uses: actions/upload-artifact@v4
--- a/.github/workflows/test-release.yaml
+++ b/.github/workflows/test-release.yaml
--- a/.github/workflows/test.fluent-ingest.yaml
+++ b/.github/workflows/test.fluent-ingest.yaml
@@ -0,0 +1,20 @@
+name: Fluent Ingest Test
+
+on:
+  pull_request: 
+  push:
+    branches-ignore:
+      - 'hotfix-*'   # excludes hotfix branches
+      - 'release'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: latest
+      - run: cd FluentIngest && npm install && npm run test
--- a/.github/workflows/test.open-telemetry-ingest.yaml
+++ b/.github/workflows/test.open-telemetry-ingest.yaml
@@ -1,4 +1,4 @@
-name: Telemetry Test
+name: OpenTelemetryIngest Test

 on:
  pull_request: 
@@ -17,6 +17,5 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version: latest
-      - run: cd Common && npm install
-      - run: cd Telemetry && npm install && npm run test
+      - run: cd OpenTelemetryIngest && npm install && npm run test
  
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -205,8 +205,8 @@
        },
        {
            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/Telemetry",
-            "name": "Telemetry: Debug with Docker",
+            "localRoot": "${workspaceFolder}/OpenTelemetryIngest",
+            "name": "OpenTelemetryIngest: Debug with Docker",
            "port": 9938,
            "remoteRoot": "/usr/src/app",
            "request": "attach",
@@ -217,6 +217,20 @@
            "restart": true,
            "autoAttachChildProcesses": true
        },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/FluentIngest",
+            "name": "Fluent Ingest: Debug with Docker",
+            "port": 9937,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
        {
            "address": "127.0.0.1",
            "localRoot": "${workspaceFolder}/IsolatedVM",
--- a/APIReference/Dockerfile.tpl
+++ b/APIReference/Dockerfile.tpl
@@ -3,7 +3,7 @@
 #

 # Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/node:24.9-alpine3.21
+FROM public.ecr.aws/docker/library/node:23.8-alpine3.21
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global

 RUN npm config set fetch-retries 5
@@ -14,12 +14,9 @@ RUN npm config set fetch-retry-maxtimeout 600000

 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE_EDITION=false

 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
-ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1


 # IF APP_VERSION is not set, set it to 1.0.0
--- a/APIReference/Service/Authentication.ts
+++ b/APIReference/Service/Authentication.ts
@@ -2,7 +2,6 @@ import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
-import Dictionary from "Common/Types/Dictionary";

 // Retrieve resources documentation
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
@@ -17,7 +16,7 @@ export default class ServiceHandler {

    // Extract page parameter from request
    const page: string | undefined = req.params["page"];
-    const pageData: Dictionary<unknown> = {};
+    const pageData: any = {};

    // Set default page title and description for the authentication page
    pageTitle = "Authentication";
--- a/APIReference/Service/DataType.ts
+++ b/APIReference/Service/DataType.ts
@@ -4,7 +4,6 @@ import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import LocalCache from "Common/Server/Infrastructure/LocalCache";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import LocalFile from "Common/Server/Utils/LocalFile";
-import Dictionary from "Common/Types/Dictionary";

 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();

@@ -13,9 +12,9 @@ export default class ServiceHandler {
    _req: ExpressRequest,
    res: ExpressResponse,
  ): Promise<void> {
-    const pageData: Dictionary<unknown> = {};
+    const pageData: any = {};

-    pageData["selectCode"] = await LocalCache.getOrSetString(
+    pageData.selectCode = await LocalCache.getOrSetString(
      "data-type",
      "select",
      async () => {
@@ -23,7 +22,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["sortCode"] = await LocalCache.getOrSetString(
+    pageData.sortCode = await LocalCache.getOrSetString(
      "data-type",
      "sort",
      async () => {
@@ -31,7 +30,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["equalToCode"] = await LocalCache.getOrSetString(
+    pageData.equalToCode = await LocalCache.getOrSetString(
      "data-type",
      "equal-to",
      async () => {
@@ -39,7 +38,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["equalToOrNullCode"] = await LocalCache.getOrSetString(
+    pageData.equalToOrNullCode = await LocalCache.getOrSetString(
      "data-type",
      "equal-to-or-null",
      async () => {
@@ -49,7 +48,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["greaterThanCode"] = await LocalCache.getOrSetString(
+    pageData.greaterThanCode = await LocalCache.getOrSetString(
      "data-type",
      "greater-than",
      async () => {
@@ -59,7 +58,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["greaterThanOrEqualCode"] = await LocalCache.getOrSetString(
+    pageData.greaterThanOrEqualCode = await LocalCache.getOrSetString(
      "data-type",
      "greater-than-or-equal",
      async () => {
@@ -69,7 +68,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["lessThanCode"] = await LocalCache.getOrSetString(
+    pageData.lessThanCode = await LocalCache.getOrSetString(
      "data-type",
      "less-than",
      async () => {
@@ -79,7 +78,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["lessThanOrEqualCode"] = await LocalCache.getOrSetString(
+    pageData.lessThanOrEqualCode = await LocalCache.getOrSetString(
      "data-type",
      "less-than-or-equal",
      async () => {
@@ -89,7 +88,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["includesCode"] = await LocalCache.getOrSetString(
+    pageData.includesCode = await LocalCache.getOrSetString(
      "data-type",
      "includes",
      async () => {
@@ -99,7 +98,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["lessThanOrNullCode"] = await LocalCache.getOrSetString(
+    pageData.lessThanOrNullCode = await LocalCache.getOrSetString(
      "data-type",
      "less-than-or-equal",
      async () => {
@@ -109,7 +108,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["greaterThanOrNullCode"] = await LocalCache.getOrSetString(
+    pageData.greaterThanOrNullCode = await LocalCache.getOrSetString(
      "data-type",
      "less-than-or-equal",
      async () => {
@@ -119,7 +118,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["isNullCode"] = await LocalCache.getOrSetString(
+    pageData.isNullCode = await LocalCache.getOrSetString(
      "data-type",
      "is-null",
      async () => {
@@ -127,7 +126,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["notNullCode"] = await LocalCache.getOrSetString(
+    pageData.notNullCode = await LocalCache.getOrSetString(
      "data-type",
      "not-null",
      async () => {
@@ -135,7 +134,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["notEqualToCode"] = await LocalCache.getOrSetString(
+    pageData.notEqualToCode = await LocalCache.getOrSetString(
      "data-type",
      "not-equals",
      async () => {
--- a/APIReference/Service/Errors.ts
+++ b/APIReference/Service/Errors.ts
@@ -2,7 +2,6 @@ import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
-import Dictionary from "Common/Types/Dictionary";

 // Fetch a list of resources used in the application
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
@@ -18,7 +17,7 @@ export default class ServiceHandler {

    // Get the 'page' parameter from the request
    const page: string | undefined = req.params["page"];
-    const pageData: Dictionary<unknown> = {};
+    const pageData: any = {};

    // Set the default page title and description
    pageTitle = "Errors";
--- a/APIReference/Service/Introduction.ts
+++ b/APIReference/Service/Introduction.ts
@@ -2,7 +2,6 @@ import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
-import Dictionary from "Common/Types/Dictionary";

 // Get all resources and featured resources from ResourceUtil
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
@@ -21,10 +20,10 @@ export default class ServiceHandler {

    // Get the requested page from the URL parameters
    const page: string | undefined = req.params["page"];
-    const pageData: Dictionary<unknown> = {};
+    const pageData: any = {};

    // Set featured resources for the page
-    pageData["featuredResources"] = FeaturedResources;
+    pageData.featuredResources = FeaturedResources;

    // Set page title and description
    pageTitle = "Introduction";
--- a/APIReference/Service/Model.ts
+++ b/APIReference/Service/Model.ts
@@ -3,10 +3,7 @@ import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import PageNotFoundServiceHandler from "./PageNotFound";
 import { AppApiRoute } from "Common/ServiceRoute";
 import { ColumnAccessControl } from "Common/Types/BaseDatabase/AccessControl";
-import {
-  getTableColumns,
-  TableColumnMetadata,
-} from "Common/Types/Database/TableColumn";
+import { getTableColumns } from "Common/Types/Database/TableColumn";
 import Dictionary from "Common/Types/Dictionary";
 import ObjectID from "Common/Types/ObjectID";
 import Permission, {
@@ -36,7 +33,7 @@ export default class ServiceHandler {
    let pageTitle: string = "";
    let pageDescription: string = "";
    let page: string | undefined = req.params["page"];
-    const pageData: Dictionary<unknown> = {};
+    const pageData: any = {};

    // Check if page is provided
    if (!page) {
@@ -59,9 +56,7 @@ export default class ServiceHandler {
    page = "model";

    // Get table columns for current resource
-    const tableColumns: Dictionary<TableColumnMetadata> = getTableColumns(
-      currentResource.model,
-    );
+    const tableColumns: any = getTableColumns(currentResource.model);

    // Filter out columns with no access
    for (const key in tableColumns) {
@@ -82,14 +77,12 @@ export default class ServiceHandler {
        continue;
      }

-      if (tableColumns[key] && tableColumns[key]!.hideColumnInDocumentation) {
+      if (tableColumns[key].hideColumnInDocumentation) {
        delete tableColumns[key];
        continue;
      }

-      if (tableColumns[key]) {
-        (tableColumns[key] as any).permissions = accessControl;
-      }
+      tableColumns[key].permissions = accessControl;
    }

    // Remove unnecessary columns
@@ -99,11 +92,11 @@ export default class ServiceHandler {
    delete tableColumns["version"];

    // Set page data
-    pageData["title"] = currentResource.model.singularName;
-    pageData["description"] = currentResource.model.tableDescription;
-    pageData["columns"] = tableColumns;
+    pageData.title = currentResource.model.singularName;
+    pageData.description = currentResource.model.tableDescription;
+    pageData.columns = tableColumns;

-    pageData["tablePermissions"] = {
+    pageData.tablePermissions = {
      read: currentResource.model.readRecordPermissions.map(
        (permission: Permission) => {
          return PermissionDictionary[permission];
@@ -127,7 +120,7 @@ export default class ServiceHandler {
    };

    // Cache the list request data
-    pageData["listRequest"] = await LocalCache.getOrSetString(
+    pageData.listRequest = await LocalCache.getOrSetString(
      "model",
      "list-request",
      async () => {
@@ -137,7 +130,7 @@ export default class ServiceHandler {
    );

    // Cache the item request data
-    pageData["itemRequest"] = await LocalCache.getOrSetString(
+    pageData.itemRequest = await LocalCache.getOrSetString(
      "model",
      "item-request",
      async () => {
@@ -147,7 +140,7 @@ export default class ServiceHandler {
    );

    // Cache the item response data
-    pageData["itemResponse"] = await LocalCache.getOrSetString(
+    pageData.itemResponse = await LocalCache.getOrSetString(
      "model",
      "item-response",
      async () => {
@@ -159,7 +152,7 @@ export default class ServiceHandler {
    );

    // Cache the count request data
-    pageData["countRequest"] = await LocalCache.getOrSetString(
+    pageData.countRequest = await LocalCache.getOrSetString(
      "model",
      "count-request",
      async () => {
@@ -171,7 +164,7 @@ export default class ServiceHandler {
    );

    // Cache the count response data
-    pageData["countResponse"] = await LocalCache.getOrSetString(
+    pageData.countResponse = await LocalCache.getOrSetString(
      "model",
      "count-response",
      async () => {
@@ -182,7 +175,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["updateRequest"] = await LocalCache.getOrSetString(
+    pageData.updateRequest = await LocalCache.getOrSetString(
      "model",
      "update-request",
      async () => {
@@ -193,7 +186,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["updateResponse"] = await LocalCache.getOrSetString(
+    pageData.updateResponse = await LocalCache.getOrSetString(
      "model",
      "update-response",
      async () => {
@@ -204,7 +197,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["createRequest"] = await LocalCache.getOrSetString(
+    pageData.createRequest = await LocalCache.getOrSetString(
      "model",
      "create-request",
      async () => {
@@ -215,7 +208,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["createResponse"] = await LocalCache.getOrSetString(
+    pageData.createResponse = await LocalCache.getOrSetString(
      "model",
      "create-response",
      async () => {
@@ -226,7 +219,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["deleteRequest"] = await LocalCache.getOrSetString(
+    pageData.deleteRequest = await LocalCache.getOrSetString(
      "model",
      "delete-request",
      async () => {
@@ -237,7 +230,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["deleteResponse"] = await LocalCache.getOrSetString(
+    pageData.deleteResponse = await LocalCache.getOrSetString(
      "model",
      "delete-response",
      async () => {
@@ -249,7 +242,7 @@ export default class ServiceHandler {
    );

    // Get list response from cache or set it if it's not available
-    pageData["listResponse"] = await LocalCache.getOrSetString(
+    pageData.listResponse = await LocalCache.getOrSetString(
      "model",
      "list-response",
      async () => {
@@ -261,15 +254,14 @@ export default class ServiceHandler {
    );

    // Generate a unique ID for the example object
-    pageData["exampleObjectID"] = ObjectID.generate();
+    pageData.exampleObjectID = ObjectID.generate();

    // Construct the API path for the current resource
-    pageData["apiPath"] =
+    pageData.apiPath =
      AppApiRoute.toString() + currentResource.model.crudApiPath?.toString();

    // Check if the current resource is a master admin API
-    pageData["isMasterAdminApiDocs"] =
-      currentResource.model.isMasterAdminApiDocs;
+    pageData.isMasterAdminApiDocs = currentResource.model.isMasterAdminApiDocs;

    // Render the index page with the required data
    return res.render(`${ViewsPath}/pages/index`, {
--- a/APIReference/Service/OpenAPI.ts
+++ b/APIReference/Service/OpenAPI.ts
@@ -7,7 +7,6 @@ import { ViewsPath } from "../Utils/Config";
 import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import URL from "Common/Types/API/URL";
-import Dictionary from "Common/Types/Dictionary";

 // Fetch a list of resources used in the application
 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();
@@ -23,7 +22,7 @@ export default class ServiceHandler {

    // Get the 'page' parameter from the request
    const page: string | undefined = req.params["page"];
-    const pageData: Dictionary<unknown> = {
+    const pageData: any = {
      hostUrl: new URL(HttpProtocol, Host).toString(),
    };

--- a/APIReference/Service/Pagination.ts
+++ b/APIReference/Service/Pagination.ts
@@ -4,7 +4,6 @@ import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import LocalCache from "Common/Server/Infrastructure/LocalCache";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import LocalFile from "Common/Server/Utils/LocalFile";
-import Dictionary from "Common/Types/Dictionary";

 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources(); // Get all resources from ResourceUtil

@@ -16,14 +15,14 @@ export default class ServiceHandler {
    let pageTitle: string = ""; // Initialize page title
    let pageDescription: string = ""; // Initialize page description
    const page: string | undefined = req.params["page"]; // Get the page parameter from the request
-    const pageData: Dictionary<unknown> = {}; // Initialize page data object
+    const pageData: any = {}; // Initialize page data object

    // Set page title and description
    pageTitle = "Pagination";
    pageDescription = "Learn how to paginate requests with OneUptime API";

    // Get response and request code from LocalCache or LocalFile
-    pageData["responseCode"] = await LocalCache.getOrSetString(
+    pageData.responseCode = await LocalCache.getOrSetString(
      "pagination",
      "response",
      async () => {
@@ -34,7 +33,7 @@ export default class ServiceHandler {
      },
    );

-    pageData["requestCode"] = await LocalCache.getOrSetString(
+    pageData.requestCode = await LocalCache.getOrSetString(
      "pagination",
      "request",
      async () => {
--- a/APIReference/Service/Permissions.ts
+++ b/APIReference/Service/Permissions.ts
@@ -3,7 +3,6 @@ import ResourceUtil, { ModelDocumentation } from "../Utils/Resources";
 import { PermissionHelper, PermissionProps } from "Common/Types/Permission";
 import { ExpressRequest, ExpressResponse } from "Common/Server/Utils/Express";
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
-import Dictionary from "Common/Types/Dictionary";

 const Resources: Array<ModelDocumentation> = ResourceUtil.getResources();

@@ -18,14 +17,14 @@ export default class ServiceHandler {

    // Get the requested page
    const page: string | undefined = req.params["page"];
-    const pageData: Dictionary<unknown> = {};
+    const pageData: any = {};

    // Set page title and description
    pageTitle = "Permissions";
    pageDescription = "Learn how permissions work with OneUptime";

    // Filter permissions to only include those assignable to tenants
-    pageData["permissions"] = PermissionHelper.getAllPermissionProps().filter(
+    pageData.permissions = PermissionHelper.getAllPermissionProps().filter(
      (i: PermissionProps) => {
        return i.isAssignableToTenant;
      },
--- a/APIReference/nodemon.json
+++ b/APIReference/nodemon.json
@@ -1,14 +1,8 @@
 {
    "watch": ["./","../Common/Server", "../Common/Types", "../Common/Utils", "../Common/Models"],
-    "ext": "ts,tsx",
+    "ext": "ts,json,tsx,env,js,jsx,hbs",
    "ignore": [
-        "./node_modules/**",
-        "./public/**",
-        "./bin/**",
-        "./build/**",
        "greenlock.d/*"
    ],
-    "watchOptions": {"useFsEvents": false, "interval": 500},
-    "env": {"TS_NODE_TRANSPILE_ONLY": "1", "TS_NODE_FILES": "false"},
-    "exec": "node  -r ts-node/register/transpile-only Index.ts"
+    "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
 }
--- a/APIReference/package-lock.json
+++ b/APIReference/package-lock.json
@@ -29,29 +29,27 @@
        "@bull-board/express": "^5.21.4",
        "@clickhouse/client": "^1.10.1",
        "@elastic/elasticsearch": "^8.12.1",
-        "@hcaptcha/react-hcaptcha": "^1.14.0",
        "@monaco-editor/react": "^4.4.6",
        "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/api-logs": "^0.206.0",
+        "@opentelemetry/api-logs": "^0.52.1",
        "@opentelemetry/context-zone": "^1.25.1",
-        "@opentelemetry/exporter-logs-otlp-http": "^0.207.0",
-        "@opentelemetry/exporter-metrics-otlp-proto": "^0.207.0",
-        "@opentelemetry/exporter-trace-otlp-http": "^0.207.0",
-        "@opentelemetry/exporter-trace-otlp-proto": "^0.207.0",
+        "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
+        "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.1",
+        "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
+        "@opentelemetry/exporter-trace-otlp-proto": "^0.52.1",
        "@opentelemetry/id-generator-aws-xray": "^1.2.2",
-        "@opentelemetry/instrumentation": "^0.207.0",
-        "@opentelemetry/instrumentation-fetch": "^0.207.0",
-        "@opentelemetry/instrumentation-xml-http-request": "^0.207.0",
+        "@opentelemetry/instrumentation": "^0.52.1",
+        "@opentelemetry/instrumentation-fetch": "^0.52.1",
+        "@opentelemetry/instrumentation-xml-http-request": "^0.52.1",
        "@opentelemetry/resources": "^1.25.1",
-        "@opentelemetry/sdk-logs": "^0.207.0",
+        "@opentelemetry/sdk-logs": "^0.52.1",
        "@opentelemetry/sdk-metrics": "^1.25.1",
-        "@opentelemetry/sdk-node": "^0.207.0",
+        "@opentelemetry/sdk-node": "^0.52.1",
+        "@opentelemetry/sdk-trace-node": "^1.25.1",
        "@opentelemetry/sdk-trace-web": "^1.25.1",
-        "@opentelemetry/semantic-conventions": "^1.37.0",
+        "@opentelemetry/semantic-conventions": "^1.26.0",
        "@remixicon/react": "^4.2.0",
-        "@simplewebauthn/server": "^13.2.2",
        "@tippyjs/react": "^4.2.6",
-        "@types/archiver": "^6.0.3",
        "@types/crypto-js": "^4.2.2",
        "@types/qrcode": "^1.5.5",
        "@types/react-highlight": "^0.12.8",
@@ -60,17 +58,14 @@
        "@types/web-push": "^3.6.4",
        "acme-client": "^5.3.0",
        "airtable": "^0.12.2",
-        "archiver": "^7.0.1",
-        "axios": "^1.12.0",
-        "botbuilder": "^4.23.3",
-        "bullmq": "^5.61.0",
+        "axios": "^1.7.2",
+        "bullmq": "^5.3.3",
        "cookie-parser": "^1.4.7",
        "cors": "^2.8.5",
        "cron-parser": "^4.8.1",
        "crypto-js": "^4.2.0",
        "dotenv": "^16.4.4",
        "ejs": "^3.1.10",
-        "elkjs": "^0.10.0",
        "esbuild": "^0.25.5",
        "express": "^4.21.1",
        "formik": "^2.4.6",
@@ -84,26 +79,26 @@
        "moment": "^2.30.1",
        "moment-timezone": "^0.5.45",
        "node-cron": "^3.0.3",
-        "nodemailer": "^7.0.7",
+        "nodemailer": "^6.9.10",
        "otpauth": "^9.3.1",
-        "pg": "^8.16.3",
-        "playwright": "^1.56.0",
-        "posthog-js": "^1.275.3",
+        "pg": "^8.7.3",
+        "playwright": "^1.50.0",
+        "posthog-js": "^1.139.6",
        "prop-types": "^15.8.1",
        "qrcode": "^1.5.3",
        "react": "^18.3.1",
        "react-beautiful-dnd": "^13.1.1",
-        "react-big-calendar": "^1.19.4",
+        "react-big-calendar": "^1.13.0",
        "react-color": "^2.19.3",
        "react-dom": "^18.3.1",
        "react-dropzone": "^14.2.2",
        "react-error-boundary": "^4.0.13",
        "react-highlight": "^0.15.0",
        "react-markdown": "^8.0.3",
-        "react-router-dom": "^6.30.1",
+        "react-router-dom": "^6.24.1",
        "react-select": "^5.4.0",
        "react-spinners": "^0.14.1",
-        "react-syntax-highlighter": "^16.0.0",
+        "react-syntax-highlighter": "^15.5.0",
        "react-toggle": "^4.1.3",
        "reactflow": "^11.11.4",
        "recharts": "^2.12.7",
@@ -115,16 +110,16 @@
        "socket.io": "^4.7.4",
        "socket.io-client": "^4.7.5",
        "stripe": "^10.17.0",
-        "tailwind-merge": "^2.6.0",
+        "tailwind-merge": "^2.5.2",
        "tippy.js": "^6.3.7",
        "twilio": "^4.22.0",
-        "typeorm": "^0.3.26",
+        "typeorm": "^0.3.20",
        "typeorm-extension": "^2.2.13",
        "universal-cookie": "^7.2.1",
        "use-async-effect": "^2.2.6",
        "uuid": "^8.3.2",
        "web-push": "^3.6.7",
-        "zod": "^3.25.76"
+        "zod": "^3.25.30"
      },
      "devDependencies": {
        "@faker-js/faker": "^8.0.2",
@@ -247,20 +242,89 @@
      }
    },
    "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
+    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/code-frame/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,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/@babel/compat-data": {
      "version": "7.23.5",
      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
@@ -436,21 +500,19 @@
      }
    },
    "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
      }
@@ -465,28 +527,109 @@
      }
    },
    "node_modules/@babel/helpers": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
-      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz",
+      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.4"
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.6",
+        "@babel/types": "^7.23.6"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
-    "node_modules/@babel/parser": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+    "node_modules/@babel/highlight": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/types": "^7.28.5"
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0"
      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/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,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+      "dev": true,
      "bin": {
        "parser": "bin/babel-parser.js"
      },
@@ -657,15 +800,14 @@
      }
    },
    "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -693,14 +835,14 @@
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.28.5"
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "to-fast-properties": "^2.0.0"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1617,23 +1759,21 @@
      }
    },
    "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "license": "MIT",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
      "dependencies": {
        "balanced-match": "^1.0.0",
        "concat-map": "0.0.1"
      }
    },
    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "fill-range": "^7.1.1"
+        "fill-range": "^7.0.1"
      },
      "engines": {
        "node": ">=8"
@@ -1863,11 +2003,10 @@
      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
    },
    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "path-key": "^3.1.0",
        "shebang-command": "^2.0.0",
@@ -1936,10 +2075,9 @@
      }
    },
    "node_modules/ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "license": "Apache-2.0",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
+      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
      "dependencies": {
        "jake": "^10.8.5"
      },
@@ -2086,10 +2224,9 @@
      }
    },
    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "license": "MIT",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
      "dependencies": {
        "balanced-match": "^1.0.0"
      }
@@ -2106,11 +2243,10 @@
      }
    },
    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@@ -2405,7 +2541,6 @@
      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">=0.12.0"
      }
@@ -3103,15 +3238,13 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
    },
    "node_modules/js-yaml": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "argparse": "^1.0.7",
        "esprima": "^4.0.0"
@@ -3264,13 +3397,12 @@
      "dev": true
    },
    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "braces": "^3.0.3",
+        "braces": "^3.0.2",
        "picomatch": "^2.3.1"
      },
      "engines": {
@@ -3551,11 +3683,10 @@
      "dev": true
    },
    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "license": "ISC"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -3975,12 +4106,20 @@
      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
      "dev": true
    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/to-regex-range": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "is-number": "^7.0.0"
      },
--- a/APIReference/views/main/pagination.ejs
+++ b/APIReference/views/main/pagination.ejs
@@ -108,7 +108,7 @@
         </div>
         </div>
         <div class="[&amp;>:first-child]:mt-0 [&amp;>:last-child]:mb-0">
-            <%- include('../partials/code', {title: "Example Pagination Request", requestUrl: "/api/monitors/get-list?skip=0&limit=3", requestType: "POST", code: pageData.requestCode }) -%>
+            <%- include('../partials/code', {title: "Example Pagination Request", requestUrl: "/api/monitors/get-list?skip=0&limit=3", requestType: "GET", code: pageData.requestCode }) -%>
            <%- include('../partials/code', {title: "Example Pagination Response" , requestUrl: "", requestType: "", code: pageData.responseCode }) -%>
         </div>
      </div>
--- a/APIReference/views/partials/head.ejs
+++ b/APIReference/views/partials/head.ejs
@@ -135,6 +135,7 @@
   <link rel="apple-touch-icon-precomposed" href="/img/ou-wb.svg">
   <link rel="icon" href="/img/ou-wb.svg">
   <link rel="image_src" type="image/png" href="/img/hou-wb.svg">
+   <link rel="canonical" href="/">
   <link rel="manifest" href="/manifest.json">
   <meta property="og:title" content="OneUptime - One Complete Observability platform.">
   <meta property="og:url" content="https://oneuptime.com">
--- a/Accounts/Dockerfile.tpl
+++ b/Accounts/Dockerfile.tpl
@@ -3,7 +3,7 @@
 #

 # Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/node:24.9-alpine3.21
+FROM public.ecr.aws/docker/library/node:23.8-alpine3.21
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global

 RUN npm config set fetch-retries 5
@@ -14,12 +14,9 @@ RUN npm config set fetch-retry-maxtimeout 600000

 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE_EDITION=false

 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
-ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1


 # IF APP_VERSION is not set, set it to 1.0.0
--- a/Accounts/nodemon.json
+++ b/Accounts/nodemon.json
@@ -1,10 +1,7 @@
 {
    "watch": ["./","../Common/UI", "../Common/Types", "../Common/Utils", "../Common/Models"],
-    "ext": "ts,tsx",
+    "ext": "ts,json,tsx,env,js,jsx,hbs",
    "ignore": [
-        "./node_modules/**",
-        "./public/**",
-        "./bin/**",
        "./public/**",
        "./public/dist/**",
        "./build/*",
--- a/Accounts/package-lock.json
+++ b/Accounts/package-lock.json
@@ -12,7 +12,7 @@
                "ejs": "^3.1.10",
                "react": "^18.3.1",
                "react-dom": "^18.3.1",
-                "react-router-dom": "^6.30.1",
+                "react-router-dom": "^6.23.1",
                "use-async-effect": "^2.2.7"
            },
            "devDependencies": {
@@ -33,29 +33,27 @@
                "@bull-board/express": "^5.21.4",
                "@clickhouse/client": "^1.10.1",
                "@elastic/elasticsearch": "^8.12.1",
-                "@hcaptcha/react-hcaptcha": "^1.14.0",
                "@monaco-editor/react": "^4.4.6",
                "@opentelemetry/api": "^1.9.0",
-                "@opentelemetry/api-logs": "^0.206.0",
+                "@opentelemetry/api-logs": "^0.52.1",
                "@opentelemetry/context-zone": "^1.25.1",
-                "@opentelemetry/exporter-logs-otlp-http": "^0.207.0",
-                "@opentelemetry/exporter-metrics-otlp-proto": "^0.207.0",
-                "@opentelemetry/exporter-trace-otlp-http": "^0.207.0",
-                "@opentelemetry/exporter-trace-otlp-proto": "^0.207.0",
+                "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
+                "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.1",
+                "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
+                "@opentelemetry/exporter-trace-otlp-proto": "^0.52.1",
                "@opentelemetry/id-generator-aws-xray": "^1.2.2",
-                "@opentelemetry/instrumentation": "^0.207.0",
-                "@opentelemetry/instrumentation-fetch": "^0.207.0",
-                "@opentelemetry/instrumentation-xml-http-request": "^0.207.0",
+                "@opentelemetry/instrumentation": "^0.52.1",
+                "@opentelemetry/instrumentation-fetch": "^0.52.1",
+                "@opentelemetry/instrumentation-xml-http-request": "^0.52.1",
                "@opentelemetry/resources": "^1.25.1",
-                "@opentelemetry/sdk-logs": "^0.207.0",
+                "@opentelemetry/sdk-logs": "^0.52.1",
                "@opentelemetry/sdk-metrics": "^1.25.1",
-                "@opentelemetry/sdk-node": "^0.207.0",
+                "@opentelemetry/sdk-node": "^0.52.1",
+                "@opentelemetry/sdk-trace-node": "^1.25.1",
                "@opentelemetry/sdk-trace-web": "^1.25.1",
-                "@opentelemetry/semantic-conventions": "^1.37.0",
+                "@opentelemetry/semantic-conventions": "^1.26.0",
                "@remixicon/react": "^4.2.0",
-                "@simplewebauthn/server": "^13.2.2",
                "@tippyjs/react": "^4.2.6",
-                "@types/archiver": "^6.0.3",
                "@types/crypto-js": "^4.2.2",
                "@types/qrcode": "^1.5.5",
                "@types/react-highlight": "^0.12.8",
@@ -64,17 +62,14 @@
                "@types/web-push": "^3.6.4",
                "acme-client": "^5.3.0",
                "airtable": "^0.12.2",
-                "archiver": "^7.0.1",
-                "axios": "^1.12.0",
-                "botbuilder": "^4.23.3",
-                "bullmq": "^5.61.0",
+                "axios": "^1.7.2",
+                "bullmq": "^5.3.3",
                "cookie-parser": "^1.4.7",
                "cors": "^2.8.5",
                "cron-parser": "^4.8.1",
                "crypto-js": "^4.2.0",
                "dotenv": "^16.4.4",
                "ejs": "^3.1.10",
-                "elkjs": "^0.10.0",
                "esbuild": "^0.25.5",
                "express": "^4.21.1",
                "formik": "^2.4.6",
@@ -88,26 +83,26 @@
                "moment": "^2.30.1",
                "moment-timezone": "^0.5.45",
                "node-cron": "^3.0.3",
-                "nodemailer": "^7.0.7",
+                "nodemailer": "^6.9.10",
                "otpauth": "^9.3.1",
-                "pg": "^8.16.3",
-                "playwright": "^1.56.0",
-                "posthog-js": "^1.275.3",
+                "pg": "^8.7.3",
+                "playwright": "^1.50.0",
+                "posthog-js": "^1.139.6",
                "prop-types": "^15.8.1",
                "qrcode": "^1.5.3",
                "react": "^18.3.1",
                "react-beautiful-dnd": "^13.1.1",
-                "react-big-calendar": "^1.19.4",
+                "react-big-calendar": "^1.13.0",
                "react-color": "^2.19.3",
                "react-dom": "^18.3.1",
                "react-dropzone": "^14.2.2",
                "react-error-boundary": "^4.0.13",
                "react-highlight": "^0.15.0",
                "react-markdown": "^8.0.3",
-                "react-router-dom": "^6.30.1",
+                "react-router-dom": "^6.24.1",
                "react-select": "^5.4.0",
                "react-spinners": "^0.14.1",
-                "react-syntax-highlighter": "^16.0.0",
+                "react-syntax-highlighter": "^15.5.0",
                "react-toggle": "^4.1.3",
                "reactflow": "^11.11.4",
                "recharts": "^2.12.7",
@@ -119,16 +114,16 @@
                "socket.io": "^4.7.4",
                "socket.io-client": "^4.7.5",
                "stripe": "^10.17.0",
-                "tailwind-merge": "^2.6.0",
+                "tailwind-merge": "^2.5.2",
                "tippy.js": "^6.3.7",
                "twilio": "^4.22.0",
-                "typeorm": "^0.3.26",
+                "typeorm": "^0.3.20",
                "typeorm-extension": "^2.2.13",
                "universal-cookie": "^7.2.1",
                "use-async-effect": "^2.2.6",
                "uuid": "^8.3.2",
                "web-push": "^3.6.7",
-                "zod": "^3.25.76"
+                "zod": "^3.25.30"
            },
            "devDependencies": {
                "@faker-js/faker": "^8.0.2",
@@ -348,9 +343,9 @@
            }
        },
        "node_modules/@remix-run/router": {
-            "version": "1.23.0",
-            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
-            "integrity": "sha512-O3rHJzAQKamUz1fvE0Qaw0xSFqsA/yafi2iqeE0pvdFtCO1viYx8QL6f3Ln/aCCTLxs68SLf0KPM9eSeM8yBnA==",
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
+            "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
            "license": "MIT",
            "engines": {
                "node": ">=14.0.0"
@@ -526,23 +521,21 @@
            }
        },
        "node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-            "license": "MIT",
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
            "dependencies": {
                "balanced-match": "^1.0.0",
                "concat-map": "0.0.1"
            }
        },
        "node_modules/braces": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
            "dev": true,
-            "license": "MIT",
            "dependencies": {
-                "fill-range": "^7.1.1"
+                "fill-range": "^7.0.1"
            },
            "engines": {
                "node": ">=8"
@@ -689,9 +682,9 @@
            }
        },
        "node_modules/filelist/node_modules/brace-expansion": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
            "license": "MIT",
            "dependencies": {
                "balanced-match": "^1.0.0"
@@ -710,11 +703,10 @@
            }
        },
        "node_modules/fill-range": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
            "dev": true,
-            "license": "MIT",
            "dependencies": {
                "to-regex-range": "^5.0.1"
            },
@@ -801,7 +793,6 @@
            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
            "dev": true,
-            "license": "MIT",
            "engines": {
                "node": ">=0.12.0"
            }
@@ -966,12 +957,12 @@
            }
        },
        "node_modules/react-router": {
-            "version": "6.30.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.1.tgz",
-            "integrity": "sha512-X1m21aEmxGXqENEPG3T6u0Th7g0aS4ZmoNynhbs+Cn+q+QGTLt+d5IQ2bHAXKzKcxGJjxACpVbnYQSCRcfxHlQ==",
+            "version": "6.23.1",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
+            "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
            "license": "MIT",
            "dependencies": {
-                "@remix-run/router": "1.23.0"
+                "@remix-run/router": "1.16.1"
            },
            "engines": {
                "node": ">=14.0.0"
@@ -981,13 +972,13 @@
            }
        },
        "node_modules/react-router-dom": {
-            "version": "6.30.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.1.tgz",
-            "integrity": "sha512-llKsgOkZdbPU1Eg3zK8lCn+sjD9wMRZZPuzmdWWX5SUs8OFkN5HnFVC0u5KMeMaC9aoancFI/KoLuKPqN+hxHw==",
+            "version": "6.23.1",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
+            "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
            "license": "MIT",
            "dependencies": {
-                "@remix-run/router": "1.23.0",
-                "react-router": "6.30.1"
+                "@remix-run/router": "1.16.1",
+                "react-router": "6.23.1"
            },
            "engines": {
                "node": ">=14.0.0"
@@ -1017,16 +1008,6 @@
                "loose-envify": "^1.1.0"
            }
        },
-        "node_modules/semver": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-            "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-            "dev": true,
-            "license": "ISC",
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
        "node_modules/simple-update-notifier": {
            "version": "1.1.0",
            "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
@@ -1039,6 +1020,15 @@
                "node": ">=8.10.0"
            }
        },
+        "node_modules/simple-update-notifier/node_modules/semver": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+            "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
        "node_modules/supports-color": {
            "version": "5.5.0",
            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -1056,7 +1046,6 @@
            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
            "dev": true,
-            "license": "MIT",
            "dependencies": {
                "is-number": "^7.0.0"
            },
--- a/Accounts/package.json
+++ b/Accounts/package.json
@@ -33,7 +33,7 @@
        "ejs": "^3.1.10",
        "react": "^18.3.1",
        "react-dom": "^18.3.1",
-        "react-router-dom": "^6.30.1",
+        "react-router-dom": "^6.23.1",
        "use-async-effect": "^2.2.7"
    },
    "devDependencies": {
--- a/Accounts/src/Pages/Login.tsx
+++ b/Accounts/src/Pages/Login.tsx
@@ -1,44 +1,28 @@
 import {
  LOGIN_API_URL,
-  VERIFY_TOTP_AUTH_API_URL,
-  GENERATE_WEBAUTHN_AUTH_OPTIONS_API_URL,
-  VERIFY_WEBAUTHN_AUTH_API_URL,
+  VERIFY_TWO_FACTOR_AUTH_API_URL,
 } from "../Utils/ApiPaths";
 import Route from "Common/Types/API/Route";
 import URL from "Common/Types/API/URL";
 import { JSONArray, JSONObject } from "Common/Types/JSON";
-import ModelForm, {
-  FormType,
-  ModelField,
-} from "Common/UI/Components/Forms/ModelForm";
-import { CustomElementProps } from "Common/UI/Components/Forms/Types/Field";
-import FormValues from "Common/UI/Components/Forms/Types/FormValues";
+import ModelForm, { FormType } from "Common/UI/Components/Forms/ModelForm";
 import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
 import Link from "Common/UI/Components/Link/Link";
-import Captcha from "Common/UI/Components/Captcha/Captcha";
-import {
-  DASHBOARD_URL,
-  CAPTCHA_ENABLED,
-  CAPTCHA_SITE_KEY,
-} from "Common/UI/Config";
+import { DASHBOARD_URL } from "Common/UI/Config";
 import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
-import EditionLabel from "Common/UI/Components/EditionLabel/EditionLabel";
 import UiAnalytics from "Common/UI/Utils/Analytics";
 import LoginUtil from "Common/UI/Utils/Login";
-import UserTotpAuth from "Common/Models/DatabaseModels/UserTotpAuth";
-import UserWebAuthn from "Common/Models/DatabaseModels/UserWebAuthn";
+import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth";
 import Navigation from "Common/UI/Utils/Navigation";
 import UserUtil from "Common/UI/Utils/User";
 import User from "Common/Models/DatabaseModels/User";
 import React from "react";
 import useAsyncEffect from "use-async-effect";
+import StaticModelList from "Common/UI/Components/ModelList/StaticModelList";
 import BasicForm from "Common/UI/Components/Forms/BasicForm";
 import API from "Common/UI/Utils/API/API";
 import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse";
 import HTTPResponse from "Common/Types/API/HTTPResponse";
-import Base64 from "Common/Utils/Base64";
-import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
-import ComponentLoader from "Common/UI/Components/ComponentLoader/ComponentLoader";

 const LoginPage: () => JSX.Element = () => {
  const apiUrl: URL = LOGIN_API_URL;
@@ -52,115 +36,19 @@ const LoginPage: () => JSX.Element = () => {
  const [showTwoFactorAuth, setShowTwoFactorAuth] =
    React.useState<boolean>(false);

-  const [totpAuthList, setTotpAuthList] = React.useState<UserTotpAuth[]>([]);
+  const [twoFactorAuthList, setTwoFactorAuthList] = React.useState<
+    UserTwoFactorAuth[]
+  >([]);

-  const [webAuthnList, setWebAuthnList] = React.useState<UserWebAuthn[]>([]);
-
-  const [selectedTotpAuth, setSelectedTotpAuth] = React.useState<
-    UserTotpAuth | undefined
+  const [selectedTwoFactorAuth, setSelectedTwoFactorAuth] = React.useState<
+    UserTwoFactorAuth | undefined
  >(undefined);

-  const [selectedWebAuthn, setSelectedWebAuthn] = React.useState<
-    UserWebAuthn | undefined
-  >(undefined);
-
-  type TwoFactorMethod = {
-    type: "totp" | "webauthn";
-    item: UserTotpAuth | UserWebAuthn;
-  };
-
-  const twoFactorMethods: TwoFactorMethod[] = [
-    ...totpAuthList.map((item: UserTotpAuth) => {
-      return { type: "totp" as const, item };
-    }),
-    ...webAuthnList.map((item: UserWebAuthn) => {
-      return { type: "webauthn" as const, item };
-    }),
-  ];
-
  const [isTwoFactorAuthLoading, setIsTwoFactorAuthLoading] =
    React.useState<boolean>(false);
  const [twofactorAuthError, setTwoFactorAuthError] =
    React.useState<string>("");

-  const isCaptchaEnabled: boolean =
-    CAPTCHA_ENABLED && Boolean(CAPTCHA_SITE_KEY);
-
-  const [shouldResetCaptcha, setShouldResetCaptcha] =
-    React.useState<boolean>(false);
-  const [captchaResetSignal, setCaptchaResetSignal] = React.useState<number>(0);
-
-  const handleCaptchaReset: () => void = React.useCallback(() => {
-    setCaptchaResetSignal((current: number) => {
-      return current + 1;
-    });
-  }, []);
-  let loginFields: Array<ModelField<User>> = [
-    {
-      field: {
-        email: true,
-      },
-      fieldType: FormFieldSchemaType.Email,
-      placeholder: "jeff@example.com",
-      required: true,
-      disabled: Boolean(initialValues && initialValues["email"]),
-      title: "Email",
-      dataTestId: "email",
-      disableSpellCheck: true,
-    },
-    {
-      field: {
-        password: true,
-      },
-      title: "Password",
-      required: true,
-      validation: {
-        minLength: 6,
-      },
-      fieldType: FormFieldSchemaType.Password,
-      sideLink: {
-        text: "Forgot password?",
-        url: new Route("/accounts/forgot-password"),
-        openLinkInNewTab: false,
-      },
-      dataTestId: "password",
-      disableSpellCheck: true,
-    },
-  ];
-
-  if (isCaptchaEnabled) {
-    loginFields = loginFields.concat([
-      {
-        overrideField: {
-          captchaToken: true,
-        },
-        overrideFieldKey: "captchaToken",
-        fieldType: FormFieldSchemaType.CustomComponent,
-        title: "Human Verification",
-        description:
-          "Complete the captcha challenge so we know you're not a bot.",
-        required: true,
-        showEvenIfPermissionDoesNotExist: true,
-        getCustomElement: (
-          _values: FormValues<User>,
-          customProps: CustomElementProps,
-        ) => {
-          return (
-            <Captcha
-              siteKey={CAPTCHA_SITE_KEY}
-              resetSignal={captchaResetSignal}
-              error={customProps.error}
-              onTokenChange={(token: string) => {
-                customProps.onChange?.(token);
-              }}
-              onBlur={customProps.onBlur}
-            />
-          );
-        },
-      },
-    ]);
-  }
-
  useAsyncEffect(async () => {
    if (Navigation.getQueryStringByName("email")) {
      setInitialValues({
@@ -169,96 +57,6 @@ const LoginPage: () => JSX.Element = () => {
    }
  }, []);

-  useAsyncEffect(async () => {
-    if (selectedWebAuthn) {
-      setIsTwoFactorAuthLoading(true);
-      try {
-        const result: HTTPResponse<JSONObject> = await API.post({
-          url: GENERATE_WEBAUTHN_AUTH_OPTIONS_API_URL,
-          data: {
-            data: {
-              email: initialValues["email"],
-            },
-          },
-        });
-
-        if (result instanceof HTTPErrorResponse) {
-          throw result;
-        }
-
-        const data: any = result.data as any;
-
-        // Convert base64url strings back to Uint8Array
-        data.options.challenge = Base64.base64UrlToUint8Array(
-          data.options.challenge,
-        );
-        if (data.options.allowCredentials) {
-          data.options.allowCredentials.forEach((cred: any) => {
-            cred.id = Base64.base64UrlToUint8Array(cred.id);
-          });
-        }
-
-        // Use WebAuthn API
-        const credential: PublicKeyCredential =
-          (await navigator.credentials.get({
-            publicKey: data.options,
-          })) as PublicKeyCredential;
-
-        const assertionResponse: AuthenticatorAssertionResponse =
-          credential.response as AuthenticatorAssertionResponse;
-
-        // Verify
-        const verifyResult: HTTPResponse<JSONObject> = await API.post({
-          url: VERIFY_WEBAUTHN_AUTH_API_URL,
-          data: {
-            data: {
-              ...initialValues,
-              challenge: data.challenge,
-              credential: {
-                id: credential.id,
-                rawId: Base64.uint8ArrayToBase64Url(
-                  new Uint8Array(credential.rawId),
-                ),
-                response: {
-                  authenticatorData: Base64.uint8ArrayToBase64Url(
-                    new Uint8Array(assertionResponse.authenticatorData),
-                  ),
-                  clientDataJSON: Base64.uint8ArrayToBase64Url(
-                    new Uint8Array(assertionResponse.clientDataJSON),
-                  ),
-                  signature: Base64.uint8ArrayToBase64Url(
-                    new Uint8Array(assertionResponse.signature),
-                  ),
-                  userHandle: assertionResponse.userHandle
-                    ? Base64.uint8ArrayToBase64Url(
-                        new Uint8Array(assertionResponse.userHandle),
-                      )
-                    : null,
-                },
-                type: credential.type,
-              },
-            },
-          },
-        });
-
-        if (verifyResult instanceof HTTPErrorResponse) {
-          throw verifyResult;
-        }
-
-        const user: User = User.fromJSON(
-          verifyResult.data as JSONObject,
-          User,
-        ) as User;
-        const miscData: JSONObject = {};
-
-        login(user as User, miscData);
-      } catch (error) {
-        setTwoFactorAuthError(API.getFriendlyErrorMessage(error as Error));
-      }
-      setIsTwoFactorAuthLoading(false);
-    }
-  }, [selectedWebAuthn]);
-
  type LoginFunction = (user: User, miscData: JSONObject) => void;

  const login: LoginFunction = (user: User, miscData: JSONObject): void => {
@@ -281,9 +79,6 @@ const LoginPage: () => JSX.Element = () => {
          src={OneUptimeLogo}
          alt="OneUptime"
        />
-        <div className="mt-4 flex justify-center">
-          <EditionLabel />
-        </div>
        {!showTwoFactorAuth && (
          <>
            <h2 className="mt-6 text-center text-2xl  tracking-tight text-gray-900">
@@ -316,64 +111,61 @@ const LoginPage: () => JSX.Element = () => {
              modelType={User}
              id="login-form"
              name="Login"
-              fields={loginFields}
+              fields={[
+                {
+                  field: {
+                    email: true,
+                  },
+                  fieldType: FormFieldSchemaType.Email,
+                  placeholder: "jeff@example.com",
+                  required: true,
+                  disabled: Boolean(initialValues && initialValues["email"]),
+                  title: "Email",
+                  dataTestId: "email",
+                  disableSpellCheck: true,
+                },
+                {
+                  field: {
+                    password: true,
+                  },
+                  title: "Password",
+                  required: true,
+                  validation: {
+                    minLength: 6,
+                  },
+                  fieldType: FormFieldSchemaType.Password,
+                  sideLink: {
+                    text: "Forgot password?",
+                    url: new Route("/accounts/forgot-password"),
+                    openLinkInNewTab: false,
+                  },
+                  dataTestId: "password",
+                  disableSpellCheck: true,
+                },
+              ]}
              createOrUpdateApiUrl={apiUrl}
              formType={FormType.Create}
              submitButtonText={"Login"}
-              onBeforeCreate={(data: User, miscDataProps: JSONObject) => {
-                if (isCaptchaEnabled) {
-                  const captchaToken: string | undefined = (
-                    miscDataProps["captchaToken"] as string | undefined
-                  )
-                    ?.toString()
-                    .trim();
-
-                  if (!captchaToken) {
-                    throw new Error(
-                      "Please complete the captcha challenge before signing in.",
-                    );
-                  }
-
-                  miscDataProps["captchaToken"] = captchaToken;
-                  setShouldResetCaptcha(true);
-                }
-
+              onBeforeCreate={(data: User) => {
                setInitialValues(User.toJSON(data, User));
                return Promise.resolve(data);
              }}
-              onLoadingChange={(loading: boolean) => {
-                if (!isCaptchaEnabled) {
-                  return;
-                }
-
-                if (!loading && shouldResetCaptcha) {
-                  setShouldResetCaptcha(false);
-                  handleCaptchaReset();
-                }
-              }}
              onSuccess={(
                value: User | JSONObject,
                miscData: JSONObject | undefined,
              ) => {
                if (
                  miscData &&
-                  ((((miscData as JSONObject)["totpAuthList"] as JSONArray)
-                    ?.length || 0) > 0 ||
-                    (((miscData as JSONObject)["webAuthnList"] as JSONArray)
-                      ?.length || 0) > 0)
+                  (miscData as JSONObject)["twoFactorAuth"] === true
                ) {
-                  const totpAuthList: Array<UserTotpAuth> =
-                    UserTotpAuth.fromJSONArray(
-                      (miscData as JSONObject)["totpAuthList"] as JSONArray,
-                      UserTotpAuth,
+                  const twoFactorAuthList: Array<UserTwoFactorAuth> =
+                    UserTwoFactorAuth.fromJSONArray(
+                      (miscData as JSONObject)[
+                        "twoFactorAuthList"
+                      ] as JSONArray,
+                      UserTwoFactorAuth,
                    );
-                  const webAuthnList: Array<UserWebAuthn> =
-                    UserWebAuthn.fromJSONArray(
-                      (miscData as JSONObject)["webAuthnList"] as JSONArray,
-                      UserWebAuthn,
-                    );
-                  setTotpAuthList(totpAuthList);
-                  setWebAuthnList(webAuthnList);
+                  setTwoFactorAuthList(twoFactorAuthList);
                  setShowTwoFactorAuth(true);
                  return;
                }
@@ -395,53 +187,19 @@ const LoginPage: () => JSX.Element = () => {
            />
          )}

-          {showTwoFactorAuth && !selectedTotpAuth && !selectedWebAuthn && (
-            <div className="space-y-4">
-              {twoFactorMethods.map(
-                (method: TwoFactorMethod, index: number) => {
-                  return (
-                    <div
-                      key={index}
-                      className="cursor-pointer p-4 border border-gray-300 rounded-lg hover:bg-gray-50"
-                      onClick={() => {
-                        if (method.type === "totp") {
-                          setSelectedTotpAuth(method.item as UserTotpAuth);
-                        } else {
-                          setSelectedWebAuthn(method.item as UserWebAuthn);
-                        }
-                      }}
-                    >
-                      <div className="font-medium">
-                        {(method.item as any).name}
-                      </div>
-                      <div className="text-sm text-gray-500">
-                        {method.type === "totp"
-                          ? "Authenticator App"
-                          : "Security Key"}
-                      </div>
-                    </div>
-                  );
-                },
-              )}
-            </div>
+          {showTwoFactorAuth && !selectedTwoFactorAuth && (
+            <StaticModelList<UserTwoFactorAuth>
+              titleField="name"
+              descriptionField=""
+              selectedItems={[]}
+              list={twoFactorAuthList}
+              onClick={(item: UserTwoFactorAuth) => {
+                setSelectedTwoFactorAuth(item);
+              }}
+            />
          )}

-          {showTwoFactorAuth && selectedWebAuthn && (
-            <div className="text-center">
-              <div className="text-lg font-medium mb-4">
-                Authenticating with Security Key
-              </div>
-              <div className="text-sm text-gray-500 mb-4">
-                Please follow the instructions on your security key device.
-              </div>
-              {isTwoFactorAuthLoading && <ComponentLoader />}
-              {twofactorAuthError && (
-                <ErrorMessage message={twofactorAuthError} />
-              )}
-            </div>
-          )}
-
-          {showTwoFactorAuth && selectedTotpAuth && (
+          {showTwoFactorAuth && selectedTwoFactorAuth && (
            <BasicForm
              id="two-factor-auth-form"
              name="Two Factor Auth"
@@ -467,17 +225,14 @@ const LoginPage: () => JSX.Element = () => {
                try {
                  const code: string = data["code"] as string;
                  const twoFactorAuthId: string =
-                    selectedTotpAuth!.id?.toString() as string;
+                    selectedTwoFactorAuth.id?.toString() as string;

                  const result: HTTPErrorResponse | HTTPResponse<JSONObject> =
-                    await API.post({
-                      url: VERIFY_TOTP_AUTH_API_URL,
+                    await API.post(VERIFY_TWO_FACTOR_AUTH_API_URL, {
                      data: {
-                        data: {
-                          ...initialValues,
-                          code: code,
-                          twoFactorAuthId: twoFactorAuthId,
-                        },
+                        ...initialValues,
+                        code: code,
+                        twoFactorAuthId: twoFactorAuthId,
                      },
                    });

@@ -506,7 +261,7 @@ const LoginPage: () => JSX.Element = () => {
          )}
        </div>
        <div className="mt-10 text-center">
-          {!selectedTotpAuth && !selectedWebAuthn && (
+          {!selectedTwoFactorAuth && (
            <div className="text-muted mb-0 text-gray-500">
              Don&apos;t have an account?{" "}
              <Link
@@ -517,12 +272,11 @@ const LoginPage: () => JSX.Element = () => {
              </Link>
            </div>
          )}
-          {selectedTotpAuth || selectedWebAuthn ? (
+          {selectedTwoFactorAuth ? (
            <div className="text-muted mb-0 text-gray-500">
              <Link
                onClick={() => {
-                  setSelectedTotpAuth(undefined);
-                  setSelectedWebAuthn(undefined);
+                  setSelectedTwoFactorAuth(undefined);
                }}
                className="text-indigo-500 hover:text-indigo-900 cursor-pointer"
              >
--- a/Accounts/src/Pages/LoginWithSSO.tsx
+++ b/Accounts/src/Pages/LoginWithSSO.tsx
@@ -42,12 +42,12 @@ const LoginPage: () => JSX.Element = () => {
      try {
        // get sso config by email.
        const listResult: HTTPErrorResponse | HTTPResponse<JSONArray> =
-          await API.get({
-            url: URL.fromString(apiUrl.toString()).addQueryParam(
+          await API.get(
+            URL.fromString(apiUrl.toString()).addQueryParam(
              "email",
              email.toString(),
            ),
-          });
+          );

        if (listResult instanceof HTTPErrorResponse) {
          throw listResult;
--- a/Accounts/src/Pages/Register.tsx
+++ b/Accounts/src/Pages/Register.tsx
@@ -4,22 +4,12 @@ import URL from "Common/Types/API/URL";
 import Dictionary from "Common/Types/Dictionary";
 import { JSONObject } from "Common/Types/JSON";
 import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage";
-import ModelForm, {
-  FormType,
-  ModelField,
-} from "Common/UI/Components/Forms/ModelForm";
-import { CustomElementProps } from "Common/UI/Components/Forms/Types/Field";
+import ModelForm, { FormType } from "Common/UI/Components/Forms/ModelForm";
+import Fields from "Common/UI/Components/Forms/Types/Fields";
 import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
-import FormValues from "Common/UI/Components/Forms/Types/FormValues";
 import Link from "Common/UI/Components/Link/Link";
 import PageLoader from "Common/UI/Components/Loader/PageLoader";
-import Captcha from "Common/UI/Components/Captcha/Captcha";
-import {
-  BILLING_ENABLED,
-  DASHBOARD_URL,
-  CAPTCHA_ENABLED,
-  CAPTCHA_SITE_KEY,
-} from "Common/UI/Config";
+import { BILLING_ENABLED, DASHBOARD_URL } from "Common/UI/Config";
 import OneUptimeLogo from "Common/UI/Images/logos/OneUptimeSVG/3-transparent.svg";
 import BaseAPI from "Common/UI/Utils/API/API";
 import UiAnalytics from "Common/UI/Utils/Analytics";
@@ -46,19 +36,6 @@ const RegisterPage: () => JSX.Element = () => {
    undefined,
  );

-  const isCaptchaEnabled: boolean =
-    CAPTCHA_ENABLED && Boolean(CAPTCHA_SITE_KEY);
-
-  const [shouldResetCaptcha, setShouldResetCaptcha] =
-    React.useState<boolean>(false);
-  const [captchaResetSignal, setCaptchaResetSignal] = React.useState<number>(0);
-
-  const handleCaptchaReset: () => void = React.useCallback(() => {
-    setCaptchaResetSignal((current: number) => {
-      return current + 1;
-    });
-  }, []);
-
  if (UserUtil.isLoggedIn()) {
    Navigation.navigate(DASHBOARD_URL);
  }
@@ -116,7 +93,7 @@ const RegisterPage: () => JSX.Element = () => {
    }
  }, []);

-  let formFields: Array<ModelField<User>> = [
+  let formFields: Fields<User> = [
    {
      field: {
        email: true,
@@ -206,39 +183,6 @@ const RegisterPage: () => JSX.Element = () => {
    },
  ]);

-  if (isCaptchaEnabled) {
-    formFields = formFields.concat([
-      {
-        overrideField: {
-          captchaToken: true,
-        },
-        overrideFieldKey: "captchaToken",
-        fieldType: FormFieldSchemaType.CustomComponent,
-        title: "Human Verification",
-        description:
-          "Complete the captcha challenge so we know you're not a bot.",
-        required: true,
-        showEvenIfPermissionDoesNotExist: true,
-        getCustomElement: (
-          _values: FormValues<User>,
-          customProps: CustomElementProps,
-        ) => {
-          return (
-            <Captcha
-              siteKey={CAPTCHA_SITE_KEY}
-              resetSignal={captchaResetSignal}
-              error={customProps.error}
-              onTokenChange={(token: string) => {
-                customProps.onChange?.(token);
-              }}
-              onBlur={customProps.onBlur}
-            />
-          );
-        },
-      },
-    ]);
-  }
-
  if (error) {
    return <ErrorMessage message={error} />;
  }
@@ -278,27 +222,7 @@ const RegisterPage: () => JSX.Element = () => {
            maxPrimaryButtonWidth={true}
            fields={formFields}
            createOrUpdateApiUrl={apiUrl}
-            onBeforeCreate={(
-              item: User,
-              miscDataProps: JSONObject,
-            ): Promise<User> => {
-              if (isCaptchaEnabled) {
-                const captchaToken: string | undefined = (
-                  miscDataProps["captchaToken"] as string | undefined
-                )
-                  ?.toString()
-                  .trim();
-
-                if (!captchaToken) {
-                  throw new Error(
-                    "Please complete the captcha challenge before signing up.",
-                  );
-                }
-
-                miscDataProps["captchaToken"] = captchaToken;
-                setShouldResetCaptcha(true);
-              }
-
+            onBeforeCreate={(item: User): Promise<User> => {
              const utmParams: Dictionary<string> = UserUtil.getUtmParams();

              if (utmParams && Object.keys(utmParams).length > 0) {
@@ -316,16 +240,6 @@ const RegisterPage: () => JSX.Element = () => {
            }}
            formType={FormType.Create}
            submitButtonText={"Sign Up"}
-            onLoadingChange={(loading: boolean) => {
-              if (!isCaptchaEnabled) {
-                return;
-              }
-
-              if (!loading && shouldResetCaptcha) {
-                setShouldResetCaptcha(false);
-                handleCaptchaReset();
-              }
-            }}
            onSuccess={(value: User, miscData: JSONObject | undefined) => {
              if (value && value.email) {
                UiAnalytics.userAuth(value.email);
--- a/Accounts/src/Utils/ApiPaths.ts
+++ b/Accounts/src/Utils/ApiPaths.ts
@@ -1,6 +1,6 @@
 import Route from "Common/Types/API/Route";
 import URL from "Common/Types/API/URL";
-import { IDENTITY_URL, APP_API_URL } from "Common/UI/Config";
+import { IDENTITY_URL } from "Common/UI/Config";

 export const SIGNUP_API_URL: URL = URL.fromURL(IDENTITY_URL).addRoute(
  new Route("/signup"),
@@ -9,17 +9,9 @@ export const LOGIN_API_URL: URL = URL.fromURL(IDENTITY_URL).addRoute(
  new Route("/login"),
 );

-export const VERIFY_TOTP_AUTH_API_URL: URL = URL.fromURL(IDENTITY_URL).addRoute(
-  new Route("/verify-totp-auth"),
-);
-
-export const GENERATE_WEBAUTHN_AUTH_OPTIONS_API_URL: URL = URL.fromURL(
-  APP_API_URL,
-).addRoute(new Route("/user-webauthn/generate-authentication-options"));
-
-export const VERIFY_WEBAUTHN_AUTH_API_URL: URL = URL.fromURL(
+export const VERIFY_TWO_FACTOR_AUTH_API_URL: URL = URL.fromURL(
  IDENTITY_URL,
-).addRoute(new Route("/verify-webauthn-auth"));
+).addRoute(new Route("/verify-two-factor-auth"));

 export const SERVICE_PROVIDER_LOGIN_URL: URL = URL.fromURL(
  IDENTITY_URL,
--- a/AdminDashboard/Dockerfile.tpl
+++ b/AdminDashboard/Dockerfile.tpl
@@ -3,7 +3,7 @@
 #

 # Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/node:24.9-alpine3.21
+FROM public.ecr.aws/docker/library/node:23.8-alpine3.21
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global

 RUN npm config set fetch-retries 5
@@ -14,12 +14,9 @@ RUN npm config set fetch-retry-maxtimeout 600000

 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE_EDITION=false

 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
-ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1


 # IF APP_VERSION is not set, set it to 1.0.0
--- a/AdminDashboard/Serve.ts
+++ b/AdminDashboard/Serve.ts
@@ -1,74 +1,13 @@
 import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
-import Express, {
-  ExpressApplication,
-  ExpressRequest,
-  ExpressResponse,
-} from "Common/Server/Utils/Express";
+import Express, { ExpressApplication } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import App from "Common/Server/Utils/StartServer";
-import Response from "Common/Server/Utils/Response";
-import UserMiddleware from "Common/Server/Middleware/UserAuthorization";
-import JSONWebToken from "Common/Server/Utils/JsonWebToken";
-import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException";
-import { JSONObject } from "Common/Types/JSON";
 import "ejs";
-import JSONWebTokenData from "Common/Types/JsonWebTokenData";

 export const APP_NAME: string = "admin";

 const app: ExpressApplication = Express.getExpressApp();

-type EnsureMasterAdminAccessFunction = (
-  req: ExpressRequest,
-  res: ExpressResponse,
-) => Promise<JSONObject>;
-
-const ensureMasterAdminAccess: EnsureMasterAdminAccessFunction = async (
-  req: ExpressRequest,
-  res: ExpressResponse,
-): Promise<JSONObject> => {
-  try {
-    const accessToken: string | undefined =
-      UserMiddleware.getAccessTokenFromExpressRequest(req);
-
-    if (!accessToken) {
-      Response.sendErrorResponse(
-        req,
-        res,
-        new NotAuthorizedException(
-          "Unauthorized: Only master admins can access the admin dashboard.",
-        ),
-      );
-      return {};
-    }
-
-    const authData: JSONWebTokenData = JSONWebToken.decode(accessToken);
-
-    if (!authData.isMasterAdmin) {
-      Response.sendErrorResponse(
-        req,
-        res,
-        new NotAuthorizedException(
-          "Unauthorized: Only master admins can access the admin dashboard.",
-        ),
-      );
-      return {};
-    }
-
-    return {};
-  } catch (error) {
-    logger.error(error);
-    Response.sendErrorResponse(
-      req,
-      res,
-      new NotAuthorizedException(
-        "Unauthorized: Only master admins can access the admin dashboard.",
-      ),
-    );
-    return {};
-  }
-};
-
 const init: PromiseVoidFunction = async (): Promise<void> => {
  try {
    // init the app
@@ -80,7 +19,6 @@ const init: PromiseVoidFunction = async (): Promise<void> => {
        liveCheck: async () => {},
        readyCheck: async () => {},
      },
-      getVariablesToRenderIndexPage: ensureMasterAdminAccess,
    });

    // add default routes
--- a/AdminDashboard/nodemon.json
+++ b/AdminDashboard/nodemon.json
@@ -1,10 +1,7 @@
 {
    "watch": ["./","../Common/UI", "../Common/Types", "../Common/Utils", "../Common/Models"],
-    "ext": "ts,tsx",
+    "ext": "ts,json,tsx,env,js,jsx,hbs",
    "ignore": [
-        "./node_modules/**",
-        "./public/**",
-        "./bin/**",
        "./public/**",
        "./public/dist/**",
        "./build/*",
--- a/AdminDashboard/package-lock.json
+++ b/AdminDashboard/package-lock.json
@@ -12,7 +12,7 @@
                "ejs": "^3.1.10",
                "react": "^18.3.1",
                "react-dom": "^18.3.1",
-                "react-router-dom": "^6.30.1"
+                "react-router-dom": "^6.23.1"
            },
            "devDependencies": {
                "@types/node": "^16.11.35",
@@ -32,29 +32,27 @@
                "@bull-board/express": "^5.21.4",
                "@clickhouse/client": "^1.10.1",
                "@elastic/elasticsearch": "^8.12.1",
-                "@hcaptcha/react-hcaptcha": "^1.14.0",
                "@monaco-editor/react": "^4.4.6",
                "@opentelemetry/api": "^1.9.0",
-                "@opentelemetry/api-logs": "^0.206.0",
+                "@opentelemetry/api-logs": "^0.52.1",
                "@opentelemetry/context-zone": "^1.25.1",
-                "@opentelemetry/exporter-logs-otlp-http": "^0.207.0",
-                "@opentelemetry/exporter-metrics-otlp-proto": "^0.207.0",
-                "@opentelemetry/exporter-trace-otlp-http": "^0.207.0",
-                "@opentelemetry/exporter-trace-otlp-proto": "^0.207.0",
+                "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
+                "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.1",
+                "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
+                "@opentelemetry/exporter-trace-otlp-proto": "^0.52.1",
                "@opentelemetry/id-generator-aws-xray": "^1.2.2",
-                "@opentelemetry/instrumentation": "^0.207.0",
-                "@opentelemetry/instrumentation-fetch": "^0.207.0",
-                "@opentelemetry/instrumentation-xml-http-request": "^0.207.0",
+                "@opentelemetry/instrumentation": "^0.52.1",
+                "@opentelemetry/instrumentation-fetch": "^0.52.1",
+                "@opentelemetry/instrumentation-xml-http-request": "^0.52.1",
                "@opentelemetry/resources": "^1.25.1",
-                "@opentelemetry/sdk-logs": "^0.207.0",
+                "@opentelemetry/sdk-logs": "^0.52.1",
                "@opentelemetry/sdk-metrics": "^1.25.1",
-                "@opentelemetry/sdk-node": "^0.207.0",
+                "@opentelemetry/sdk-node": "^0.52.1",
+                "@opentelemetry/sdk-trace-node": "^1.25.1",
                "@opentelemetry/sdk-trace-web": "^1.25.1",
-                "@opentelemetry/semantic-conventions": "^1.37.0",
+                "@opentelemetry/semantic-conventions": "^1.26.0",
                "@remixicon/react": "^4.2.0",
-                "@simplewebauthn/server": "^13.2.2",
                "@tippyjs/react": "^4.2.6",
-                "@types/archiver": "^6.0.3",
                "@types/crypto-js": "^4.2.2",
                "@types/qrcode": "^1.5.5",
                "@types/react-highlight": "^0.12.8",
@@ -63,17 +61,14 @@
                "@types/web-push": "^3.6.4",
                "acme-client": "^5.3.0",
                "airtable": "^0.12.2",
-                "archiver": "^7.0.1",
-                "axios": "^1.12.0",
-                "botbuilder": "^4.23.3",
-                "bullmq": "^5.61.0",
+                "axios": "^1.7.2",
+                "bullmq": "^5.3.3",
                "cookie-parser": "^1.4.7",
                "cors": "^2.8.5",
                "cron-parser": "^4.8.1",
                "crypto-js": "^4.2.0",
                "dotenv": "^16.4.4",
                "ejs": "^3.1.10",
-                "elkjs": "^0.10.0",
                "esbuild": "^0.25.5",
                "express": "^4.21.1",
                "formik": "^2.4.6",
@@ -87,26 +82,26 @@
                "moment": "^2.30.1",
                "moment-timezone": "^0.5.45",
                "node-cron": "^3.0.3",
-                "nodemailer": "^7.0.7",
+                "nodemailer": "^6.9.10",
                "otpauth": "^9.3.1",
-                "pg": "^8.16.3",
-                "playwright": "^1.56.0",
-                "posthog-js": "^1.275.3",
+                "pg": "^8.7.3",
+                "playwright": "^1.50.0",
+                "posthog-js": "^1.139.6",
                "prop-types": "^15.8.1",
                "qrcode": "^1.5.3",
                "react": "^18.3.1",
                "react-beautiful-dnd": "^13.1.1",
-                "react-big-calendar": "^1.19.4",
+                "react-big-calendar": "^1.13.0",
                "react-color": "^2.19.3",
                "react-dom": "^18.3.1",
                "react-dropzone": "^14.2.2",
                "react-error-boundary": "^4.0.13",
                "react-highlight": "^0.15.0",
                "react-markdown": "^8.0.3",
-                "react-router-dom": "^6.30.1",
+                "react-router-dom": "^6.24.1",
                "react-select": "^5.4.0",
                "react-spinners": "^0.14.1",
-                "react-syntax-highlighter": "^16.0.0",
+                "react-syntax-highlighter": "^15.5.0",
                "react-toggle": "^4.1.3",
                "reactflow": "^11.11.4",
                "recharts": "^2.12.7",
@@ -118,16 +113,16 @@
                "socket.io": "^4.7.4",
                "socket.io-client": "^4.7.5",
                "stripe": "^10.17.0",
-                "tailwind-merge": "^2.6.0",
+                "tailwind-merge": "^2.5.2",
                "tippy.js": "^6.3.7",
                "twilio": "^4.22.0",
-                "typeorm": "^0.3.26",
+                "typeorm": "^0.3.20",
                "typeorm-extension": "^2.2.13",
                "universal-cookie": "^7.2.1",
                "use-async-effect": "^2.2.6",
                "uuid": "^8.3.2",
                "web-push": "^3.6.7",
-                "zod": "^3.25.76"
+                "zod": "^3.25.30"
            },
            "devDependencies": {
                "@faker-js/faker": "^8.0.2",
@@ -347,9 +342,9 @@
            "dev": true
        },
        "node_modules/@remix-run/router": {
-            "version": "1.23.0",
-            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
-            "integrity": "sha512-O3rHJzAQKamUz1fvE0Qaw0xSFqsA/yafi2iqeE0pvdFtCO1viYx8QL6f3Ln/aCCTLxs68SLf0KPM9eSeM8yBnA==",
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
+            "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
            "license": "MIT",
            "engines": {
                "node": ">=14.0.0"
@@ -495,23 +490,21 @@
            }
        },
        "node_modules/brace-expansion": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-            "license": "MIT",
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
            "dependencies": {
                "balanced-match": "^1.0.0",
                "concat-map": "0.0.1"
            }
        },
        "node_modules/braces": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
            "dev": true,
-            "license": "MIT",
            "dependencies": {
-                "fill-range": "^7.1.1"
+                "fill-range": "^7.0.1"
            },
            "engines": {
                "node": ">=8"
@@ -607,10 +600,9 @@
            }
        },
        "node_modules/filelist/node_modules/brace-expansion": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-            "license": "MIT",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
            "dependencies": {
                "balanced-match": "^1.0.0"
            }
@@ -627,11 +619,10 @@
            }
        },
        "node_modules/fill-range": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
            "dev": true,
-            "license": "MIT",
            "dependencies": {
                "to-regex-range": "^5.0.1"
            },
@@ -718,7 +709,6 @@
            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
            "dev": true,
-            "license": "MIT",
            "engines": {
                "node": ">=0.12.0"
            }
@@ -946,12 +936,12 @@
            }
        },
        "node_modules/react-router": {
-            "version": "6.30.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.1.tgz",
-            "integrity": "sha512-X1m21aEmxGXqENEPG3T6u0Th7g0aS4ZmoNynhbs+Cn+q+QGTLt+d5IQ2bHAXKzKcxGJjxACpVbnYQSCRcfxHlQ==",
+            "version": "6.23.1",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
+            "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
            "license": "MIT",
            "dependencies": {
-                "@remix-run/router": "1.23.0"
+                "@remix-run/router": "1.16.1"
            },
            "engines": {
                "node": ">=14.0.0"
@@ -961,13 +951,13 @@
            }
        },
        "node_modules/react-router-dom": {
-            "version": "6.30.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.1.tgz",
-            "integrity": "sha512-llKsgOkZdbPU1Eg3zK8lCn+sjD9wMRZZPuzmdWWX5SUs8OFkN5HnFVC0u5KMeMaC9aoancFI/KoLuKPqN+hxHw==",
+            "version": "6.23.1",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
+            "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
            "license": "MIT",
            "dependencies": {
-                "@remix-run/router": "1.23.0",
-                "react-router": "6.30.1"
+                "@remix-run/router": "1.16.1",
+                "react-router": "6.23.1"
            },
            "engines": {
                "node": ">=14.0.0"
@@ -997,16 +987,6 @@
                "loose-envify": "^1.1.0"
            }
        },
-        "node_modules/semver": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-            "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-            "dev": true,
-            "license": "ISC",
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
        "node_modules/simple-update-notifier": {
            "version": "1.1.0",
            "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
@@ -1019,6 +999,15 @@
                "node": ">=8.10.0"
            }
        },
+        "node_modules/simple-update-notifier/node_modules/semver": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+            "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
        "node_modules/supports-color": {
            "version": "5.5.0",
            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -1036,7 +1025,6 @@
            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
            "dev": true,
-            "license": "MIT",
            "dependencies": {
                "is-number": "^7.0.0"
            },
--- a/AdminDashboard/package.json
+++ b/AdminDashboard/package.json
@@ -8,7 +8,7 @@
        "ejs": "^3.1.10",
        "react": "^18.3.1",
        "react-dom": "^18.3.1",
-        "react-router-dom": "^6.30.1"
+        "react-router-dom": "^6.23.1"
    },
    "scripts": {
        "dev-build": "NODE_ENV=development node esbuild.config.js",
--- a/AdminDashboard/public/assets/img/favicons/html_code.html
+++ b/AdminDashboard/public/assets/img/favicons/html_code.html
@@ -3,6 +3,7 @@
 <link rel="icon" type="image/png" sizes="194x194" href="/favicon-194x194.png">
 <link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png">
 <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+<link rel="manifest" href="/site.webmanifest">
 <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
 <meta name="msapplication-TileColor" content="#121212">
 <meta name="theme-color" content="#121212">
--- a/AdminDashboard/public/assets/img/favicons/site.webmanifest
+++ b/AdminDashboard/public/assets/img/favicons/site.webmanifest
@@ -0,0 +1,56 @@
+{
+    "name": "OneUptime Account",
+    "short_name": "OneUptime",
+    "icons": [
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-36x36.png",
+            "sizes": "36x36",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-48x48.png",
+            "sizes": "48x48",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-72x72.png",
+            "sizes": "72x72",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-96x96.png",
+            "sizes": "96x96",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-144x144.png",
+            "sizes": "144x144",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-256x256.png",
+            "sizes": "256x256",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-384x384.png",
+            "sizes": "384x384",
+            "type": "image/png"
+        },
+        {
+            "src": "/accounts/assets/img/favicons/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "start_url": ".",
+    "theme_color": "#121212",
+    "background_color": "#121212",
+    "display": "standalone"
+  }
+  
--- a/AdminDashboard/public/manifest.json
+++ b/AdminDashboard/public/manifest.json
@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "./assets/img/favicons/favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
--- a/AdminDashboard/src/App.tsx
+++ b/AdminDashboard/src/App.tsx
@@ -5,7 +5,6 @@ import Projects from "./Pages/Projects/Index";
 import SettingsAPIKey from "./Pages/Settings/APIKey/Index";
 import SettingsAuthentication from "./Pages/Settings/Authentication/Index";
 import SettingsCallSMS from "./Pages/Settings/CallSMS/Index";
-import SettingsWhatsApp from "./Pages/Settings/WhatsApp/Index";
 // Settings Pages.
 import SettingsEmail from "./Pages/Settings/Email/Index";
 import SettingsProbes from "./Pages/Settings/Probes/Index";
@@ -26,7 +25,6 @@ import {
 } from "react-router-dom";
 import UserView from "./Pages/Users/View/Index";
 import UserDelete from "./Pages/Users/View/Delete";
-import UserSettings from "./Pages/Users/View/Settings";
 import ProjectView from "./Pages/Projects/View/Index";
 import ProjectDelete from "./Pages/Projects/View/Delete";

@@ -72,11 +70,6 @@ const App: () => JSX.Element = () => {
          element={<UserView />}
        />

-        <PageRoute
-          path={RouteMap[PageMap.USER_SETTINGS]?.toString() || ""}
-          element={<UserSettings />}
-        />
-
        <PageRoute
          path={RouteMap[PageMap.USER_DELETE]?.toString() || ""}
          element={<UserDelete />}
@@ -112,11 +105,6 @@ const App: () => JSX.Element = () => {
          element={<SettingsCallSMS />}
        />

-        <PageRoute
-          path={RouteMap[PageMap.SETTINGS_WHATSAPP]?.toString() || ""}
-          element={<SettingsWhatsApp />}
-        />
-
        <PageRoute
          path={RouteMap[PageMap.SETTINGS_PROBES]?.toString() || ""}
          element={<SettingsProbes />}
--- a/AdminDashboard/src/Components/Footer/Footer.tsx
+++ b/AdminDashboard/src/Components/Footer/Footer.tsx
@@ -54,9 +54,9 @@ const DashboardFooter: () => JSX.Element = () => {
  const fetchAppVersion: (appName: string) => Promise<JSONObject> = async (
    appName: string,
  ): Promise<JSONObject> => {
-    const response: HTTPResponse<JSONObject> = await API.get<JSONObject>({
-      url: URL.fromString(`${HTTP_PROTOCOL}/${HOST}${appName}/version`),
-    });
+    const response: HTTPResponse<JSONObject> = await API.get<JSONObject>(
+      URL.fromString(`${HTTP_PROTOCOL}/${HOST}${appName}/version`),
+    );

    if (response.data) {
      return response.data as JSONObject;
--- a/AdminDashboard/src/Components/Header/Header.tsx
+++ b/AdminDashboard/src/Components/Header/Header.tsx
@@ -3,7 +3,6 @@ import Logo from "./Logo";
 import UserProfile from "./UserProfile";
 import Button, { ButtonStyleType } from "Common/UI/Components/Button/Button";
 import Header from "Common/UI/Components/Header/Header";
-import EditionLabel from "Common/UI/Components/EditionLabel/EditionLabel";
 import { DASHBOARD_URL } from "Common/UI/Config";
 import Navigation from "Common/UI/Utils/Navigation";
 import React, { FunctionComponent, ReactElement } from "react";
@@ -28,7 +27,6 @@ const DashboardHeader: FunctionComponent = (): ReactElement => {
        }
        rightComponents={
          <>
-            <EditionLabel className="mr-3 hidden md:inline-flex" />
            <Button
              title="Exit Admin"
              buttonStyle={ButtonStyleType.NORMAL}
--- a/AdminDashboard/src/Pages/Settings/SideMenu.tsx
+++ b/AdminDashboard/src/Pages/Settings/SideMenu.tsx
@@ -50,15 +50,6 @@ const DashboardSideMenu: () => JSX.Element = (): ReactElement => {
          }}
          icon={IconProp.Call}
        />
-        <SideMenuItem
-          link={{
-            title: "WhatsApp",
-            to: RouteUtil.populateRouteParams(
-              RouteMap[PageMap.SETTINGS_WHATSAPP] as Route,
-            ),
-          }}
-          icon={IconProp.WhatsApp}
-        />
      </SideMenuSection>

      <SideMenuSection title="Monitoring">
--- a/AdminDashboard/src/Pages/Settings/WhatsApp/Index.tsx
+++ b/AdminDashboard/src/Pages/Settings/WhatsApp/Index.tsx
@@ -1,491 +0,0 @@
-import PageMap from "../../../Utils/PageMap";
-import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
-import DashboardSideMenu from "../SideMenu";
-import Route from "Common/Types/API/Route";
-import ObjectID from "Common/Types/ObjectID";
-import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
-import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
-import Page from "Common/UI/Components/Page/Page";
-import FieldType from "Common/UI/Components/Types/FieldType";
-import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
-import React, { FunctionComponent, ReactElement, useState } from "react";
-import Card from "Common/UI/Components/Card/Card";
-import MarkdownViewer from "Common/UI/Components/Markdown.tsx/MarkdownViewer";
-import BasicForm from "Common/UI/Components/Forms/BasicForm";
-import Alert, { AlertType } from "Common/UI/Components/Alerts/Alert";
-import { JSONObject } from "Common/Types/JSON";
-import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse";
-import HTTPResponse from "Common/Types/API/HTTPResponse";
-import URL from "Common/Types/API/URL";
-import API from "Common/UI/Utils/API/API";
-import { APP_API_URL } from "Common/UI/Config";
-import WhatsAppTemplateMessages, {
-  WhatsAppTemplateId,
-  WhatsAppTemplateIds,
-  WhatsAppTemplateLanguage,
-} from "Common/Types/WhatsApp/WhatsAppTemplates";
-
-type ToFriendlyName = (value: string) => string;
-
-const toFriendlyName: ToFriendlyName = (value: string): string => {
-  return value
-    .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
-    .replace(/_/g, " ")
-    .replace(/\s+/g, " ")
-    .trim();
-};
-
-type ExtractTemplateVariables = (template: string) => Array<string>;
-
-const extractTemplateVariables: ExtractTemplateVariables = (
-  template: string,
-): Array<string> => {
-  const matches: RegExpMatchArray | null = template.match(/\{\{(.*?)\}\}/g);
-
-  if (!matches) {
-    return [];
-  }
-
-  const uniqueVariables: Set<string> = new Set<string>();
-
-  for (const match of matches) {
-    const variable: string = match.replace("{{", "").replace("}}", "").trim();
-
-    if (variable) {
-      uniqueVariables.add(variable);
-    }
-  }
-
-  return Array.from(uniqueVariables).sort((a: string, b: string) => {
-    return a.localeCompare(b);
-  });
-};
-
-type BuildWhatsAppSetupMarkdown = () => string;
-
-const buildWhatsAppSetupMarkdown: BuildWhatsAppSetupMarkdown = (): string => {
-  const templateKeys: Array<keyof typeof WhatsAppTemplateIds> = Object.keys(
-    WhatsAppTemplateIds,
-  ) as Array<keyof typeof WhatsAppTemplateIds>;
-
-  const appApiBaseUrl: string = APP_API_URL.toString().replace(/\/$/, "");
-  const primaryWebhookUrl: string = `${appApiBaseUrl}/notification/whatsapp/webhook`;
-
-  const description: string =
-    "Follow these steps to connect Meta WhatsApp with OneUptime so notifications can be delivered via WhatsApp.";
-
-  const prerequisitesList: Array<string> = [
-    "Meta Business Manager admin access for the WhatsApp Business Account.",
-    "A WhatsApp Business phone number approved for API messaging.",
-    "Admin access to OneUptime with permission to edit global notification settings.",
-    "A webhook verify token string that you'll configure identically in Meta and OneUptime.",
-  ];
-
-  const setupStepsList: Array<string> = [
-    "Sign in to the [Meta Business Manager](https://business.facebook.com/) with admin access to your WhatsApp Business Account.",
-    "From **Business Settings → Accounts → WhatsApp Accounts**, create or select the account that owns your sender phone number.",
-    "In Buisness Portfolio, create a system user and assign it to the WhatsApp Business Account with the role of **Admin**.",
-    "Generate a token for this system user and this will be your long-lived access token. Make sure to select the **whatsapp_business_management** and **whatsapp_business_messaging** permissions when generating the token.",
-    "Paste the access token, phone number ID, and webhook verify token into the **Meta WhatsApp Settings** card above, then save.",
-    "For the **Business Account ID**, go to **Business Settings → Business Info** (or **Business Settings → WhatsApp Accounts → Settings**) and copy the **WhatsApp Business Account ID** value.",
-    "To locate the **App ID** and **App Secret**, open [Meta for Developers](https://developers.facebook.com/apps/), select your WhatsApp app, then navigate to **Settings → Basic**. The App ID is shown at the top; click **Show** next to **App Secret** to reveal and copy it.",
-    "Create each template listed below in the Meta WhatsApp Manager. Make sure the template name, language, and variables match exactly. You can however change the content to your preference. Please make sure it's approved by Meta.",
-    "Send a test notification from OneUptime to confirm that WhatsApp delivery succeeds.",
-  ];
-
-  const prerequisitesMarkdown: string = prerequisitesList
-    .map((item: string) => {
-      return `- ${item}`;
-    })
-    .join("\n");
-
-  const setupStepsMarkdown: string = setupStepsList
-    .map((item: string, index: number) => {
-      return `${index + 1}. ${item}`;
-    })
-    .join("\n");
-
-  const tableRows: string = templateKeys
-    .map((enumKey: keyof typeof WhatsAppTemplateIds) => {
-      const templateId: WhatsAppTemplateId = WhatsAppTemplateIds[enumKey];
-      const friendlyName: string = toFriendlyName(enumKey.toString());
-      const templateMessage: string = WhatsAppTemplateMessages[templateId];
-      const language: string = WhatsAppTemplateLanguage[templateId] || "en";
-      const variables: Array<string> =
-        extractTemplateVariables(templateMessage);
-      const variableList: string =
-        variables.length > 0
-          ? variables
-              .map((variable: string) => {
-                return `\`${variable}\``;
-              })
-              .join(", ")
-          : "_None_";
-
-      return `| ${friendlyName} | \`${templateId}\` | ${language} | ${variableList} |`;
-    })
-    .join("\n");
-
-  const templateBodies: string = templateKeys
-    .map((enumKey: keyof typeof WhatsAppTemplateIds) => {
-      const templateId: WhatsAppTemplateId = WhatsAppTemplateIds[enumKey];
-      const friendlyName: string = toFriendlyName(enumKey.toString());
-      const templateMessage: string = WhatsAppTemplateMessages[templateId];
-      const language: string = WhatsAppTemplateLanguage[templateId] || "en";
-      const variables: Array<string> =
-        extractTemplateVariables(templateMessage);
-      const variableMarkdown: string =
-        variables.length > 0
-          ? variables
-              .map((variable: string) => {
-                return `- \`${variable}\``;
-              })
-              .join("\n")
-          : "_None_";
-      const variablesHeading: string = variables.length
-        ? `**Variables (${variables.length})**`
-        : "**Variables**";
-
-      return [
-        `#### ${friendlyName}`,
-        "",
-        `**Template Name:** \`${templateId}\``,
-        `**Language:** ${language}`,
-        "",
-        variablesHeading,
-        variableMarkdown,
-        "",
-        "**Body**",
-        "```plaintext",
-        templateMessage,
-        "```",
-        "",
-        "---",
-      ].join("\n");
-    })
-    .join("\n\n");
-
-  const templateSummaryTable: string = [
-    "| Friendly Name | Template Name | Language | Variables |",
-    "| --- | --- | --- | --- |",
-    tableRows,
-  ]
-    .filter(Boolean)
-    .join("\n");
-
-  const webhookSection: string = [
-    "### Configure Meta Webhook Subscription",
-    "1. In the OneUptime Admin Dashboard, open **Settings → WhatsApp → Meta WhatsApp Settings** and enter a strong value in **Webhook Verify Token**. Save the form so the encrypted token is stored in Global Config.",
-    "2. Keep that verify token handy—Meta does not generate one for you. You'll paste the exact same value when configuring the callback.",
-    "3. In [Meta for Developers](https://developers.facebook.com/apps/), select your WhatsApp app and navigate to **WhatsApp → Configuration → Webhooks**.",
-    `4. Click **Configure**, then supply one of the following callback URLs when Meta asks for your endpoint:\n   - \`${primaryWebhookUrl}\`\n `,
-    "5. Paste the verify token from step 1 into Meta's **Verify Token** field and submit. Meta will call the callback URL and expect that value to match before it approves the subscription.",
-    "6. After verification succeeds, subscribe to the **messages** field (and any other WhatsApp webhook categories you need) so delivery status updates are forwarded to OneUptime.",
-  ]
-    .filter(Boolean)
-    .join("\n\n");
-
-  return [
-    description,
-    "### Prerequisites",
-    prerequisitesMarkdown,
-    "### Setup Steps",
-    setupStepsMarkdown,
-    webhookSection,
-    "### Required WhatsApp Templates",
-    templateSummaryTable,
-    "### Template Bodies",
-    "> Copy the exact template body below—including punctuation and spacing—when creating each template inside Meta. The variables list shows every placeholder that must be configured in WhatsApp Manager.",
-    templateBodies,
-  ]
-    .filter(Boolean)
-    .join("\n\n");
-};
-
-const whatsappSetupMarkdown: string = buildWhatsAppSetupMarkdown();
-
-const SettingsWhatsApp: FunctionComponent = (): ReactElement => {
-  const [isSendingTest, setIsSendingTest] = useState<boolean>(false);
-  const [testError, setTestError] = useState<string>("");
-  const [testSuccess, setTestSuccess] = useState<string>("");
-
-  return (
-    <Page
-      title={"Admin Settings"}
-      breadcrumbLinks={[
-        {
-          title: "Admin Dashboard",
-          to: RouteUtil.populateRouteParams(RouteMap[PageMap.HOME] as Route),
-        },
-        {
-          title: "Settings",
-          to: RouteUtil.populateRouteParams(
-            RouteMap[PageMap.SETTINGS] as Route,
-          ),
-        },
-        {
-          title: "WhatsApp",
-          to: RouteUtil.populateRouteParams(
-            RouteMap[PageMap.SETTINGS_WHATSAPP] as Route,
-          ),
-        },
-      ]}
-      sideMenu={<DashboardSideMenu />}
-    >
-      <CardModelDetail
-        name="Meta WhatsApp Settings"
-        cardProps={{
-          title: "Meta WhatsApp Settings",
-          description:
-            "Configure Meta WhatsApp credentials. These values are used to send WhatsApp notifications from OneUptime.",
-        }}
-        isEditable={true}
-        editButtonText="Edit Meta WhatsApp Config"
-        formSteps={[
-          {
-            title: "Credentials",
-            id: "meta-credentials",
-          },
-          {
-            title: "Meta App",
-            id: "meta-app",
-          },
-        ]}
-        formFields={[
-          {
-            field: {
-              metaWhatsAppAccessToken: true,
-            },
-            title: "Access Token",
-            stepId: "meta-credentials",
-            fieldType: FormFieldSchemaType.EncryptedText,
-            required: true,
-            description:
-              "Long-lived access token generated in the Meta WhatsApp Business Platform.",
-            placeholder: "EAAG...",
-          },
-          {
-            field: {
-              metaWhatsAppPhoneNumberId: true,
-            },
-            title: "Phone Number ID",
-            stepId: "meta-credentials",
-            fieldType: FormFieldSchemaType.Text,
-            required: true,
-            description:
-              "The WhatsApp Business phone number ID associated with your sending number.",
-            placeholder: "123456789012345",
-          },
-          {
-            field: {
-              metaWhatsAppBusinessAccountId: true,
-            },
-            title: "Business Account ID",
-            stepId: "meta-credentials",
-            fieldType: FormFieldSchemaType.Text,
-            required: false,
-            description:
-              "Optional Business Account ID that owns the WhatsApp templates.",
-            placeholder: "123456789012345",
-          },
-          {
-            field: {
-              metaWhatsAppWebhookVerifyToken: true,
-            },
-            title: "Webhook Verify Token",
-            stepId: "meta-credentials",
-            fieldType: FormFieldSchemaType.EncryptedText,
-            required: false,
-            description:
-              "Secret token configured in Meta to validate webhook subscription requests.",
-            placeholder: "Webhook verify token",
-          },
-          {
-            field: {
-              metaWhatsAppAppId: true,
-            },
-            title: "App ID",
-            stepId: "meta-app",
-            fieldType: FormFieldSchemaType.Text,
-            required: false,
-            description:
-              "Optional Facebook App ID tied to your WhatsApp integration.",
-            placeholder: "987654321098765",
-          },
-          {
-            field: {
-              metaWhatsAppAppSecret: true,
-            },
-            title: "App Secret",
-            stepId: "meta-app",
-            fieldType: FormFieldSchemaType.EncryptedText,
-            required: false,
-            description:
-              "Optional Facebook App Secret used for webhook signature verification.",
-            placeholder: "Facebook App Secret",
-          },
-        ]}
-        modelDetailProps={{
-          modelType: GlobalConfig,
-          id: "model-detail-global-config-meta-whatsapp",
-          fields: [
-            {
-              field: {
-                metaWhatsAppAccessToken: true,
-              },
-              title: "Access Token",
-              fieldType: FieldType.HiddenText,
-              placeholder: "Not Configured",
-            },
-            {
-              field: {
-                metaWhatsAppPhoneNumberId: true,
-              },
-              title: "Phone Number ID",
-              fieldType: FieldType.Text,
-              placeholder: "Not Configured",
-            },
-            {
-              field: {
-                metaWhatsAppBusinessAccountId: true,
-              },
-              title: "Business Account ID",
-              fieldType: FieldType.Text,
-              placeholder: "Not Configured",
-            },
-            {
-              field: {
-                metaWhatsAppWebhookVerifyToken: true,
-              },
-              title: "Webhook Verify Token",
-              fieldType: FieldType.HiddenText,
-              placeholder: "Not Configured",
-            },
-            {
-              field: {
-                metaWhatsAppAppId: true,
-              },
-              title: "App ID",
-              fieldType: FieldType.Text,
-              placeholder: "Not Configured",
-            },
-            {
-              field: {
-                metaWhatsAppAppSecret: true,
-              },
-              title: "App Secret",
-              fieldType: FieldType.HiddenText,
-              placeholder: "Not Configured",
-            },
-          ],
-          modelId: ObjectID.getZeroObjectID(),
-        }}
-      />
-
-      <Card
-        title="Send Test WhatsApp Message"
-        description="Send a test WhatsApp template message to confirm your Meta configuration."
-      >
-        {testSuccess ? (
-          <Alert
-            type={AlertType.SUCCESS}
-            title={testSuccess}
-            className="mb-4"
-          />
-        ) : (
-          <></>
-        )}
-
-        <BasicForm
-          id="send-test-whatsapp-form"
-          name="Send Test WhatsApp Message"
-          isLoading={isSendingTest}
-          error={testError || ""}
-          submitButtonText="Send Test Message"
-          maxPrimaryButtonWidth={true}
-          initialValues={{
-            phoneNumber: "",
-          }}
-          fields={[
-            {
-              field: {
-                phoneNumber: true,
-              },
-              title: "Recipient WhatsApp Number",
-              description:
-                "Enter the full international phone number (including country code) that should receive the test message.",
-              placeholder: "+11234567890",
-              required: true,
-              fieldType: FormFieldSchemaType.Phone,
-              disableSpellCheck: true,
-            },
-          ]}
-          onSubmit={async (
-            values: JSONObject,
-            onSubmitSuccessful?: () => void,
-          ) => {
-            const toPhone: string = String(values["phoneNumber"] || "").trim();
-
-            if (!toPhone) {
-              setTestSuccess("");
-              setTestError(
-                "Please enter a WhatsApp number before sending a test message.",
-              );
-              return;
-            }
-
-            setIsSendingTest(true);
-            setTestError("");
-            setTestSuccess("");
-
-            try {
-              const response: HTTPResponse<JSONObject> | HTTPErrorResponse =
-                await API.post({
-                  url: URL.fromString(APP_API_URL.toString()).addRoute(
-                    "/notification/whatsapp/test",
-                  ),
-                  data: {
-                    toPhone,
-                    templateKey: WhatsAppTemplateIds.TestNotification,
-                    templateLanguageCode:
-                      WhatsAppTemplateLanguage[
-                        WhatsAppTemplateIds.TestNotification
-                      ],
-                  },
-                });
-
-              if (response instanceof HTTPErrorResponse) {
-                throw response;
-              }
-
-              if (response.isFailure()) {
-                throw new Error("Failed to send test WhatsApp message.");
-              }
-
-              setTestSuccess(
-                "Test WhatsApp message sent successfully. Check the recipient device to confirm delivery.",
-              );
-
-              if (onSubmitSuccessful) {
-                onSubmitSuccessful();
-              }
-            } catch (err) {
-              setTestError(API.getFriendlyMessage(err));
-            } finally {
-              setIsSendingTest(false);
-            }
-          }}
-        />
-      </Card>
-
-      <Card
-        title="Meta WhatsApp Setup Guide"
-        description="Steps to connect Meta WhatsApp and the templates you must provision."
-      >
-        <MarkdownViewer text={whatsappSetupMarkdown} />
-      </Card>
-    </Page>
-  );
-};
-
-export default SettingsWhatsApp;
--- a/AdminDashboard/src/Pages/Users/View/Settings.tsx
+++ b/AdminDashboard/src/Pages/Users/View/Settings.tsx
@@ -1,94 +0,0 @@
-import PageMap from "../../../Utils/PageMap";
-import RouteMap, { RouteUtil } from "../../../Utils/RouteMap";
-import Route from "Common/Types/API/Route";
-import ObjectID from "Common/Types/ObjectID";
-import Navigation from "Common/UI/Utils/Navigation";
-import React, { FunctionComponent, ReactElement } from "react";
-import SideMenuComponent from "./SideMenu";
-import User from "Common/Models/DatabaseModels/User";
-import ModelPage from "Common/UI/Components/Page/ModelPage";
-import CardModelDetail from "Common/UI/Components/ModelDetail/CardModelDetail";
-import FormFieldSchemaType from "Common/UI/Components/Forms/Types/FormFieldSchemaType";
-import FieldType from "Common/UI/Components/Types/FieldType";
-
-const UserSettings: FunctionComponent = (): ReactElement => {
-  const modelId: ObjectID = Navigation.getLastParamAsObjectID(1);
-
-  return (
-    <ModelPage<User>
-      modelId={modelId}
-      modelNameField="email"
-      modelType={User}
-      title={"User"}
-      breadcrumbLinks={[
-        {
-          title: "Admin Dashboard",
-          to: RouteUtil.populateRouteParams(RouteMap[PageMap.HOME] as Route),
-        },
-        {
-          title: "Users",
-          to: RouteUtil.populateRouteParams(RouteMap[PageMap.USERS] as Route),
-        },
-        {
-          title: "User",
-          to: RouteUtil.populateRouteParams(
-            RouteMap[PageMap.USER_VIEW] as Route,
-            {
-              modelId: modelId,
-            },
-          ),
-        },
-        {
-          title: "Settings",
-          to: RouteUtil.populateRouteParams(
-            RouteMap[PageMap.USER_SETTINGS] as Route,
-            {
-              modelId: modelId,
-            },
-          ),
-        },
-      ]}
-      sideMenu={<SideMenuComponent modelId={modelId} />}
-    >
-      <CardModelDetail<User>
-        name="user-master-admin-settings"
-        cardProps={{
-          title: "Master Admin Access",
-          description:
-            "Grant or revoke master admin access for this user. Master admins can manage every project and workspace.",
-        }}
-        isEditable={true}
-        editButtonText="Update Access"
-        formFields={[
-          {
-            field: {
-              isMasterAdmin: true,
-            },
-            title: "Master Admin",
-            description:
-              "Enable to give this user full access to the entire platform.",
-            fieldType: FormFieldSchemaType.Toggle,
-            required: true,
-          },
-        ]}
-        modelDetailProps={{
-          modelType: User,
-          id: "user-master-admin-settings-detail",
-          fields: [
-            {
-              field: {
-                isMasterAdmin: true,
-              },
-              title: "Master Admin",
-              fieldType: FieldType.Boolean,
-              placeholder: "No",
-            },
-          ],
-          modelId: modelId,
-        }}
-      />
-    </ModelPage>
-  );
-};
-
-export default UserSettings;
--- a/AdminDashboard/src/Pages/Users/View/SideMenu.tsx
+++ b/AdminDashboard/src/Pages/Users/View/SideMenu.tsx
@@ -30,18 +30,6 @@ const SideMenuComponent: FunctionComponent<SideMenuProps> = (
          }}
          icon={IconProp.Info}
        />
-        <SideMenuItem
-          link={{
-            title: "Settings",
-            to: RouteUtil.populateRouteParams(
-              RouteMap[PageMap.USER_SETTINGS] as Route,
-              {
-                modelId: props.modelId,
-              },
-            ),
-          }}
-          icon={IconProp.Settings}
-        />
      </SideMenuSection>

      <SideMenuSection title="Advanced">
--- a/AdminDashboard/src/Utils/PageMap.ts
+++ b/AdminDashboard/src/Utils/PageMap.ts
@@ -6,7 +6,6 @@ enum PageMap {

  USERS = "USERS",
  USER_VIEW = "USER_VIEW",
-  USER_SETTINGS = "USER_SETTINGS",
  USER_DELETE = "USER_DELETE",

  PROJECTS = "PROJECTS",
@@ -16,7 +15,6 @@ enum PageMap {
  SETTINGS_HOST = "SETTINGS_HOST",
  SETTINGS_SMTP = "SETTINGS_SMTP",
  SETTINGS_CALL_AND_SMS = "SETTINGS_CALL_AND_SMS",
-  SETTINGS_WHATSAPP = "SETTINGS_WHATSAPP",
  SETTINGS_PROBES = "SETTINGS_PROBES",
  SETTINGS_AUTHENTICATION = "SETTINGS_AUTHENTICATION",
  SETTINGS_API_KEY = "SETTINGS_API_KEY",
--- a/AdminDashboard/src/Utils/RouteMap.ts
+++ b/AdminDashboard/src/Utils/RouteMap.ts
@@ -18,9 +18,6 @@ const RouteMap: Dictionary<Route> = {

  [PageMap.USERS]: new Route(`/admin/users`),
  [PageMap.USER_VIEW]: new Route(`/admin/users/${RouteParams.ModelID}`),
-  [PageMap.USER_SETTINGS]: new Route(
-    `/admin/users/${RouteParams.ModelID}/settings`,
-  ),
  [PageMap.USER_DELETE]: new Route(
    `/admin/users/${RouteParams.ModelID}/delete`,
  ),
@@ -28,7 +25,6 @@ const RouteMap: Dictionary<Route> = {
  [PageMap.SETTINGS_HOST]: new Route(`/admin/settings/host`),
  [PageMap.SETTINGS_SMTP]: new Route(`/admin/settings/smtp`),
  [PageMap.SETTINGS_CALL_AND_SMS]: new Route(`/admin/settings/call-and-sms`),
-  [PageMap.SETTINGS_WHATSAPP]: new Route(`/admin/settings/whatsapp`),
  [PageMap.SETTINGS_PROBES]: new Route(`/admin/settings/probes`),
  [PageMap.SETTINGS_AUTHENTICATION]: new Route(
    `/admin/settings/authentication`,
--- a/AdminDashboard/views/index.ejs
+++ b/AdminDashboard/views/index.ejs
@@ -22,6 +22,7 @@
    <!-- End Google Tag Manager -->
    <% } %>

+    <link rel="manifest" href="/admin/assets/img/favicons/ma">
    <link rel="apple-touch-icon" sizes="180x180" href="/admin/assets/img/favicons/apple-touch-icon.png">
    <link rel="shortcut icon" href="/admin/assets/img/favicons/favicon.ico">
    <link rel="icon" type="image/png" sizes="32x32" href="/admin/assets/img/favicons/favicon-32x32.png">
@@ -74,6 +75,20 @@

    <title>OneUptime Admin Dashboard</title>

+   
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
  </head>
  <body class="h-full bg-gray-50">
    <% if(typeof enableGoogleTagManager !== 'undefined' ? enableGoogleTagManager : false){ %> 
--- a/App/Dockerfile.tpl
+++ b/App/Dockerfile.tpl
@@ -3,7 +3,7 @@
 #

 # Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/node:24.9-alpine3.21
+FROM public.ecr.aws/docker/library/node:23.8-alpine3.21
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global

 RUN npm config set fetch-retries 5
@@ -14,12 +14,9 @@ RUN npm config set fetch-retry-maxtimeout 600000

 ARG GIT_SHA
 ARG APP_VERSION
-ARG IS_ENTERPRISE_EDITION=false

 ENV GIT_SHA=${GIT_SHA}
 ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
-ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1


 # IF APP_VERSION is not set, set it to 1.0.0
--- a/App/FeatureSet/BaseAPI/Index.ts
+++ b/App/FeatureSet/BaseAPI/Index.ts
@@ -1,6 +1,5 @@
 import BaseAPI from "Common/Server/API/BaseAPI";
 import BaseAnalyticsAPI from "Common/Server/API/BaseAnalyticsAPI";
-import BillingAPI from "Common/Server/API/BillingAPI";
 import BillingInvoiceAPI from "Common/Server/API/BillingInvoiceAPI";
 import BillingPaymentMethodAPI from "Common/Server/API/BillingPaymentMethodAPI";
 import CopilotCodeRepositoryAPI from "Common/Server/API/CopilotCodeRepositoryAPI";
@@ -14,11 +13,9 @@ import TelemetryAPI from "Common/Server/API/TelemetryAPI";
 import ProbeAPI from "Common/Server/API/ProbeAPI";
 import ProjectAPI from "Common/Server/API/ProjectAPI";
 import ProjectSsoAPI from "Common/Server/API/ProjectSSO";
-import WhatsAppLogAPI from "./WhatsAppLogAPI";

 // Import API
 import ResellerPlanAPI from "Common/Server/API/ResellerPlanAPI";
-import EnterpriseLicenseAPI from "Common/Server/API/EnterpriseLicenseAPI";
 import MonitorAPI from "Common/Server/API/MonitorAPI";
 import ShortLinkAPI from "Common/Server/API/ShortLinkAPI";
 import StatusPageAPI from "Common/Server/API/StatusPageAPI";
@@ -26,21 +23,13 @@ import WorkspaceNotificationRuleAPI from "Common/Server/API/WorkspaceNotificatio
 import StatusPageDomainAPI from "Common/Server/API/StatusPageDomainAPI";
 import StatusPageSubscriberAPI from "Common/Server/API/StatusPageSubscriberAPI";
 import UserCallAPI from "Common/Server/API/UserCallAPI";
-import UserTotpAuthAPI from "Common/Server/API/UserTotpAuthAPI";
-import UserWebAuthnAPI from "Common/Server/API/UserWebAuthnAPI";
+import UserTwoFactorAuthAPI from "Common/Server/API/UserTwoFactorAuthAPI";
 import MonitorTest from "Common/Models/DatabaseModels/MonitorTest";
-import IncidentInternalNoteAPI from "Common/Server/API/IncidentInternalNoteAPI";
-import IncidentPublicNoteAPI from "Common/Server/API/IncidentPublicNoteAPI";
-import ScheduledMaintenanceInternalNoteAPI from "Common/Server/API/ScheduledMaintenanceInternalNoteAPI";
-import ScheduledMaintenancePublicNoteAPI from "Common/Server/API/ScheduledMaintenancePublicNoteAPI";
-import IncidentAPI from "Common/Server/API/IncidentAPI";
 // User Notification methods.
 import UserEmailAPI from "Common/Server/API/UserEmailAPI";
 import UserNotificationLogTimelineAPI from "Common/Server/API/UserOnCallLogTimelineAPI";
 import UserSMSAPI from "Common/Server/API/UserSmsAPI";
-import UserWhatsAppAPI from "Common/Server/API/UserWhatsAppAPI";
 import UserPushAPI from "Common/Server/API/UserPushAPI";
-import UserAPI from "Common/Server/API/UserAPI";
 import ApiKeyPermissionService, {
  Service as ApiKeyPermissionServiceType,
 } from "Common/Server/Services/ApiKeyPermissionService";
@@ -66,7 +55,9 @@ import EmailVerificationTokenService, {
 import AlertCustomFieldService, {
  Service as AlertCustomFieldServiceType,
 } from "Common/Server/Services/AlertCustomFieldService";
-import AlertInternalNoteAPI from "Common/Server/API/AlertInternalNoteAPI";
+import AlertInternalNoteService, {
+  Service as AlertInternalNoteServiceType,
+} from "Common/Server/Services/AlertInternalNoteService";
 import AlertNoteTemplateService, {
  Service as AlertNoteTemplateServiceType,
 } from "Common/Server/Services/AlertNoteTemplateService";
@@ -97,12 +88,12 @@ import AlertStateTimelineService, {
 import IncidentCustomFieldService, {
  Service as IncidentCustomFieldServiceType,
 } from "Common/Server/Services/IncidentCustomFieldService";
+import IncidentInternalNoteService, {
+  Service as IncidentInternalNoteServiceType,
+} from "Common/Server/Services/IncidentInternalNoteService";
 import IncidentNoteTemplateService, {
  Service as IncidentNoteTemplateServiceType,
 } from "Common/Server/Services/IncidentNoteTemplateService";
-import IncidentPostmortemTemplateService, {
-  Service as IncidentPostmortemTemplateServiceType,
-} from "Common/Server/Services/IncidentPostmortemTemplateService";
 import TableViewService, {
  Service as TableViewServiceType,
 } from "Common/Server/Services/TableViewService";
@@ -112,6 +103,12 @@ import IncidentOwnerTeamService, {
 import IncidentOwnerUserService, {
  Service as IncidentOwnerUserServiceType,
 } from "Common/Server/Services/IncidentOwnerUserService";
+import IncidentPublicNoteService, {
+  Service as IncidentPublicNoteServiceType,
+} from "Common/Server/Services/IncidentPublicNoteService";
+import IncidentService, {
+  Service as IncidentServiceType,
+} from "Common/Server/Services/IncidentService";
 import IncidentSeverityService, {
  Service as IncidentSeverityServiceType,
 } from "Common/Server/Services/IncidentSeverityService";
@@ -140,6 +137,9 @@ import LogService, {
  LogService as LogServiceType,
 } from "Common/Server/Services/LogService";

+import TelemetryAttributeService, {
+  TelemetryAttributeService as TelemetryAttributeServiceType,
+} from "Common/Server/Services/TelemetryAttributeService";
 import CopilotActionTypePriorityService, {
  Service as CopilotActionTypePriorityServiceType,
 } from "Common/Server/Services/CopilotActionTypePriorityService";
@@ -227,6 +227,9 @@ import ResellerService, {
 import ScheduledMaintenanceCustomFieldService, {
  Service as ScheduledMaintenanceCustomFieldServiceType,
 } from "Common/Server/Services/ScheduledMaintenanceCustomFieldService";
+import ScheduledMaintenanceInternalNoteService, {
+  Service as ScheduledMaintenanceInternalNoteServiceType,
+} from "Common/Server/Services/ScheduledMaintenanceInternalNoteService";
 import ScheduledMaintenanceNoteTemplateService, {
  Service as ScheduledMaintenanceNoteTemplateServiceType,
 } from "Common/Server/Services/ScheduledMaintenanceNoteTemplateService";
@@ -236,6 +239,9 @@ import ScheduledMaintenanceOwnerTeamService, {
 import ScheduledMaintenanceOwnerUserService, {
  Service as ScheduledMaintenanceOwnerUserServiceType,
 } from "Common/Server/Services/ScheduledMaintenanceOwnerUserService";
+import ScheduledMaintenancePublicNoteService, {
+  Service as ScheduledMaintenancePublicNoteServiceType,
+} from "Common/Server/Services/ScheduledMaintenancePublicNoteService";
 import ScheduledMaintenanceService, {
  Service as ScheduledMaintenanceServiceType,
 } from "Common/Server/Services/ScheduledMaintenanceService";
@@ -282,7 +288,9 @@ import PushNotificationLogService, {
 import SpanService, {
  SpanService as SpanServiceType,
 } from "Common/Server/Services/SpanService";
-import StatusPageAnnouncementAPI from "Common/Server/API/StatusPageAnnouncementAPI";
+import StatusPageAnnouncementService, {
+  Service as StatusPageAnnouncementServiceType,
+} from "Common/Server/Services/StatusPageAnnouncementService";
 import StatusPageCustomFieldService, {
  Service as StatusPageCustomFieldServiceType,
 } from "Common/Server/Services/StatusPageCustomFieldService";
@@ -319,9 +327,6 @@ import TeamMemberService, {
 import TeamPermissionService, {
  Service as TeamPermissionServiceType,
 } from "Common/Server/Services/TeamPermissionService";
-import TeamComplianceSettingService, {
-  TeamComplianceSettingService as TeamComplianceSettingServiceType,
-} from "Common/Server/Services/TeamComplianceSettingService";
 import TeamService, {
  Service as TeamServiceType,
 } from "Common/Server/Services/TeamService";
@@ -340,6 +345,9 @@ import UserNotificationSettingService, {
 import UserOnCallLogService, {
  Service as UserNotificationLogServiceType,
 } from "Common/Server/Services/UserOnCallLogService";
+import UserService, {
+  Service as UserServiceType,
+} from "Common/Server/Services/UserService";
 import WorkflowLogService, {
  Service as WorkflowLogServiceType,
 } from "Common/Server/Services/WorkflowLogService";
@@ -365,7 +373,6 @@ import TelemetryExceptionService, {
 import ExceptionInstanceService, {
  ExceptionInstanceService as ExceptionInstanceServiceType,
 } from "Common/Server/Services/ExceptionInstanceService";
-import AcmeChallengeAPI from "Common/Server/API/AcmeChallengeAPI";

 import FeatureSet from "Common/Server/Types/FeatureSet";
 import Express, { ExpressApplication } from "Common/Server/Utils/Express";
@@ -384,6 +391,7 @@ import Dashboard from "Common/Models/DatabaseModels/Dashboard";

 import Alert from "Common/Models/DatabaseModels/Alert";
 import AlertCustomField from "Common/Models/DatabaseModels/AlertCustomField";
+import AlertInternalNote from "Common/Models/DatabaseModels/AlertInternalNote";
 import AlertNoteTemplate from "Common/Models/DatabaseModels/AlertNoteTemplate";
 import AlertOwnerTeam from "Common/Models/DatabaseModels/AlertOwnerTeam";
 import AlertOwnerUser from "Common/Models/DatabaseModels/AlertOwnerUser";
@@ -391,11 +399,13 @@ import AlertSeverity from "Common/Models/DatabaseModels/AlertSeverity";
 import AlertState from "Common/Models/DatabaseModels/AlertState";
 import AlertStateTimeline from "Common/Models/DatabaseModels/AlertStateTimeline";

+import Incident from "Common/Models/DatabaseModels/Incident";
 import IncidentCustomField from "Common/Models/DatabaseModels/IncidentCustomField";
+import IncidentInternalNote from "Common/Models/DatabaseModels/IncidentInternalNote";
 import IncidentNoteTemplate from "Common/Models/DatabaseModels/IncidentNoteTemplate";
-import IncidentPostmortemTemplate from "Common/Models/DatabaseModels/IncidentPostmortemTemplate";
 import IncidentOwnerTeam from "Common/Models/DatabaseModels/IncidentOwnerTeam";
 import IncidentOwnerUser from "Common/Models/DatabaseModels/IncidentOwnerUser";
+import IncidentPublicNote from "Common/Models/DatabaseModels/IncidentPublicNote";
 import IncidentSeverity from "Common/Models/DatabaseModels/IncidentSeverity";
 import IncidentState from "Common/Models/DatabaseModels/IncidentState";
 import IncidentStateTimeline from "Common/Models/DatabaseModels/IncidentStateTimeline";
@@ -430,9 +440,11 @@ import PromoCode from "Common/Models/DatabaseModels/PromoCode";
 import Reseller from "Common/Models/DatabaseModels/Reseller";
 import ScheduledMaintenance from "Common/Models/DatabaseModels/ScheduledMaintenance";
 import ScheduledMaintenanceCustomField from "Common/Models/DatabaseModels/ScheduledMaintenanceCustomField";
+import ScheduledMaintenanceInternalNote from "Common/Models/DatabaseModels/ScheduledMaintenanceInternalNote";
 import ScheduledMaintenanceNoteTemplate from "Common/Models/DatabaseModels/ScheduledMaintenanceNoteTemplate";
 import ScheduledMaintenanceOwnerTeam from "Common/Models/DatabaseModels/ScheduledMaintenanceOwnerTeam";
 import ScheduledMaintenanceOwnerUser from "Common/Models/DatabaseModels/ScheduledMaintenanceOwnerUser";
+import ScheduledMaintenancePublicNote from "Common/Models/DatabaseModels/ScheduledMaintenancePublicNote";
 import ScheduledMaintenanceState from "Common/Models/DatabaseModels/ScheduledMaintenanceState";
 import ScheduledMaintenanceStateTimeline from "Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline";
 import ServiceCatalog from "Common/Models/DatabaseModels/ServiceCatalog";
@@ -441,6 +453,7 @@ import ServiceCatalogOwnerUser from "Common/Models/DatabaseModels/ServiceCatalog
 import ServiceCopilotCodeRepository from "Common/Models/DatabaseModels/ServiceCopilotCodeRepository";
 import ShortLink from "Common/Models/DatabaseModels/ShortLink";
 import SmsLog from "Common/Models/DatabaseModels/SmsLog";
+import StatusPageAnnouncement from "Common/Models/DatabaseModels/StatusPageAnnouncement";
 // Custom Fields API
 import StatusPageCustomField from "Common/Models/DatabaseModels/StatusPageCustomField";
 import StatusPageFooterLink from "Common/Models/DatabaseModels/StatusPageFooterLink";
@@ -456,9 +469,9 @@ import StatusPageSSO from "Common/Models/DatabaseModels/StatusPageSso";
 import Team from "Common/Models/DatabaseModels/Team";
 import TeamMember from "Common/Models/DatabaseModels/TeamMember";
 import TeamPermission from "Common/Models/DatabaseModels/TeamPermission";
-import TeamComplianceSetting from "Common/Models/DatabaseModels/TeamComplianceSetting";
 import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
 import TelemetryUsageBilling from "Common/Models/DatabaseModels/TelemetryUsageBilling";
+import User from "Common/Models/DatabaseModels/User";
 import UserNotificationRule from "Common/Models/DatabaseModels/UserNotificationRule";
 import UserNotificationSetting from "Common/Models/DatabaseModels/UserNotificationSetting";
 import UserOnCallLog from "Common/Models/DatabaseModels/UserOnCallLog";
@@ -468,6 +481,7 @@ import WorkflowVariable from "Common/Models/DatabaseModels/WorkflowVariable";
 import ProbeOwnerTeam from "Common/Models/DatabaseModels/ProbeOwnerTeam";
 import ProbeOwnerUser from "Common/Models/DatabaseModels/ProbeOwnerUser";
 import ServiceCatalogDependency from "Common/Models/DatabaseModels/ServiceCatalogDependency";
+import TelemetryAttribute from "Common/Models/AnalyticsModels/TelemetryAttribute";
 import ExceptionInstance from "Common/Models/AnalyticsModels/ExceptionInstance";
 import TelemetyException from "Common/Models/DatabaseModels/TelemetryException";
 import CopilotActionTypePriority from "Common/Models/DatabaseModels/CopilotActionTypePriority";
@@ -507,7 +521,6 @@ import ScheduledMaintenanceFeedService, {
 } from "Common/Server/Services/ScheduledMaintenanceFeedService";

 import SlackAPI from "Common/Server/API/SlackAPI";
-import MicrosoftTeamsAPI from "Common/Server/API/MicrosoftTeamsAPI";

 import WorkspaceProjectAuthToken from "Common/Models/DatabaseModels/WorkspaceProjectAuthToken";
 import WorkspaceProjectAuthTokenService, {
@@ -525,6 +538,11 @@ import WorkspaceSettingService, {
  Service as WorkspaceSettingServiceType,
 } from "Common/Server/Services/WorkspaceSettingService";

+import ProjectUser from "Common/Models/DatabaseModels/ProjectUser";
+import ProjectUserService, {
+  Service as ProjectUserServiceType,
+} from "Common/Server/Services/ProjectUserService";
+
 import MonitorFeed from "Common/Models/DatabaseModels/MonitorFeed";
 import MonitorFeedService, {
  Service as MonitorFeedServiceType,
@@ -537,7 +555,10 @@ import MetricTypeService, {
 import MetricType from "Common/Models/DatabaseModels/MetricType";

 import OnCallDutyPolicyAPI from "Common/Server/API/OnCallDutyPolicyAPI";
-import TeamComplianceAPI from "Common/Server/API/TeamComplianceAPI";
+
+// OnCallDutyPolicyOwnerTeam
+// OnCallDutyPolicyOwnerUser
+// OnCallDutyPolicyFeed

 import OnCallDutyPolicyFeed from "Common/Models/DatabaseModels/OnCallDutyPolicyFeed";
 import OnCallDutyPolicyFeedService, {
@@ -593,7 +614,10 @@ const BaseAPIFeatureSet: FeatureSet = {

    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
-      new AcmeChallengeAPI().getRouter(),
+      new BaseAnalyticsAPI<TelemetryAttribute, TelemetryAttributeServiceType>(
+        TelemetryAttribute,
+        TelemetryAttributeService,
+      ).getRouter(),
    );

    app.use(`/${APP_NAME.toLocaleLowerCase()}`, OpenAPI.getRouter());
@@ -712,6 +736,14 @@ const BaseAPIFeatureSet: FeatureSet = {
      ).getRouter(),
    );

+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<ProjectUser, ProjectUserServiceType>(
+        ProjectUser,
+        ProjectUserService,
+      ).getRouter(),
+    );
+
    //service provider setting
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
@@ -824,7 +856,10 @@ const BaseAPIFeatureSet: FeatureSet = {

    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
-      new AlertInternalNoteAPI().getRouter(),
+      new BaseAPI<AlertInternalNote, AlertInternalNoteServiceType>(
+        AlertInternalNote,
+        AlertInternalNoteService,
+      ).getRouter(),
    );

    app.use(
@@ -1021,7 +1056,10 @@ const BaseAPIFeatureSet: FeatureSet = {

    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
-      new StatusPageAnnouncementAPI().getRouter(),
+      new BaseAPI<StatusPageAnnouncement, StatusPageAnnouncementServiceType>(
+        StatusPageAnnouncement,
+        StatusPageAnnouncementService,
+      ).getRouter(),
    );

    app.use(
@@ -1142,14 +1180,6 @@ const BaseAPIFeatureSet: FeatureSet = {
      ).getRouter(),
    );

-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAPI<TeamComplianceSetting, TeamComplianceSettingServiceType>(
-        TeamComplianceSetting,
-        TeamComplianceSettingService,
-      ).getRouter(),
-    );
-
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
      new BaseAPI<MonitorStatus, MonitorStatusServiceType>(
@@ -1265,7 +1295,13 @@ const BaseAPIFeatureSet: FeatureSet = {
      ).getRouter(),
    );

-    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new IncidentAPI().getRouter());
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<Incident, IncidentServiceType>(
+        Incident,
+        IncidentService,
+      ).getRouter(),
+    );

    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
@@ -1363,17 +1399,6 @@ const BaseAPIFeatureSet: FeatureSet = {
      ).getRouter(),
    );

-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new BaseAPI<
-        IncidentPostmortemTemplate,
-        IncidentPostmortemTemplateServiceType
-      >(
-        IncidentPostmortemTemplate,
-        IncidentPostmortemTemplateService,
-      ).getRouter(),
-    );
-
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
      new BaseAPI<
@@ -1514,11 +1539,6 @@ const BaseAPIFeatureSet: FeatureSet = {
      new BaseAPI<SmsLog, SmsLogServiceType>(SmsLog, SmsLogService).getRouter(),
    );

-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new WhatsAppLogAPI().getRouter(),
-    );
-
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
      new BaseAPI<PushNotificationLog, PushNotificationLogServiceType>(
@@ -1574,6 +1594,7 @@ const BaseAPIFeatureSet: FeatureSet = {
        MonitorTimelineStatusService,
      ).getRouter(),
    );
+
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new ShortLinkAPI().getRouter());
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new MonitorAPI().getRouter());
    app.use(
@@ -1587,12 +1608,6 @@ const BaseAPIFeatureSet: FeatureSet = {
      new OnCallDutyPolicyAPI().getRouter(),
    );

-    // TeamComplianceAPI
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new TeamComplianceAPI().getRouter(),
-    );
-
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
      new WorkspaceNotificationRuleAPI().getRouter(),
@@ -1616,15 +1631,7 @@ const BaseAPIFeatureSet: FeatureSet = {
      `/${APP_NAME.toLocaleLowerCase()}`,
      new ResellerPlanAPI().getRouter(),
    );
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new EnterpriseLicenseAPI().getRouter(),
-    );
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new SlackAPI().getRouter());
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new MicrosoftTeamsAPI().getRouter(),
-    );
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
      new GlobalConfigAPI().getRouter(),
@@ -1652,18 +1659,10 @@ const BaseAPIFeatureSet: FeatureSet = {
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserCallAPI().getRouter());
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
-      new UserTotpAuthAPI().getRouter(),
-    );
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new UserWebAuthnAPI().getRouter(),
+      new UserTwoFactorAuthAPI().getRouter(),
    );
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserEmailAPI().getRouter());
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserSMSAPI().getRouter());
-    app.use(
-      `/${APP_NAME.toLocaleLowerCase()}`,
-      new UserWhatsAppAPI().getRouter(),
-    );
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserPushAPI().getRouter());
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new ProbeAPI().getRouter());

@@ -1684,26 +1683,42 @@ const BaseAPIFeatureSet: FeatureSet = {
      new BillingInvoiceAPI().getRouter(),
    );

-    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new BillingAPI().getRouter());
-
    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
-      new ScheduledMaintenancePublicNoteAPI().getRouter(),
+      new BaseAPI<
+        ScheduledMaintenancePublicNote,
+        ScheduledMaintenancePublicNoteServiceType
+      >(
+        ScheduledMaintenancePublicNote,
+        ScheduledMaintenancePublicNoteService,
+      ).getRouter(),
    );

    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
-      new ScheduledMaintenanceInternalNoteAPI().getRouter(),
+      new BaseAPI<
+        ScheduledMaintenanceInternalNote,
+        ScheduledMaintenanceInternalNoteServiceType
+      >(
+        ScheduledMaintenanceInternalNote,
+        ScheduledMaintenanceInternalNoteService,
+      ).getRouter(),
    );

    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
-      new IncidentPublicNoteAPI().getRouter(),
+      new BaseAPI<IncidentPublicNote, IncidentPublicNoteServiceType>(
+        IncidentPublicNote,
+        IncidentPublicNoteService,
+      ).getRouter(),
    );

    app.use(
      `/${APP_NAME.toLocaleLowerCase()}`,
-      new IncidentInternalNoteAPI().getRouter(),
+      new BaseAPI<IncidentInternalNote, IncidentInternalNoteServiceType>(
+        IncidentInternalNote,
+        IncidentInternalNoteService,
+      ).getRouter(),
    );

    app.use(
@@ -1820,7 +1835,10 @@ const BaseAPIFeatureSet: FeatureSet = {
    app.use(`/${APP_NAME.toLocaleLowerCase()}`, TelemetryAPI);

    //attach api's
-    app.use(`/${APP_NAME.toLocaleLowerCase()}`, new UserAPI().getRouter());
+    app.use(
+      `/${APP_NAME.toLocaleLowerCase()}`,
+      new BaseAPI<User, UserServiceType>(User, UserService).getRouter(),
+    );
  },
 };

--- a/App/FeatureSet/BaseAPI/WhatsAppLogAPI.ts
+++ b/App/FeatureSet/BaseAPI/WhatsAppLogAPI.ts
@@ -1,14 +0,0 @@
-import BaseAPI from "Common/Server/API/BaseAPI";
-import WhatsAppLog from "Common/Models/DatabaseModels/WhatsAppLog";
-import WhatsAppLogService, {
-  Service as WhatsAppLogServiceType,
-} from "Common/Server/Services/WhatsAppLogService";
-
-export default class WhatsAppLogAPI extends BaseAPI<
-  WhatsAppLog,
-  WhatsAppLogServiceType
-> {
-  public constructor() {
-    super(WhatsAppLog, WhatsAppLogService);
-  }
-}
--- a/App/FeatureSet/Identity/API/Authentication.ts
+++ b/App/FeatureSet/Identity/API/Authentication.ts
@@ -24,72 +24,23 @@ import AccessTokenService from "Common/Server/Services/AccessTokenService";
 import EmailVerificationTokenService from "Common/Server/Services/EmailVerificationTokenService";
 import MailService from "Common/Server/Services/MailService";
 import UserService from "Common/Server/Services/UserService";
-import UserTotpAuthService from "Common/Server/Services/UserTotpAuthService";
-import UserSessionService, {
-  SessionMetadata,
-} from "Common/Server/Services/UserSessionService";
+import UserTwoFactorAuthService from "Common/Server/Services/UserTwoFactorAuthService";
 import CookieUtil from "Common/Server/Utils/Cookie";
 import Express, {
  ExpressRequest,
  ExpressResponse,
  ExpressRouter,
  NextFunction,
-  extractDeviceInfo,
-  getClientIp,
-  headerValueToString,
 } from "Common/Server/Utils/Express";
-import CaptchaUtil from "Common/Server/Utils/Captcha";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
-import TotpAuth from "Common/Server/Utils/TotpAuth";
+import TwoFactorAuth from "Common/Server/Utils/TwoFactorAuth";
 import EmailVerificationToken from "Common/Models/DatabaseModels/EmailVerificationToken";
 import User from "Common/Models/DatabaseModels/User";
-import UserSession from "Common/Models/DatabaseModels/UserSession";
-import UserTotpAuth from "Common/Models/DatabaseModels/UserTotpAuth";
-import UserWebAuthn from "Common/Models/DatabaseModels/UserWebAuthn";
-import UserWebAuthnService from "Common/Server/Services/UserWebAuthnService";
-import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException";
+import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth";

 const router: ExpressRouter = Express.getRouter();

-const ACCESS_TOKEN_EXPIRY_SECONDS: number = 15 * 60;
-
-type FinalizeUserLoginInput = {
-  req: ExpressRequest;
-  res: ExpressResponse;
-  user: User;
-  isGlobalLogin: boolean;
-};
-
-const finalizeUserLogin: (
-  data: FinalizeUserLoginInput,
-) => Promise<SessionMetadata> = async (
-  data: FinalizeUserLoginInput,
-): Promise<SessionMetadata> => {
-  const { req, res, user, isGlobalLogin } = data;
-
-  const sessionMetadata: SessionMetadata =
-    await UserSessionService.createSession({
-      userId: user.id!,
-      isGlobalLogin,
-      ipAddress: getClientIp(req),
-      userAgent: headerValueToString(req.headers["user-agent"]),
-      ...extractDeviceInfo(req),
-    });
-
-  CookieUtil.setUserCookie({
-    expressResponse: res,
-    user,
-    isGlobalLogin,
-    sessionId: sessionMetadata.session.id!,
-    refreshToken: sessionMetadata.refreshToken,
-    refreshTokenExpiresAt: sessionMetadata.refreshTokenExpiresAt,
-    accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
-  });
-
-  return sessionMetadata;
-};
-
 router.post(
  "/signup",
  async (
@@ -108,16 +59,6 @@ router.post(
        );
      }

-      const miscDataProps: JSONObject =
-        (req.body["miscDataProps"] as JSONObject) || {};
-
-      await CaptchaUtil.verifyCaptcha({
-        token:
-          (miscDataProps["captchaToken"] as string | undefined) ||
-          (req.body["captchaToken"] as string | undefined),
-        remoteIp: getClientIp(req) || null,
-      });
-
      const data: JSONObject = req.body["data"];

      /* Creating a type that is a partial of the TBaseModel type. */
@@ -242,9 +183,9 @@ router.post(
      if (savedUser) {
        // Refresh Permissions for this user here.
        await AccessTokenService.refreshUserAllPermissions(savedUser.id!);
-        await finalizeUserLogin({
-          req,
-          res,
+
+        CookieUtil.setUserCookie({
+          expressResponse: res,
          user: savedUser,
          isGlobalLogin: true,
        });
@@ -544,127 +485,6 @@ router.post(
  },
 );

-router.post(
-  "/refresh-token",
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
-    try {
-      const refreshToken: string | undefined =
-        CookieUtil.getRefreshTokenFromExpressRequest(req);
-
-      if (!refreshToken) {
-        CookieUtil.removeAllCookies(req, res);
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException(
-            "Refresh token missing. Please login again.",
-          ),
-        );
-      }
-
-      const session: UserSession | null =
-        await UserSessionService.findActiveSessionByRefreshToken(refreshToken);
-
-      if (!session || !session.id) {
-        CookieUtil.removeAllCookies(req, res);
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException("Session expired. Please login again."),
-        );
-      }
-
-      if (
-        session.refreshTokenExpiresAt &&
-        OneUptimeDate.hasExpired(session.refreshTokenExpiresAt)
-      ) {
-        await UserSessionService.revokeSessionById(session.id, {
-          reason: "Refresh token expired",
-        });
-        CookieUtil.removeAllCookies(req, res);
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException("Session expired. Please login again."),
-        );
-      }
-
-      if (!session.userId) {
-        await UserSessionService.revokeSessionById(session.id, {
-          reason: "Session missing user",
-        });
-        CookieUtil.removeAllCookies(req, res);
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException("Session expired. Please login again."),
-        );
-      }
-
-      const user: User | null = await UserService.findOneById({
-        id: session.userId,
-        props: {
-          isRoot: true,
-        },
-        select: {
-          _id: true,
-          email: true,
-          name: true,
-          isMasterAdmin: true,
-          profilePictureId: true,
-          timezone: true,
-          enableTwoFactorAuth: true,
-        },
-      });
-
-      if (!user) {
-        await UserSessionService.revokeSessionById(session.id, {
-          reason: "User not found",
-        });
-        CookieUtil.removeAllCookies(req, res);
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException("Account no longer exists."),
-        );
-      }
-
-      const additionalInfo: JSONObject = (session.additionalInfo ||
-        {}) as JSONObject;
-      const isGlobalLogin: boolean =
-        typeof additionalInfo["isGlobalLogin"] === "boolean"
-          ? (additionalInfo["isGlobalLogin"] as boolean)
-          : true;
-
-      const renewedSession: SessionMetadata =
-        await UserSessionService.renewSessionWithNewRefreshToken({
-          session,
-          ipAddress: getClientIp(req),
-          userAgent: headerValueToString(req.headers["user-agent"]),
-          ...extractDeviceInfo(req),
-        });
-
-      CookieUtil.setUserCookie({
-        expressResponse: res,
-        user,
-        isGlobalLogin,
-        sessionId: renewedSession.session.id!,
-        refreshToken: renewedSession.refreshToken,
-        refreshTokenExpiresAt: renewedSession.refreshTokenExpiresAt,
-        accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
-      });
-
-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
-    }
-  },
-);
-
 router.post(
  "/logout",
  async (
@@ -673,15 +493,6 @@ router.post(
    next: NextFunction,
  ): Promise<void> => {
    try {
-      const refreshToken: string | undefined =
-        CookieUtil.getRefreshTokenFromExpressRequest(req);
-
-      if (refreshToken) {
-        await UserSessionService.revokeSessionByRefreshToken(refreshToken, {
-          reason: "User logout",
-        });
-      }
-
      CookieUtil.removeAllCookies(req, res);

      return Response.sendEmptySuccessResponse(req, res);
@@ -692,7 +503,7 @@ router.post(
 );

 router.post(
-  "/verify-totp-auth",
+  "/verify-two-factor-auth",
  async (
    req: ExpressRequest,
    res: ExpressResponse,
@@ -702,25 +513,7 @@ router.post(
      req: req,
      res: res,
      next: next,
-      verifyTotpAuth: true,
-      verifyWebAuthn: false,
-    });
-  },
-);
-
-router.post(
-  "/verify-webauthn-auth",
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
-    return login({
-      req: req,
-      res: res,
-      next: next,
-      verifyTotpAuth: false,
-      verifyWebAuthn: true,
+      verifyTwoFactorAuth: true,
    });
  },
 );
@@ -736,111 +529,62 @@ router.post(
      req: req,
      res: res,
      next: next,
-      verifyTotpAuth: false,
-      verifyWebAuthn: false,
+      verifyTwoFactorAuth: false,
    });
  },
 );

-type FetchTotpAuthListFunction = (userId: ObjectID) => Promise<{
-  totpAuthList: Array<UserTotpAuth>;
-  webAuthnList: Array<UserWebAuthn>;
-}>;
-
-const fetchTotpAuthList: FetchTotpAuthListFunction = async (
+type FetchTwoFactorAuthListFunction = (
  userId: ObjectID,
-): Promise<{
-  totpAuthList: Array<UserTotpAuth>;
-  webAuthnList: Array<UserWebAuthn>;
-}> => {
-  const totpAuthList: Array<UserTotpAuth> = await UserTotpAuthService.findBy({
-    query: {
-      userId: userId,
-      isVerified: true,
-    },
-    select: {
-      _id: true,
-      userId: true,
-      name: true,
-    },
-    limit: LIMIT_PER_PROJECT,
-    skip: 0,
-    props: {
-      isRoot: true,
-    },
-  });
+) => Promise<Array<UserTwoFactorAuth>>;

-  const webAuthnList: Array<UserWebAuthn> = await UserWebAuthnService.findBy({
-    query: {
-      userId: userId,
-      isVerified: true,
-    },
-    select: {
-      _id: true,
-      userId: true,
-      name: true,
-    },
-    limit: LIMIT_PER_PROJECT,
-    skip: 0,
-    props: {
-      isRoot: true,
-    },
-  });
+const fetchTwoFactorAuthList: FetchTwoFactorAuthListFunction = async (
+  userId: ObjectID,
+): Promise<Array<UserTwoFactorAuth>> => {
+  const twoFactorAuthList: Array<UserTwoFactorAuth> =
+    await UserTwoFactorAuthService.findBy({
+      query: {
+        userId: userId,
+        isVerified: true,
+      },
+      select: {
+        _id: true,
+        userId: true,
+        name: true,
+      },
+      limit: LIMIT_PER_PROJECT,
+      skip: 0,
+      props: {
+        isRoot: true,
+      },
+    });

-  return {
-    totpAuthList: totpAuthList || [],
-    webAuthnList: webAuthnList || [],
-  };
+  return twoFactorAuthList;
 };

 type LoginFunction = (options: {
  req: ExpressRequest;
  res: ExpressResponse;
  next: NextFunction;
-  verifyTotpAuth: boolean;
-  verifyWebAuthn: boolean;
+  verifyTwoFactorAuth: boolean;
 }) => Promise<void>;

 const login: LoginFunction = async (options: {
  req: ExpressRequest;
  res: ExpressResponse;
  next: NextFunction;
-  verifyTotpAuth: boolean;
-  verifyWebAuthn: boolean;
+  verifyTwoFactorAuth: boolean;
 }): Promise<void> => {
  const req: ExpressRequest = options.req;
  const res: ExpressResponse = options.res;
  const next: NextFunction = options.next;
-  const verifyTotpAuth: boolean = options.verifyTotpAuth;
-  const verifyWebAuthn: boolean = options.verifyWebAuthn;
+  const verifyTwoFactorAuth: boolean = options.verifyTwoFactorAuth;

  try {
-    const miscDataProps: JSONObject =
-      (req.body["miscDataProps"] as JSONObject) || {};
-
-    if (!verifyTotpAuth && !verifyWebAuthn) {
-      await CaptchaUtil.verifyCaptcha({
-        token:
-          (miscDataProps["captchaToken"] as string | undefined) ||
-          (req.body["captchaToken"] as string | undefined),
-        remoteIp: getClientIp(req) || null,
-      });
-    }
-
    const data: JSONObject = req.body["data"];

-    logger.debug("Login request data: " + JSON.stringify(req.body, null, 2));
-
    const user: User = BaseModel.fromJSON(data as JSONObject, User) as User;

-    if (!user.email || !user.password) {
-      return Response.sendErrorResponse(
-        req,
-        res,
-        new BadDataException("Email and password are required."),
-      );
-    }
-
    await user.password?.hashValue(EncryptionSecret);

    const alreadySavedUser: User | null = await UserService.findOneBy({
@@ -894,21 +638,13 @@ const login: LoginFunction = async (options: {
        );
      }

-      if (
-        alreadySavedUser.enableTwoFactorAuth &&
-        !verifyTotpAuth &&
-        !verifyWebAuthn
-      ) {
+      if (alreadySavedUser.enableTwoFactorAuth && !verifyTwoFactorAuth) {
        // If two factor auth is enabled then we will send the user to the two factor auth page.

-        const { totpAuthList, webAuthnList } = await fetchTotpAuthList(
-          alreadySavedUser.id!,
-        );
+        const twoFactorAuthList: Array<UserTwoFactorAuth> =
+          await fetchTwoFactorAuthList(alreadySavedUser.id!);

-        if (
-          (!totpAuthList || totpAuthList.length === 0) &&
-          (!webAuthnList || webAuthnList.length === 0)
-        ) {
+        if (!twoFactorAuthList || twoFactorAuthList.length === 0) {
          const errorMessage: string = IsBillingEnabled
            ? "Two Factor Authentication is enabled but no two factor auth is setup. Please contact OneUptime support for help."
            : "Two Factor Authentication is enabled but no two factor auth is setup. Please contact your server admin to disable two factor auth for this account.";
@@ -920,76 +656,69 @@ const login: LoginFunction = async (options: {
          );
        }

-        return Response.sendEntityResponse(req, res, alreadySavedUser, User, {
+        return Response.sendEntityResponse(req, res, user, User, {
          miscData: {
-            totpAuthList: UserTotpAuth.toJSONArray(totpAuthList, UserTotpAuth),
-            webAuthnList: UserWebAuthn.toJSONArray(webAuthnList, UserWebAuthn),
+            twoFactorAuthList: UserTwoFactorAuth.toJSONArray(
+              twoFactorAuthList,
+              UserTwoFactorAuth,
+            ),
+            twoFactorAuth: true,
          },
        });
      }

-      if (verifyTotpAuth || verifyWebAuthn) {
-        if (verifyTotpAuth) {
-          // code from req
-          const code: string = data["code"] as string;
-          const twoFactorAuthId: string = data["twoFactorAuthId"] as string;
+      if (verifyTwoFactorAuth) {
+        // code from req
+        const code: string = data["code"] as string;
+        const twoFactorAuthId: string = data["twoFactorAuthId"] as string;

-          const totpAuth: UserTotpAuth | null =
-            await UserTotpAuthService.findOneBy({
-              query: {
-                _id: twoFactorAuthId,
-                userId: alreadySavedUser.id!,
-                isVerified: true,
-              },
-              select: {
-                _id: true,
-                twoFactorSecret: true,
-              },
-              props: {
-                isRoot: true,
-              },
-            });
-
-          if (!totpAuth) {
-            return Response.sendErrorResponse(
-              req,
-              res,
-              new BadDataException("Invalid two factor auth id."),
-            );
-          }
-
-          const isVerified: boolean = TotpAuth.verifyToken({
-            token: code,
-            secret: totpAuth.twoFactorSecret!,
-            email: alreadySavedUser.email!,
+        const twoFactorAuth: UserTwoFactorAuth | null =
+          await UserTwoFactorAuthService.findOneBy({
+            query: {
+              _id: twoFactorAuthId,
+              userId: alreadySavedUser.id!,
+              isVerified: true,
+            },
+            select: {
+              _id: true,
+              twoFactorSecret: true,
+            },
+            props: {
+              isRoot: true,
+            },
          });

-          if (!isVerified) {
-            return Response.sendErrorResponse(
-              req,
-              res,
-              new BadDataException("Invalid code."),
-            );
-          }
-        } else if (verifyWebAuthn) {
-          const expectedChallenge: string = data["challenge"] as string;
-          const credential: any = data["credential"];
-
-          await UserWebAuthnService.verifyAuthentication({
-            userId: alreadySavedUser.id!.toString(),
-            challenge: expectedChallenge,
-            credential: credential,
-          });
+        if (!twoFactorAuth) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadDataException("Invalid two factor auth id."),
+          );
        }
-      } // Refresh Permissions for this user here.
+
+        const isVerified: boolean = TwoFactorAuth.verifyToken({
+          token: code,
+          secret: twoFactorAuth.twoFactorSecret!,
+          email: alreadySavedUser.email!,
+        });
+
+        if (!isVerified) {
+          return Response.sendErrorResponse(
+            req,
+            res,
+            new BadDataException("Invalid code."),
+          );
+        }
+      }
+
+      // Refresh Permissions for this user here.
      await AccessTokenService.refreshUserAllPermissions(alreadySavedUser.id!);

      if (alreadySavedUser.password.toString() === user.password!.toString()) {
        logger.info("User logged in: " + alreadySavedUser.email?.toString());

-        await finalizeUserLogin({
-          req,
-          res,
+        CookieUtil.setUserCookie({
+          expressResponse: res,
          user: alreadySavedUser,
          isGlobalLogin: true,
        });
--- a/App/FeatureSet/Identity/API/SCIM.ts
+++ b/App/FeatureSet/Identity/API/SCIM.ts
--- a/App/FeatureSet/Identity/API/SSO.ts
+++ b/App/FeatureSet/Identity/API/SSO.ts
@@ -20,9 +20,6 @@ import AccessTokenService from "Common/Server/Services/AccessTokenService";
 import ProjectSSOService from "Common/Server/Services/ProjectSsoService";
 import TeamMemberService from "Common/Server/Services/TeamMemberService";
 import UserService from "Common/Server/Services/UserService";
-import UserSessionService, {
-  SessionMetadata,
-} from "Common/Server/Services/UserSessionService";
 import QueryHelper from "Common/Server/Types/Database/QueryHelper";
 import Select from "Common/Server/Types/Database/Select";
 import CookieUtil from "Common/Server/Utils/Cookie";
@@ -31,9 +28,6 @@ import Express, {
  ExpressResponse,
  ExpressRouter,
  NextFunction,
-  extractDeviceInfo,
-  getClientIp,
-  headerValueToString,
 } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
@@ -46,20 +40,12 @@ import Name from "Common/Types/Name";

 const router: ExpressRouter = Express.getRouter();

-const ACCESS_TOKEN_EXPIRY_SECONDS: number = 15 * 60;
-
-/*
- * This route is used to get the SSO config for the user.
- * when the user logs in from OneUptime and not from the IDP.
- */
+// This route is used to get the SSO config for the user.
+// when the user logs in from OneUptime and not from the IDP.

 router.get(
  "/service-provider-login",
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
    try {
      if (!req.query["email"]) {
        return Response.sendErrorResponse(
@@ -164,11 +150,7 @@ router.get(
    } catch (err) {
      logger.error(err);

-      if (err instanceof Exception) {
-        return next(err);
-      }
-
-      return next(new ServerException());
+      Response.sendErrorResponse(req, res, err as Exception);
    }
  },
 );
@@ -178,7 +160,7 @@ router.get(
  async (
    req: ExpressRequest,
    res: ExpressResponse,
-    next: NextFunction,
+    _next: NextFunction,
  ): Promise<void> => {
    try {
      if (!req.params["projectId"]) {
@@ -254,42 +236,22 @@ router.get(
    } catch (err) {
      logger.error(err);

-      if (err instanceof Exception) {
-        return next(err);
-      }
-
-      return next(new ServerException());
+      Response.sendErrorResponse(req, res, err as Exception);
    }
  },
 );

 router.get(
  "/idp-login/:projectId/:projectSsoId",
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
-    try {
-      await loginUserWithSso(req, res);
-    } catch (err) {
-      return next(err);
-    }
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    return await loginUserWithSso(req, res);
  },
 );

 router.post(
  "/idp-login/:projectId/:projectSsoId",
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
-    try {
-      await loginUserWithSso(req, res);
-    } catch (err) {
-      return next(err);
-    }
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    return await loginUserWithSso(req, res);
  },
 );

@@ -472,10 +434,8 @@ const loginUserWithSso: LoginUserWithSsoFunction = async (
      isNewUser = true;
    }

-    /*
-     * If he does not then add him to teams that he should belong and log in.
-     * This should never happen because email is verified before he logs in with SSO.
-     */
+    // If he does not then add him to teams that he should belong and log in.
+    // This should never happen because email is verified before he logs in with SSO.
    if (!alreadySavedUser.isEmailVerified && !isNewUser) {
      await AuthenticationEmail.sendVerificationEmail(alreadySavedUser!);

@@ -547,31 +507,15 @@ const loginUserWithSso: LoginUserWithSsoFunction = async (
      expressResponse: res,
    });

-    // Refresh Permissions for this user here.
-    await AccessTokenService.refreshUserAllPermissions(alreadySavedUser.id!);
-
-    const sessionMetadata: SessionMetadata =
-      await UserSessionService.createSession({
-        userId: alreadySavedUser.id!,
-        isGlobalLogin: false,
-        ipAddress: getClientIp(req),
-        userAgent: headerValueToString(req.headers["user-agent"]),
-        ...extractDeviceInfo(req),
-        additionalInfo: {
-          projectId: projectId.toString(),
-        },
-      });
-
    CookieUtil.setUserCookie({
      expressResponse: res,
      user: alreadySavedUser,
      isGlobalLogin: false,
-      sessionId: sessionMetadata.session.id!,
-      refreshToken: sessionMetadata.refreshToken,
-      refreshTokenExpiresAt: sessionMetadata.refreshTokenExpiresAt,
-      accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
    });

+    // Refresh Permissions for this user here.
+    await AccessTokenService.refreshUserAllPermissions(alreadySavedUser.id!);
+
    const host: Hostname = await DatabaseConfig.getHost();
    const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();

--- a/App/FeatureSet/Identity/API/StatusPageAuthentication.ts
+++ b/App/FeatureSet/Identity/API/StatusPageAuthentication.ts
@@ -1,145 +1,35 @@
 import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
-import { StatusPageApiRoute } from "Common/ServiceRoute";
+import { FileRoute } from "Common/ServiceRoute";
 import Hostname from "Common/Types/API/Hostname";
 import Protocol from "Common/Types/API/Protocol";
 import URL from "Common/Types/API/URL";
 import OneUptimeDate from "Common/Types/Date";
 import EmailTemplateType from "Common/Types/Email/EmailTemplateType";
 import BadDataException from "Common/Types/Exception/BadDataException";
-import NotAuthenticatedException from "Common/Types/Exception/NotAuthenticatedException";
 import { JSONObject } from "Common/Types/JSON";
 import JSONFunctions from "Common/Types/JSONFunctions";
 import ObjectID from "Common/Types/ObjectID";
+import PositiveNumber from "Common/Types/PositiveNumber";
 import DatabaseConfig from "Common/Server/DatabaseConfig";
 import { EncryptionSecret } from "Common/Server/EnvironmentConfig";
 import MailService from "Common/Server/Services/MailService";
 import StatusPagePrivateUserService from "Common/Server/Services/StatusPagePrivateUserService";
 import StatusPageService from "Common/Server/Services/StatusPageService";
-import StatusPagePrivateUserSessionService, {
-  SessionMetadata as StatusPageSessionMetadata,
-} from "Common/Server/Services/StatusPagePrivateUserSessionService";
 import CookieUtil from "Common/Server/Utils/Cookie";
-import JSONWebToken from "Common/Server/Utils/JsonWebToken";
 import Express, {
  ExpressRequest,
  ExpressResponse,
  ExpressRouter,
  NextFunction,
-  extractDeviceInfo,
-  getClientIp,
-  headerValueToString,
 } from "Common/Server/Utils/Express";
+import JSONWebToken from "Common/Server/Utils/JsonWebToken";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
 import StatusPage from "Common/Models/DatabaseModels/StatusPage";
 import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser";
-import StatusPagePrivateUserSession from "Common/Models/DatabaseModels/StatusPagePrivateUserSession";
-import { MASTER_PASSWORD_COOKIE_IDENTIFIER } from "Common/Types/StatusPage/MasterPassword";

 const router: ExpressRouter = Express.getRouter();

-const ACCESS_TOKEN_EXPIRY_SECONDS: number = 15 * 60;
-
-type MasterPasswordAuthInput = {
-  req: ExpressRequest;
-  res?: ExpressResponse;
-  statusPageId: ObjectID;
-};
-
-const hasValidMasterPasswordSession: (
-  data: MasterPasswordAuthInput,
-) => boolean = (data: MasterPasswordAuthInput): boolean => {
-  const token: string | undefined = CookieUtil.getCookieFromExpressRequest(
-    data.req,
-    CookieUtil.getStatusPageMasterPasswordKey(data.statusPageId),
-  );
-
-  if (!token) {
-    return false;
-  }
-
-  try {
-    const payload: JSONObject = JSONWebToken.decodeJsonPayload(token);
-
-    return (
-      payload["statusPageId"] === data.statusPageId.toString() &&
-      payload["type"] === MASTER_PASSWORD_COOKIE_IDENTIFIER
-    );
-  } catch (err) {
-    logger.error(err);
-  }
-
-  return false;
-};
-
-const respondWithMasterPasswordAccess: (
-  data: MasterPasswordAuthInput & { res: ExpressResponse },
-) => boolean = (
-  data: MasterPasswordAuthInput & { res: ExpressResponse },
-): boolean => {
-  if (!hasValidMasterPasswordSession(data)) {
-    return false;
-  }
-
-  Response.sendEmptySuccessResponse(data.req, data.res);
-  return true;
-};
-
-type FinalizeStatusPageLoginInput = {
-  req: ExpressRequest;
-  res: ExpressResponse;
-  user: StatusPagePrivateUser;
-};
-
-const finalizeStatusPageLogin: (data: FinalizeStatusPageLoginInput) => Promise<{
-  sessionMetadata: StatusPageSessionMetadata;
-  accessToken: string;
-}> = async (
-  data: FinalizeStatusPageLoginInput,
-): Promise<{
-  sessionMetadata: StatusPageSessionMetadata;
-  accessToken: string;
-}> => {
-  const { req, res, user } = data;
-
-  if (!user.projectId) {
-    throw new BadDataException(
-      "Status page user is missing associated projectId.",
-    );
-  }
-
-  if (!user.statusPageId) {
-    throw new BadDataException(
-      "Status page user is missing associated statusPageId.",
-    );
-  }
-
-  const sessionMetadata: StatusPageSessionMetadata =
-    await StatusPagePrivateUserSessionService.createSession({
-      projectId: user.projectId,
-      statusPageId: user.statusPageId,
-      statusPagePrivateUserId: user.id!,
-      ipAddress: getClientIp(req),
-      userAgent: headerValueToString(req.headers["user-agent"]),
-      ...extractDeviceInfo(req),
-    });
-
-  const accessToken: string = CookieUtil.setStatusPagePrivateUserCookie({
-    expressResponse: res,
-    user,
-    statusPageId: user.statusPageId,
-    sessionId: sessionMetadata.session.id!,
-    refreshToken: sessionMetadata.refreshToken,
-    refreshTokenExpiresAt: sessionMetadata.refreshTokenExpiresAt,
-    accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
-  });
-
-  return {
-    sessionMetadata,
-    accessToken,
-  };
-};
-
 router.post(
  "/logout/:statuspageid",
  async (
@@ -156,21 +46,7 @@ router.post(
        req.params["statuspageid"].toString(),
      );

-      const refreshToken: string | undefined =
-        CookieUtil.getRefreshTokenFromExpressRequest(req, statusPageId);
-
-      if (refreshToken) {
-        await StatusPagePrivateUserSessionService.revokeSessionByRefreshToken(
-          refreshToken,
-          {
-            reason: "User logged out",
-          },
-        );
-      }
-
-      CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
-      CookieUtil.removeCookie(res, CookieUtil.getRefreshTokenKey(statusPageId));
-      CookieUtil.removeStatusPageMasterPasswordCookie(res, statusPageId);
+      CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId)); // remove the cookie.

      return Response.sendEmptySuccessResponse(req, res);
    } catch (err) {
@@ -179,258 +55,6 @@ router.post(
  },
 );

-router.post(
-  "/refresh-token/:statuspageid",
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
-    try {
-      const statusPageIdParam: string | undefined = req.params["statuspageid"];
-
-      if (!statusPageIdParam) {
-        throw new BadDataException("Status Page ID is required.");
-      }
-
-      const statusPageId: ObjectID = new ObjectID(statusPageIdParam.toString());
-
-      const refreshToken: string | undefined =
-        CookieUtil.getRefreshTokenFromExpressRequest(req, statusPageId);
-
-      if (!refreshToken) {
-        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
-        CookieUtil.removeCookie(
-          res,
-          CookieUtil.getRefreshTokenKey(statusPageId),
-        );
-
-        if (
-          respondWithMasterPasswordAccess({
-            req,
-            res,
-            statusPageId,
-          })
-        ) {
-          return;
-        }
-
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException(
-            "Refresh token missing. Please login again.",
-          ),
-        );
-      }
-
-      const session: StatusPagePrivateUserSession | null =
-        await StatusPagePrivateUserSessionService.findActiveSessionByRefreshToken(
-          refreshToken,
-        );
-
-      if (!session || !session.id || !session.statusPageId) {
-        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
-        CookieUtil.removeCookie(
-          res,
-          CookieUtil.getRefreshTokenKey(statusPageId),
-        );
-
-        if (
-          respondWithMasterPasswordAccess({
-            req,
-            res,
-            statusPageId,
-          })
-        ) {
-          return;
-        }
-
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException("Session expired. Please login again."),
-        );
-      }
-
-      if (session.statusPageId.toString() !== statusPageId.toString()) {
-        await StatusPagePrivateUserSessionService.revokeSessionById(
-          session.id,
-          {
-            reason: "Status page mismatch",
-          },
-        );
-
-        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
-        CookieUtil.removeCookie(
-          res,
-          CookieUtil.getRefreshTokenKey(statusPageId),
-        );
-
-        if (
-          respondWithMasterPasswordAccess({
-            req,
-            res,
-            statusPageId,
-          })
-        ) {
-          return;
-        }
-
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException("Session expired. Please login again."),
-        );
-      }
-
-      if (
-        session.refreshTokenExpiresAt &&
-        OneUptimeDate.hasExpired(session.refreshTokenExpiresAt)
-      ) {
-        await StatusPagePrivateUserSessionService.revokeSessionById(
-          session.id,
-          {
-            reason: "Refresh token expired",
-          },
-        );
-
-        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
-        CookieUtil.removeCookie(
-          res,
-          CookieUtil.getRefreshTokenKey(statusPageId),
-        );
-
-        if (
-          respondWithMasterPasswordAccess({
-            req,
-            res,
-            statusPageId,
-          })
-        ) {
-          return;
-        }
-
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException("Session expired. Please login again."),
-        );
-      }
-
-      if (!session.statusPagePrivateUserId) {
-        await StatusPagePrivateUserSessionService.revokeSessionById(
-          session.id,
-          {
-            reason: "Session missing user",
-          },
-        );
-
-        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
-        CookieUtil.removeCookie(
-          res,
-          CookieUtil.getRefreshTokenKey(statusPageId),
-        );
-
-        if (
-          respondWithMasterPasswordAccess({
-            req,
-            res,
-            statusPageId,
-          })
-        ) {
-          return;
-        }
-
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException("Session expired. Please login again."),
-        );
-      }
-
-      const user: StatusPagePrivateUser | null =
-        await StatusPagePrivateUserService.findOneById({
-          id: session.statusPagePrivateUserId,
-          props: {
-            isRoot: true,
-          },
-          select: {
-            _id: true,
-            email: true,
-            statusPageId: true,
-            projectId: true,
-          },
-        });
-
-      if (!user) {
-        await StatusPagePrivateUserSessionService.revokeSessionById(
-          session.id,
-          {
-            reason: "User not found",
-          },
-        );
-
-        CookieUtil.removeCookie(res, CookieUtil.getUserTokenKey(statusPageId));
-        CookieUtil.removeCookie(
-          res,
-          CookieUtil.getRefreshTokenKey(statusPageId),
-        );
-
-        if (
-          respondWithMasterPasswordAccess({
-            req,
-            res,
-            statusPageId,
-          })
-        ) {
-          return;
-        }
-
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new NotAuthenticatedException("Account no longer exists."),
-        );
-      }
-
-      const renewedSession: StatusPageSessionMetadata =
-        await StatusPagePrivateUserSessionService.renewSessionWithNewRefreshToken(
-          {
-            session,
-            ipAddress: getClientIp(req),
-            userAgent: headerValueToString(req.headers["user-agent"]),
-            ...extractDeviceInfo(req),
-          },
-        );
-
-      const accessToken: string = CookieUtil.setStatusPagePrivateUserCookie({
-        expressResponse: res,
-        user,
-        statusPageId: user.statusPageId!,
-        sessionId: renewedSession.session.id!,
-        refreshToken: renewedSession.refreshToken,
-        refreshTokenExpiresAt: renewedSession.refreshTokenExpiresAt,
-        accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
-      });
-
-      return Response.sendEntityResponse(
-        req,
-        res,
-        user,
-        StatusPagePrivateUser,
-        {
-          miscData: {
-            token: accessToken,
-          },
-        },
-      );
-    } catch (err) {
-      return next(err);
-    }
-  },
-);
-
 router.post(
  "/forgot-password",
  async (
@@ -522,8 +146,6 @@ router.post(

        const host: Hostname = await DatabaseConfig.getHost();
        const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
-        const statusPageIdString: string | null =
-          statusPage.id?.toString() || statusPage._id?.toString() || null;

        MailService.sendMail(
          {
@@ -532,13 +154,12 @@ router.post(
            templateType: EmailTemplateType.StatusPageForgotPassword,
            vars: {
              statusPageName: statusPageName!,
-              logoUrl:
-                statusPage.logoFileId && statusPageIdString
-                  ? new URL(httpProtocol, host)
-                      .addRoute(StatusPageApiRoute)
-                      .addRoute(`/logo/${statusPageIdString}`)
-                      .toString()
-                  : "",
+              logoUrl: statusPage.logoFileId
+                ? new URL(httpProtocol, host)
+                    .addRoute(FileRoute)
+                    .addRoute("/image/" + statusPage.logoFileId)
+                    .toString()
+                : "",
              homeURL: statusPageURL,
              tokenVerifyUrl: URL.fromString(statusPageURL)
                .addRoute("/reset-password/" + token)
@@ -667,8 +288,6 @@ router.post(

      const host: Hostname = await DatabaseConfig.getHost();
      const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
-      const statusPageIdString: string | null =
-        statusPage.id?.toString() || statusPage._id?.toString() || null;

      MailService.sendMail(
        {
@@ -678,13 +297,12 @@ router.post(
          vars: {
            homeURL: statusPageURL,
            statusPageName: statusPageName || "",
-            logoUrl:
-              statusPage.logoFileId && statusPageIdString
-                ? new URL(httpProtocol, host)
-                    .addRoute(StatusPageApiRoute)
-                    .addRoute(`/logo/${statusPageIdString}`)
-                    .toString()
-                : "",
+            logoUrl: statusPage.logoFileId
+              ? new URL(httpProtocol, host)
+                  .addRoute(FileRoute)
+                  .addRoute("/image/" + statusPage.logoFileId)
+                  .toString()
+              : "",
          },
        },
        {
@@ -758,7 +376,6 @@ router.post(
            password: true,
            email: true,
            statusPageId: true,
-            projectId: true,
          },
          props: {
            isRoot: true,
@@ -766,38 +383,31 @@ router.post(
        });

      if (alreadySavedUser) {
-        const { accessToken } = await finalizeStatusPageLogin({
-          req,
-          res,
-          user: alreadySavedUser,
+        const token: string = JSONWebToken.sign({
+          data: alreadySavedUser,
+          expiresInSeconds: OneUptimeDate.getSecondsInDays(
+            new PositiveNumber(30),
+          ),
        });

-        const sanitizedUser: StatusPagePrivateUser | null =
-          await StatusPagePrivateUserService.findOneById({
-            id: alreadySavedUser.id!,
-            props: {
-              isRoot: true,
-            },
-            select: {
-              _id: true,
-              email: true,
-              statusPageId: true,
-              projectId: true,
-            },
-          });
-
-        if (!sanitizedUser && (alreadySavedUser as any).password) {
-          delete (alreadySavedUser as any).password;
-        }
+        CookieUtil.setCookie(
+          res,
+          CookieUtil.getUserTokenKey(alreadySavedUser.statusPageId!),
+          token,
+          {
+            httpOnly: true,
+            maxAge: OneUptimeDate.getMillisecondsInDays(new PositiveNumber(30)),
+          },
+        );

        return Response.sendEntityResponse(
          req,
          res,
-          sanitizedUser || alreadySavedUser,
+          alreadySavedUser,
          StatusPagePrivateUser,
          {
            miscData: {
-              token: accessToken,
+              token: token,
            },
          },
        );
--- a/App/FeatureSet/Identity/API/StatusPageSCIM.ts
+++ b/App/FeatureSet/Identity/API/StatusPageSCIM.ts
@@ -4,7 +4,6 @@ import Express, {
  ExpressRequest,
  ExpressResponse,
  ExpressRouter,
-  NextFunction,
  OneUptimeRequest,
 } from "Common/Server/Utils/Express";
 import Response from "Common/Server/Utils/Response";
@@ -20,6 +19,7 @@ import LIMIT_MAX, { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
 import {
  formatUserForSCIM,
  generateServiceProviderConfig,
+  logSCIMOperation,
 } from "../Utils/SCIMUtils";
 import Text from "Common/Types/Text";
 import HashedString from "Common/Types/HashedString";
@@ -30,14 +30,12 @@ const router: ExpressRouter = Express.getRouter();
 router.get(
  "/status-page-scim/v2/:statusPageScimId/ServiceProviderConfig",
  SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
    try {
-      logger.debug(
-        `Status Page SCIM ServiceProviderConfig - scimId: ${req.params["statusPageScimId"]!}`,
+      logSCIMOperation(
+        "ServiceProviderConfig",
+        "status-page",
+        req.params["statusPageScimId"]!,
      );

      const serviceProviderConfig: JSONObject = generateServiceProviderConfig(
@@ -49,7 +47,7 @@ router.get(
      return Response.sendJsonObjectResponse(req, res, serviceProviderConfig);
    } catch (err) {
      logger.error(err);
-      return next(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
    }
  },
 );
@@ -58,11 +56,7 @@ router.get(
 router.get(
  "/status-page-scim/v2/:statusPageScimId/Users",
  SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
    try {
      logger.debug(
        `Status Page SCIM Users list request for statusPageScimId: ${req.params["statusPageScimId"]}`,
@@ -79,54 +73,17 @@ router.get(
        parseInt(req.query["count"] as string) || 100,
        LIMIT_PER_PROJECT,
      );
-      const filter: string = req.query["filter"] as string;

      logger.debug(
-        `Status Page SCIM Users - statusPageId: ${statusPageId}, startIndex: ${startIndex}, count: ${count}, filter: ${filter || "none"}`,
+        `Status Page SCIM Users - statusPageId: ${statusPageId}, startIndex: ${startIndex}, count: ${count}`,
      );

-      // Build query for status page users
-      const query: any = {
-        statusPageId: statusPageId,
-      };
-
-      // Handle SCIM filter for userName
-      if (filter) {
-        const emailMatch: RegExpMatchArray | null = filter.match(
-          /userName eq "([^"]+)"/i,
-        );
-        if (emailMatch) {
-          const email: string = emailMatch[1]!;
-          logger.debug(
-            `Status Page SCIM Users list - statusPageScimId: ${req.params["statusPageScimId"]!}, filter by email: ${email}`,
-          );
-
-          if (email) {
-            if (Email.isValid(email)) {
-              query.email = new Email(email);
-              logger.debug(
-                `Status Page SCIM Users list - statusPageScimId: ${req.params["statusPageScimId"]!}, filtering by email: ${email}`,
-              );
-            } else {
-              logger.debug(
-                `Status Page SCIM Users list - statusPageScimId: ${req.params["statusPageScimId"]!}, invalid email format in filter: ${email}`,
-              );
-              return Response.sendJsonObjectResponse(req, res, {
-                schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"],
-                totalResults: 0,
-                startIndex: startIndex,
-                itemsPerPage: 0,
-                Resources: [],
-              });
-            }
-          }
-        }
-      }
-
      // Get all private users for this status page
      const statusPageUsers: Array<StatusPagePrivateUser> =
        await StatusPagePrivateUserService.findBy({
-          query: query,
+          query: {
+            statusPageId: statusPageId,
+          },
          select: {
            _id: true,
            email: true,
@@ -173,7 +130,7 @@ router.get(
      });
    } catch (err) {
      logger.error(err);
-      return next(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
    }
  },
 );
@@ -182,11 +139,7 @@ router.get(
 router.get(
  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
  SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
    try {
      logger.debug(
        `Status Page SCIM Get individual user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
@@ -244,7 +197,7 @@ router.get(
      return Response.sendJsonObjectResponse(req, res, user);
    } catch (err) {
      logger.error(err);
-      return next(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
    }
  },
 );
@@ -253,11 +206,7 @@ router.get(
 router.post(
  "/status-page-scim/v2/:statusPageScimId/Users",
  SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
    try {
      logger.debug(
        `Status Page SCIM Create user request for statusPageScimId: ${req.params["statusPageScimId"]}`,
@@ -350,129 +299,46 @@ router.post(
      return Response.sendJsonObjectResponse(req, res, createdUser);
    } catch (err) {
      logger.error(err);
-      return next(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
    }
  },
 );

-const handleStatusPageUserUpdate: (
-  req: ExpressRequest,
-  res: ExpressResponse,
-  next: NextFunction,
-) => Promise<void> = async (
-  req: ExpressRequest,
-  res: ExpressResponse,
-  next: NextFunction,
-): Promise<void> => {
-  try {
-    logger.debug(
-      `Status Page SCIM Update user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
-    );
-    const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
-    const bearerData: JSONObject =
-      oneuptimeRequest.bearerTokenData as JSONObject;
-    const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
-    const userId: string = req.params["userId"]!;
-    const scimUser: JSONObject = req.body;
-
-    logger.debug(
-      `Status Page SCIM Update user - statusPageId: ${statusPageId}, userId: ${userId}`,
-    );
-
-    logger.debug(
-      `Request body for Status Page SCIM Update user: ${JSON.stringify(scimUser, null, 2)}`,
-    );
-
-    if (!userId) {
-      throw new BadRequestException("User ID is required");
-    }
-
-    // Check if user exists and belongs to this status page
-    const statusPageUser: StatusPagePrivateUser | null =
-      await StatusPagePrivateUserService.findOneBy({
-        query: {
-          statusPageId: statusPageId,
-          _id: new ObjectID(userId),
-        },
-        select: {
-          _id: true,
-          email: true,
-          createdAt: true,
-          updatedAt: true,
-        },
-        props: { isRoot: true },
-      });
-
-    if (!statusPageUser) {
+// Update Status Page User - PUT /status-page-scim/v2/Users/{id}
+router.put(
+  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
+  SCIMMiddleware.isAuthorizedSCIMRequest,
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
+    try {
      logger.debug(
-        `Status Page SCIM Update user - user not found for userId: ${userId}`,
+        `Status Page SCIM Update user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
      );
-      throw new NotFoundException(
-        "User not found or not part of this status page",
-      );
-    }
+      const oneuptimeRequest: OneUptimeRequest = req as OneUptimeRequest;
+      const bearerData: JSONObject =
+        oneuptimeRequest.bearerTokenData as JSONObject;
+      const statusPageId: ObjectID = bearerData["statusPageId"] as ObjectID;
+      const userId: string = req.params["userId"]!;
+      const scimUser: JSONObject = req.body;

-    // Update user information
-    const email: string =
-      (scimUser["userName"] as string) ||
-      ((scimUser["emails"] as JSONObject[])?.[0]?.["value"] as string);
-    const active: boolean = scimUser["active"] as boolean;
-
-    logger.debug(
-      `Status Page SCIM Update user - email: ${email}, active: ${active}`,
-    );
-
-    // Handle user deactivation by deleting from status page
-    if (active === false) {
      logger.debug(
-        `Status Page SCIM Update user - user marked as inactive, removing from status page`,
+        `Status Page SCIM Update user - statusPageId: ${statusPageId}, userId: ${userId}`,
      );

-      const scimConfig: StatusPageSCIM = bearerData[
-        "scimConfig"
-      ] as StatusPageSCIM;
-      if (scimConfig.autoDeprovisionUsers) {
-        await StatusPagePrivateUserService.deleteOneById({
-          id: new ObjectID(userId),
-          props: { isRoot: true },
-        });
+      logger.debug(
+        `Request body for Status Page SCIM Update user: ${JSON.stringify(scimUser, null, 2)}`,
+      );

-        logger.debug(
-          `Status Page SCIM Update user - user removed from status page`,
-        );
-
-        // Return empty response for deleted user
-        return Response.sendJsonObjectResponse(req, res, {});
+      if (!userId) {
+        throw new BadRequestException("User ID is required");
      }
-    }

-    // Prepare update data
-    const updateData: {
-      email?: Email;
-    } = {};
-
-    if (email && email !== statusPageUser.email?.toString()) {
-      updateData.email = new Email(email);
-    }
-
-    // Only update if there are changes
-    if (Object.keys(updateData).length > 0) {
-      logger.debug(
-        `Status Page SCIM Update user - updating user with data: ${JSON.stringify(updateData)}`,
-      );
-
-      await StatusPagePrivateUserService.updateOneById({
-        id: new ObjectID(userId),
-        data: updateData,
-        props: { isRoot: true },
-      });
-
-      logger.debug(`Status Page SCIM Update user - user updated successfully`);
-
-      // Fetch updated user
-      const updatedUser: StatusPagePrivateUser | null =
-        await StatusPagePrivateUserService.findOneById({
-          id: new ObjectID(userId),
+      // Check if user exists and belongs to this status page
+      const statusPageUser: StatusPagePrivateUser | null =
+        await StatusPagePrivateUserService.findOneBy({
+          query: {
+            statusPageId: statusPageId,
+            _id: new ObjectID(userId),
+          },
          select: {
            _id: true,
            email: true,
@@ -482,59 +348,123 @@ const handleStatusPageUserUpdate: (
          props: { isRoot: true },
        });

-      if (updatedUser) {
-        const user: JSONObject = formatUserForSCIM(
-          updatedUser,
-          req,
-          req.params["statusPageScimId"]!,
-          "status-page",
+      if (!statusPageUser) {
+        logger.debug(
+          `Status Page SCIM Update user - user not found for userId: ${userId}`,
+        );
+        throw new NotFoundException(
+          "User not found or not part of this status page",
        );
-        return Response.sendJsonObjectResponse(req, res, user);
      }
+
+      // Update user information
+      const email: string =
+        (scimUser["userName"] as string) ||
+        ((scimUser["emails"] as JSONObject[])?.[0]?.["value"] as string);
+      const active: boolean = scimUser["active"] as boolean;
+
+      logger.debug(
+        `Status Page SCIM Update user - email: ${email}, active: ${active}`,
+      );
+
+      // Handle user deactivation by deleting from status page
+      if (active === false) {
+        logger.debug(
+          `Status Page SCIM Update user - user marked as inactive, removing from status page`,
+        );
+
+        const scimConfig: StatusPageSCIM = bearerData[
+          "scimConfig"
+        ] as StatusPageSCIM;
+        if (scimConfig.autoDeprovisionUsers) {
+          await StatusPagePrivateUserService.deleteOneById({
+            id: new ObjectID(userId),
+            props: { isRoot: true },
+          });
+
+          logger.debug(
+            `Status Page SCIM Update user - user removed from status page`,
+          );
+
+          // Return empty response for deleted user
+          return Response.sendJsonObjectResponse(req, res, {});
+        }
+      }
+
+      // Prepare update data
+      const updateData: {
+        email?: Email;
+      } = {};
+
+      if (email && email !== statusPageUser.email?.toString()) {
+        updateData.email = new Email(email);
+      }
+
+      // Only update if there are changes
+      if (Object.keys(updateData).length > 0) {
+        logger.debug(
+          `Status Page SCIM Update user - updating user with data: ${JSON.stringify(updateData)}`,
+        );
+
+        await StatusPagePrivateUserService.updateOneById({
+          id: new ObjectID(userId),
+          data: updateData,
+          props: { isRoot: true },
+        });
+
+        logger.debug(
+          `Status Page SCIM Update user - user updated successfully`,
+        );
+
+        // Fetch updated user
+        const updatedUser: StatusPagePrivateUser | null =
+          await StatusPagePrivateUserService.findOneById({
+            id: new ObjectID(userId),
+            select: {
+              _id: true,
+              email: true,
+              createdAt: true,
+              updatedAt: true,
+            },
+            props: { isRoot: true },
+          });
+
+        if (updatedUser) {
+          const user: JSONObject = formatUserForSCIM(
+            updatedUser,
+            req,
+            req.params["statusPageScimId"]!,
+            "status-page",
+          );
+          return Response.sendJsonObjectResponse(req, res, user);
+        }
+      }
+
+      logger.debug(
+        `Status Page SCIM Update user - no updates made, returning existing user`,
+      );
+
+      // If no updates were made, return the existing user
+      const user: JSONObject = formatUserForSCIM(
+        statusPageUser,
+        req,
+        req.params["statusPageScimId"]!,
+        "status-page",
+      );
+
+      return Response.sendJsonObjectResponse(req, res, user);
+    } catch (err) {
+      logger.error(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
    }
-
-    logger.debug(
-      `Status Page SCIM Update user - no updates made, returning existing user`,
-    );
-
-    // If no updates were made, return the existing user
-    const user: JSONObject = formatUserForSCIM(
-      statusPageUser,
-      req,
-      req.params["statusPageScimId"]!,
-      "status-page",
-    );
-
-    return Response.sendJsonObjectResponse(req, res, user);
-  } catch (err) {
-    logger.error(err);
-    return next(err);
-  }
-};
-
-// Update Status Page User - PUT /status-page-scim/v2/Users/{id}
-router.put(
-  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
-  SCIMMiddleware.isAuthorizedSCIMRequest,
-  handleStatusPageUserUpdate,
-);
-
-// Update Status Page User - PATCH /status-page-scim/v2/Users/{id}
-router.patch(
-  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
-  SCIMMiddleware.isAuthorizedSCIMRequest,
-  handleStatusPageUserUpdate,
+  },
 );

 // Delete Status Page User - DELETE /status-page-scim/v2/Users/{id}
 router.delete(
  "/status-page-scim/v2/:statusPageScimId/Users/:userId",
  SCIMMiddleware.isAuthorizedSCIMRequest,
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
    try {
      logger.debug(
        `Status Page SCIM Delete user request for userId: ${req.params["userId"]}, statusPageScimId: ${req.params["statusPageScimId"]}`,
@@ -598,7 +528,7 @@ router.delete(
      return Response.sendEmptySuccessResponse(req, res);
    } catch (err) {
      logger.error(err);
-      return next(err);
+      return Response.sendErrorResponse(req, res, err as BadRequestException);
    }
  },
 );
--- a/App/FeatureSet/Identity/API/StatusPageSSO.ts
+++ b/App/FeatureSet/Identity/API/StatusPageSSO.ts
@@ -1,5 +1,6 @@
 import SSOUtil from "../Utils/SSO";
 import URL from "Common/Types/API/URL";
+import OneUptimeDate from "Common/Types/Date";
 import Email from "Common/Types/Email";
 import BadRequestException from "Common/Types/Exception/BadRequestException";
 import Exception from "Common/Types/Exception/Exception";
@@ -7,11 +8,9 @@ import ServerException from "Common/Types/Exception/ServerException";
 import HashedString from "Common/Types/HashedString";
 import { JSONObject } from "Common/Types/JSON";
 import ObjectID from "Common/Types/ObjectID";
+import PositiveNumber from "Common/Types/PositiveNumber";
 import { Host, HttpProtocol } from "Common/Server/EnvironmentConfig";
 import StatusPagePrivateUserService from "Common/Server/Services/StatusPagePrivateUserService";
-import StatusPagePrivateUserSessionService, {
-  SessionMetadata as StatusPageSessionMetadata,
-} from "Common/Server/Services/StatusPagePrivateUserSessionService";
 import StatusPageService from "Common/Server/Services/StatusPageService";
 import StatusPageSsoService from "Common/Server/Services/StatusPageSsoService";
 import CookieUtil from "Common/Server/Utils/Cookie";
@@ -20,10 +19,8 @@ import Express, {
  ExpressResponse,
  ExpressRouter,
  NextFunction,
-  extractDeviceInfo,
-  getClientIp,
-  headerValueToString,
 } from "Common/Server/Utils/Express";
+import JSONWebToken from "Common/Server/Utils/JsonWebToken";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
 import StatusPagePrivateUser from "Common/Models/DatabaseModels/StatusPagePrivateUser";
@@ -33,8 +30,6 @@ import xml2js from "xml2js";
 // Initialize Express router.
 const router: ExpressRouter = Express.getRouter();

-const ACCESS_TOKEN_EXPIRY_SECONDS: number = 15 * 60;
-
 // Define a GET route for SSO in a status page context.
 router.get(
  "/status-page-sso/:statusPageId/:statusPageSsoId",
@@ -120,11 +115,7 @@ router.get(

 router.post(
  "/status-page-idp-login/:statusPageId/:statusPageSsoId",
-  async (
-    req: ExpressRequest,
-    res: ExpressResponse,
-    next: NextFunction,
-  ): Promise<void> => {
+  async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
    try {
      const samlResponseBase64: string = req.body.SAMLResponse;

@@ -290,30 +281,24 @@ router.post(
        });
      }

-      if (!alreadySavedUser.projectId) {
-        alreadySavedUser.projectId = projectId;
-      }
-
-      const sessionMetadata: StatusPageSessionMetadata =
-        await StatusPagePrivateUserSessionService.createSession({
-          projectId: alreadySavedUser.projectId!,
-          statusPageId: statusPageId,
-          statusPagePrivateUserId: alreadySavedUser.id!,
-          ipAddress: getClientIp(req),
-          userAgent: headerValueToString(req.headers["user-agent"]),
-          ...extractDeviceInfo(req),
-        });
-
-      const token: string = CookieUtil.setStatusPagePrivateUserCookie({
-        expressResponse: res,
-        user: alreadySavedUser,
-        statusPageId: statusPageId,
-        sessionId: sessionMetadata.session.id!,
-        refreshToken: sessionMetadata.refreshToken,
-        refreshTokenExpiresAt: sessionMetadata.refreshTokenExpiresAt,
-        accessTokenExpiresInSeconds: ACCESS_TOKEN_EXPIRY_SECONDS,
+      const token: string = JSONWebToken.sign({
+        data: alreadySavedUser,
+        expiresInSeconds: OneUptimeDate.getSecondsInDays(
+          new PositiveNumber(30),
+        ),
      });

+      CookieUtil.setCookie(
+        res,
+        CookieUtil.getUserTokenKey(alreadySavedUser.statusPageId!),
+        token,
+
+        {
+          httpOnly: true,
+          maxAge: OneUptimeDate.getMillisecondsInDays(new PositiveNumber(30)),
+        },
+      );
+
      // get status page URL.
      const statusPageURL: string =
        await StatusPageService.getStatusPageFirstURL(statusPageId);
@@ -327,11 +312,7 @@ router.post(
      );
    } catch (err) {
      logger.error(err);
-      if (err instanceof Exception) {
-        return next(err);
-      }
-
-      return next(new ServerException());
+      Response.sendErrorResponse(req, res, new ServerException());
    }
  },
 );
--- a/App/FeatureSet/Identity/Utils/AuthenticationEmail.ts
+++ b/App/FeatureSet/Identity/Utils/AuthenticationEmail.ts
@@ -35,8 +35,6 @@ export default class AuthenticationEmail {
    const host: Hostname = await DatabaseConfig.getHost();
    const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();

-    logger.debug("Sending verification email");
-
    MailService.sendMail({
      toEmail: user.email!,
      subject: "Please verify email.",
@@ -52,13 +50,8 @@ export default class AuthenticationEmail {
        ).toString(),
        homeUrl: new URL(httpProtocol, host).toString(),
      },
-    })
-      .then(() => {
-        logger.debug("Verification email sent");
-      })
-      .catch((err: Error) => {
-        logger.debug("Error sending verification email");
-        logger.error(err);
-      });
+    }).catch((err: Error) => {
+      logger.error(err);
+    });
  }
 }
--- a/App/FeatureSet/Identity/Utils/SCIMUtils.ts
+++ b/App/FeatureSet/Identity/Utils/SCIMUtils.ts
@@ -227,27 +227,6 @@ export const generateUsersListResponse: (
  };
 };

-/**
- * Generate SCIM ListResponse for groups
- */
-export const generateGroupsListResponse: (
-  groups: JSONObject[],
-  startIndex: number,
-  totalResults: number,
-) => JSONObject = (
-  groups: JSONObject[],
-  startIndex: number,
-  totalResults: number,
-): JSONObject => {
-  return {
-    schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"],
-    totalResults: totalResults,
-    startIndex: startIndex,
-    itemsPerPage: groups.length,
-    Resources: groups,
-  };
-};
-
 /**
 * Parse query parameters for SCIM list requests
 */
@@ -263,3 +242,23 @@ export const parseSCIMQueryParams: (req: ExpressRequest) => {

  return { startIndex, count };
 };
+
+/**
+ * Log SCIM operation with consistent format
+ */
+export const logSCIMOperation: (
+  operation: string,
+  scimType: "project" | "status-page",
+  scimId: string,
+  details?: string,
+) => void = (
+  operation: string,
+  scimType: "project" | "status-page",
+  scimId: string,
+  details?: string,
+): void => {
+  const logPrefix: string =
+    scimType === "project" ? "Project SCIM" : "Status Page SCIM";
+  const message: string = `${logPrefix} ${operation} - scimId: ${scimId}${details ? `, ${details}` : ""}`;
+  logger.debug(message);
+};
--- a/App/FeatureSet/Identity/Utils/SSO.ts
+++ b/App/FeatureSet/Identity/Utils/SSO.ts
@@ -184,17 +184,15 @@ export default class SSOUtil {
      return null;
    }

-    /*
-     * get displayName attribute.
-     *   {
-     *     "$": {
-     *         "Name": "http://schemas.microsoft.com/identity/claims/displayname"
-     *     },
-     *     "AttributeValue": [
-     *         "Nawaz Dhandala"
-     *     ]
-     * },
-     */
+    // get displayName attribute.
+    //   {
+    //     "$": {
+    //         "Name": "http://schemas.microsoft.com/identity/claims/displayname"
+    //     },
+    //     "AttributeValue": [
+    //         "Nawaz Dhandala"
+    //     ]
+    // },

    for (let i: number = 0; i < samlAttribute.length; i++) {
      const attribute: JSONObject = samlAttribute[i] as JSONObject;
--- a/App/FeatureSet/Identity/Views/Partials/Head.ejs
+++ b/App/FeatureSet/Identity/Views/Partials/Head.ejs
@@ -67,6 +67,7 @@
 <link rel="apple-touch-icon-precomposed" href="/img/ou-wb.svg">
 <link rel="icon" href="/img/ou-wb.svg">
 <link rel="image_src" type="image/png" href="/img/hou-wb.svg">
+<link rel="canonical" href="/">
 <link rel="manifest" href="/manifest.json">
 <meta property="og:title" content="OneUptime - One Complete Observability platform.">
 <meta property="og:url" content="https://oneuptime.com">
--- a/App/FeatureSet/Notification/API/Call.ts
+++ b/App/FeatureSet/Notification/API/Call.ts
@@ -12,7 +12,6 @@ import Express, {
  ExpressRequest,
  ExpressResponse,
  ExpressRouter,
-  NextFunction,
 } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
@@ -23,146 +22,139 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
  "/make-call",
  ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    try {
-      const body: JSONObject = JSONFunctions.deserialize(req.body);
+  async (req: ExpressRequest, res: ExpressResponse) => {
+    const body: JSONObject = JSONFunctions.deserialize(req.body);

-      await CallService.makeCall(body["callRequest"] as CallRequest, {
-        projectId: body["projectId"] as ObjectID,
-        isSensitive: (body["isSensitive"] as boolean) || false,
-        userOnCallLogTimelineId:
-          (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
-        customTwilioConfig: body["customTwilioConfig"] as any,
-        incidentId: (body["incidentId"] as ObjectID) || undefined,
-        alertId: (body["alertId"] as ObjectID) || undefined,
-        scheduledMaintenanceId:
-          (body["scheduledMaintenanceId"] as ObjectID) || undefined,
-        statusPageId: (body["statusPageId"] as ObjectID) || undefined,
-        statusPageAnnouncementId:
-          (body["statusPageAnnouncementId"] as ObjectID) || undefined,
-        userId: (body["userId"] as ObjectID) || undefined,
-        onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
-        onCallPolicyEscalationRuleId:
-          (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
-        onCallDutyPolicyExecutionLogTimelineId:
-          (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
-          undefined,
-        onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
-        teamId: (body["teamId"] as ObjectID) || undefined,
-      });
+    await CallService.makeCall(body["callRequest"] as CallRequest, {
+      projectId: body["projectId"] as ObjectID,
+      isSensitive: (body["isSensitive"] as boolean) || false,
+      userOnCallLogTimelineId:
+        (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+      customTwilioConfig: body["customTwilioConfig"] as any,
+      incidentId: (body["incidentId"] as ObjectID) || undefined,
+      alertId: (body["alertId"] as ObjectID) || undefined,
+      scheduledMaintenanceId:
+        (body["scheduledMaintenanceId"] as ObjectID) || undefined,
+      statusPageId: (body["statusPageId"] as ObjectID) || undefined,
+      statusPageAnnouncementId:
+        (body["statusPageAnnouncementId"] as ObjectID) || undefined,
+      userId: (body["userId"] as ObjectID) || undefined,
+      onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
+      onCallPolicyEscalationRuleId:
+        (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
+      onCallDutyPolicyExecutionLogTimelineId:
+        (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
+        undefined,
+      onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
+      teamId: (body["teamId"] as ObjectID) || undefined,
+    });

-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
-    }
+    return Response.sendEmptySuccessResponse(req, res);
  },
 );

-router.post(
-  "/test",
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    try {
-      const body: JSONObject = req.body;
+router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
+  const body: JSONObject = req.body;

-      const callSMSConfigId: ObjectID = new ObjectID(
-        body["callSMSConfigId"] as string,
-      );
+  const callSMSConfigId: ObjectID = new ObjectID(
+    body["callSMSConfigId"] as string,
+  );

-      const config: ProjectCallSMSConfig | null =
-        await ProjectCallSMSConfigService.findOneById({
-          id: callSMSConfigId,
-          props: {
-            isRoot: true,
-          },
-          select: {
-            _id: true,
-            twilioAccountSID: true,
-            twilioAuthToken: true,
-            twilioPrimaryPhoneNumber: true,
-            twilioSecondaryPhoneNumbers: true,
-            projectId: true,
-          },
-        });
+  const config: ProjectCallSMSConfig | null =
+    await ProjectCallSMSConfigService.findOneById({
+      id: callSMSConfigId,
+      props: {
+        isRoot: true,
+      },
+      select: {
+        _id: true,
+        twilioAccountSID: true,
+        twilioAuthToken: true,
+        twilioPrimaryPhoneNumber: true,
+        twilioSecondaryPhoneNumbers: true,
+        projectId: true,
+      },
+    });

-      if (!config) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException(
-            "call and sms config not found for id" + callSMSConfigId.toString(),
-          ),
-        );
-      }
+  if (!config) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException(
+        "call and sms config not found for id" + callSMSConfigId.toString(),
+      ),
+    );
+  }

-      const toPhone: Phone = new Phone(body["toPhone"] as string);
+  const toPhone: Phone = new Phone(body["toPhone"] as string);

-      if (!toPhone) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException("toPhone is required"),
-        );
-      }
+  if (!toPhone) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException("toPhone is required"),
+    );
+  }

-      // if any of the twilio config is missing, we will not send make the call
+  // if any of the twilio config is missing, we will not send make the call

-      if (!config.twilioAccountSID) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException("twilioAccountSID is required"),
-        );
-      }
+  if (!config.twilioAccountSID) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException("twilioAccountSID is required"),
+    );
+  }

-      if (!config.twilioAuthToken) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException("twilioAuthToken is required"),
-        );
-      }
+  if (!config.twilioAuthToken) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException("twilioAuthToken is required"),
+    );
+  }

-      if (!config.twilioPrimaryPhoneNumber) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException("twilioPrimaryPhoneNumber is required"),
-        );
-      }
+  if (!config.twilioPrimaryPhoneNumber) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException("twilioPrimaryPhoneNumber is required"),
+    );
+  }

-      const twilioConfig: TwilioConfig | undefined =
-        ProjectCallSMSConfigService.toTwilioConfig(config);
+  const twilioConfig: TwilioConfig | undefined =
+    ProjectCallSMSConfigService.toTwilioConfig(config);

-      try {
-        if (!twilioConfig) {
-          throw new BadDataException("twilioConfig is undefined");
-        }
-
-        const testCallRequest: CallRequest = {
-          data: [
-            {
-              sayMessage: "This is a test call from OneUptime.",
-            },
-          ],
-          to: toPhone,
-        };
-
-        await CallService.makeCall(testCallRequest, {
-          projectId: config.projectId,
-          customTwilioConfig: twilioConfig,
-        });
-      } catch (err) {
-        logger.error(err);
-        throw new BadDataException(
-          "Error making test call. Please check the twilio logs for more details",
-        );
-      }
-
-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
+  try {
+    if (!twilioConfig) {
+      throw new BadDataException("twilioConfig is undefined");
    }
-  },
-);
+
+    const testCallRequest: CallRequest = {
+      data: [
+        {
+          sayMessage: "This is a test call from OneUptime.",
+        },
+      ],
+      to: toPhone,
+    };
+
+    await CallService.makeCall(testCallRequest, {
+      projectId: config.projectId,
+      customTwilioConfig: twilioConfig,
+    });
+  } catch (err) {
+    logger.error(err);
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException(
+        "Error making test call. Please check the twilio logs for more details",
+      ),
+    );
+  }
+
+  return Response.sendEmptySuccessResponse(req, res);
+});

 export default router;
--- a/App/FeatureSet/Notification/API/Mail.ts
+++ b/App/FeatureSet/Notification/API/Mail.ts
@@ -11,7 +11,6 @@ import Express, {
  ExpressRequest,
  ExpressResponse,
  ExpressRouter,
-  NextFunction,
 } from "Common/Server/Utils/Express";
 import Response from "Common/Server/Utils/Response";

@@ -20,74 +19,70 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
  "/send",
  ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    try {
-      const body: JSONObject = req.body;
+  async (req: ExpressRequest, res: ExpressResponse) => {
+    const body: JSONObject = req.body;

-      const mail: EmailMessage = {
-        templateType: body["templateType"] as EmailTemplateType,
-        toEmail: new Email(body["toEmail"] as string),
-        subject: body["subject"] as string,
-        vars: body["vars"] as Dictionary<string>,
-        body: (body["body"] as string) || "",
-      };
+    const mail: EmailMessage = {
+      templateType: body["templateType"] as EmailTemplateType,
+      toEmail: new Email(body["toEmail"] as string),
+      subject: body["subject"] as string,
+      vars: body["vars"] as Dictionary<string>,
+      body: (body["body"] as string) || "",
+    };

-      let mailServer: EmailServer | undefined = undefined;
+    let mailServer: EmailServer | undefined = undefined;

-      if (hasMailServerSettingsInBody(body)) {
-        mailServer = MailService.getEmailServer(req.body);
-      }
-
-      await MailService.send(mail, {
-        projectId: body["projectId"]
-          ? new ObjectID(body["projectId"] as string)
-          : undefined,
-        emailServer: mailServer,
-        userOnCallLogTimelineId:
-          (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
-        incidentId: body["incidentId"]
-          ? new ObjectID(body["incidentId"].toString())
-          : undefined,
-        alertId: body["alertId"]
-          ? new ObjectID(body["alertId"].toString())
-          : undefined,
-        scheduledMaintenanceId: body["scheduledMaintenanceId"]
-          ? new ObjectID(body["scheduledMaintenanceId"].toString())
-          : undefined,
-        statusPageId: body["statusPageId"]
-          ? new ObjectID(body["statusPageId"].toString())
-          : undefined,
-        statusPageAnnouncementId: body["statusPageAnnouncementId"]
-          ? new ObjectID(body["statusPageAnnouncementId"].toString())
-          : undefined,
-        userId: body["userId"]
-          ? new ObjectID(body["userId"].toString())
-          : undefined,
-        onCallPolicyId: body["onCallPolicyId"]
-          ? new ObjectID(body["onCallPolicyId"].toString())
-          : undefined,
-        onCallPolicyEscalationRuleId: body["onCallPolicyEscalationRuleId"]
-          ? new ObjectID(body["onCallPolicyEscalationRuleId"].toString())
-          : undefined,
-        onCallDutyPolicyExecutionLogTimelineId: body[
-          "onCallDutyPolicyExecutionLogTimelineId"
-        ]
-          ? new ObjectID(
-              body["onCallDutyPolicyExecutionLogTimelineId"].toString(),
-            )
-          : undefined,
-        onCallScheduleId: body["onCallScheduleId"]
-          ? new ObjectID(body["onCallScheduleId"].toString())
-          : undefined,
-        teamId: body["teamId"]
-          ? new ObjectID(body["teamId"].toString())
-          : undefined,
-      });
-
-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
+    if (hasMailServerSettingsInBody(body)) {
+      mailServer = MailService.getEmailServer(req.body);
    }
+
+    await MailService.send(mail, {
+      projectId: body["projectId"]
+        ? new ObjectID(body["projectId"] as string)
+        : undefined,
+      emailServer: mailServer,
+      userOnCallLogTimelineId:
+        (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+      incidentId: body["incidentId"]
+        ? new ObjectID(body["incidentId"].toString())
+        : undefined,
+      alertId: body["alertId"]
+        ? new ObjectID(body["alertId"].toString())
+        : undefined,
+      scheduledMaintenanceId: body["scheduledMaintenanceId"]
+        ? new ObjectID(body["scheduledMaintenanceId"].toString())
+        : undefined,
+      statusPageId: body["statusPageId"]
+        ? new ObjectID(body["statusPageId"].toString())
+        : undefined,
+      statusPageAnnouncementId: body["statusPageAnnouncementId"]
+        ? new ObjectID(body["statusPageAnnouncementId"].toString())
+        : undefined,
+      userId: body["userId"]
+        ? new ObjectID(body["userId"].toString())
+        : undefined,
+      onCallPolicyId: body["onCallPolicyId"]
+        ? new ObjectID(body["onCallPolicyId"].toString())
+        : undefined,
+      onCallPolicyEscalationRuleId: body["onCallPolicyEscalationRuleId"]
+        ? new ObjectID(body["onCallPolicyEscalationRuleId"].toString())
+        : undefined,
+      onCallDutyPolicyExecutionLogTimelineId: body[
+        "onCallDutyPolicyExecutionLogTimelineId"
+      ]
+        ? new ObjectID(
+            body["onCallDutyPolicyExecutionLogTimelineId"].toString(),
+          )
+        : undefined,
+      onCallScheduleId: body["onCallScheduleId"]
+        ? new ObjectID(body["onCallScheduleId"].toString())
+        : undefined,
+      teamId: body["teamId"]
+        ? new ObjectID(body["teamId"].toString())
+        : undefined,
+    });
+
+    return Response.sendEmptySuccessResponse(req, res);
  },
 );

--- a/App/FeatureSet/Notification/API/PushNotification.ts
+++ b/App/FeatureSet/Notification/API/PushNotification.ts
@@ -5,7 +5,6 @@ import Express, {
  ExpressRequest,
  ExpressResponse,
  ExpressRouter,
-  NextFunction,
 } from "Common/Server/Utils/Express";
 import Response from "Common/Server/Utils/Response";
 import { JSONObject } from "Common/Types/JSON";
@@ -16,54 +15,50 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
  "/send",
  ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    try {
-      const body: JSONObject = JSONFunctions.deserialize(req.body);
+  async (req: ExpressRequest, res: ExpressResponse) => {
+    const body: JSONObject = JSONFunctions.deserialize(req.body);

-      // Support both new devices format and legacy deviceTokens/deviceNames format
-      let devices: Array<{ token: string; name?: string }> = [];
+    // Support both new devices format and legacy deviceTokens/deviceNames format
+    let devices: Array<{ token: string; name?: string }> = [];

-      if (body["devices"]) {
-        // New format: devices as array of objects
-        devices = body["devices"] as Array<{ token: string; name?: string }>;
-      } else {
-        throw new Error("Invalid request format: 'devices' array is required.");
-      }
-
-      await PushService.send(
-        {
-          devices,
-          deviceType: (body["deviceType"] as any) || "web",
-          message: body["message"] as any,
-        },
-        {
-          projectId: (body["projectId"] as ObjectID) || undefined,
-          isSensitive: (body["isSensitive"] as boolean) || false,
-          userOnCallLogTimelineId:
-            (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
-          incidentId: (body["incidentId"] as ObjectID) || undefined,
-          alertId: (body["alertId"] as ObjectID) || undefined,
-          scheduledMaintenanceId:
-            (body["scheduledMaintenanceId"] as ObjectID) || undefined,
-          statusPageId: (body["statusPageId"] as ObjectID) || undefined,
-          statusPageAnnouncementId:
-            (body["statusPageAnnouncementId"] as ObjectID) || undefined,
-          userId: (body["userId"] as ObjectID) || undefined,
-          onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
-          onCallPolicyEscalationRuleId:
-            (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
-          onCallDutyPolicyExecutionLogTimelineId:
-            (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
-            undefined,
-          onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
-          teamId: (body["teamId"] as ObjectID) || undefined,
-        },
-      );
-
-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
+    if (body["devices"]) {
+      // New format: devices as array of objects
+      devices = body["devices"] as Array<{ token: string; name?: string }>;
+    } else {
+      throw new Error("Invalid request format: 'devices' array is required.");
    }
+
+    await PushService.send(
+      {
+        devices,
+        deviceType: (body["deviceType"] as any) || "web",
+        message: body["message"] as any,
+      },
+      {
+        projectId: (body["projectId"] as ObjectID) || undefined,
+        isSensitive: (body["isSensitive"] as boolean) || false,
+        userOnCallLogTimelineId:
+          (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+        incidentId: (body["incidentId"] as ObjectID) || undefined,
+        alertId: (body["alertId"] as ObjectID) || undefined,
+        scheduledMaintenanceId:
+          (body["scheduledMaintenanceId"] as ObjectID) || undefined,
+        statusPageId: (body["statusPageId"] as ObjectID) || undefined,
+        statusPageAnnouncementId:
+          (body["statusPageAnnouncementId"] as ObjectID) || undefined,
+        userId: (body["userId"] as ObjectID) || undefined,
+        onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
+        onCallPolicyEscalationRuleId:
+          (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
+        onCallDutyPolicyExecutionLogTimelineId:
+          (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
+          undefined,
+        onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
+        teamId: (body["teamId"] as ObjectID) || undefined,
+      },
+    );
+
+    return Response.sendEmptySuccessResponse(req, res);
  },
 );

--- a/App/FeatureSet/Notification/API/SMS.ts
+++ b/App/FeatureSet/Notification/API/SMS.ts
@@ -11,7 +11,6 @@ import Express, {
  ExpressRequest,
  ExpressResponse,
  ExpressRouter,
-  NextFunction,
 } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
@@ -22,141 +21,130 @@ const router: ExpressRouter = Express.getRouter();
 router.post(
  "/send",
  ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    try {
-      const body: JSONObject = JSONFunctions.deserialize(req.body);
+  async (req: ExpressRequest, res: ExpressResponse) => {
+    const body: JSONObject = JSONFunctions.deserialize(req.body);

-      await SmsService.sendSms(body["to"] as Phone, body["message"] as string, {
-        projectId: body["projectId"] as ObjectID,
-        isSensitive: (body["isSensitive"] as boolean) || false,
-        userOnCallLogTimelineId:
-          (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
-        customTwilioConfig: body["customTwilioConfig"] as any,
-        incidentId: (body["incidentId"] as ObjectID) || undefined,
-        alertId: (body["alertId"] as ObjectID) || undefined,
-        scheduledMaintenanceId:
-          (body["scheduledMaintenanceId"] as ObjectID) || undefined,
-        statusPageId: (body["statusPageId"] as ObjectID) || undefined,
-        statusPageAnnouncementId:
-          (body["statusPageAnnouncementId"] as ObjectID) || undefined,
-        userId: (body["userId"] as ObjectID) || undefined,
-        onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
-        onCallPolicyEscalationRuleId:
-          (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
-        onCallDutyPolicyExecutionLogTimelineId:
-          (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
-          undefined,
-        onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
-        teamId: (body["teamId"] as ObjectID) || undefined,
-      });
+    await SmsService.sendSms(body["to"] as Phone, body["message"] as string, {
+      projectId: body["projectId"] as ObjectID,
+      isSensitive: (body["isSensitive"] as boolean) || false,
+      userOnCallLogTimelineId:
+        (body["userOnCallLogTimelineId"] as ObjectID) || undefined,
+      customTwilioConfig: body["customTwilioConfig"] as any,
+      incidentId: (body["incidentId"] as ObjectID) || undefined,
+      alertId: (body["alertId"] as ObjectID) || undefined,
+      scheduledMaintenanceId:
+        (body["scheduledMaintenanceId"] as ObjectID) || undefined,
+      statusPageId: (body["statusPageId"] as ObjectID) || undefined,
+      statusPageAnnouncementId:
+        (body["statusPageAnnouncementId"] as ObjectID) || undefined,
+      userId: (body["userId"] as ObjectID) || undefined,
+      onCallPolicyId: (body["onCallPolicyId"] as ObjectID) || undefined,
+      onCallPolicyEscalationRuleId:
+        (body["onCallPolicyEscalationRuleId"] as ObjectID) || undefined,
+      onCallDutyPolicyExecutionLogTimelineId:
+        (body["onCallDutyPolicyExecutionLogTimelineId"] as ObjectID) ||
+        undefined,
+      onCallScheduleId: (body["onCallScheduleId"] as ObjectID) || undefined,
+      teamId: (body["teamId"] as ObjectID) || undefined,
+    });

-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
-    }
+    return Response.sendEmptySuccessResponse(req, res);
  },
 );

-router.post(
-  "/test",
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    try {
-      const body: JSONObject = req.body;
+router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
+  const body: JSONObject = req.body;

-      const callSMSConfigId: ObjectID = new ObjectID(
-        body["callSMSConfigId"] as string,
-      );
+  const callSMSConfigId: ObjectID = new ObjectID(
+    body["callSMSConfigId"] as string,
+  );

-      const config: ProjectCallSMSConfig | null =
-        await ProjectCallSMSConfigService.findOneById({
-          id: callSMSConfigId,
-          props: {
-            isRoot: true,
-          },
-          select: {
-            _id: true,
-            twilioAccountSID: true,
-            twilioAuthToken: true,
-            twilioPrimaryPhoneNumber: true,
-            twilioSecondaryPhoneNumbers: true,
-            projectId: true,
-          },
-        });
+  const config: ProjectCallSMSConfig | null =
+    await ProjectCallSMSConfigService.findOneById({
+      id: callSMSConfigId,
+      props: {
+        isRoot: true,
+      },
+      select: {
+        _id: true,
+        twilioAccountSID: true,
+        twilioAuthToken: true,
+        twilioPrimaryPhoneNumber: true,
+        twilioSecondaryPhoneNumbers: true,
+        projectId: true,
+      },
+    });

-      if (!config) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException(
-            "call and sms config not found for id" + callSMSConfigId.toString(),
-          ),
-        );
-      }
+  if (!config) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException(
+        "call and sms config not found for id" + callSMSConfigId.toString(),
+      ),
+    );
+  }

-      const toPhone: Phone = new Phone(body["toPhone"] as string);
+  const toPhone: Phone = new Phone(body["toPhone"] as string);

-      if (!toPhone) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException("toPhone is required"),
-        );
-      }
+  if (!toPhone) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException("toPhone is required"),
+    );
+  }

-      // if any of the twilio config is missing, we will not send make the call
+  // if any of the twilio config is missing, we will not send make the call

-      if (!config.twilioAccountSID) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException("twilioAccountSID is required"),
-        );
-      }
+  if (!config.twilioAccountSID) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException("twilioAccountSID is required"),
+    );
+  }

-      if (!config.twilioAuthToken) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException("twilioAuthToken is required"),
-        );
-      }
+  if (!config.twilioAuthToken) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException("twilioAuthToken is required"),
+    );
+  }

-      if (!config.twilioPrimaryPhoneNumber) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException("twilioPrimaryPhoneNumber is required"),
-        );
-      }
+  if (!config.twilioPrimaryPhoneNumber) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException("twilioPrimaryPhoneNumber is required"),
+    );
+  }

-      const twilioConfig: TwilioConfig | undefined =
-        ProjectCallSMSConfigService.toTwilioConfig(config);
+  const twilioConfig: TwilioConfig | undefined =
+    ProjectCallSMSConfigService.toTwilioConfig(config);

-      try {
-        if (!twilioConfig) {
-          throw new BadDataException("twilioConfig is undefined");
-        }
-
-        await SmsService.sendSms(
-          toPhone,
-          "This is a test SMS from OneUptime.",
-          {
-            projectId: config.projectId,
-            customTwilioConfig: twilioConfig,
-          },
-        );
-      } catch (err) {
-        logger.error(err);
-        throw new BadDataException(
-          "Failed to send test SMS. Please check the twilio logs for more details.",
-        );
-      }
-
-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
+  try {
+    if (!twilioConfig) {
+      throw new BadDataException("twilioConfig is undefined");
    }
-  },
-);
+
+    await SmsService.sendSms(toPhone, "This is a test SMS from OneUptime.", {
+      projectId: config.projectId,
+      customTwilioConfig: twilioConfig,
+    });
+  } catch (err) {
+    logger.error(err);
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException(
+        "Failed to send test SMS. Please check the twilio logs for more details.",
+      ),
+    );
+  }
+
+  return Response.sendEmptySuccessResponse(req, res);
+});

 export default router;
--- a/App/FeatureSet/Notification/API/SMTPConfig.ts
+++ b/App/FeatureSet/Notification/API/SMTPConfig.ts
@@ -11,7 +11,6 @@ import Express, {
  ExpressRequest,
  ExpressResponse,
  ExpressRouter,
-  NextFunction,
 } from "Common/Server/Utils/Express";
 import logger from "Common/Server/Utils/Logger";
 import Response from "Common/Server/Utils/Response";
@@ -19,92 +18,87 @@ import ProjectSmtpConfig from "Common/Models/DatabaseModels/ProjectSmtpConfig";

 const router: ExpressRouter = Express.getRouter();

-router.post(
-  "/test",
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    try {
-      const body: JSONObject = req.body;
+router.post("/test", async (req: ExpressRequest, res: ExpressResponse) => {
+  const body: JSONObject = req.body;

-      const smtpConfigId: ObjectID = new ObjectID(
-        body["smtpConfigId"] as string,
-      );
+  const smtpConfigId: ObjectID = new ObjectID(body["smtpConfigId"] as string);

-      const config: ProjectSmtpConfig | null =
-        await ProjectSMTPConfigService.findOneById({
-          id: smtpConfigId,
-          props: {
-            isRoot: true,
-          },
-          select: {
-            _id: true,
-            hostname: true,
-            port: true,
-            username: true,
-            password: true,
-            fromEmail: true,
-            fromName: true,
-            secure: true,
-            projectId: true,
-          },
-        });
+  const config: ProjectSmtpConfig | null =
+    await ProjectSMTPConfigService.findOneById({
+      id: smtpConfigId,
+      props: {
+        isRoot: true,
+      },
+      select: {
+        _id: true,
+        hostname: true,
+        port: true,
+        username: true,
+        password: true,
+        fromEmail: true,
+        fromName: true,
+        secure: true,
+        projectId: true,
+      },
+    });

-      if (!config) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException(
-            "smtp-config not found for id" + smtpConfigId.toString(),
-          ),
-        );
-      }
+  if (!config) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException(
+        "smtp-config not found for id" + smtpConfigId.toString(),
+      ),
+    );
+  }

-      const toEmail: Email = new Email(body["toEmail"] as string);
+  const toEmail: Email = new Email(body["toEmail"] as string);

-      if (!toEmail) {
-        return Response.sendErrorResponse(
-          req,
-          res,
-          new BadDataException("toEmail is required"),
-        );
-      }
+  if (!toEmail) {
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException("toEmail is required"),
+    );
+  }

-      const mail: EmailMessage = {
-        templateType: EmailTemplateType.SMTPTest,
-        toEmail: new Email(body["toEmail"] as string),
-        subject: "Test Email from OneUptime",
-        vars: {},
-        body: "",
-      };
+  const mail: EmailMessage = {
+    templateType: EmailTemplateType.SMTPTest,
+    toEmail: new Email(body["toEmail"] as string),
+    subject: "Test Email from OneUptime",
+    vars: {},
+    body: "",
+  };

-      const mailServer: EmailServer = {
-        id: config.id!,
-        host: config.hostname!,
-        port: config.port!,
-        username: config.username!,
-        password: config.password!,
-        fromEmail: config.fromEmail!,
-        fromName: config.fromName!,
-        secure: Boolean(config.secure),
-      };
+  const mailServer: EmailServer = {
+    id: config.id!,
+    host: config.hostname!,
+    port: config.port!,
+    username: config.username!,
+    password: config.password!,
+    fromEmail: config.fromEmail!,
+    fromName: config.fromName!,
+    secure: Boolean(config.secure),
+  };

-      try {
-        await MailService.send(mail, {
-          emailServer: mailServer,
-          projectId: config.projectId!,
-          timeout: 4000,
-        });
-      } catch (err) {
-        logger.error(err);
-        throw new BadDataException(
-          "Cannot send email. Please check your SMTP config. If you are using Google or Gmail, please dont since it does not support machine access to their mail servers. If you are still having issues, please uncheck SSL/TLS toggle and try again. We recommend using SendGrid or Mailgun or any large volume mail provider for SMTP.",
-        );
-      }
+  try {
+    await MailService.send(mail, {
+      emailServer: mailServer,
+      projectId: config.projectId!,
+      timeout: 4000,
+    });
+  } catch (err) {
+    logger.error(err);
+    return Response.sendErrorResponse(
+      req,
+      res,
+      new BadDataException(
+        "Cannot send email. Please check your SMTP config. If you are using Google or Gmail, please dont since it does not support machine access to their mail servers. If you are still having issues, please uncheck SSL/TLS toggle and try again. We recommend using SendGrid or Mailgun or any large volume mail provider for SMTP.",
+      ),
+    );
+  }

-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
-    }
-  },
-);
+  return Response.sendEmptySuccessResponse(req, res);
+});

 export default router;
--- a/App/FeatureSet/Notification/API/WhatsApp.ts
+++ b/App/FeatureSet/Notification/API/WhatsApp.ts
@@ -1,491 +0,0 @@
-import WhatsAppService from "../Services/WhatsAppService";
-import BadDataException from "Common/Types/Exception/BadDataException";
-import GlobalConfig from "Common/Models/DatabaseModels/GlobalConfig";
-import { JSONArray, JSONObject } from "Common/Types/JSON";
-import ObjectID from "Common/Types/ObjectID";
-import Phone from "Common/Types/Phone";
-import WhatsAppMessage from "Common/Types/WhatsApp/WhatsAppMessage";
-import {
-  WhatsAppTemplateId,
-  WhatsAppTemplateIds,
-  WhatsAppTemplateLanguage,
-} from "Common/Types/WhatsApp/WhatsAppTemplates";
-import WhatsAppStatus from "Common/Types/WhatsAppStatus";
-import ClusterKeyAuthorization from "Common/Server/Middleware/ClusterKeyAuthorization";
-import WhatsAppLogService from "Common/Server/Services/WhatsAppLogService";
-import GlobalConfigService from "Common/Server/Services/GlobalConfigService";
-import Express, {
-  ExpressRequest,
-  ExpressResponse,
-  ExpressRouter,
-  NextFunction,
-} from "Common/Server/Utils/Express";
-import logger from "Common/Server/Utils/Logger";
-import Response from "Common/Server/Utils/Response";
-
-const router: ExpressRouter = Express.getRouter();
-
-const MAX_STATUS_MESSAGE_LENGTH: number = 500;
-
-export const mapWebhookStatusToWhatsAppStatus: (
-  status?: string,
-) => WhatsAppStatus = (status?: string): WhatsAppStatus => {
-  switch ((status || "").toLowerCase()) {
-    case "sent":
-      return WhatsAppStatus.Sent;
-    case "delivered":
-      return WhatsAppStatus.Delivered;
-    case "read":
-      return WhatsAppStatus.Read;
-    case "failed":
-      return WhatsAppStatus.Failed;
-    case "deleted":
-    case "removed":
-      return WhatsAppStatus.Deleted;
-    case "warning":
-      return WhatsAppStatus.Warning;
-    case "queued":
-    case "pending":
-      return WhatsAppStatus.Queued;
-    case "error":
-      return WhatsAppStatus.Error;
-    case "success":
-      return WhatsAppStatus.Success;
-    default:
-      return WhatsAppStatus.Unknown;
-  }
-};
-
-export const buildStatusMessage: (payload: JSONObject) => string | undefined = (
-  payload: JSONObject,
-): string | undefined => {
-  const messageParts: Array<string> = [];
-  const rawStatus: string | undefined = payload["status"]
-    ? String(payload["status"])
-    : undefined;
-
-  if (rawStatus) {
-    messageParts.push(`Status: ${rawStatus}`);
-  }
-
-  const timestamp: string | undefined = payload["timestamp"]
-    ? String(payload["timestamp"])
-    : undefined;
-
-  if (timestamp) {
-    const numericTimestamp: number = Number(timestamp);
-    if (!isNaN(numericTimestamp)) {
-      messageParts.push(
-        `Timestamp: ${new Date(numericTimestamp * 1000).toISOString()}`,
-      );
-    } else {
-      messageParts.push(`Timestamp: ${timestamp}`);
-    }
-  }
-
-  const conversation: JSONObject | undefined =
-    (payload["conversation"] as JSONObject | undefined) || undefined;
-
-  if (conversation) {
-    if (conversation["id"]) {
-      messageParts.push(`Conversation: ${conversation["id"]}`);
-    }
-
-    const origin: JSONObject | undefined =
-      (conversation["origin"] as JSONObject | undefined) || undefined;
-
-    if (origin?.["type"]) {
-      messageParts.push(`Origin: ${origin["type"]}`);
-    }
-
-    if (conversation["expiration_timestamp"]) {
-      const expirationTimestamp: number = Number(
-        conversation["expiration_timestamp"],
-      );
-
-      if (!isNaN(expirationTimestamp)) {
-        messageParts.push(
-          `Conversation expires: ${new Date(expirationTimestamp * 1000).toISOString()}`,
-        );
-      }
-    }
-  }
-
-  const pricing: JSONObject | undefined =
-    (payload["pricing"] as JSONObject | undefined) || undefined;
-
-  if (pricing) {
-    const pricingParts: Array<string> = [];
-
-    if (pricing["billable"] !== undefined) {
-      pricingParts.push(`billable=${pricing["billable"]}`);
-    }
-
-    if (pricing["category"]) {
-      pricingParts.push(`category=${pricing["category"]}`);
-    }
-
-    if (pricing["pricing_model"]) {
-      pricingParts.push(`model=${pricing["pricing_model"]}`);
-    }
-
-    if (pricingParts.length > 0) {
-      messageParts.push(`Pricing: ${pricingParts.join(", ")}`);
-    }
-  }
-
-  const errors: JSONArray | undefined =
-    (payload["errors"] as JSONArray | undefined) || undefined;
-
-  if (Array.isArray(errors) && errors.length > 0) {
-    const firstError: JSONObject = errors[0] as JSONObject;
-    const errorParts: Array<string> = [];
-
-    if (firstError["title"]) {
-      errorParts.push(String(firstError["title"]));
-    }
-
-    if (firstError["code"]) {
-      errorParts.push(`code=${firstError["code"]}`);
-    }
-
-    if (firstError["detail"]) {
-      errorParts.push(String(firstError["detail"]));
-    }
-
-    if (errorParts.length > 0) {
-      messageParts.push(`Error: ${errorParts.join(" - ")}`);
-    }
-  }
-
-  if (messageParts.length === 0) {
-    return undefined;
-  }
-
-  const statusMessage: string = messageParts.join(" | ");
-
-  if (statusMessage.length <= MAX_STATUS_MESSAGE_LENGTH) {
-    return statusMessage;
-  }
-
-  return `${statusMessage.substring(0, MAX_STATUS_MESSAGE_LENGTH - 3)}...`;
-};
-
-const updateWhatsAppLogStatus: (
-  statusPayload: JSONObject,
-) => Promise<void> = async (statusPayload: JSONObject): Promise<void> => {
-  const messageId: string | undefined = statusPayload["id"]
-    ? String(statusPayload["id"])
-    : undefined;
-
-  if (!messageId) {
-    logger.warn(
-      `[Meta WhatsApp Webhook] Received status payload without message id. Payload: ${JSON.stringify(statusPayload)}`,
-    );
-    return;
-  }
-
-  const rawStatus: string | undefined = statusPayload["status"]
-    ? String(statusPayload["status"])
-    : undefined;
-
-  const derivedStatus: WhatsAppStatus =
-    mapWebhookStatusToWhatsAppStatus(rawStatus);
-
-  const statusMessage: string | undefined = buildStatusMessage(statusPayload);
-
-  const updateResult: number = await WhatsAppLogService.updateOneBy({
-    query: {
-      whatsAppMessageId: messageId,
-    },
-    data: {
-      status: derivedStatus,
-      ...(statusMessage ? { statusMessage } : {}),
-    },
-    props: {
-      isRoot: true,
-    },
-  });
-
-  if (updateResult === 0) {
-    logger.warn(
-      `[Meta WhatsApp Webhook] No WhatsApp log found for message id ${messageId}. Payload: ${JSON.stringify(statusPayload)}`,
-    );
-  } else {
-    logger.debug(
-      `[Meta WhatsApp Webhook] Updated WhatsApp log for message id ${messageId} with status ${derivedStatus}.`,
-    );
-  }
-};
-
-const toTemplateVariables: (
-  rawVariables: JSONObject | undefined,
-) => Record<string, string> | undefined = (
-  rawVariables: JSONObject | undefined,
-): Record<string, string> | undefined => {
-  if (!rawVariables) {
-    return undefined;
-  }
-
-  const result: Record<string, string> = {};
-
-  for (const key of Object.keys(rawVariables)) {
-    const value: unknown = rawVariables[key];
-    if (value !== null && value !== undefined) {
-      result[key] = String(value);
-    }
-  }
-
-  return Object.keys(result).length > 0 ? result : undefined;
-};
-
-router.post(
-  "/send",
-  ClusterKeyAuthorization.isAuthorizedServiceMiddleware,
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    const body: JSONObject = req.body as JSONObject;
-
-    if (!body["to"]) {
-      throw new BadDataException("`to` phone number is required");
-    }
-
-    const toPhone: Phone = new Phone(body["to"] as string);
-
-    const message: WhatsAppMessage = {
-      to: toPhone,
-      body: (body["body"] as string) || "",
-      templateKey: (body["templateKey"] as string) || undefined,
-      templateVariables: toTemplateVariables(
-        body["templateVariables"] as JSONObject | undefined,
-      ),
-      templateLanguageCode:
-        (body["templateLanguageCode"] as string) || undefined,
-    };
-
-    try {
-      await WhatsAppService.sendWhatsApp(message, {
-        projectId: body["projectId"]
-          ? new ObjectID(body["projectId"] as string)
-          : undefined,
-        isSensitive: (body["isSensitive"] as boolean) || false,
-        userOnCallLogTimelineId: body["userOnCallLogTimelineId"]
-          ? new ObjectID(body["userOnCallLogTimelineId"] as string)
-          : undefined,
-        incidentId: body["incidentId"]
-          ? new ObjectID(body["incidentId"] as string)
-          : undefined,
-        alertId: body["alertId"]
-          ? new ObjectID(body["alertId"] as string)
-          : undefined,
-        scheduledMaintenanceId: body["scheduledMaintenanceId"]
-          ? new ObjectID(body["scheduledMaintenanceId"] as string)
-          : undefined,
-        statusPageId: body["statusPageId"]
-          ? new ObjectID(body["statusPageId"] as string)
-          : undefined,
-        statusPageAnnouncementId: body["statusPageAnnouncementId"]
-          ? new ObjectID(body["statusPageAnnouncementId"] as string)
-          : undefined,
-        userId: body["userId"]
-          ? new ObjectID(body["userId"] as string)
-          : undefined,
-        onCallPolicyId: body["onCallPolicyId"]
-          ? new ObjectID(body["onCallPolicyId"] as string)
-          : undefined,
-        onCallPolicyEscalationRuleId: body["onCallPolicyEscalationRuleId"]
-          ? new ObjectID(body["onCallPolicyEscalationRuleId"] as string)
-          : undefined,
-        onCallDutyPolicyExecutionLogTimelineId: body[
-          "onCallDutyPolicyExecutionLogTimelineId"
-        ]
-          ? new ObjectID(
-              body["onCallDutyPolicyExecutionLogTimelineId"] as string,
-            )
-          : undefined,
-        onCallScheduleId: body["onCallScheduleId"]
-          ? new ObjectID(body["onCallScheduleId"] as string)
-          : undefined,
-        teamId: body["teamId"]
-          ? new ObjectID(body["teamId"] as string)
-          : undefined,
-      });
-
-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
-    }
-  },
-);
-
-router.get("/webhook", async (req: ExpressRequest, res: ExpressResponse) => {
-  const mode: string | undefined = req.query["hub.mode"]
-    ? String(req.query["hub.mode"])
-    : undefined;
-  const verifyToken: string | undefined = req.query["hub.verify_token"]
-    ? String(req.query["hub.verify_token"])
-    : undefined;
-  const challenge: string | undefined = req.query["hub.challenge"]
-    ? String(req.query["hub.challenge"])
-    : undefined;
-
-  if (mode === "subscribe" && challenge) {
-    const globalConfigTokenResponse: GlobalConfig | null =
-      await GlobalConfigService.findOneBy({
-        query: {
-          _id: ObjectID.getZeroObjectID().toString(),
-        },
-        props: {
-          isRoot: true,
-        },
-        select: {
-          metaWhatsAppWebhookVerifyToken: true,
-        },
-      });
-
-    const configuredVerifyToken: string | undefined =
-      globalConfigTokenResponse?.metaWhatsAppWebhookVerifyToken?.trim() ||
-      undefined;
-
-    if (!configuredVerifyToken) {
-      logger.error(
-        "Meta WhatsApp webhook verify token is not configured. Rejecting verification request.",
-      );
-      res.sendStatus(403);
-      return;
-    }
-
-    if (verifyToken === configuredVerifyToken) {
-      res.status(200).send(challenge);
-      return;
-    }
-
-    logger.warn(
-      "Meta WhatsApp webhook verification failed due to token mismatch.",
-    );
-    res.sendStatus(403);
-    return;
-  }
-
-  res.sendStatus(400);
-});
-
-router.post(
-  "/webhook",
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    try {
-      const body: JSONObject = req.body as JSONObject;
-
-      if (
-        (body["object"] as string | undefined) !== "whatsapp_business_account"
-      ) {
-        logger.debug(
-          `[Meta WhatsApp Webhook] Received event for unsupported object: ${JSON.stringify(body)}`,
-        );
-        return Response.sendEmptySuccessResponse(req, res);
-      }
-
-      const entries: JSONArray | undefined = body["entry"] as
-        | JSONArray
-        | undefined;
-
-      if (!Array.isArray(entries)) {
-        logger.warn(
-          `[Meta WhatsApp Webhook] Payload did not include entries array. Payload: ${JSON.stringify(body)}`,
-        );
-        return Response.sendEmptySuccessResponse(req, res);
-      }
-
-      const statusUpdatePromises: Array<Promise<void>> = [];
-
-      for (const entry of entries) {
-        const entryObject: JSONObject = entry as JSONObject;
-        const changes: JSONArray | undefined =
-          (entryObject["changes"] as JSONArray | undefined) || undefined;
-
-        if (!Array.isArray(changes)) {
-          continue;
-        }
-
-        for (const change of changes) {
-          const changeObject: JSONObject = change as JSONObject;
-          const value: JSONObject | undefined =
-            (changeObject["value"] as JSONObject | undefined) || undefined;
-
-          if (!value) {
-            continue;
-          }
-
-          const statuses: JSONArray | undefined =
-            (value["statuses"] as JSONArray | undefined) || undefined;
-
-          if (Array.isArray(statuses)) {
-            for (const statusItem of statuses) {
-              statusUpdatePromises.push(
-                updateWhatsAppLogStatus(statusItem as JSONObject),
-              );
-            }
-          }
-        }
-      }
-
-      if (statusUpdatePromises.length > 0) {
-        await Promise.allSettled(statusUpdatePromises);
-      }
-
-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
-    }
-  },
-);
-
-router.post(
-  "/test",
-  async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
-    try {
-      const body: JSONObject = req.body as JSONObject;
-
-      if (!body["toPhone"]) {
-        throw new BadDataException("toPhone is required");
-      }
-
-      const toPhone: Phone = new Phone(body["toPhone"] as string);
-
-      const templateKey: WhatsAppTemplateId =
-        WhatsAppTemplateIds.TestNotification;
-
-      const templateLanguageCode: string =
-        WhatsAppTemplateLanguage[templateKey] || "en";
-
-      const message: WhatsAppMessage = {
-        to: toPhone,
-        body: "",
-        templateKey,
-        templateVariables: undefined,
-        templateLanguageCode,
-      };
-
-      try {
-        await WhatsAppService.sendWhatsApp(message, {
-          projectId: body["projectId"]
-            ? new ObjectID(body["projectId"] as string)
-            : undefined,
-          isSensitive: false,
-        });
-      } catch (err) {
-        const errorMsg: string =
-          err instanceof Error && err.message
-            ? err.message
-            : "Failed to send test WhatsApp message.";
-
-        throw new BadDataException(errorMsg);
-      }
-
-      return Response.sendEmptySuccessResponse(req, res);
-    } catch (err) {
-      return next(err);
-    }
-  },
-);
-
-export default router;
--- a/App/FeatureSet/Notification/Config.ts
+++ b/App/FeatureSet/Notification/Config.ts
@@ -12,8 +12,6 @@ import Phone from "Common/Types/Phone";

 type GetGlobalSMTPConfig = () => Promise<EmailServer | null>;

-export const DEFAULT_META_WHATSAPP_API_VERSION: string = "v23.0";
-
 export const getGlobalSMTPConfig: GetGlobalSMTPConfig =
  async (): Promise<EmailServer | null> => {
    const globalConfig: GlobalConfig | null =
@@ -224,83 +222,6 @@ export const SMSHighRiskCostInCents: number = process.env[
  ? parseInt(process.env["SMS_HIGH_RISK_COST_IN_CENTS"])
  : 0;

-export interface MetaWhatsAppConfig {
-  accessToken: string;
-  phoneNumberId: string;
-  businessAccountId?: string | undefined;
-  appId?: string | undefined;
-  appSecret?: string | undefined;
-  apiVersion?: string | undefined;
-}
-
-type GetMetaWhatsAppConfigFunction = () => Promise<MetaWhatsAppConfig>;
-
-export const getMetaWhatsAppConfig: GetMetaWhatsAppConfigFunction =
-  async (): Promise<MetaWhatsAppConfig> => {
-    const globalConfig: GlobalConfig | null =
-      await GlobalConfigService.findOneBy({
-        query: {
-          _id: ObjectID.getZeroObjectID().toString(),
-        },
-        props: {
-          isRoot: true,
-        },
-        select: {
-          metaWhatsAppAccessToken: true,
-          metaWhatsAppPhoneNumberId: true,
-          metaWhatsAppBusinessAccountId: true,
-          metaWhatsAppAppId: true,
-          metaWhatsAppAppSecret: true,
-        },
-      });
-
-    if (!globalConfig) {
-      throw new BadDataException("Global Config not found");
-    }
-
-    const accessToken: string | undefined =
-      globalConfig.metaWhatsAppAccessToken?.trim();
-    const phoneNumberId: string | undefined =
-      globalConfig.metaWhatsAppPhoneNumberId?.trim();
-
-    if (!accessToken) {
-      throw new BadDataException(
-        "Meta WhatsApp access token not configured. Please set it in the Admin Dashboard: " +
-          AdminDashboardClientURL.toString(),
-      );
-    }
-
-    if (!phoneNumberId) {
-      throw new BadDataException(
-        "Meta WhatsApp phone number ID not configured. Please set it in the Admin Dashboard: " +
-          AdminDashboardClientURL.toString(),
-      );
-    }
-
-    const businessAccountId: string | undefined =
-      globalConfig.metaWhatsAppBusinessAccountId?.trim() || undefined;
-    const appId: string | undefined =
-      globalConfig.metaWhatsAppAppId?.trim() || undefined;
-    const appSecret: string | undefined =
-      globalConfig.metaWhatsAppAppSecret?.trim() || undefined;
-    const apiVersion: string = DEFAULT_META_WHATSAPP_API_VERSION;
-
-    return {
-      accessToken,
-      phoneNumberId,
-      businessAccountId,
-      appId,
-      appSecret,
-      apiVersion,
-    };
-  };
-
-export const WhatsAppTextDefaultCostInCents: number = process.env[
-  "WHATSAPP_TEXT_DEFAULT_COST_IN_CENTS"
-]
-  ? parseInt(process.env["WHATSAPP_TEXT_DEFAULT_COST_IN_CENTS"])
-  : 0;
-
 export const CallHighRiskCostInCentsPerMinute: number = process.env[
  "CALL_HIGH_RISK_COST_IN_CENTS_PER_MINUTE"
 ]
--- a/App/FeatureSet/Notification/Index.ts
+++ b/App/FeatureSet/Notification/Index.ts
@@ -2,7 +2,6 @@ import CallAPI from "./API/Call";
 // API
 import MailAPI from "./API/Mail";
 import SmsAPI from "./API/SMS";
-import WhatsAppAPI from "./API/WhatsApp";
 import PushNotificationAPI from "./API/PushNotification";
 import SMTPConfigAPI from "./API/SMTPConfig";
 import "./Utils/Handlebars";
@@ -17,7 +16,6 @@ const NotificationFeatureSet: FeatureSet = {

    app.use([`/${APP_NAME}/email`, "/email"], MailAPI);
    app.use([`/${APP_NAME}/sms`, "/sms"], SmsAPI);
-    app.use([`/${APP_NAME}/whatsapp`, "/whatsapp"], WhatsAppAPI);
    app.use([`/${APP_NAME}/push`, "/push"], PushNotificationAPI);
    app.use([`/${APP_NAME}/call`, "/call"], CallAPI);
    app.use([`/${APP_NAME}/smtp-config`, "/smtp-config"], SMTPConfigAPI);
--- a/App/FeatureSet/Notification/Services/CallService.ts
+++ b/App/FeatureSet/Notification/Services/CallService.ts
@@ -47,11 +47,9 @@ function extractSayMessagesFromCallRequest(callRequest: CallRequest): string {
      if ((item as GatherInput).introMessage) {
        sayMessages.push((item as GatherInput).introMessage);
      }
-      /*
-       * NOTE: Excluding noInputMessage and onInputCallRequest messages from summary
-       * as they contain system responses like "Good bye", "Invalid input", "You have acknowledged"
-       * which should not be included in the call summary according to user requirements
-       */
+      // NOTE: Excluding noInputMessage and onInputCallRequest messages from summary
+      // as they contain system responses like "Good bye", "Invalid input", "You have acknowledged"
+      // which should not be included in the call summary according to user requirements
    }
  }

--- a/App/FeatureSet/Notification/Services/MailService.ts
+++ b/App/FeatureSet/Notification/Services/MailService.ts
@@ -37,49 +37,11 @@ class TransporterPool {
  private static semaphore: Map<string, number> = new Map();
  private static readonly MAX_CONCURRENT_CONNECTIONS = 100;

-  private static resolveConnectionSettings(emailServer: EmailServer): {
-    portNumber: number;
-    wantsSecureConnection: boolean;
-    secureConnection: boolean;
-    requireTLS: boolean;
-    mode: "implicit-tls" | "starttls" | "plain";
-  } {
-    const portNumber: number = emailServer.port.toNumber();
-    const wantsSecureConnection: boolean = emailServer.secure;
-    const isImplicitTLSPort: boolean = portNumber === 465;
-
-    const secureConnection: boolean = isImplicitTLSPort;
-    const requireTLS: boolean = wantsSecureConnection && !isImplicitTLSPort;
-
-    let mode: "implicit-tls" | "starttls" | "plain" = "plain";
-
-    if (secureConnection) {
-      mode = "implicit-tls";
-    } else if (requireTLS) {
-      mode = "starttls";
-    }
-
-    return {
-      portNumber,
-      wantsSecureConnection,
-      secureConnection,
-      requireTLS,
-      mode,
-    };
-  }
-
-  private static getPoolKey(emailServer: EmailServer): string {
-    const { portNumber, mode } = this.resolveConnectionSettings(emailServer);
-    const username: string = emailServer.username || "noauth";
-
-    return `${emailServer.host.toString()}:${portNumber}:${username}:${mode}`;
-  }
-
  public static getTransporter(
    emailServer: EmailServer,
    options: { timeout?: number | undefined },
  ): Transporter {
-    const key: string = this.getPoolKey(emailServer);
+    const key: string = `${emailServer.host.toString()}:${emailServer.port.toNumber()}:${emailServer.username || "noauth"}`;

    if (!this.pools.has(key)) {
      const transporter: Transporter = this.createTransporter(
@@ -97,12 +59,9 @@ class TransporterPool {
    emailServer: EmailServer,
    options: { timeout?: number | undefined },
  ): Transporter {
-    const { portNumber, wantsSecureConnection, secureConnection, requireTLS } =
-      this.resolveConnectionSettings(emailServer);
-
    let tlsOptions: tls.ConnectionOptions | undefined = undefined;

-    if (!wantsSecureConnection) {
+    if (!emailServer.secure) {
      tlsOptions = {
        rejectUnauthorized: false,
      };
@@ -110,9 +69,8 @@ class TransporterPool {

    return nodemailer.createTransport({
      host: emailServer.host.toString(),
-      port: portNumber,
-      secure: secureConnection,
-      requireTLS,
+      port: emailServer.port.toNumber(),
+      secure: emailServer.secure,
      tls: tlsOptions,
      auth:
        emailServer.username && emailServer.password
@@ -130,7 +88,7 @@ class TransporterPool {
  public static async acquireConnection(
    emailServer: EmailServer,
  ): Promise<void> {
-    const key: string = this.getPoolKey(emailServer);
+    const key: string = `${emailServer.host.toString()}:${emailServer.port.toNumber()}:${emailServer.username || "noauth"}`;

    while ((this.semaphore.get(key) || 0) >= this.MAX_CONCURRENT_CONNECTIONS) {
      await new Promise<void>((resolve: () => void) => {
@@ -142,7 +100,7 @@ class TransporterPool {
  }

  public static releaseConnection(emailServer: EmailServer): void {
-    const key: string = this.getPoolKey(emailServer);
+    const key: string = `${emailServer.host.toString()}:${emailServer.port.toNumber()}:${emailServer.username || "noauth"}`;
    const current: number = this.semaphore.get(key) || 0;
    this.semaphore.set(key, Math.max(0, current - 1));
  }
--- a/App/FeatureSet/Notification/Services/WhatsAppService.ts
+++ b/App/FeatureSet/Notification/Services/WhatsAppService.ts
@@ -1,497 +0,0 @@
-import {
-  WhatsAppTextDefaultCostInCents,
-  getMetaWhatsAppConfig,
-  MetaWhatsAppConfig,
-  DEFAULT_META_WHATSAPP_API_VERSION,
-} from "../Config";
-import BadDataException from "Common/Types/Exception/BadDataException";
-import ObjectID from "Common/Types/ObjectID";
-import UserNotificationStatus from "Common/Types/UserNotification/UserNotificationStatus";
-import WhatsAppMessage from "Common/Types/WhatsApp/WhatsAppMessage";
-import WhatsAppStatus from "Common/Types/WhatsAppStatus";
-import {
-  AuthenticationTemplates,
-  WhatsAppTemplateId,
-} from "Common/Types/WhatsApp/WhatsAppTemplates";
-import { JSONArray, JSONObject } from "Common/Types/JSON";
-import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
-import NotificationService from "Common/Server/Services/NotificationService";
-import ProjectService from "Common/Server/Services/ProjectService";
-import UserOnCallLogTimelineService from "Common/Server/Services/UserOnCallLogTimelineService";
-import WhatsAppLogService from "Common/Server/Services/WhatsAppLogService";
-import logger from "Common/Server/Utils/Logger";
-import Project from "Common/Models/DatabaseModels/Project";
-import WhatsAppLog from "Common/Models/DatabaseModels/WhatsAppLog";
-import API from "Common/Utils/API";
-import HTTPErrorResponse from "Common/Types/API/HTTPErrorResponse";
-import HTTPResponse from "Common/Types/API/HTTPResponse";
-import Protocol from "Common/Types/API/Protocol";
-import Route from "Common/Types/API/Route";
-import URL from "Common/Types/API/URL";
-
-const SENSITIVE_MESSAGE_PLACEHOLDER: string =
-  "This message is sensitive and is not logged";
-
-export default class WhatsAppService {
-  public static async sendWhatsApp(
-    message: WhatsAppMessage,
-    options: {
-      projectId?: ObjectID | undefined;
-      isSensitive?: boolean | undefined;
-      userOnCallLogTimelineId?: ObjectID | undefined;
-      incidentId?: ObjectID | undefined;
-      alertId?: ObjectID | undefined;
-      scheduledMaintenanceId?: ObjectID | undefined;
-      statusPageId?: ObjectID | undefined;
-      statusPageAnnouncementId?: ObjectID | undefined;
-      userId?: ObjectID | undefined;
-      onCallPolicyId?: ObjectID | undefined;
-      onCallPolicyEscalationRuleId?: ObjectID | undefined;
-      onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
-      onCallScheduleId?: ObjectID | undefined;
-      teamId?: ObjectID | undefined;
-    } = {},
-  ): Promise<void> {
-    let sendError: Error | null = null;
-    const whatsAppLog: WhatsAppLog = new WhatsAppLog();
-
-    try {
-      if (!message.to) {
-        throw new BadDataException(
-          "WhatsApp recipient phone number is required",
-        );
-      }
-
-      if (!message.body && !message.templateKey) {
-        throw new BadDataException(
-          "Either WhatsApp message body or template key must be provided",
-        );
-      }
-
-      const isSensitiveMessage: boolean = Boolean(options.isSensitive);
-      const messageSummary: string = isSensitiveMessage
-        ? SENSITIVE_MESSAGE_PLACEHOLDER
-        : message.body ||
-          (message.templateKey
-            ? `Template: ${message.templateKey}${
-                message.templateVariables
-                  ? " Variables: " + JSON.stringify(message.templateVariables)
-                  : ""
-              }`
-            : "");
-
-      whatsAppLog.toNumber = message.to;
-      whatsAppLog.messageText = messageSummary;
-      whatsAppLog.whatsAppCostInUSDCents = 0;
-
-      if (options.projectId) {
-        whatsAppLog.projectId = options.projectId;
-      }
-
-      if (options.incidentId) {
-        whatsAppLog.incidentId = options.incidentId;
-      }
-
-      if (options.alertId) {
-        whatsAppLog.alertId = options.alertId;
-      }
-
-      if (options.scheduledMaintenanceId) {
-        whatsAppLog.scheduledMaintenanceId = options.scheduledMaintenanceId;
-      }
-
-      if (options.statusPageId) {
-        whatsAppLog.statusPageId = options.statusPageId;
-      }
-
-      if (options.statusPageAnnouncementId) {
-        whatsAppLog.statusPageAnnouncementId = options.statusPageAnnouncementId;
-      }
-
-      if (options.userId) {
-        whatsAppLog.userId = options.userId;
-      }
-
-      if (options.teamId) {
-        whatsAppLog.teamId = options.teamId;
-      }
-
-      if (options.onCallPolicyId) {
-        whatsAppLog.onCallDutyPolicyId = options.onCallPolicyId;
-      }
-
-      if (options.onCallPolicyEscalationRuleId) {
-        whatsAppLog.onCallDutyPolicyEscalationRuleId =
-          options.onCallPolicyEscalationRuleId;
-      }
-
-      if (options.onCallScheduleId) {
-        whatsAppLog.onCallDutyPolicyScheduleId = options.onCallScheduleId;
-      }
-
-      const config: MetaWhatsAppConfig = await getMetaWhatsAppConfig();
-
-      let messageCost: number = 0;
-      const shouldChargeForMessage: boolean = IsBillingEnabled;
-
-      if (shouldChargeForMessage) {
-        messageCost = WhatsAppTextDefaultCostInCents / 100;
-      }
-
-      let project: Project | null = null;
-
-      if (options.projectId) {
-        project = await ProjectService.findOneById({
-          id: options.projectId,
-          select: {
-            smsOrCallCurrentBalanceInUSDCents: true,
-            lowCallAndSMSBalanceNotificationSentToOwners: true,
-            name: true,
-            notEnabledSmsOrCallNotificationSentToOwners: true,
-          },
-          props: {
-            isRoot: true,
-          },
-        });
-
-        if (!project) {
-          whatsAppLog.status = WhatsAppStatus.Error;
-          whatsAppLog.statusMessage = `Project ${options.projectId.toString()} not found.`;
-          logger.error(whatsAppLog.statusMessage);
-          await WhatsAppLogService.create({
-            data: whatsAppLog,
-            props: {
-              isRoot: true,
-            },
-          });
-          return;
-        }
-
-        if (shouldChargeForMessage) {
-          let updatedBalance: number =
-            project.smsOrCallCurrentBalanceInUSDCents || 0;
-
-          try {
-            updatedBalance = await NotificationService.rechargeIfBalanceIsLow(
-              project.id!,
-            );
-          } catch (err) {
-            logger.error(err);
-          }
-
-          project.smsOrCallCurrentBalanceInUSDCents = updatedBalance;
-
-          if (!project.smsOrCallCurrentBalanceInUSDCents) {
-            whatsAppLog.status = WhatsAppStatus.LowBalance;
-            whatsAppLog.statusMessage = `Project ${options.projectId.toString()} does not have enough balance for WhatsApp messages.`;
-            logger.error(whatsAppLog.statusMessage);
-
-            await WhatsAppLogService.create({
-              data: whatsAppLog,
-              props: {
-                isRoot: true,
-              },
-            });
-
-            if (!project.lowCallAndSMSBalanceNotificationSentToOwners) {
-              await ProjectService.updateOneById({
-                id: project.id!,
-                data: {
-                  lowCallAndSMSBalanceNotificationSentToOwners: true,
-                },
-                props: {
-                  isRoot: true,
-                },
-              });
-
-              await ProjectService.sendEmailToProjectOwners(
-                project.id!,
-                `Low WhatsApp message balance for ${project.name || ""}`,
-                `We tried to send a WhatsApp message to ${message.to.toString()} with message:<br/><br/>${messageSummary}<br/><br/>The message was not sent because your project does not have enough balance for WhatsApp messages. Current balance is ${
-                  (project.smsOrCallCurrentBalanceInUSDCents || 0) / 100
-                } USD. Required balance for this message is ${messageCost} USD. Please enable auto recharge or recharge manually.`,
-              );
-            }
-            return;
-          }
-
-          if (project.smsOrCallCurrentBalanceInUSDCents < messageCost * 100) {
-            whatsAppLog.status = WhatsAppStatus.LowBalance;
-            whatsAppLog.statusMessage = `Project does not have enough balance to send WhatsApp message. Current balance is ${
-              project.smsOrCallCurrentBalanceInUSDCents / 100
-            } USD. Required balance is ${messageCost} USD.`;
-            logger.error(whatsAppLog.statusMessage);
-
-            await WhatsAppLogService.create({
-              data: whatsAppLog,
-              props: {
-                isRoot: true,
-              },
-            });
-
-            if (!project.lowCallAndSMSBalanceNotificationSentToOwners) {
-              await ProjectService.updateOneById({
-                id: project.id!,
-                data: {
-                  lowCallAndSMSBalanceNotificationSentToOwners: true,
-                },
-                props: {
-                  isRoot: true,
-                },
-              });
-
-              await ProjectService.sendEmailToProjectOwners(
-                project.id!,
-                `Low WhatsApp message balance for ${project.name || ""}`,
-                `We tried to send a WhatsApp message to ${message.to.toString()} with message:<br/><br/>${messageSummary}<br/><br/>The message was not sent because your project does not have enough balance for WhatsApp messages. Current balance is ${
-                  project.smsOrCallCurrentBalanceInUSDCents / 100
-                } USD. Required balance is ${messageCost} USD. Please enable auto recharge or recharge manually.`,
-              );
-            }
-            return;
-          }
-        }
-      }
-
-      const payload: JSONObject = {
-        messaging_product: "whatsapp",
-        recipient_type: "individual",
-        to: message.to.toString(),
-      } as JSONObject;
-
-      if (!message.templateKey) {
-        throw new BadDataException("WhatsApp message template key is required");
-      }
-
-      if (message.templateKey) {
-        const template: JSONObject = {
-          name: message.templateKey,
-          language: {
-            code: message.templateLanguageCode || "en",
-          },
-        } as JSONObject;
-
-        const components: JSONArray = [];
-
-        if (
-          message.templateVariables &&
-          Object.keys(message.templateVariables).length > 0
-        ) {
-          const parameters: JSONArray = [];
-
-          for (const [key, value] of Object.entries(
-            message.templateVariables,
-          )) {
-            parameters.push({
-              type: "text",
-              parameter_name: key,
-              text: value,
-            } as JSONObject);
-          }
-
-          if (parameters.length > 0) {
-            components.push({
-              type: "body",
-              parameters,
-            } as JSONObject);
-          }
-        }
-
-        /*
-         * Check if this is an authentication template
-         * Authentication templates may have special requirements including button components
-         */
-        const isAuthTemplate: boolean = AuthenticationTemplates.has(
-          message.templateKey as WhatsAppTemplateId,
-        );
-
-        if (isAuthTemplate) {
-          logger.info(
-            `Sending authentication template: ${message.templateKey}`,
-          );
-
-          /*
-           * Authentication templates in WhatsApp may have a button component for "Copy Code"
-           * If the template was created with a button, we need to provide button parameters
-           */
-          if (message.templateVariables) {
-            const otpCode: string | undefined =
-              message.templateVariables["1"] ||
-              message.templateVariables["otp"] ||
-              message.templateVariables["code"];
-
-            if (otpCode) {
-              /*
-               * Add button component - the index should match the button position in the template
-               * Usually authentication templates have the button as the first (and only) button
-               */
-              components.push({
-                type: "button",
-                sub_type: "url",
-                index: 0,
-                parameters: [
-                  {
-                    type: "text",
-                    text: otpCode,
-                  },
-                ],
-              } as JSONObject);
-            }
-          }
-        }
-
-        if (components.length > 0) {
-          template["components"] = components;
-        }
-
-        payload["type"] = "template";
-        payload["template"] = template;
-      } else {
-        payload["type"] = "text";
-        payload["text"] = {
-          body: message.body || "",
-        } as JSONObject;
-      }
-
-      const apiVersion: string =
-        config.apiVersion?.trim() || DEFAULT_META_WHATSAPP_API_VERSION;
-
-      const url: URL = new URL(
-        Protocol.HTTPS,
-        "graph.facebook.com",
-        new Route(`${apiVersion}/${config.phoneNumberId}/messages`),
-      );
-
-      logger.debug(`WhatsApp API request: ${JSON.stringify(payload)}`);
-
-      const response: HTTPResponse<JSONObject> | HTTPErrorResponse =
-        await API.post<JSONObject>({
-          url,
-          data: payload,
-          headers: {
-            Authorization: `Bearer ${config.accessToken}`,
-            "Content-Type": "application/json",
-          },
-        });
-
-      if (response instanceof HTTPErrorResponse) {
-        logger.error("Failed to send WhatsApp message.");
-        logger.error(response);
-        const responseDataAsJSONObject: JSONObject = response.data;
-        const responseJsonAsJSONObject: JSONObject | undefined =
-          (response.jsonData as JSONObject | undefined) || undefined;
-
-        // Log full error details for debugging
-        const errorObject: JSONObject | undefined =
-          (responseDataAsJSONObject["error"] as JSONObject | undefined) ||
-          (responseJsonAsJSONObject?.["error"] as JSONObject | undefined);
-
-        if (errorObject) {
-          logger.error("WhatsApp API Error Details:");
-          logger.error(JSON.stringify(errorObject, null, 2));
-        }
-
-        const detailedErrorMessage: string | undefined =
-          ((responseDataAsJSONObject["error"] as JSONObject | undefined)?.[
-            "message"
-          ] as string | undefined) ||
-          ((responseJsonAsJSONObject?.["error"] as JSONObject | undefined)?.[
-            "message"
-          ] as string | undefined);
-
-        throw new BadDataException(
-          detailedErrorMessage || "Failed to send WhatsApp message.",
-        );
-      }
-
-      const responseData: JSONObject = (response.jsonData || {}) as JSONObject;
-
-      let messageId: string | undefined = undefined;
-      const messagesArray: JSONArray | undefined =
-        (responseData["messages"] as JSONArray) || undefined;
-
-      if (Array.isArray(messagesArray) && messagesArray.length > 0) {
-        const firstMessage: JSONObject = messagesArray[0] as JSONObject;
-        if (firstMessage["id"]) {
-          messageId = firstMessage["id"] as string;
-        }
-      }
-
-      if (messageId) {
-        whatsAppLog.whatsAppMessageId = messageId;
-      }
-
-      whatsAppLog.status = WhatsAppStatus.Sent;
-      whatsAppLog.statusMessage = messageId
-        ? `Message ID: ${messageId}`
-        : "WhatsApp message sent successfully";
-
-      if (shouldChargeForMessage && project) {
-        const deduction: number = Math.floor(messageCost * 100);
-        whatsAppLog.whatsAppCostInUSDCents = deduction;
-
-        project.smsOrCallCurrentBalanceInUSDCents = Math.max(
-          0,
-          Math.floor(
-            (project.smsOrCallCurrentBalanceInUSDCents || 0) - deduction,
-          ),
-        );
-
-        await ProjectService.updateOneById({
-          id: project.id!,
-          data: {
-            smsOrCallCurrentBalanceInUSDCents:
-              project.smsOrCallCurrentBalanceInUSDCents,
-            notEnabledSmsOrCallNotificationSentToOwners: false,
-          },
-          props: {
-            isRoot: true,
-          },
-        });
-      }
-    } catch (error: any) {
-      logger.error("Failed to send WhatsApp message.");
-      logger.error(error);
-      whatsAppLog.whatsAppCostInUSDCents = 0;
-      whatsAppLog.status = WhatsAppStatus.Error;
-      const errorMessage: string =
-        error && error.message ? error.message.toString() : `${error}`;
-      whatsAppLog.statusMessage = errorMessage;
-
-      sendError = error;
-    }
-
-    if (options.projectId) {
-      await WhatsAppLogService.create({
-        data: whatsAppLog,
-        props: {
-          isRoot: true,
-        },
-      });
-    }
-
-    if (options.userOnCallLogTimelineId) {
-      await UserOnCallLogTimelineService.updateOneById({
-        id: options.userOnCallLogTimelineId,
-        data: {
-          status: [
-            WhatsAppStatus.Success,
-            WhatsAppStatus.Sent,
-            WhatsAppStatus.Delivered,
-            WhatsAppStatus.Read,
-          ].includes(whatsAppLog.status || WhatsAppStatus.Error)
-            ? UserNotificationStatus.Sent
-            : UserNotificationStatus.Error,
-          statusMessage: whatsAppLog.statusMessage,
-        },
-        props: {
-          isRoot: true,
-        },
-      });
-    }
-
-    if (sendError) {
-      throw sendError;
-    }
-  }
-}
--- a/App/FeatureSet/Notification/Templates/StatusPageSubscriberReport.hbs
+++ b/App/FeatureSet/Notification/Templates/StatusPageSubscriberReport.hbs
@@ -42,11 +42,8 @@
 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}


-{{#if detailsUrl}}
-{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
-{{else}}
-{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
-{{/if}}
+{{> InfoBlock info="You can visit the status page here:"}}
+{{> InfoBlock info=statusPageUrl}}

 {{> UnsubscribeBlock this}}
 {{> VerticalSpace this}}
--- a/App/FeatureSet/Notification/Templates/SubscriberAnnouncementCreated.hbs
+++ b/App/FeatureSet/Notification/Templates/SubscriberAnnouncementCreated.hbs
@@ -13,11 +13,8 @@
 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}


-{{#if detailsUrl}}
-{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
-{{else}}
-{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
-{{/if}}
+{{> InfoBlock info="You can visit the status page here:"}}
+{{> InfoBlock info=statusPageUrl}}

 {{> UnsubscribeBlock this}}

--- a/App/FeatureSet/Notification/Templates/SubscriberIncidentCreated.hbs
+++ b/App/FeatureSet/Notification/Templates/SubscriberIncidentCreated.hbs
@@ -20,11 +20,8 @@
 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}


-{{#if detailsUrl}}
-{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
-{{else}}
-{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
-{{/if}}
+{{> InfoBlock info="You can visit the status page here:"}}
+{{> InfoBlock info=statusPageUrl}}



--- a/App/FeatureSet/Notification/Templates/SubscriberIncidentNoteCreated.hbs
+++ b/App/FeatureSet/Notification/Templates/SubscriberIncidentNoteCreated.hbs
@@ -17,11 +17,8 @@
 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}


-{{#if detailsUrl}}
-{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
-{{else}}
-{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
-{{/if}}
+{{> InfoBlock info="You can visit the status page here:"}}
+{{> InfoBlock info=statusPageUrl}}

 {{> UnsubscribeBlock this}}
 {{> VerticalSpace this}}
--- a/App/FeatureSet/Notification/Templates/SubscriberIncidentPostmortemCreated.hbs
+++ b/App/FeatureSet/Notification/Templates/SubscriberIncidentPostmortemCreated.hbs
@@ -1,35 +0,0 @@
-{{> Start this}}
-
-
-
-{{> CustomLogo this}}
-{{> EmailTitle title=(concat "Postmortem Published: " incidentTitle) }}
-
-{{> InfoBlock info="A postmortem has been published for an incident. Here are the details: "}}
-
-
-{{> DetailBoxStart this }}
-{{> DetailBoxField title=incidentTitle text="" }}
-{{> DetailBoxField title="Resources Affected: " text=resourcesAffected  }}
-{{> DetailBoxField title="Severity: " text=incidentSeverity  }}
-{{> DetailBoxField title="Postmortem: " text=""  }}
-{{> DetailBoxField title="" text=postmortemNote  }}
-{{> DetailBoxEnd this }}
-
-
-{{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}
-
-
-{{#if detailsUrl}}
-{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
-{{else}}
-{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
-{{/if}}
-
-
-
-
-{{> UnsubscribeBlock this}}
-{{> VerticalSpace this}}
-
-{{> End this}}
--- a/App/FeatureSet/Notification/Templates/SubscriberIncidentStateChanged.hbs
+++ b/App/FeatureSet/Notification/Templates/SubscriberIncidentStateChanged.hbs
@@ -14,11 +14,8 @@

 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}

-{{#if detailsUrl}}
-{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
-{{else}}
-{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
-{{/if}}
+{{> InfoBlock info="You can visit the status page here:"}}
+{{> InfoBlock info=statusPageUrl}}

 {{> UnsubscribeBlock this}}
 {{> VerticalSpace this}}
--- a/App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventCreated.hbs
+++ b/App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventCreated.hbs
@@ -24,11 +24,8 @@
 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}


-{{#if detailsUrl}}
-{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
-{{else}}
-{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
-{{/if}}
+{{> InfoBlock info="You can visit the status page here:"}}
+{{> InfoBlock info=statusPageUrl}}

 {{> UnsubscribeBlock this}}
 {{> VerticalSpace this}}
--- a/App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventNoteCreated.hbs
+++ b/App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventNoteCreated.hbs
@@ -25,11 +25,8 @@
 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}


-{{#if detailsUrl}}
-{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
-{{else}}
-{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
-{{/if}}
+{{> InfoBlock info="You can visit the status page here:"}}
+{{> InfoBlock info=statusPageUrl}}

 {{> UnsubscribeBlock this}}
 {{> VerticalSpace this}}
--- a/App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventStateChanged.hbs
+++ b/App/FeatureSet/Notification/Templates/SubscriberScheduledMaintenanceEventStateChanged.hbs
@@ -20,11 +20,8 @@
 {{> InfoBlock info=(concat subscriberEmailNotificationFooterText "") }}


-{{#if detailsUrl}}
-{{> InfoBlock info=(concat "Find further information here: " detailsUrl)}}
-{{else}}
-{{> InfoBlock info=(concat "Find further information here: " statusPageUrl)}}
-{{/if}}
+{{> InfoBlock info="You can visit the status page here:"}}
+{{> InfoBlock info=statusPageUrl}}

 {{> UnsubscribeBlock this}}
 {{> VerticalSpace this}}
--- a/App/FeatureSet/Notification/Utils/Handlebars.ts
+++ b/App/FeatureSet/Notification/Utils/Handlebars.ts
@@ -42,10 +42,10 @@ loadPartials().catch((err: Error) => {

 Handlebars.registerHelper("ifCond", function (v1, v2, options) {
  if (v1 === v2) {
-    //@ts-expect-error - Handlebars uses dynamic this context for template helpers
+    //@ts-ignore
    return options.fn(this);
  }
-  //@ts-expect-error - Handlebars uses dynamic this context for template helpers
+  //@ts-ignore
  return options.inverse(this);
 });

@@ -56,9 +56,9 @@ Handlebars.registerHelper("concat", (v1: any, v2: any) => {

 Handlebars.registerHelper("ifNotCond", function (v1, v2, options) {
  if (v1 !== v2) {
-    //@ts-expect-error - Handlebars uses dynamic this context for template helpers
+    //@ts-ignore
    return options.fn(this);
  }
-  //@ts-expect-error - Handlebars uses dynamic this context for template helpers
+  //@ts-ignore
  return options.inverse(this);
 });
--- a/App/nodemon.json
+++ b/App/nodemon.json
@@ -1,20 +1,8 @@
 {
    "watch": ["./","../Common/Server", "../Common/Types", "../Common/Utils", "../Common/Models"],
-    "ext": "ts,tsx",
+    "ext": "ts,json,tsx,env,js,jsx,hbs",
    "ignore": [
-        "./node_modules/**",
-        "./public/**",
-        "./bin/**",
-        "./build/**",
        "greenlock.d/*"
    ],
-    "watchOptions": {
-        "useFsEvents": false,
-        "interval": 500
-    },
-    "env": {
-        "TS_NODE_TRANSPILE_ONLY": "1",
-        "TS_NODE_FILES": "false"
-    },
-    "exec": "node  -r ts-node/register/transpile-only Index.ts"
+    "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts"
 }
--- a/App/package-lock.json
+++ b/App/package-lock.json
@@ -39,29 +39,27 @@
        "@bull-board/express": "^5.21.4",
        "@clickhouse/client": "^1.10.1",
        "@elastic/elasticsearch": "^8.12.1",
-        "@hcaptcha/react-hcaptcha": "^1.14.0",
        "@monaco-editor/react": "^4.4.6",
        "@opentelemetry/api": "^1.9.0",
-        "@opentelemetry/api-logs": "^0.206.0",
+        "@opentelemetry/api-logs": "^0.52.1",
        "@opentelemetry/context-zone": "^1.25.1",
-        "@opentelemetry/exporter-logs-otlp-http": "^0.207.0",
-        "@opentelemetry/exporter-metrics-otlp-proto": "^0.207.0",
-        "@opentelemetry/exporter-trace-otlp-http": "^0.207.0",
-        "@opentelemetry/exporter-trace-otlp-proto": "^0.207.0",
+        "@opentelemetry/exporter-logs-otlp-http": "^0.52.1",
+        "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.1",
+        "@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
+        "@opentelemetry/exporter-trace-otlp-proto": "^0.52.1",
        "@opentelemetry/id-generator-aws-xray": "^1.2.2",
-        "@opentelemetry/instrumentation": "^0.207.0",
-        "@opentelemetry/instrumentation-fetch": "^0.207.0",
-        "@opentelemetry/instrumentation-xml-http-request": "^0.207.0",
+        "@opentelemetry/instrumentation": "^0.52.1",
+        "@opentelemetry/instrumentation-fetch": "^0.52.1",
+        "@opentelemetry/instrumentation-xml-http-request": "^0.52.1",
        "@opentelemetry/resources": "^1.25.1",
-        "@opentelemetry/sdk-logs": "^0.207.0",
+        "@opentelemetry/sdk-logs": "^0.52.1",
        "@opentelemetry/sdk-metrics": "^1.25.1",
-        "@opentelemetry/sdk-node": "^0.207.0",
+        "@opentelemetry/sdk-node": "^0.52.1",
+        "@opentelemetry/sdk-trace-node": "^1.25.1",
        "@opentelemetry/sdk-trace-web": "^1.25.1",
-        "@opentelemetry/semantic-conventions": "^1.37.0",
+        "@opentelemetry/semantic-conventions": "^1.26.0",
        "@remixicon/react": "^4.2.0",
-        "@simplewebauthn/server": "^13.2.2",
        "@tippyjs/react": "^4.2.6",
-        "@types/archiver": "^6.0.3",
        "@types/crypto-js": "^4.2.2",
        "@types/qrcode": "^1.5.5",
        "@types/react-highlight": "^0.12.8",
@@ -70,17 +68,14 @@
        "@types/web-push": "^3.6.4",
        "acme-client": "^5.3.0",
        "airtable": "^0.12.2",
-        "archiver": "^7.0.1",
-        "axios": "^1.12.0",
-        "botbuilder": "^4.23.3",
-        "bullmq": "^5.61.0",
+        "axios": "^1.7.2",
+        "bullmq": "^5.3.3",
        "cookie-parser": "^1.4.7",
        "cors": "^2.8.5",
        "cron-parser": "^4.8.1",
        "crypto-js": "^4.2.0",
        "dotenv": "^16.4.4",
        "ejs": "^3.1.10",
-        "elkjs": "^0.10.0",
        "esbuild": "^0.25.5",
        "express": "^4.21.1",
        "formik": "^2.4.6",
@@ -94,26 +89,26 @@
        "moment": "^2.30.1",
        "moment-timezone": "^0.5.45",
        "node-cron": "^3.0.3",
-        "nodemailer": "^7.0.7",
+        "nodemailer": "^6.9.10",
        "otpauth": "^9.3.1",
-        "pg": "^8.16.3",
-        "playwright": "^1.56.0",
-        "posthog-js": "^1.275.3",
+        "pg": "^8.7.3",
+        "playwright": "^1.50.0",
+        "posthog-js": "^1.139.6",
        "prop-types": "^15.8.1",
        "qrcode": "^1.5.3",
        "react": "^18.3.1",
        "react-beautiful-dnd": "^13.1.1",
-        "react-big-calendar": "^1.19.4",
+        "react-big-calendar": "^1.13.0",
        "react-color": "^2.19.3",
        "react-dom": "^18.3.1",
        "react-dropzone": "^14.2.2",
        "react-error-boundary": "^4.0.13",
        "react-highlight": "^0.15.0",
        "react-markdown": "^8.0.3",
-        "react-router-dom": "^6.30.1",
+        "react-router-dom": "^6.24.1",
        "react-select": "^5.4.0",
        "react-spinners": "^0.14.1",
-        "react-syntax-highlighter": "^16.0.0",
+        "react-syntax-highlighter": "^15.5.0",
        "react-toggle": "^4.1.3",
        "reactflow": "^11.11.4",
        "recharts": "^2.12.7",
@@ -125,16 +120,16 @@
        "socket.io": "^4.7.4",
        "socket.io-client": "^4.7.5",
        "stripe": "^10.17.0",
-        "tailwind-merge": "^2.6.0",
+        "tailwind-merge": "^2.5.2",
        "tippy.js": "^6.3.7",
        "twilio": "^4.22.0",
-        "typeorm": "^0.3.26",
+        "typeorm": "^0.3.20",
        "typeorm-extension": "^2.2.13",
        "universal-cookie": "^7.2.1",
        "use-async-effect": "^2.2.6",
        "uuid": "^8.3.2",
        "web-push": "^3.6.7",
-        "zod": "^3.25.76"
+        "zod": "^3.25.30"
      },
      "devDependencies": {
        "@faker-js/faker": "^8.0.2",
@@ -257,20 +252,89 @@
      }
    },
    "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
+    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/code-frame/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,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/@babel/compat-data": {
      "version": "7.23.5",
      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
@@ -446,21 +510,19 @@
      }
    },
    "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
-      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
      }
@@ -475,28 +537,109 @@
      }
    },
    "node_modules/@babel/helpers": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
-      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.6.tgz",
+      "integrity": "sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.4"
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.23.6",
+        "@babel/types": "^7.23.6"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
-    "node_modules/@babel/parser": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+    "node_modules/@babel/highlight": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/types": "^7.28.5"
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0"
      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/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,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+      "dev": true,
      "bin": {
        "parser": "bin/babel-parser.js"
      },
@@ -667,15 +810,14 @@
      }
    },
    "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -703,14 +845,14 @@
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "version": "7.23.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.28.5"
+        "@babel/helper-string-parser": "^7.23.4",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "to-fast-properties": "^2.0.0"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -1602,17 +1744,15 @@
    "node_modules/asynckit": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "license": "MIT"
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
    },
    "node_modules/axios": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.1.tgz",
-      "integrity": "sha512-hU4EGxxt+j7TQijx1oYdAjw4xuIp1wRQSsbMFwSthCWeBQur1eF+qJ5iQ5sN3Tw8YRzQNKb8jszgBdMDVqwJcw==",
-      "license": "MIT",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.4",
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
        "proxy-from-env": "^1.1.0"
      }
    },
@@ -1722,23 +1862,21 @@
      }
    },
    "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "license": "MIT",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
      "dependencies": {
        "balanced-match": "^1.0.0",
        "concat-map": "0.0.1"
      }
    },
    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "fill-range": "^7.1.1"
+        "fill-range": "^7.0.1"
      },
      "engines": {
        "node": ">=8"
@@ -1809,19 +1947,6 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/callsites": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -1982,7 +2107,6 @@
      "version": "1.0.8",
      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "license": "MIT",
      "dependencies": {
        "delayed-stream": "~1.0.0"
      },
@@ -2011,11 +2135,10 @@
      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
    },
    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "path-key": "^3.1.0",
        "shebang-command": "^2.0.0",
@@ -2077,7 +2200,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "license": "MIT",
      "engines": {
        "node": ">=0.4.0"
      }
@@ -2108,20 +2230,6 @@
        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
      }
    },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/ecdsa-sig-formatter": {
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -2131,10 +2239,9 @@
      }
    },
    "node_modules/ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "license": "Apache-2.0",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
+      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
      "dependencies": {
        "jake": "^10.8.5"
      },
@@ -2178,51 +2285,6 @@
        "is-arrayish": "^0.2.1"
      }
    },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/escalade": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -2326,10 +2388,9 @@
      }
    },
    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "license": "MIT",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
      "dependencies": {
        "balanced-match": "^1.0.0"
      }
@@ -2346,11 +2407,10 @@
      }
    },
    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@@ -2372,16 +2432,15 @@
      }
    },
    "node_modules/follow-redirects": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
      "funding": [
        {
          "type": "individual",
          "url": "https://github.com/sponsors/RubenVerborgh"
        }
      ],
-      "license": "MIT",
      "engines": {
        "node": ">=4.0"
      },
@@ -2392,15 +2451,12 @@
      }
    },
    "node_modules/form-data": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
-      "license": "MIT",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
      "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"
      },
      "engines": {
@@ -2454,24 +2510,14 @@
      }
    },
    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-      "license": "MIT",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -2486,19 +2532,6 @@
        "node": ">=8.0.0"
      }
    },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/get-stream": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -2553,12 +2586,11 @@
      }
    },
    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -2609,11 +2641,10 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-      "license": "MIT",
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
      "engines": {
        "node": ">= 0.4"
      },
@@ -2621,14 +2652,10 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
      "engines": {
        "node": ">= 0.4"
      },
@@ -2637,10 +2664,9 @@
      }
    },
    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "license": "MIT",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
      "dependencies": {
        "function-bind": "^1.1.2"
      },
@@ -2799,7 +2825,6 @@
      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">=0.12.0"
      }
@@ -3497,15 +3522,13 @@
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
    },
    "node_modules/js-yaml": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "argparse": "^1.0.7",
        "esprima": "^4.0.0"
@@ -3756,15 +3779,6 @@
        "tmpl": "1.0.5"
      }
    },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/merge-stream": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -3772,13 +3786,12 @@
      "dev": true
    },
    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "braces": "^3.0.3",
+        "braces": "^3.0.2",
        "picomatch": "^2.3.1"
      },
      "engines": {
@@ -3789,7 +3802,6 @@
      "version": "1.52.0",
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "license": "MIT",
      "engines": {
        "node": ">= 0.6"
      }
@@ -3798,7 +3810,6 @@
      "version": "2.1.35",
      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "license": "MIT",
      "dependencies": {
        "mime-db": "1.52.0"
      },
@@ -3863,10 +3874,9 @@
      "dev": true
    },
    "node_modules/nodemailer": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.1.tgz",
-      "integrity": "sha512-Z+iLaBGVaSjbIzQ4pX6XV41HrooLsQ10ZWPUehGmuantvzWoDVBnmsdUcOIDM1t+yPor5pDhVlDESgOMEGxhHA==",
-      "license": "MIT-0",
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.7.tgz",
+      "integrity": "sha512-rUtR77ksqex/eZRLmQ21LKVH5nAAsVicAtAYudK7JgwenEDZ0UIQ1adUGqErz7sMkWYxWTTU1aeP2Jga6WQyJw==",
      "engines": {
        "node": ">=6.0.0"
      }
@@ -4109,11 +4119,10 @@
      "dev": true
    },
    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "license": "ISC"
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -4617,12 +4626,20 @@
      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
      "dev": true
    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/to-regex-range": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "is-number": "^7.0.0"
      },
@@ -4892,10 +4909,9 @@
      }
    },
    "node_modules/xml-crypto": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-3.2.1.tgz",
-      "integrity": "sha512-0GUNbPtQt+PLMsC5HoZRONX+K6NBJEqpXe/lsvrFj0EqfpGPpVfJKGE7a5jCg8s2+Wkrf/2U1G41kIH+zC9eyQ==",
-      "license": "MIT",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-3.2.0.tgz",
+      "integrity": "sha512-qVurBUOQrmvlgmZqIVBqmb06TD2a/PpEUfFPgD7BuBfjmoH4zgkqaWSIJrnymlCvM2GGt9x+XtJFA+ttoAufqg==",
      "dependencies": {
        "@xmldom/xmldom": "^0.8.8",
        "xpath": "0.0.32"
--- a/App/package.json
+++ b/App/package.json
@@ -18,6 +18,8 @@
  "dependencies": {
    "@sendgrid/mail": "^8.1.0",
    "Common": "file:../Common",
+    
+
    "ejs": "^3.1.9",
    "handlebars": "^4.7.8",
    "nodemailer": "^6.9.7",
--- a/Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts
+++ b/Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts
@@ -3,8 +3,6 @@ import Route from "../../../Types/API/Route";
 import AnalyticsTableEngine from "../../../Types/AnalyticsDatabase/AnalyticsTableEngine";
 import AnalyticsTableColumn from "../../../Types/AnalyticsDatabase/TableColumn";
 import TableColumnType from "../../../Types/AnalyticsDatabase/TableColumnType";
-import Projection from "../../../Types/AnalyticsDatabase/Projection";
-import MaterializedView from "../../../Types/AnalyticsDatabase/MaterializedView";
 import {
  ColumnAccessControl,
  TableAccessControl,
@@ -42,8 +40,6 @@ export default class AnalyticsBaseModel extends CommonModel {
    enableWorkflowOn?: EnableWorkflowOn | undefined;
    enableRealtimeEventsOn?: EnableRealtimeEventsOn | undefined;
    partitionKey: string;
-    projections?: Array<Projection> | undefined;
-    materializedViews?: Array<MaterializedView> | undefined;
  }) {
    super({
      tableColumns: data.tableColumns,
@@ -144,8 +140,6 @@ export default class AnalyticsBaseModel extends CommonModel {
    this.crudApiPath = data.crudApiPath;
    this.enableRealtimeEventsOn = data.enableRealtimeEventsOn;
    this.partitionKey = data.partitionKey;
-    this.projections = data.projections || [];
-    this.materializedViews = data.materializedViews || [];
  }

  private _enableWorkflowOn: EnableWorkflowOn | undefined;
@@ -256,22 +250,6 @@ export default class AnalyticsBaseModel extends CommonModel {
    this._crudApiPath = v;
  }

-  private _projections: Array<Projection> = [];
-  public get projections(): Array<Projection> {
-    return this._projections;
-  }
-  public set projections(v: Array<Projection>) {
-    this._projections = v;
-  }
-
-  private _materializedViews: Array<MaterializedView> = [];
-  public get materializedViews(): Array<MaterializedView> {
-    return this._materializedViews;
-  }
-  public set materializedViews(v: Array<MaterializedView>) {
-    this._materializedViews = v;
-  }
-
  public getTenantColumn(): AnalyticsTableColumn | null {
    const column: AnalyticsTableColumn | undefined = this.tableColumns.find(
      (column: AnalyticsTableColumn) => {
--- a/Common/Models/AnalyticsModels/ExceptionInstance.ts
+++ b/Common/Models/AnalyticsModels/ExceptionInstance.ts
@@ -9,332 +9,6 @@ import { SpanStatus } from "./Span";

 export default class ExceptionInstance extends AnalyticsBaseModel {
  public constructor() {
-    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "projectId",
-      title: "Project ID",
-      description: "ID of project",
-      required: true,
-      type: TableColumnType.ObjectID,
-      isTenantId: true,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceId",
-      title: "Service ID",
-      description: "ID of the Service which created the log",
-      required: true,
-      type: TableColumnType.ObjectID,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "time",
-      title: "Time",
-      description: "When was the log created?",
-      required: true,
-      type: TableColumnType.Date,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const timeUnixNanoColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "timeUnixNano",
-      title: "Time (in Unix Nano)",
-      description: "When was the log created?",
-      required: true,
-      type: TableColumnType.LongNumber,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const exceptionTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "exceptionType",
-      title: "Exception Type",
-      description: "Exception Type", // Examples: java.net.ConnectException; OSError; etc.
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const stackTraceColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "stackTrace",
-      title: "Stack Trace",
-      description: "Exception Stack Trace", // Examples: Division by zero; Can't convert 'int' object to str implicitly
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const messageColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "message",
-      title: "Exception Message",
-      description: "Exception Message", // Examples: Division by zero; Can't convert 'int' object to str implicitly
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const spanStatusCodeColumn: AnalyticsTableColumn = new AnalyticsTableColumn(
-      {
-        key: "spanStatusCode",
-        title: "Span Status Code",
-        description: "Span Status Code",
-        required: false,
-        type: TableColumnType.Number,
-        accessControl: {
-          read: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.ReadTelemetryException,
-          ],
-          create: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.CreateTelemetryException,
-          ],
-          update: [],
-        },
-      },
-    );
-
-    const escapedColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "escaped",
-      title: "Exception Escaped",
-      description: "Exception Escaped", // SHOULD be set to true if the exception event is recorded at a point where it is known that the exception is escaping the scope of the span.
-      required: false,
-      type: TableColumnType.Boolean,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const traceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "traceId",
-      title: "Trace ID",
-      description: "ID of the trace",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const spanIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "spanId",
-      title: "Span ID",
-      description: "ID of the span",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const fingerprintColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "fingerprint",
-      title: "Fingerprint",
-      description: "Fingerprint of the exception",
-      required: true,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
-    const spanNameColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "spanName",
-      title: "Span Name",
-      description: "Name of the span",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const attributesColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "attributes",
-      title: "Attributes",
-      description: "Attributes",
-      required: true,
-      defaultValue: {},
-      type: TableColumnType.JSON,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryException,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryException,
-        ],
-        update: [],
-      },
-    });
-
    super({
      tableName: "ExceptionItem",
      tableEngine: AnalyticsTableEngine.MergeTree,
@@ -371,22 +45,330 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
      },
      crudApiPath: new Route("/exceptions"),
      tableColumns: [
-        projectIdColumn,
-        serviceIdColumn,
-        timeColumn,
-        timeUnixNanoColumn,
-        exceptionTypeColumn,
-        stackTraceColumn,
-        messageColumn,
-        spanStatusCodeColumn,
-        escapedColumn,
-        traceIdColumn,
-        spanIdColumn,
-        fingerprintColumn,
-        spanNameColumn,
-        attributesColumn,
+        new AnalyticsTableColumn({
+          key: "projectId",
+          title: "Project ID",
+          description: "ID of project",
+          required: true,
+          type: TableColumnType.ObjectID,
+          isTenantId: true,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "serviceId",
+          title: "Service ID",
+          description: "ID of the Service which created the log",
+          required: true,
+          type: TableColumnType.ObjectID,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "time",
+          title: "Time",
+          description: "When was the log created?",
+          required: true,
+          type: TableColumnType.Date,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "timeUnixNano",
+          title: "Time (in Unix Nano)",
+          description: "When was the log created?",
+          required: true,
+          type: TableColumnType.LongNumber,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "exceptionType",
+          title: "Exception Type",
+          description: "Exception Type", // Examples: java.net.ConnectException; OSError; etc.
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "stackTrace",
+          title: "Stack Trace",
+          description: "Exception Stack Trace", // Examples: Division by zero; Can't convert 'int' object to str implicitly
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "message",
+          title: "Exception Message",
+          description: "Exception Message", // Examples: Division by zero; Can't convert 'int' object to str implicitly
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "spanStatusCode",
+          title: "Span Status Code",
+          description: "Span Status Code",
+          required: false,
+          type: TableColumnType.Number,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "escaped",
+          title: "Exception Escaped",
+          description: "Exception Escaped", // SHOULD be set to true if the exception event is recorded at a point where it is known that the exception is escaping the scope of the span.
+          required: false,
+          type: TableColumnType.Boolean,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "traceId",
+          title: "Trace ID",
+          description: "ID of the trace",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "spanId",
+          title: "Span ID",
+          description: "ID of the span",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "fingerprint",
+          title: "Fingerprint",
+          description: "Fingerprint of the exception",
+          required: true,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "spanName",
+          title: "Span Name",
+          description: "Name of the span",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "attributes",
+          title: "Attributes",
+          description: "Attributes",
+          required: true,
+          defaultValue: {},
+          type: TableColumnType.JSON,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryException,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryException,
+            ],
+            update: [],
+          },
+        }),
      ],
-      projections: [],
      sortKeys: ["projectId", "time", "serviceId", "fingerprint"],
      primaryKeys: ["projectId", "time", "serviceId", "fingerprint"],
      partitionKey: "sipHash64(projectId) % 16",
--- a/Common/Models/AnalyticsModels/Index.ts
+++ b/Common/Models/AnalyticsModels/Index.ts
@@ -2,6 +2,7 @@ import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
 import Log from "./Log";
 import Metric from "./Metric";
 import Span from "./Span";
+import TelemetryAttribute from "./TelemetryAttribute";
 import ExceptionInstance from "./ExceptionInstance";
 import MonitorLog from "./MonitorLog";

@@ -9,6 +10,7 @@ const AnalyticsModels: Array<{ new (): AnalyticsBaseModel }> = [
  Log,
  Span,
  Metric,
+  TelemetryAttribute,
  ExceptionInstance,
  MonitorLog,
 ];
--- a/Common/Models/AnalyticsModels/Log.ts
+++ b/Common/Models/AnalyticsModels/Log.ts
@@ -10,264 +10,6 @@ import LogSeverity from "../../Types/Log/LogSeverity";

 export default class Log extends AnalyticsBaseModel {
  public constructor() {
-    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "projectId",
-      title: "Project ID",
-      description: "ID of project",
-      required: true,
-      type: TableColumnType.ObjectID,
-      isTenantId: true,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceId",
-      title: "Service ID",
-      description: "ID of the Service which created the log",
-      required: true,
-      type: TableColumnType.ObjectID,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "time",
-      title: "Time",
-      description: "When was the log created?",
-      required: true,
-      type: TableColumnType.Date,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const timeUnixNanoColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "timeUnixNano",
-      title: "Time (in Unix Nano)",
-      description: "When was the log created?",
-      required: true,
-      type: TableColumnType.LongNumber,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const severityTextColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "severityText",
-      title: "Severity Text",
-      description: "Log Severity Text",
-      required: true,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const severityNumberColumn: AnalyticsTableColumn = new AnalyticsTableColumn(
-      {
-        key: "severityNumber",
-        title: "Severity Number",
-        description: "Log Severity Number",
-        required: true,
-        type: TableColumnType.Number,
-        accessControl: {
-          read: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.ReadTelemetryServiceLog,
-          ],
-          create: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.CreateTelemetryServiceLog,
-          ],
-          update: [],
-        },
-      },
-    );
-
-    const attributesColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "attributes",
-      title: "Attributes",
-      description: "Attributes",
-      required: true,
-      defaultValue: {},
-      type: TableColumnType.JSON,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const attributeKeysColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "attributeKeys",
-      title: "Attribute Keys",
-      description: "Attribute keys extracted from attributes",
-      required: true,
-      defaultValue: [],
-      type: TableColumnType.ArrayText,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const traceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "traceId",
-      title: "Trace ID",
-      description: "ID of the trace",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const spanIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "spanId",
-      title: "Span ID",
-      description: "ID of the span",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const bodyColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "body",
-      title: "Log Body",
-      description: "Body of the Log",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
    super({
      tableName: "LogItem",
      tableEngine: AnalyticsTableEngine.MergeTree,
@@ -301,19 +43,238 @@ export default class Log extends AnalyticsBaseModel {
      pluralName: "Logs",
      crudApiPath: new Route("/logs"),
      tableColumns: [
-        projectIdColumn,
-        serviceIdColumn,
-        timeColumn,
-        timeUnixNanoColumn,
-        severityTextColumn,
-        severityNumberColumn,
-        attributesColumn,
-        attributeKeysColumn,
-        traceIdColumn,
-        spanIdColumn,
-        bodyColumn,
+        new AnalyticsTableColumn({
+          key: "projectId",
+          title: "Project ID",
+          description: "ID of project",
+          required: true,
+          type: TableColumnType.ObjectID,
+          isTenantId: true,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "serviceId",
+          title: "Service ID",
+          description: "ID of the Service which created the log",
+          required: true,
+          type: TableColumnType.ObjectID,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "time",
+          title: "Time",
+          description: "When was the log created?",
+          required: true,
+          type: TableColumnType.Date,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "timeUnixNano",
+          title: "Time (in Unix Nano)",
+          description: "When was the log created?",
+          required: true,
+          type: TableColumnType.LongNumber,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "severityText",
+          title: "Severity Text",
+          description: "Log Severity Text",
+          required: true,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "severityNumber",
+          title: "Severity Number",
+          description: "Log Severity Number",
+          required: true,
+          type: TableColumnType.Number,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "attributes",
+          title: "Attributes",
+          description: "Attributes",
+          required: true,
+          defaultValue: {},
+          type: TableColumnType.JSON,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "traceId",
+          title: "Trace ID",
+          description: "ID of the trace",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "spanId",
+          title: "Span ID",
+          description: "ID of the span",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "body",
+          title: "Log Body",
+          description: "Body of the Log",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
      ],
-      projections: [],
      sortKeys: ["projectId", "time", "serviceId"],
      primaryKeys: ["projectId", "time", "serviceId"],
      partitionKey: "sipHash64(projectId) % 16",
@@ -384,14 +345,6 @@ export default class Log extends AnalyticsBaseModel {
    this.setColumnValue("attributes", v);
  }

-  public get attributeKeys(): Array<string> | undefined {
-    return this.getColumnValue("attributeKeys") as Array<string> | undefined;
-  }
-
-  public set attributeKeys(v: Array<string> | undefined) {
-    this.setColumnValue("attributeKeys", v);
-  }
-
  public get traceId(): string | undefined {
    return this.getColumnValue("traceId") as string | undefined;
  }
--- a/Common/Models/AnalyticsModels/Metric.ts
+++ b/Common/Models/AnalyticsModels/Metric.ts
@@ -28,481 +28,6 @@ export enum ServiceType {

 export default class Metric extends AnalyticsBaseModel {
  public constructor() {
-    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "projectId",
-      title: "Project ID",
-      description: "ID of project",
-      required: true,
-      type: TableColumnType.ObjectID,
-      isTenantId: true,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    // this can also be the monitor id or the telemetry service id.
-    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceId",
-      title: "Service ID",
-      description: "ID of the Service which created the Metric",
-      required: true,
-      type: TableColumnType.ObjectID,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    // this can also be the monitor id or the telemetry service id.
-    const serviceTypeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceType",
-      title: "Service Type",
-      description: "Type of the service that this telemetry belongs to",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    // add name and description
-    const nameColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "name",
-      title: "Name",
-      description: "Name of the Metric",
-      required: true,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const aggregationTemporalityColumn: AnalyticsTableColumn =
-      new AnalyticsTableColumn({
-        key: "aggregationTemporality",
-        title: "Aggregation Temporality",
-        description: "Aggregation Temporality of this Metric",
-        required: false,
-        type: TableColumnType.Text,
-        accessControl: {
-          read: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.ReadTelemetryServiceLog,
-          ],
-          create: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.CreateTelemetryServiceLog,
-          ],
-          update: [],
-        },
-      });
-
-    const metricPointTypeColumn: AnalyticsTableColumn =
-      new AnalyticsTableColumn({
-        key: "metricPointType",
-        title: "Metric Point Type",
-        description: "Metric Point Type of this Metric",
-        required: false,
-        type: TableColumnType.Text,
-        accessControl: {
-          read: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.ReadTelemetryServiceLog,
-          ],
-          create: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.CreateTelemetryServiceLog,
-          ],
-          update: [],
-        },
-      });
-
-    // this is end time.
-    const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "time",
-      title: "Time",
-      description: "When did the Metric happen?",
-      required: true,
-      type: TableColumnType.Date,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const startTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "startTime",
-      title: "Start Time",
-      description: "When did the Metric happen?",
-      required: false,
-      type: TableColumnType.Date,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    // end time.
-    const timeUnixNanoColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "timeUnixNano",
-      title: "Time (in Unix Nano)",
-      description: "When did the Metric happen?",
-      required: true,
-      type: TableColumnType.LongNumber,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const startTimeUnixNanoColumn: AnalyticsTableColumn =
-      new AnalyticsTableColumn({
-        key: "startTimeUnixNano",
-        title: "Start Time (in Unix Nano)",
-        description: "When did the Metric happen?",
-        required: false,
-        type: TableColumnType.LongNumber,
-        accessControl: {
-          read: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.ReadTelemetryServiceLog,
-          ],
-          create: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.CreateTelemetryServiceLog,
-          ],
-          update: [],
-        },
-      });
-
-    const attributesColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "attributes",
-      title: "Attributes",
-      description: "Attributes",
-      required: true,
-      type: TableColumnType.JSON,
-      defaultValue: {},
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const attributeKeysColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "attributeKeys",
-      title: "Attribute Keys",
-      description: "Attribute keys extracted from attributes",
-      required: true,
-      defaultValue: [],
-      type: TableColumnType.ArrayText,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const isMonotonicColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "isMonotonic",
-      title: "Is Monotonic",
-      description: "Is Monotonic",
-      required: false,
-      type: TableColumnType.Boolean,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const countColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "count",
-      title: "Count",
-      description: "Count",
-      required: false,
-      type: TableColumnType.Number,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const sumColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "sum",
-      title: "Sum",
-      description: "Sum",
-      required: false,
-      type: TableColumnType.Decimal,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const valueColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "value",
-      title: "Value",
-      description: "Value",
-      required: false,
-      type: TableColumnType.Decimal,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const minColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "min",
-      title: "Min",
-      description: "Min",
-      required: false,
-      type: TableColumnType.Decimal,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const maxColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "max",
-      title: "Max",
-      description: "Max",
-      required: false,
-      type: TableColumnType.Decimal,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const bucketCountsColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "bucketCounts",
-      title: "Bucket Counts",
-      description: "Bucket Counts",
-      required: true,
-      defaultValue: [],
-      type: TableColumnType.ArrayNumber,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceLog,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceLog,
-        ],
-        update: [],
-      },
-    });
-
-    const explicitBoundsColumn: AnalyticsTableColumn = new AnalyticsTableColumn(
-      {
-        key: "explicitBounds",
-        title: "Explicit Bonds",
-        description: "Explicit Bonds",
-        required: true,
-        defaultValue: [],
-        type: TableColumnType.ArrayNumber,
-        accessControl: {
-          read: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.ReadTelemetryServiceLog,
-          ],
-          create: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.CreateTelemetryServiceLog,
-          ],
-          update: [],
-        },
-      },
-    );
-
    super({
      tableName: "MetricItem",
      tableEngine: AnalyticsTableEngine.MergeTree,
@@ -536,28 +61,453 @@ export default class Metric extends AnalyticsBaseModel {
        ],
      },
      tableColumns: [
-        projectIdColumn,
-        serviceIdColumn,
-        serviceTypeColumn,
-        nameColumn,
-        aggregationTemporalityColumn,
-        metricPointTypeColumn,
-        timeColumn,
-        startTimeColumn,
-        timeUnixNanoColumn,
-        startTimeUnixNanoColumn,
-        attributesColumn,
-        attributeKeysColumn,
-        isMonotonicColumn,
-        countColumn,
-        sumColumn,
-        valueColumn,
-        minColumn,
-        maxColumn,
-        bucketCountsColumn,
-        explicitBoundsColumn,
+        new AnalyticsTableColumn({
+          key: "projectId",
+          title: "Project ID",
+          description: "ID of project",
+          required: true,
+          type: TableColumnType.ObjectID,
+          isTenantId: true,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        // this can also be the monitor id or the telemetry service id.
+        new AnalyticsTableColumn({
+          key: "serviceId",
+          title: "Service ID",
+          description: "ID of the Service which created the Metric",
+          required: true,
+          type: TableColumnType.ObjectID,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        // this can also be the monitor id or the telemetry service id.
+        new AnalyticsTableColumn({
+          key: "serviceType",
+          title: "Service Type",
+          description: "Type of the service that this telemetry belongs to",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        // add name and description
+
+        new AnalyticsTableColumn({
+          key: "name",
+          title: "Name",
+          description: "Name of the Metric",
+          required: true,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "aggregationTemporality",
+          title: "Aggregation Temporality",
+          description: "Aggregation Temporality of this Metric",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "metricPointType",
+          title: "Metric Point Type",
+          description: "Metric Point Type of this Metric",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        // this is end time.
+        new AnalyticsTableColumn({
+          key: "time",
+          title: "Time",
+          description: "When did the Metric happen?",
+          required: true,
+          type: TableColumnType.Date,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "startTime",
+          title: "Start Time",
+          description: "When did the Metric happen?",
+          required: false,
+          type: TableColumnType.Date,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        // end time.
+        new AnalyticsTableColumn({
+          key: "timeUnixNano",
+          title: "Time (in Unix Nano)",
+          description: "When did the Metric happen?",
+          required: true,
+          type: TableColumnType.LongNumber,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "startTimeUnixNano",
+          title: "Start Time (in Unix Nano)",
+          description: "When did the Metric happen?",
+          required: false,
+          type: TableColumnType.LongNumber,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "attributes",
+          title: "Attributes",
+          description: "Attributes",
+          required: true,
+          type: TableColumnType.JSON,
+          defaultValue: {},
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "isMonotonic",
+          title: "Is Monotonic",
+          description: "Is Monotonic",
+          required: false,
+          type: TableColumnType.Boolean,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "count",
+          title: "Count",
+          description: "Count",
+          required: false,
+          type: TableColumnType.Number,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "sum",
+          title: "Sum",
+          description: "Sum",
+          required: false,
+          type: TableColumnType.Decimal,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "value",
+          title: "Value",
+          description: "Value",
+          required: false,
+          type: TableColumnType.Decimal,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "min",
+          title: "Min",
+          description: "Min",
+          required: false,
+          type: TableColumnType.Decimal,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "max",
+          title: "Max",
+          description: "Max",
+          required: false,
+          type: TableColumnType.Decimal,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "bucketCounts",
+          title: "Bucket Counts",
+          description: "Bucket Counts",
+          required: true,
+          defaultValue: [],
+          type: TableColumnType.ArrayNumber,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "explicitBounds",
+          title: "Explicit Bonds",
+          description: "Explicit Bonds",
+          required: true,
+          defaultValue: [],
+          type: TableColumnType.ArrayNumber,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceLog,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceLog,
+            ],
+            update: [],
+          },
+        }),
      ],
-      projections: [],
      sortKeys: ["projectId", "time", "serviceId"],
      primaryKeys: ["projectId", "time", "serviceId"],
      partitionKey: "sipHash64(projectId) % 16",
@@ -640,14 +590,6 @@ export default class Metric extends AnalyticsBaseModel {
    this.setColumnValue("attributes", v);
  }

-  public get attributeKeys(): Array<string> | undefined {
-    return this.getColumnValue("attributeKeys") as Array<string> | undefined;
-  }
-
-  public set attributeKeys(v: Array<string> | undefined) {
-    this.setColumnValue("attributeKeys", v);
-  }
-
  public get startTime(): Date | undefined {
    return this.getColumnValue("startTime") as Date | undefined;
  }
--- a/Common/Models/AnalyticsModels/MonitorLog.ts
+++ b/Common/Models/AnalyticsModels/MonitorLog.ts
@@ -9,100 +9,6 @@ import Permission from "../../Types/Permission";

 export default class MonitorLog extends AnalyticsBaseModel {
  public constructor() {
-    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "projectId",
-      title: "Project ID",
-      description: "ID of project",
-      required: true,
-      type: TableColumnType.ObjectID,
-      isTenantId: true,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadProjectMonitor,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateProjectMonitor,
-        ],
-        update: [],
-      },
-    });
-
-    const monitorIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "monitorId",
-      title: "Monitor ID",
-      description: "ID of the monitor which this logs belongs to",
-      required: true,
-      type: TableColumnType.ObjectID,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadProjectMonitor,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateProjectMonitor,
-        ],
-        update: [],
-      },
-    });
-
-    const timeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "time",
-      title: "Time",
-      description: "When was the log created?",
-      required: true,
-      type: TableColumnType.Date,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadProjectMonitor,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateProjectMonitor,
-        ],
-        update: [],
-      },
-    });
-
-    const logBodyColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "logBody",
-      title: "Log Body",
-      description: "The body of the log",
-      required: true,
-      defaultValue: {},
-      type: TableColumnType.JSON,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadProjectMonitor,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateProjectMonitor,
-        ],
-        update: [],
-      },
-    });
-
    super({
      tableName: "MonitorLog",
      tableEngine: AnalyticsTableEngine.MergeTree,
@@ -136,12 +42,100 @@ export default class MonitorLog extends AnalyticsBaseModel {
      pluralName: "Monitor Logs",
      crudApiPath: new Route("/monitor-log"),
      tableColumns: [
-        projectIdColumn,
-        monitorIdColumn,
-        timeColumn,
-        logBodyColumn,
+        new AnalyticsTableColumn({
+          key: "projectId",
+          title: "Project ID",
+          description: "ID of project",
+          required: true,
+          type: TableColumnType.ObjectID,
+          isTenantId: true,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadProjectMonitor,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateProjectMonitor,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "monitorId",
+          title: "Monitor ID",
+          description: "ID of the monitor which this logs belongs to",
+          required: true,
+          type: TableColumnType.ObjectID,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadProjectMonitor,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateProjectMonitor,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "time",
+          title: "Time",
+          description: "When was the log created?",
+          required: true,
+          type: TableColumnType.Date,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadProjectMonitor,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateProjectMonitor,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "logBody",
+          title: "Log Body",
+          description: "The body of the log",
+          required: true,
+          defaultValue: {},
+          type: TableColumnType.JSON,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadProjectMonitor,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateProjectMonitor,
+            ],
+            update: [],
+          },
+        }),
      ],
-      projections: [],
      sortKeys: ["projectId", "time", "monitorId"],
      primaryKeys: ["projectId", "time", "monitorId"],
      partitionKey: "sipHash64(projectId) % 16",
--- a/Common/Models/AnalyticsModels/Span.ts
+++ b/Common/Models/AnalyticsModels/Span.ts
@@ -41,451 +41,6 @@ export interface SpanLink {

 export default class Span extends AnalyticsBaseModel {
  public constructor() {
-    const projectIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "projectId",
-      title: "Project ID",
-      description: "ID of project",
-      required: true,
-      type: TableColumnType.ObjectID,
-      isTenantId: true,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const serviceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "serviceId",
-      title: "Service ID",
-      description: "ID of the Service which created the log",
-      required: true,
-      type: TableColumnType.ObjectID,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const startTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "startTime",
-      title: "Start Time",
-      description: "When did the span start?",
-      required: true,
-      type: TableColumnType.Date,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const endTimeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "endTime",
-      title: "End Time",
-      description: "When did the span end?",
-      required: true,
-      type: TableColumnType.Date,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const startTimeUnixNanoColumn: AnalyticsTableColumn =
-      new AnalyticsTableColumn({
-        key: "startTimeUnixNano",
-        title: "Start Time in Unix Nano",
-        description: "When did the span start?",
-        required: true,
-        type: TableColumnType.LongNumber,
-        accessControl: {
-          read: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.ReadTelemetryServiceTraces,
-          ],
-          create: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.CreateTelemetryServiceTraces,
-          ],
-          update: [],
-        },
-      });
-
-    const durationUnixNanoColumn: AnalyticsTableColumn =
-      new AnalyticsTableColumn({
-        key: "durationUnixNano",
-        title: "Duration in Unix Nano",
-        description: "How long did the span last?",
-        required: true,
-        type: TableColumnType.LongNumber,
-        accessControl: {
-          read: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.ReadTelemetryServiceTraces,
-          ],
-          create: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.CreateTelemetryServiceTraces,
-          ],
-          update: [],
-        },
-      });
-
-    const endTimeUnixNanoColumn: AnalyticsTableColumn =
-      new AnalyticsTableColumn({
-        key: "endTimeUnixNano",
-        title: "End Time",
-        description: "When did the span end?",
-        required: true,
-        type: TableColumnType.LongNumber,
-        accessControl: {
-          read: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.ReadTelemetryServiceTraces,
-          ],
-          create: [
-            Permission.ProjectOwner,
-            Permission.ProjectAdmin,
-            Permission.ProjectMember,
-            Permission.CreateTelemetryServiceTraces,
-          ],
-          update: [],
-        },
-      });
-
-    const traceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "traceId",
-      title: "Trace ID",
-      description: "ID of the trace",
-      required: true,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const spanIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "spanId",
-      title: "Span ID",
-      description: "ID of the span",
-      required: true,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const parentSpanIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "parentSpanId",
-      title: "Parent Span ID",
-      description: "ID of the parent span",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const traceStateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "traceState",
-      title: "Trace State",
-      description: "Trace State",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const attributesColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "attributes",
-      title: "Attributes",
-      description: "Attributes",
-      required: true,
-      defaultValue: {},
-      type: TableColumnType.JSON,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const attributeKeysColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "attributeKeys",
-      title: "Attribute Keys",
-      description: "Attribute keys extracted from attributes",
-      required: true,
-      defaultValue: [],
-      type: TableColumnType.ArrayText,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const eventsColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "events",
-      title: "Events",
-      description: "Span Events",
-      required: true,
-      defaultValue: [],
-      type: TableColumnType.JSONArray,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const linksColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "links",
-      title: "Links",
-      description: "Span Links",
-      required: true,
-      defaultValue: {},
-      type: TableColumnType.JSON,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const statusCodeColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "statusCode",
-      title: "Status Code",
-      description: "Status Code",
-      required: false,
-      type: TableColumnType.Number,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const statusMessageColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "statusMessage",
-      title: "Status Message",
-      description: "Status Message",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const nameColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "name",
-      title: "Name",
-      description: "Name of the span",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
-    const kindColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
-      key: "kind",
-      title: "Kind",
-      description: "Kind of the span",
-      required: false,
-      type: TableColumnType.Text,
-      accessControl: {
-        read: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.ReadTelemetryServiceTraces,
-        ],
-        create: [
-          Permission.ProjectOwner,
-          Permission.ProjectAdmin,
-          Permission.ProjectMember,
-          Permission.CreateTelemetryServiceTraces,
-        ],
-        update: [],
-      },
-    });
-
    super({
      tableName: "SpanItem",
      tableEngine: AnalyticsTableEngine.MergeTree,
@@ -519,27 +74,424 @@ export default class Span extends AnalyticsBaseModel {
        ],
      },
      tableColumns: [
-        projectIdColumn,
-        serviceIdColumn,
-        startTimeColumn,
-        endTimeColumn,
-        startTimeUnixNanoColumn,
-        durationUnixNanoColumn,
-        endTimeUnixNanoColumn,
-        traceIdColumn,
-        spanIdColumn,
-        parentSpanIdColumn,
-        traceStateColumn,
-        attributesColumn,
-        attributeKeysColumn,
-        eventsColumn,
-        linksColumn,
-        statusCodeColumn,
-        statusMessageColumn,
-        nameColumn,
-        kindColumn,
+        new AnalyticsTableColumn({
+          key: "projectId",
+          title: "Project ID",
+          description: "ID of project",
+          required: true,
+          type: TableColumnType.ObjectID,
+          isTenantId: true,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "serviceId",
+          title: "Service ID",
+          description: "ID of the Service which created the log",
+          required: true,
+          type: TableColumnType.ObjectID,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "startTime",
+          title: "Start Time",
+          description: "When did the span start?",
+          required: true,
+          type: TableColumnType.Date,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "endTime",
+          title: "End Time",
+          description: "When did the span end?",
+          required: true,
+          type: TableColumnType.Date,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "startTimeUnixNano",
+          title: "Start Time in Unix Nano",
+          description: "When did the span start?",
+          required: true,
+          type: TableColumnType.LongNumber,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "durationUnixNano",
+          title: "Duration in Unix Nano",
+          description: "How long did the span last?",
+          required: true,
+          type: TableColumnType.LongNumber,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "endTimeUnixNano",
+          title: "End Time",
+          description: "When did the span end?",
+          required: true,
+          type: TableColumnType.LongNumber,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "traceId",
+          title: "Trace ID",
+          description: "ID of the trace",
+          required: true,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "spanId",
+          title: "Span ID",
+          description: "ID of the span",
+          required: true,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "parentSpanId",
+          title: "Parent Span ID",
+          description: "ID of the parent span",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "traceState",
+          title: "Trace State",
+          description: "Trace State",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "attributes",
+          title: "Attributes",
+          description: "Attributes",
+          required: true,
+          defaultValue: {},
+          type: TableColumnType.JSON,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "events",
+          title: "Events",
+          description: "Span Events",
+          required: true,
+          defaultValue: [],
+          type: TableColumnType.JSONArray,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "links",
+          title: "Links",
+          description: "Span Links",
+          required: true,
+          defaultValue: {},
+          type: TableColumnType.JSON,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "statusCode",
+          title: "Status Code",
+          description: "Status Code",
+          required: false,
+          type: TableColumnType.Number,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "statusMessage",
+          title: "Status Message",
+          description: "Status Message",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "name",
+          title: "Name",
+          description: "Name of the span",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "kind",
+          title: "Kind",
+          description: "Kind of the span",
+          required: false,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.CreateTelemetryServiceTraces,
+            ],
+            update: [],
+          },
+        }),
      ],
-      projections: [],
      sortKeys: ["projectId", "startTime", "serviceId", "traceId"],
      primaryKeys: ["projectId", "startTime", "serviceId", "traceId"],
      partitionKey: "sipHash64(projectId) % 16",
@@ -658,14 +610,6 @@ export default class Span extends AnalyticsBaseModel {
    this.setColumnValue("attributes", v);
  }

-  public get attributeKeys(): Array<string> | undefined {
-    return this.getColumnValue("attributeKeys") as Array<string> | undefined;
-  }
-
-  public set attributeKeys(v: Array<string> | undefined) {
-    this.setColumnValue("attributeKeys", v);
-  }
-
  public get events(): Array<SpanEvent> | undefined {
    return this.getColumnValue("events") as Array<SpanEvent> | undefined;
  }
--- a/Common/Models/AnalyticsModels/TelemetryAttribute.ts
+++ b/Common/Models/AnalyticsModels/TelemetryAttribute.ts
@@ -0,0 +1,164 @@
+import AnalyticsBaseModel from "./AnalyticsBaseModel/AnalyticsBaseModel";
+import Route from "../../Types/API/Route";
+import AnalyticsTableEngine from "../../Types/AnalyticsDatabase/AnalyticsTableEngine";
+import AnalyticsTableColumn from "../../Types/AnalyticsDatabase/TableColumn";
+import TableColumnType from "../../Types/AnalyticsDatabase/TableColumnType";
+import TelemetryType from "../../Types/Telemetry/TelemetryType";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+
+export default class TelemetryAttribute extends AnalyticsBaseModel {
+  public constructor() {
+    super({
+      tableName: "TelemetryAttribute",
+      tableEngine: AnalyticsTableEngine.MergeTree,
+      singularName: "Telemetry Attribute",
+      pluralName: "Telemetry Attributes",
+      crudApiPath: new Route("/telemetry-attributes"),
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceTraces,
+          Permission.ReadTelemetryServiceLog,
+          Permission.ReadTelemetryServiceMetrics,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceTraces,
+          Permission.CreateTelemetryServiceLog,
+          Permission.CreateTelemetryServiceMetrics,
+        ],
+        update: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.EditTelemetryServiceTraces,
+          Permission.EditTelemetryServiceLog,
+          Permission.EditTelemetryServiceMetrics,
+        ],
+        delete: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.DeleteTelemetryServiceTraces,
+          Permission.DeleteTelemetryServiceLog,
+          Permission.DeleteTelemetryServiceMetrics,
+        ],
+      },
+      tableColumns: [
+        new AnalyticsTableColumn({
+          key: "projectId",
+          title: "Project ID",
+          description: "ID of project",
+          required: true,
+          type: TableColumnType.ObjectID,
+          isTenantId: true,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+              Permission.ReadTelemetryServiceLog,
+              Permission.ReadTelemetryServiceMetrics,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.EditTelemetryServiceTraces,
+              Permission.EditTelemetryServiceLog,
+              Permission.EditTelemetryServiceMetrics,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "telemetryType",
+          title: "Telemetry Type",
+          description: "Type of telemetry",
+          required: true,
+          type: TableColumnType.Text,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+              Permission.ReadTelemetryServiceLog,
+              Permission.ReadTelemetryServiceMetrics,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.EditTelemetryServiceTraces,
+              Permission.EditTelemetryServiceLog,
+              Permission.EditTelemetryServiceMetrics,
+            ],
+            update: [],
+          },
+        }),
+
+        new AnalyticsTableColumn({
+          key: "attributes",
+          title: "Attributes",
+          description: "Attributes",
+          required: true,
+          type: TableColumnType.JSONArray,
+          accessControl: {
+            read: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.ReadTelemetryServiceTraces,
+              Permission.ReadTelemetryServiceLog,
+              Permission.ReadTelemetryServiceMetrics,
+            ],
+            create: [
+              Permission.ProjectOwner,
+              Permission.ProjectAdmin,
+              Permission.ProjectMember,
+              Permission.EditTelemetryServiceTraces,
+              Permission.EditTelemetryServiceLog,
+              Permission.EditTelemetryServiceMetrics,
+            ],
+            update: [],
+          },
+        }),
+      ],
+      sortKeys: ["projectId", "telemetryType"],
+      primaryKeys: ["projectId", "telemetryType"],
+      partitionKey: "sipHash64(projectId) % 16",
+    });
+  }
+
+  public get projectId(): ObjectID | undefined {
+    return this.getColumnValue("projectId") as ObjectID | undefined;
+  }
+
+  public set projectId(v: ObjectID | undefined) {
+    this.setColumnValue("projectId", v);
+  }
+
+  public get telemetryType(): TelemetryType | undefined {
+    return this.getColumnValue("telemetryType") as TelemetryType | undefined;
+  }
+
+  public set telemetryType(v: TelemetryType | undefined) {
+    this.setColumnValue("telemetryType", v);
+  }
+
+  public get attributes(): Array<string> | undefined {
+    return this.getColumnValue("attributes") as Array<string> | undefined;
+  }
+
+  public set attributes(v: Array<string> | undefined) {
+    this.setColumnValue("attributes", v);
+  }
+}
--- a/Common/Models/DatabaseModels/AcmeChallenge.ts
+++ b/Common/Models/DatabaseModels/AcmeChallenge.ts
@@ -4,13 +4,11 @@ import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccess
 import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
 import ColumnLength from "../../Types/Database/ColumnLength";
 import ColumnType from "../../Types/Database/ColumnType";
-import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
-import Route from "../../Types/API/Route";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";

@TableAccessControl({
@@ -26,7 +24,6 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
  icon: IconProp.Lock,
  tableDescription: "HTTP Challege for Lets Encrypt Certificates",
 })
-@CrudApiEndpoint(new Route("/acme-challenge"))
@Entity({
  name: "AcmeChallenge",
 })
--- a/Common/Models/DatabaseModels/AlertFeed.ts
+++ b/Common/Models/DatabaseModels/AlertFeed.ts
@@ -10,7 +10,6 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
-import ColorField from "../../Types/Database/ColorField";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
@@ -419,7 +418,6 @@ export default class AlertFeed extends BaseModel {
    ],
    update: [],
  })
-  @ColorField()
  @TableColumn({
    type: TableColumnType.Color,
    required: true,
--- a/Common/Models/DatabaseModels/AlertInternalNote.ts
+++ b/Common/Models/DatabaseModels/AlertInternalNote.ts
@@ -1,7 +1,6 @@
 import Alert from "./Alert";
 import Project from "./Project";
 import User from "./User";
-import File from "./File";
 import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
 import Route from "../../Types/API/Route";
 import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
@@ -18,15 +17,7 @@ import TenantColumn from "../../Types/Database/TenantColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
-import {
-  Column,
-  Entity,
-  Index,
-  JoinColumn,
-  JoinTable,
-  ManyToMany,
-  ManyToOne,
-} from "typeorm";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";

@EnableDocumentation()
@CanAccessIfCanReadOn("alert")
@@ -349,54 +340,6 @@ export default class AlertInternalNote extends BaseModel {
  })
  public note?: string = undefined;

-  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.CreateAlertInternalNote,
-    ],
-    read: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.ReadAlertInternalNote,
-    ],
-    update: [
-      Permission.ProjectOwner,
-      Permission.ProjectAdmin,
-      Permission.ProjectMember,
-      Permission.EditAlertInternalNote,
-    ],
-  })
-  @TableColumn({
-    type: TableColumnType.EntityArray,
-    modelType: File,
-    title: "Attachments",
-    description: "Files attached to this note",
-    required: false,
-  })
-  @ManyToMany(
-    () => {
-      return File;
-    },
-    {
-      eager: false,
-    },
-  )
-  @JoinTable({
-    name: "AlertInternalNoteFile",
-    joinColumn: {
-      name: "alertInternalNoteId",
-      referencedColumnName: "_id",
-    },
-    inverseJoinColumn: {
-      name: "fileId",
-      referencedColumnName: "_id",
-    },
-  })
-  public attachments?: Array<File> = undefined;
-
  @ColumnAccessControl({
    create: [],
    read: [
--- a/Common/Models/DatabaseModels/AlertSeverity.ts
+++ b/Common/Models/DatabaseModels/AlertSeverity.ts
@@ -12,7 +12,6 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
-import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -379,7 +378,6 @@ export default class AlertSeverity extends BaseModel {
      Permission.EditAlertSeverity,
    ],
  })
-  @ColorField()
  @TableColumn({
    title: "Color",
    required: true,
--- a/Common/Models/DatabaseModels/AlertState.ts
+++ b/Common/Models/DatabaseModels/AlertState.ts
@@ -12,7 +12,6 @@ import ColumnType from "../../Types/Database/ColumnType";
 import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
 import EnableDocumentation from "../../Types/Database/EnableDocumentation";
 import EnableWorkflow from "../../Types/Database/EnableWorkflow";
-import ColorField from "../../Types/Database/ColorField";
 import SlugifyColumn from "../../Types/Database/SlugifyColumn";
 import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
@@ -357,7 +356,6 @@ export default class AlertState extends BaseModel {
      Permission.EditAlertState,
    ],
  })
-  @ColorField()
  @TableColumn({
    title: "Color",
    required: true,
--- a/Common/Models/DatabaseModels/BillingPaymentMethod.ts
+++ b/Common/Models/DatabaseModels/BillingPaymentMethod.ts
@@ -20,11 +20,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
@AllowAccessIfSubscriptionIsUnpaid()
@TenantColumn("projectId")
@TableAccessControl({
-  create: [
-    Permission.ProjectOwner,
-    Permission.ManageProjectBilling,
-    Permission.CreateBillingPaymentMethod,
-  ],
+  create: [Permission.ProjectOwner, Permission.CreateBillingPaymentMethod],
  read: [
    Permission.ProjectOwner,
    Permission.ProjectUser,
@@ -32,11 +28,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
    Permission.ProjectMember,
    Permission.ReadBillingPaymentMethod,
  ],
-  delete: [
-    Permission.ProjectOwner,
-    Permission.ManageProjectBilling,
-    Permission.DeleteBillingPaymentMethod,
-  ],
+  delete: [Permission.ProjectOwner, Permission.DeleteBillingPaymentMethod],
  update: [],
 })
@CrudApiEndpoint(new Route("/billing-payment-methods"))
@@ -53,11 +45,7 @@ import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 })
 export default class BillingPaymentMethod extends BaseModel {
  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ManageProjectBilling,
-      Permission.CreateBillingPaymentMethod,
-    ],
+    create: [Permission.ProjectOwner, Permission.CreateBillingPaymentMethod],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectUser,
@@ -89,11 +77,7 @@ export default class BillingPaymentMethod extends BaseModel {
  public project?: Project = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ManageProjectBilling,
-      Permission.CreateBillingPaymentMethod,
-    ],
+    create: [Permission.ProjectOwner, Permission.CreateBillingPaymentMethod],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -119,11 +103,7 @@ export default class BillingPaymentMethod extends BaseModel {
  public projectId?: ObjectID = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ManageProjectBilling,
-      Permission.CreateBillingPaymentMethod,
-    ],
+    create: [Permission.ProjectOwner, Permission.CreateBillingPaymentMethod],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -156,11 +136,7 @@ export default class BillingPaymentMethod extends BaseModel {
  public createdByUser?: User = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ManageProjectBilling,
-      Permission.CreateBillingPaymentMethod,
-    ],
+    create: [Permission.ProjectOwner, Permission.CreateBillingPaymentMethod],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -242,11 +218,7 @@ export default class BillingPaymentMethod extends BaseModel {
  public deletedByUserId?: ObjectID = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ManageProjectBilling,
-      Permission.CreateBillingPaymentMethod,
-    ],
+    create: [Permission.ProjectOwner, Permission.CreateBillingPaymentMethod],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -306,11 +278,7 @@ export default class BillingPaymentMethod extends BaseModel {
  public paymentProviderCustomerId?: string = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ManageProjectBilling,
-      Permission.CreateBillingPaymentMethod,
-    ],
+    create: [Permission.ProjectOwner, Permission.CreateBillingPaymentMethod],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
@@ -330,11 +298,7 @@ export default class BillingPaymentMethod extends BaseModel {
  public last4Digits?: string = undefined;

  @ColumnAccessControl({
-    create: [
-      Permission.ProjectOwner,
-      Permission.ManageProjectBilling,
-      Permission.CreateBillingPaymentMethod,
-    ],
+    create: [Permission.ProjectOwner, Permission.CreateBillingPaymentMethod],
    read: [
      Permission.ProjectOwner,
      Permission.ProjectAdmin,
--- a/Show More
+++ b/Show More