diff --git a/src/app/api/portfolio/[portfolioId]/bulk-uploads/[uploadId]/onboard/route.ts b/src/app/api/portfolio/[portfolioId]/bulk-uploads/[uploadId]/onboard/route.ts
index 15fe2124..5a6d4b01 100644
--- a/src/app/api/portfolio/[portfolioId]/bulk-uploads/[uploadId]/onboard/route.ts
+++ b/src/app/api/portfolio/[portfolioId]/bulk-uploads/[uploadId]/onboard/route.ts
@@ -1,6 +1,7 @@
 import { db } from "@/app/db/db";
 import { bulkAddressUploads } from "@/app/db/schema/bulk_address_uploads";
 import { tasks } from "@/app/db/schema/tasks/tasks";
+import { subTasks } from "@/app/db/schema/tasks/subtask";
 import { eq } from "drizzle-orm";
 import { NextRequest, NextResponse } from "next/server";
 import { getServerSession } from "next-auth";
@@ -8,6 +9,8 @@ import { AuthOptions } from "@/app/api/auth/[...nextauth]/authOptions";
 import { z } from "zod";
 import { createS3Client } from "@/app/utils/s3";
 import { sendToQueue } from "@/app/utils/sqs";
+import S3 from "aws-sdk/clients/s3";
+import * as XLSX from "xlsx";
 
 const FIELD_RENAME: Record<string, string> = {
   address_1: "Address 1",
@@ -22,25 +25,26 @@ const BodySchema = z.object({
   subTaskId: z.string().uuid(),
 });
 
-function transformCsv(
-  raw: string,
+function transformFile(
+  buffer: Buffer,
   columnMapping: Record<string, string>
 ): { csv: string; error?: never } | { csv?: never; error: string } {
-  const lines = raw.split(/\r?\n/);
-  if (lines.length === 0) return { error: "Empty file" };
+  const wb = XLSX.read(buffer, { type: "buffer" });
+  const sheet = wb.Sheets[wb.SheetNames[0]];
+  const rows = XLSX.utils.sheet_to_json<Record<string, unknown>>(sheet, { defval: "" });
 
-  const sourceHeaders = lines[0].split(",").map((h) => h.trim().replace(/^"|"$/g, ""));
+  if (rows.length === 0) return { error: "Empty file" };
 
+  const sourceHeaders = Object.keys(rows[0]);
   const outputHeaders: string[] = [];
-  const keepIndices: number[] = [];
+  const sourceToOutput: Record<string, string> = {};
 
-  for (let i = 0; i < sourceHeaders.length; i++) {
-    const src = sourceHeaders[i];
+  for (const src of sourceHeaders) {
     const mapped = columnMapping[src];
     if (!mapped || mapped === "skip") continue;
     const renamed = FIELD_RENAME[mapped] ?? mapped;
     outputHeaders.push(renamed);
-    keepIndices.push(i);
+    sourceToOutput[src] = renamed;
   }
 
   if (!outputHeaders.includes("Address 1"))
@@ -48,16 +52,16 @@ function transformCsv(
   if (!outputHeaders.includes("postcode"))
     return { error: 'Mapping must include "postcode"' };
 
-  const outputLines: string[] = [outputHeaders.join(",")];
+  const outputRows = rows.map((row) => {
+    const out: Record<string, unknown> = {};
+    for (const [src, renamed] of Object.entries(sourceToOutput)) {
+      out[renamed] = row[src] ?? "";
+    }
+    return out;
+  });
 
-  for (let r = 1; r < lines.length; r++) {
-    const line = lines[r].trim();
-    if (!line) continue;
-    const cols = line.split(",").map((c) => c.trim().replace(/^"|"$/g, ""));
-    outputLines.push(keepIndices.map((i) => cols[i] ?? "").join(","));
-  }
-
-  return { csv: outputLines.join("\n") };
+  const outSheet = XLSX.utils.json_to_sheet(outputRows, { header: outputHeaders });
+  return { csv: XLSX.utils.sheet_to_csv(outSheet) };
 }
 
 export async function POST(
@@ -89,27 +93,33 @@ export async function POST(
     return NextResponse.json({ error: "Column mapping missing" }, { status: 422 });
 
   const s3 = createS3Client();
+  const outputS3 = new S3({
+    region: process.env.RETROFIT_DATA_DEV_REGION,
+    accessKeyId: process.env.RETROFIT_DATA_DEV_ACCESS_KEY,
+    secretAccessKey: process.env.RETROFIT_DATA_DEV_SECRET_KEY,
+  });
+  const outputBucket = process.env.RETROFIT_DATA_DEV_S3_BUCKET_NAME!;
   const bucket = upload.s3Bucket;
 
-  let rawCsv: string;
+  let fileBuffer: Buffer;
   try {
     const obj = await s3
       .getObject({ Bucket: bucket, Key: upload.s3Key })
       .promise();
-    rawCsv = obj.Body?.toString("utf-8") ?? "";
+    fileBuffer = Buffer.from(obj.Body as Uint8Array);
   } catch (err) {
-    console.error("Failed to read source CSV from S3:", err);
+    console.error("Failed to read source file from S3:", err);
     return NextResponse.json({ error: "Failed to read source file" }, { status: 500 });
   }
 
-  const result = transformCsv(rawCsv, upload.columnMapping);
+  const result = transformFile(fileBuffer, upload.columnMapping);
   if (result.error) return NextResponse.json({ error: result.error }, { status: 422 });
 
   const transformedKey = `bulk_onboarding_inputs/${portfolioId}/${uploadId}.csv`;
   try {
-    await s3
+    await outputS3
       .putObject({
-        Bucket: bucket,
+        Bucket: outputBucket,
         Key: transformedKey,
         Body: result.csv,
         ContentType: "text/csv",
@@ -120,7 +130,7 @@ export async function POST(
     return NextResponse.json({ error: "Failed to store transformed file" }, { status: 500 });
   }
 
-  const s3Uri = `s3://${bucket}/${transformedKey}`;
+  const s3Uri = `s3://${outputBucket}/${transformedKey}`;
   const queueName = process.env.POSTCODE_SPLITTER_QUEUE_NAME;
   if (!queueName) {
     console.error("POSTCODE_SPLITTER_QUEUE_NAME not set");
@@ -137,15 +147,17 @@ export async function POST(
     return NextResponse.json({ error: "Failed to queue onboarding job" }, { status: 500 });
   }
 
-  await db
-    .update(bulkAddressUploads)
-    .set({ status: "processing", taskId: body.taskId })
-    .where(eq(bulkAddressUploads.id, uploadId));
-
-  await db
-    .update(tasks)
-    .set({ status: "in progress" })
-    .where(eq(tasks.id, body.taskId));
+  await Promise.all([
+    db.update(bulkAddressUploads)
+      .set({ status: "processing", taskId: body.taskId })
+      .where(eq(bulkAddressUploads.id, uploadId)),
+    db.update(tasks)
+      .set({ status: "in progress" })
+      .where(eq(tasks.id, body.taskId)),
+    db.update(subTasks)
+      .set({ inputs: JSON.stringify({ task_id: body.taskId, sub_task_id: body.subTaskId, s3_uri: s3Uri }) })
+      .where(eq(subTasks.id, body.subTaskId)),
+  ]);
 
   return NextResponse.json({ taskId: body.taskId }, { status: 200 });
 }
diff --git a/src/app/api/tasks/[taskId]/route.ts b/src/app/api/tasks/[taskId]/route.ts
index 9eaa1ed6..8c43f4f4 100644
--- a/src/app/api/tasks/[taskId]/route.ts
+++ b/src/app/api/tasks/[taskId]/route.ts
@@ -1,40 +1,26 @@
 import { db } from "@/app/db/db";
-import { tasks } from "@/app/db/schema/tasks/tasks";
 import { subTasks } from "@/app/db/schema/tasks/subtask";
-import { eq, count, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 import { NextRequest, NextResponse } from "next/server";
 
 export async function GET(
-  _request: NextRequest,
+  request: NextRequest,
   { params }: { params: Promise<{ taskId: string }> }
 ) {
-  const { taskId } = await params;
-
   try {
-    const [row] = await db
-      .select({
-        id: tasks.id,
-        taskSource: tasks.taskSource,
-        status: tasks.status,
-        service: tasks.service,
-        jobStarted: tasks.jobStarted,
-        jobCompleted: tasks.jobCompleted,
-        updatedAt: tasks.updatedAt,
-        totalSubtasks: count(subTasks.id),
-        completedSubtasks: sql<number>`count(case when lower(${subTasks.status}) in ('completed', 'complete') then 1 end)::int`,
-        failedSubtasks: sql<number>`count(case when lower(${subTasks.status}) in ('failed', 'failure', 'error') then 1 end)::int`,
-      })
-      .from(tasks)
-      .leftJoin(subTasks, eq(subTasks.taskId, tasks.id))
-      .where(eq(tasks.id, taskId))
-      .groupBy(tasks.id)
-      .limit(1);
+    const { taskId } = await params;
+    const taskSubTasks = await db
+      .select()
+      .from(subTasks)
+      .where(eq(subTasks.taskId, taskId))
+      .orderBy(subTasks.updatedAt);
 
-    if (!row) return NextResponse.json({ error: "Not found" }, { status: 404 });
-
-    return NextResponse.json(row);
+    return NextResponse.json(taskSubTasks);
   } catch (error) {
-    console.error("Error fetching task:", error);
-    return NextResponse.json({ error: "Failed to fetch task" }, { status: 500 });
+    console.error("Error fetching subtasks:", error);
+    return NextResponse.json(
+      { error: "Failed to fetch subtasks" },
+      { status: 500 }
+    );
   }
 }
diff --git a/src/app/api/tasks/[taskId]/summary/route.ts b/src/app/api/tasks/[taskId]/summary/route.ts
new file mode 100644
index 00000000..6e5cb5c2
--- /dev/null
+++ b/src/app/api/tasks/[taskId]/summary/route.ts
@@ -0,0 +1,40 @@
+import { db } from "@/app/db/db";
+import { tasks } from "@/app/db/schema/tasks/tasks";
+import { subTasks } from "@/app/db/schema/tasks/subtask";
+import { eq, count, sql } from "drizzle-orm";
+import { NextRequest, NextResponse } from "next/server";
+
+export async function GET(
+  _request: NextRequest,
+  { params }: { params: Promise<{ taskId: string }> }
+) {
+  const { taskId } = await params;
+
+  try {
+    const [row] = await db
+      .select({
+        id: tasks.id,
+        taskSource: tasks.taskSource,
+        status: tasks.status,
+        service: tasks.service,
+        jobStarted: tasks.jobStarted,
+        jobCompleted: tasks.jobCompleted,
+        updatedAt: tasks.updatedAt,
+        totalSubtasks: count(subTasks.id),
+        completedSubtasks: sql<number>`count(case when lower(${subTasks.status}) in ('completed', 'complete') then 1 end)::int`,
+        failedSubtasks: sql<number>`count(case when lower(${subTasks.status}) in ('failed', 'failure', 'error') then 1 end)::int`,
+      })
+      .from(tasks)
+      .leftJoin(subTasks, eq(subTasks.taskId, tasks.id))
+      .where(eq(tasks.id, taskId))
+      .groupBy(tasks.id)
+      .limit(1);
+
+    if (!row) return NextResponse.json({ error: "Not found" }, { status: 404 });
+
+    return NextResponse.json(row);
+  } catch (error) {
+    console.error("Error fetching task summary:", error);
+    return NextResponse.json({ error: "Failed to fetch task summary" }, { status: 500 });
+  }
+}
diff --git a/src/app/components/portfolio/AddNew.tsx b/src/app/components/portfolio/AddNew.tsx
index 28bcec7b..2dfe23bd 100644
--- a/src/app/components/portfolio/AddNew.tsx
+++ b/src/app/components/portfolio/AddNew.tsx
@@ -13,7 +13,7 @@ import {
 import { cn } from "@/lib/utils";
 import { useRouter } from "next/navigation";
 import { Dispatch, SetStateAction, useState } from "react";
-// import BulkUploadComingSoonModal from "@/app/components/portfolio/BulkUploadComingSoonModal";
+import BulkUploadComingSoonModal from "@/app/components/portfolio/BulkUploadComingSoonModal";
 
 interface AddNewProps {
   portfolioId: string;
@@ -37,11 +37,11 @@ export default function AddNew({
 
   return (
     <>
-      {/* <BulkUploadComingSoonModal
-      isOpen={isBulkUploadOpen}
-      onClose={() => setIsBulkUploadOpen(false)}
-      portfolioId={portfolioId}
-    /> */}
+      <BulkUploadComingSoonModal
+        isOpen={isBulkUploadOpen}
+        onClose={() => setIsBulkUploadOpen(false)}
+        portfolioId={portfolioId}
+      />
       <Menu as="div" className="relative inline-block text-left">
         <MenuButton
           className="
diff --git a/src/app/db/migrations/0176_bulk_upload_combined_output.sql b/src/app/db/migrations/0176_bulk_upload_combined_output.sql
new file mode 100644
index 00000000..01daf31e
--- /dev/null
+++ b/src/app/db/migrations/0176_bulk_upload_combined_output.sql
@@ -0,0 +1 @@
+ALTER TABLE "bulk_address_uploads" ADD COLUMN "combined_output_s3_uri" text;
diff --git a/src/app/db/migrations/0177_wooden_dexter_bennett.sql b/src/app/db/migrations/0177_wooden_dexter_bennett.sql
new file mode 100644
index 00000000..795c77d6
--- /dev/null
+++ b/src/app/db/migrations/0177_wooden_dexter_bennett.sql
@@ -0,0 +1 @@
+ALTER TABLE "bulk_address_uploads" ADD COLUMN "combined_output_s3_uri" text;
\ No newline at end of file
diff --git a/src/app/db/migrations/meta/0177_snapshot.json b/src/app/db/migrations/meta/0177_snapshot.json
new file mode 100644
index 00000000..57e9fb4a
--- /dev/null
+++ b/src/app/db/migrations/meta/0177_snapshot.json
@@ -0,0 +1,6766 @@
+{
+  "id": "1099360c-ef3d-4381-ac80-28cb4475b1c7",
+  "prevId": "98f5e69e-f11d-482a-bdcf-a7dd4de35fe0",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.postcode_search": {
+      "name": "postcode_search",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "result_data": {
+          "name": "result_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "last_updated_at": {
+          "name": "last_updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "postcode_search_postcode_unique": {
+          "name": "postcode_search_postcode_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "postcode"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.deal_measure_approval_events": {
+      "name": "deal_measure_approval_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "hubspot_deal_id": {
+          "name": "hubspot_deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure_name": {
+          "name": "measure_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "acted_by": {
+          "name": "acted_by",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "acted_at": {
+          "name": "acted_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "idx_deal_measure_events_deal_id": {
+          "name": "idx_deal_measure_events_deal_id",
+          "columns": [
+            {
+              "expression": "hubspot_deal_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_deal_measure_events_acted_at": {
+          "name": "idx_deal_measure_events_acted_at",
+          "columns": [
+            {
+              "expression": "acted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "deal_measure_approval_events_acted_by_user_id_fk": {
+          "name": "deal_measure_approval_events_acted_by_user_id_fk",
+          "tableFrom": "deal_measure_approval_events",
+          "tableTo": "user",
+          "columnsFrom": [
+            "acted_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.deal_measure_approvals": {
+      "name": "deal_measure_approvals",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "hubspot_deal_id": {
+          "name": "hubspot_deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure_name": {
+          "name": "measure_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_approved": {
+          "name": "is_approved",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "approved_by": {
+          "name": "approved_by",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "approved_at": {
+          "name": "approved_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "idx_deal_measure_approvals_deal_id": {
+          "name": "idx_deal_measure_approvals_deal_id",
+          "columns": [
+            {
+              "expression": "hubspot_deal_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "deal_measure_approvals_approved_by_user_id_fk": {
+          "name": "deal_measure_approvals_approved_by_user_id_fk",
+          "tableFrom": "deal_measure_approvals",
+          "tableTo": "user",
+          "columnsFrom": [
+            "approved_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "uq_deal_measure": {
+          "name": "uq_deal_measure",
+          "nullsNotDistinct": false,
+          "columns": [
+            "hubspot_deal_id",
+            "measure_name"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.bulk_address_uploads": {
+      "name": "bulk_address_uploads",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_bucket": {
+          "name": "s3_bucket",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_key": {
+          "name": "s3_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "filename": {
+          "name": "filename",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ready_for_processing'"
+        },
+        "source_headers": {
+          "name": "source_headers",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "column_mapping": {
+          "name": "column_mapping",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "combined_output_s3_uri": {
+          "name": "combined_output_s3_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.aspect_condition": {
+      "name": "aspect_condition",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "element_id": {
+          "name": "element_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "aspect_type": {
+          "name": "aspect_type",
+          "type": "aspect_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "aspect_instance": {
+          "name": "aspect_instance",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "install_date": {
+          "name": "install_date",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "renewal_year": {
+          "name": "renewal_year",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "comments": {
+          "name": "comments",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "aspect_condition_element_id_element_id_fk": {
+          "name": "aspect_condition_element_id_element_id_fk",
+          "tableFrom": "aspect_condition",
+          "tableTo": "element",
+          "columnsFrom": [
+            "element_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.element": {
+      "name": "element",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "survey_id": {
+          "name": "survey_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "element_type": {
+          "name": "element_type",
+          "type": "element_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "element_instance": {
+          "name": "element_instance",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "element_survey_id_property_condition_survey_id_fk": {
+          "name": "element_survey_id_property_condition_survey_id_fk",
+          "tableFrom": "element",
+          "tableTo": "property_condition_survey",
+          "columnsFrom": [
+            "survey_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_condition_survey": {
+      "name": "property_condition_survey",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "date": {
+          "name": "date",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.hubspot_company_data": {
+      "name": "hubspot_company_data",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "company_id": {
+          "name": "company_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "company_name": {
+          "name": "company_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "group_id": {
+          "name": "group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.hubspot_deal_data": {
+      "name": "hubspot_deal_data",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "deal_id": {
+          "name": "deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "dealname": {
+          "name": "dealname",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "dealstage": {
+          "name": "dealstage",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "company_id": {
+          "name": "company_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "project_code": {
+          "name": "project_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "landlord_property_id": {
+          "name": "landlord_property_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "listing_id": {
+          "name": "listing_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "outcome": {
+          "name": "outcome",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "outcome_notes": {
+          "name": "outcome_notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "major_condition_issue_description": {
+          "name": "major_condition_issue_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "major_condition_issue_photos": {
+          "name": "major_condition_issue_photos",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "major_condition_issue_evidence_s3_url": {
+          "name": "major_condition_issue_evidence_s3_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "coordination_status": {
+          "name": "coordination_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "design_status": {
+          "name": "design_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pashub_link": {
+          "name": "pashub_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sharepoint_link": {
+          "name": "sharepoint_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "dampmould_growth": {
+          "name": "dampmould_growth",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pre_sap": {
+          "name": "pre_sap",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "coordinator": {
+          "name": "coordinator",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mtp_completion_date": {
+          "name": "mtp_completion_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mtp_re_model_completion_date": {
+          "name": "mtp_re_model_completion_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ioe_v3_completion_date": {
+          "name": "ioe_v3_completion_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "proposed_measures": {
+          "name": "proposed_measures",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "approved_package": {
+          "name": "approved_package",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "designer": {
+          "name": "designer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "design_type": {
+          "name": "design_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "design_completion_date": {
+          "name": "design_completion_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actual_measures_installed": {
+          "name": "actual_measures_installed",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installer": {
+          "name": "installer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installer_handover": {
+          "name": "installer_handover",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodgement_status": {
+          "name": "lodgement_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "measures_lodgement_date": {
+          "name": "measures_lodgement_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodgement_date": {
+          "name": "lodgement_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expected_commencement_date": {
+          "name": "expected_commencement_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "coordination_comments": {
+          "name": "coordination_comments",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "surveyor": {
+          "name": "surveyor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "damp_mould_and_repairs_comments": {
+          "name": "damp_mould_and_repairs_comments",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "confirmed_survey_date": {
+          "name": "confirmed_survey_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "confirmed_survey_time": {
+          "name": "confirmed_survey_time",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "surveyed_date": {
+          "name": "surveyed_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_status_tracker": {
+      "name": "property_status_tracker",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "hubspot_deal_id": {
+          "name": "hubspot_deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "property_status_tracker_property_id_property_id_fk": {
+          "name": "property_status_tracker_property_id_property_id_fk",
+          "tableFrom": "property_status_tracker",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "property_status_tracker_portfolio_id_portfolio_id_fk": {
+          "name": "property_status_tracker_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property_status_tracker",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.energy_assessments": {
+      "name": "energy_assessments",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uprn_source": {
+          "name": "uprn_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_type": {
+          "name": "property_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "building_reference_number": {
+          "name": "building_reference_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_efficiency": {
+          "name": "current_energy_efficiency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "current_energy_rating": {
+          "name": "current_energy_rating",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address1": {
+          "name": "address1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address2": {
+          "name": "address2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address3": {
+          "name": "address3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "posttown": {
+          "name": "posttown",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address": {
+          "name": "address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "county": {
+          "name": "county",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "constituency": {
+          "name": "constituency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "constituency_label": {
+          "name": "constituency_label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "low_energy_fixed_light_count": {
+          "name": "low_energy_fixed_light_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "construction_age_band": {
+          "name": "construction_age_band",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheat_energy_eff": {
+          "name": "mainheat_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "windows_env_eff": {
+          "name": "windows_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_energy_eff": {
+          "name": "lighting_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environment_impact_potential": {
+          "name": "environment_impact_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheatcont_description": {
+          "name": "mainheatcont_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sheating_energy_eff": {
+          "name": "sheating_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "local_authority": {
+          "name": "local_authority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "local_authority_label": {
+          "name": "local_authority_label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "fixed_lighting_outlets_count": {
+          "name": "fixed_lighting_outlets_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_tariff": {
+          "name": "energy_tariff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mechanical_ventilation": {
+          "name": "mechanical_ventilation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "solar_water_heating_flag": {
+          "name": "solar_water_heating_flag",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "co2_emissions_potential": {
+          "name": "co2_emissions_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_heated_rooms": {
+          "name": "number_heated_rooms",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_description": {
+          "name": "floor_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_consumption_potential": {
+          "name": "energy_consumption_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "built_form": {
+          "name": "built_form",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_open_fireplaces": {
+          "name": "number_open_fireplaces",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "windows_description": {
+          "name": "windows_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "glazed_area": {
+          "name": "glazed_area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inspection_date": {
+          "name": "inspection_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mains_gas_flag": {
+          "name": "mains_gas_flag",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "co2_emiss_curr_per_floor_area": {
+          "name": "co2_emiss_curr_per_floor_area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heat_loss_corridor": {
+          "name": "heat_loss_corridor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unheated_corridor_length": {
+          "name": "unheated_corridor_length",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "flat_storey_count": {
+          "name": "flat_storey_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_energy_eff": {
+          "name": "roof_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_floor_area": {
+          "name": "total_floor_area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environment_impact_current": {
+          "name": "environment_impact_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "roof_description": {
+          "name": "roof_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_energy_eff": {
+          "name": "floor_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_habitable_rooms": {
+          "name": "number_habitable_rooms",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_env_eff": {
+          "name": "hot_water_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheatc_energy_eff": {
+          "name": "mainheatc_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "main_fuel": {
+          "name": "main_fuel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_env_eff": {
+          "name": "lighting_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "windows_energy_eff": {
+          "name": "windows_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_env_eff": {
+          "name": "floor_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sheating_env_eff": {
+          "name": "sheating_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_description": {
+          "name": "lighting_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "roof_env_eff": {
+          "name": "roof_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "walls_energy_eff": {
+          "name": "walls_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "photo_supply": {
+          "name": "photo_supply",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_cost_potential": {
+          "name": "lighting_cost_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheat_env_eff": {
+          "name": "mainheat_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "multi_glaze_proportion": {
+          "name": "multi_glaze_proportion",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "main_heating_controls": {
+          "name": "main_heating_controls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "flat_top_storey": {
+          "name": "flat_top_storey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "secondheat_description": {
+          "name": "secondheat_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "walls_env_eff": {
+          "name": "walls_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "transaction_type": {
+          "name": "transaction_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "extension_count": {
+          "name": "extension_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheatc_env_eff": {
+          "name": "mainheatc_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lmk_key": {
+          "name": "lmk_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wind_turbine_count": {
+          "name": "wind_turbine_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tenure": {
+          "name": "tenure",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_level": {
+          "name": "floor_level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "potential_energy_efficiency": {
+          "name": "potential_energy_efficiency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "potential_energy_rating": {
+          "name": "potential_energy_rating",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_energy_eff": {
+          "name": "hot_water_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "low_energy_lighting": {
+          "name": "low_energy_lighting",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "walls_description": {
+          "name": "walls_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hotwater_description": {
+          "name": "hotwater_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "co2_emissions_current": {
+          "name": "co2_emissions_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heating_cost_current": {
+          "name": "heating_cost_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heating_cost_potential": {
+          "name": "heating_cost_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_cost_current": {
+          "name": "hot_water_cost_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_cost_potential": {
+          "name": "hot_water_cost_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_cost_current": {
+          "name": "lighting_cost_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_consumption_current": {
+          "name": "energy_consumption_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lodgement_date": {
+          "name": "lodgement_date",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lodgement_datetime": {
+          "name": "lodgement_datetime",
+          "type": "timestamp (6)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheat_description": {
+          "name": "mainheat_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_height": {
+          "name": "floor_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "glazed_type": {
+          "name": "glazed_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_location": {
+          "name": "file_location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor_name": {
+          "name": "surveyor_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor_company": {
+          "name": "surveyor_company",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "space_heating_kwh": {
+          "name": "space_heating_kwh",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "water_heating_kwh": {
+          "name": "water_heating_kwh",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_doors": {
+          "name": "number_of_doors",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_insulated_doors": {
+          "name": "number_of_insulated_doors",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_floors": {
+          "name": "number_of_floors",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "insulation_wall_area": {
+          "name": "insulation_wall_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heat_loss_perimeter": {
+          "name": "heat_loss_perimeter",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "party_wall_length": {
+          "name": "party_wall_length",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "perimeter": {
+          "name": "perimeter",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "rooms_with_bath_and_or_shower": {
+          "name": "rooms_with_bath_and_or_shower",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rooms_with_mixer_shower_no_bath": {
+          "name": "rooms_with_mixer_shower_no_bath",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "room_with_bath_and_mixer_shower": {
+          "name": "room_with_bath_and_mixer_shower",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "percent_draftproofed": {
+          "name": "percent_draftproofed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_hot_water_cylinder": {
+          "name": "has_hot_water_cylinder",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cylinder_insulation_type": {
+          "name": "cylinder_insulation_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cylinder_insulation_thickness": {
+          "name": "cylinder_insulation_thickness",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cylinder_thermostat": {
+          "name": "cylinder_thermostat",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_dwelling_ground_floor_area": {
+          "name": "main_dwelling_ground_floor_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_windows": {
+          "name": "number_of_windows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows_area": {
+          "name": "windows_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.energy_assessment_documents": {
+      "name": "energy_assessment_documents",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_assessment_id": {
+          "name": "energy_assessment_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_type": {
+          "name": "document_type",
+          "type": "document_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_location": {
+          "name": "document_location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "scenario_id": {
+          "name": "scenario_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "energy_assessment_documents_energy_assessment_id_energy_assessments_id_fk": {
+          "name": "energy_assessment_documents_energy_assessment_id_energy_assessments_id_fk",
+          "tableFrom": "energy_assessment_documents",
+          "tableTo": "energy_assessments",
+          "columnsFrom": [
+            "energy_assessment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "energy_assessment_documents_scenario_id_energy_assessment_scenarios_id_fk": {
+          "name": "energy_assessment_documents_scenario_id_energy_assessment_scenarios_id_fk",
+          "tableFrom": "energy_assessment_documents",
+          "tableTo": "energy_assessment_scenarios",
+          "columnsFrom": [
+            "scenario_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.energy_assessment_scenarios": {
+      "name": "energy_assessment_scenarios",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "scenario_name": {
+          "name": "scenario_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_assessment_id": {
+          "name": "energy_assessment_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "energy_assessment_scenarios_energy_assessment_id_energy_assessments_id_fk": {
+          "name": "energy_assessment_scenarios_energy_assessment_id_energy_assessments_id_fk",
+          "tableFrom": "energy_assessment_scenarios",
+          "tableTo": "energy_assessments",
+          "columnsFrom": [
+            "energy_assessment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_store": {
+      "name": "epc_store",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_api_created_at": {
+          "name": "epc_api_created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_api": {
+          "name": "epc_api",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_page_created_at": {
+          "name": "epc_page_created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_page": {
+          "name": "epc_page",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_page_rrn": {
+          "name": "epc_page_rrn",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "uq_epc_store_uprn": {
+          "name": "uq_epc_store_uprn",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.files_from_surveyor": {
+      "name": "files_from_surveyor",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_json_url": {
+          "name": "s3_json_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "files_from_surveyor_portfolio_id_portfolio_id_fk": {
+          "name": "files_from_surveyor_portfolio_id_portfolio_id_fk",
+          "tableFrom": "files_from_surveyor",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "files_from_surveyor_property_id_property_id_fk": {
+          "name": "files_from_surveyor_property_id_property_id_fk",
+          "tableFrom": "files_from_surveyor",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.funding_package": {
+      "name": "funding_package",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan_id": {
+          "name": "plan_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scheme": {
+          "name": "scheme",
+          "type": "scheme",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "project_funding": {
+          "name": "project_funding",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_uplift": {
+          "name": "total_uplift",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "full_project_score": {
+          "name": "full_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "partial_project_score": {
+          "name": "partial_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uplift_project_score": {
+          "name": "uplift_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "funding_package_plan_id_plan_id_fk": {
+          "name": "funding_package_plan_id_plan_id_fk",
+          "tableFrom": "funding_package",
+          "tableTo": "plan",
+          "columnsFrom": [
+            "plan_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.funding_package_measures": {
+      "name": "funding_package_measures",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "funding_package_id": {
+          "name": "funding_package_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure": {
+          "name": "measure",
+          "type": "type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "material_id": {
+          "name": "material_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "innovation_uplift": {
+          "name": "innovation_uplift",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "partial_project_score": {
+          "name": "partial_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uplift_project_score": {
+          "name": "uplift_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "funding_package_measures_funding_package_id_funding_package_id_fk": {
+          "name": "funding_package_measures_funding_package_id_funding_package_id_fk",
+          "tableFrom": "funding_package_measures",
+          "tableTo": "funding_package",
+          "columnsFrom": [
+            "funding_package_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "funding_package_measures_material_id_material_id_fk": {
+          "name": "funding_package_measures_material_id_material_id_fk",
+          "tableFrom": "funding_package_measures",
+          "tableTo": "material",
+          "columnsFrom": [
+            "material_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.inspections": {
+      "name": "inspections",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "archetype": {
+          "name": "archetype",
+          "type": "inspection_archetype",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archetype_2": {
+          "name": "archetype_2",
+          "type": "inspection_archetype_2",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wall_construction": {
+          "name": "wall_construction",
+          "type": "inspections_wall_construction",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "insulation": {
+          "name": "insulation",
+          "type": "inspections_wall_insulation",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "insulation_material": {
+          "name": "insulation_material",
+          "type": "inspections_insulation_material",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "borescoped": {
+          "name": "borescoped",
+          "type": "inspection_borescoped",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_orientation": {
+          "name": "roof_orientation",
+          "type": "inspections_roof_orientation",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tile_hung": {
+          "name": "tile_hung",
+          "type": "inspections_tile_hung",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rendered": {
+          "name": "rendered",
+          "type": "inspections_rendered",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cladding": {
+          "name": "cladding",
+          "type": "inspections_cladding",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_issues": {
+          "name": "access_issues",
+          "type": "inspections_access_issues",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor_name": {
+          "name": "surveyor_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "inspections_property_id_property_id_fk": {
+          "name": "inspections_property_id_property_id_fk",
+          "tableFrom": "inspections",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.material": {
+      "name": "material",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "depth": {
+          "name": "depth",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "depth_unit": {
+          "name": "depth_unit",
+          "type": "depth_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_unit": {
+          "name": "cost_unit",
+          "type": "cost_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "r_value_per_mm": {
+          "name": "r_value_per_mm",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "r_value_unit": {
+          "name": "r_value_unit",
+          "type": "r_value_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "thermal_conductivity": {
+          "name": "thermal_conductivity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "thermal_conductivity_unit": {
+          "name": "thermal_conductivity_unit",
+          "type": "thermal_conductivity_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "link": {
+          "name": "link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "prime_material_cost": {
+          "name": "prime_material_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "material_cost": {
+          "name": "material_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_cost": {
+          "name": "labour_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_hours_per_unit": {
+          "name": "labour_hours_per_unit",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plant_cost": {
+          "name": "plant_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_cost": {
+          "name": "total_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_installer_quote": {
+          "name": "is_installer_quote",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "innovation_rate": {
+          "name": "innovation_rate",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "size": {
+          "name": "size",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "size_unit": {
+          "name": "size_unit",
+          "type": "size_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "includes_scaffolding": {
+          "name": "includes_scaffolding",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "includes_battery": {
+          "name": "includes_battery",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "battery_size": {
+          "name": "battery_size",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.organisation": {
+      "name": "organisation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "hubspot_company_id": {
+          "name": "hubspot_company_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.portfolio_organisation": {
+      "name": "portfolio_organisation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organisation_id": {
+          "name": "organisation_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "portfolio_organisation_portfolio_id_portfolio_id_fk": {
+          "name": "portfolio_organisation_portfolio_id_portfolio_id_fk",
+          "tableFrom": "portfolio_organisation",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "portfolio_organisation_organisation_id_organisation_id_fk": {
+          "name": "portfolio_organisation_organisation_id_organisation_id_fk",
+          "tableFrom": "portfolio_organisation",
+          "tableTo": "organisation",
+          "columnsFrom": [
+            "organisation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "portfolio_organisation_portfolio_id_unique": {
+          "name": "portfolio_organisation_portfolio_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "portfolio_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.portfolio": {
+      "name": "portfolio",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "budget": {
+          "name": "budget",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "goal": {
+          "name": "goal",
+          "type": "goal",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cost": {
+          "name": "cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_properties": {
+          "name": "number_of_properties",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_equivalent_savings": {
+          "name": "co2_equivalent_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_savings": {
+          "name": "energy_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_cost_savings": {
+          "name": "energy_cost_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_valuation_increase": {
+          "name": "property_valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rental_yield_increase": {
+          "name": "rental_yield_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_work_hours": {
+          "name": "total_work_hours",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_days": {
+          "name": "labour_days",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "epc_breakdown_pre_retrofit": {
+          "name": "epc_breakdown_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_breakdown_post_retrofit": {
+          "name": "epc_breakdown_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "n_units_to_retrofit": {
+          "name": "n_units_to_retrofit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_pre_retrofit": {
+          "name": "co2_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_post_retrofit": {
+          "name": "co2_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_pre_retrofit": {
+          "name": "energy_bill_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_post_retrofit": {
+          "name": "energy_bill_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_pre_retrofit": {
+          "name": "energy_consumption_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_post_retrofit": {
+          "name": "energy_consumption_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_improvement_per_unit": {
+          "name": "valuation_improvement_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_unit": {
+          "name": "cost_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_co2_saved": {
+          "name": "cost_per_co2_saved",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_sap_point": {
+          "name": "cost_per_sap_point",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_return_on_investment": {
+          "name": "valuation_return_on_investment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.portfolio_capabilities": {
+      "name": "portfolio_capabilities",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "capability": {
+          "name": "capability",
+          "type": "portfolio_capability",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "portfolio_capabilities_user_id_user_id_fk": {
+          "name": "portfolio_capabilities_user_id_user_id_fk",
+          "tableFrom": "portfolio_capabilities",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "portfolio_capabilities_portfolio_id_portfolio_id_fk": {
+          "name": "portfolio_capabilities_portfolio_id_portfolio_id_fk",
+          "tableFrom": "portfolio_capabilities",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "portfolio_capabilities_user_id_portfolio_id_capability_unique": {
+          "name": "portfolio_capabilities_user_id_portfolio_id_capability_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "user_id",
+            "portfolio_id",
+            "capability"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.portfolioUsers": {
+      "name": "portfolioUsers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "role",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "portfolioUsers_user_id_user_id_fk": {
+          "name": "portfolioUsers_user_id_user_id_fk",
+          "tableFrom": "portfolioUsers",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "portfolioUsers_portfolio_id_portfolio_id_fk": {
+          "name": "portfolioUsers_portfolio_id_portfolio_id_fk",
+          "tableFrom": "portfolioUsers",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.non_intrusive_survey": {
+      "name": "non_intrusive_survey",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "survey_date": {
+          "name": "survey_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor": {
+          "name": "surveyor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.non_intrusive_survey_notes": {
+      "name": "non_intrusive_survey_notes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "survey_id": {
+          "name": "survey_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "note": {
+          "name": "note",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "non_intrusive_survey_notes_survey_id_non_intrusive_survey_id_fk": {
+          "name": "non_intrusive_survey_notes_survey_id_non_intrusive_survey_id_fk",
+          "tableFrom": "non_intrusive_survey_notes",
+          "tableTo": "non_intrusive_survey",
+          "columnsFrom": [
+            "survey_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property": {
+      "name": "property",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "creation_status": {
+          "name": "creation_status",
+          "type": "creation_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "landlord_property_id": {
+          "name": "landlord_property_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "building_reference_number": {
+          "name": "building_reference_number",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "address": {
+          "name": "address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_pre_condition_report": {
+          "name": "has_pre_condition_report",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_recommendations": {
+          "name": "has_recommendations",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "property_type": {
+          "name": "property_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "built_form": {
+          "name": "built_form",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "local_authority": {
+          "name": "local_authority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "constituency": {
+          "name": "constituency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_rooms": {
+          "name": "number_of_rooms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "year_built": {
+          "name": "year_built",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tenure": {
+          "name": "tenure",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_epc_rating": {
+          "name": "current_epc_rating",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_sap_points": {
+          "name": "current_sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_valuation": {
+          "name": "current_valuation",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_sap_point_adjustment": {
+          "name": "installed_measures_sap_point_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_sap_points_adjusted_for_installed_measures": {
+          "name": "is_sap_points_adjusted_for_installed_measures",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "original_sap_points": {
+          "name": "original_sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodged_sap_points": {
+          "name": "lodged_sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodged_epc_rating": {
+          "name": "lodged_epc_rating",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "uq_property_portfolio_uprn": {
+          "name": "uq_property_portfolio_uprn",
+          "columns": [
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"property\".\"uprn\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "property_portfolio_id_portfolio_id_fk": {
+          "name": "property_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_details_epc": {
+      "name": "property_details_epc",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "full_address": {
+          "name": "full_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodgement_date": {
+          "name": "lodgement_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_expired": {
+          "name": "is_expired",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_floor_area": {
+          "name": "total_floor_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "walls": {
+          "name": "walls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "walls_rating": {
+          "name": "walls_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof": {
+          "name": "roof",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_rating": {
+          "name": "roof_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor": {
+          "name": "floor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_rating": {
+          "name": "floor_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows": {
+          "name": "windows",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows_rating": {
+          "name": "windows_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating": {
+          "name": "heating",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_rating": {
+          "name": "heating_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_controls": {
+          "name": "heating_controls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_controls_rating": {
+          "name": "heating_controls_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water": {
+          "name": "hot_water",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water_rating": {
+          "name": "hot_water_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting": {
+          "name": "lighting",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting_rating": {
+          "name": "lighting_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mainfuel": {
+          "name": "mainfuel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation": {
+          "name": "ventilation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "solar_pv": {
+          "name": "solar_pv",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "solar_hot_water": {
+          "name": "solar_hot_water",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wind_turbine": {
+          "name": "wind_turbine",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_height": {
+          "name": "floor_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_heated_rooms": {
+          "name": "number_heated_rooms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_loss_corridor": {
+          "name": "heat_loss_corridor",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "unheated_corridor_length": {
+          "name": "unheated_corridor_length",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_open_fireplaces": {
+          "name": "number_of_open_fireplaces",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_extensions": {
+          "name": "number_of_extensions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_storeys": {
+          "name": "number_of_storeys",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mains_gas": {
+          "name": "mains_gas",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_tariff": {
+          "name": "energy_tariff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "primary_energy_consumption": {
+          "name": "primary_energy_consumption",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_emissions": {
+          "name": "co2_emissions",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_demand": {
+          "name": "current_energy_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_demand_heating_hotwater": {
+          "name": "current_energy_demand_heating_hotwater",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "estimated": {
+          "name": "estimated",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "sap_05_overwritten": {
+          "name": "sap_05_overwritten",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "sap_05_score": {
+          "name": "sap_05_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sap_05_epc_rating": {
+          "name": "sap_05_epc_rating",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_cost_current": {
+          "name": "heating_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water_cost_current": {
+          "name": "hot_water_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting_cost_current": {
+          "name": "lighting_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "appliances_cost_current": {
+          "name": "appliances_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gas_standing_charge": {
+          "name": "gas_standing_charge",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "electricity_standing_charge": {
+          "name": "electricity_standing_charge",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_co2_emissions": {
+          "name": "original_co2_emissions",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_primary_energy_consumption": {
+          "name": "original_primary_energy_consumption",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_current_energy_demand": {
+          "name": "original_current_energy_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_current_energy_demand_heating_hotwater": {
+          "name": "original_current_energy_demand_heating_hotwater",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_co2_adjustment": {
+          "name": "installed_measures_co2_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_energy_demand_adjustment": {
+          "name": "installed_measures_energy_demand_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_total_energy_bill_adjustment": {
+          "name": "installed_measures_total_energy_bill_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_heat_demand_adjustment": {
+          "name": "installed_measures_heat_demand_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_epc_adjusted_for_installed_measures": {
+          "name": "is_epc_adjusted_for_installed_measures",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "lodged_co2_emissions": {
+          "name": "lodged_co2_emissions",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodged_heat_demand": {
+          "name": "lodged_heat_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_been_remodelled": {
+          "name": "has_been_remodelled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "environment_impact_current": {
+          "name": "environment_impact_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "uq_property_details_epc_property_portfolio": {
+          "name": "uq_property_details_epc_property_portfolio",
+          "columns": [
+            {
+              "expression": "property_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "property_details_epc_property_id_property_id_fk": {
+          "name": "property_details_epc_property_id_property_id_fk",
+          "tableFrom": "property_details_epc",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "property_details_epc_portfolio_id_portfolio_id_fk": {
+          "name": "property_details_epc_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property_details_epc",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_details_meter": {
+      "name": "property_details_meter",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_supplier": {
+          "name": "energy_supplier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gas_supplier": {
+          "name": "gas_supplier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "meter_reading_total": {
+          "name": "meter_reading_total",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "meter_reading_electricity": {
+          "name": "meter_reading_electricity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "meter_reading_gas": {
+          "name": "meter_reading_gas",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_details_spatial": {
+      "name": "property_details_spatial",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "x_coordinate": {
+          "name": "x_coordinate",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "y_coordinate": {
+          "name": "y_coordinate",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "latitude": {
+          "name": "latitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "longitude": {
+          "name": "longitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "conservation_status": {
+          "name": "conservation_status",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_listed_building": {
+          "name": "is_listed_building",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_heritage_building": {
+          "name": "is_heritage_building",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "uq_property_details_spatial_uprn": {
+          "name": "uq_property_details_spatial_uprn",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_targets": {
+      "name": "property_targets",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "epc": {
+          "name": "epc",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_demand": {
+          "name": "heat_demand",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "property_targets_property_id_property_id_fk": {
+          "name": "property_targets_property_id_property_id_fk",
+          "tableFrom": "property_targets",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "property_targets_portfolio_id_portfolio_id_fk": {
+          "name": "property_targets_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property_targets",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.installed_measure": {
+      "name": "installed_measure",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure_type": {
+          "name": "measure_type",
+          "type": "measure_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "installed_at": {
+          "name": "installed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "sap_points": {
+          "name": "sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "carbon_savings": {
+          "name": "carbon_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "kwh_savings": {
+          "name": "kwh_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "bill_savings": {
+          "name": "bill_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_demand_savings": {
+          "name": "heat_demand_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source": {
+          "name": "source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        }
+      },
+      "indexes": {
+        "idx_installed_measure_uprn": {
+          "name": "idx_installed_measure_uprn",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_installed_measure_uprn_active": {
+          "name": "idx_installed_measure_uprn_active",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"installed_measure\".\"is_active\" = true",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_installed_measure_measure_type": {
+          "name": "idx_installed_measure_measure_type",
+          "columns": [
+            {
+              "expression": "measure_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_installed_measure_uprn_measure": {
+          "name": "idx_installed_measure_uprn_measure",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "measure_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"installed_measure\".\"is_active\" = true",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.plan": {
+      "name": "plan",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scenario_id": {
+          "name": "scenario_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "valuation_increase_lower_bound": {
+          "name": "valuation_increase_lower_bound",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_increase_upper_bound": {
+          "name": "valuation_increase_upper_bound",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_increase_average": {
+          "name": "valuation_increase_average",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_sap_points": {
+          "name": "post_sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_epc_rating": {
+          "name": "post_epc_rating",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_co2_emissions": {
+          "name": "post_co2_emissions",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_savings": {
+          "name": "co2_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_energy_bill": {
+          "name": "post_energy_bill",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_savings": {
+          "name": "energy_bill_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_energy_consumption": {
+          "name": "post_energy_consumption",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_savings": {
+          "name": "energy_consumption_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_post_retrofit": {
+          "name": "valuation_post_retrofit",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_increase": {
+          "name": "valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_of_works": {
+          "name": "cost_of_works",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "contingency_cost": {
+          "name": "contingency_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plan_type": {
+          "name": "plan_type",
+          "type": "plan_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "idx_plan_portfolio_scenario": {
+          "name": "idx_plan_portfolio_scenario",
+          "columns": [
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "scenario_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_plan_latest_per_property": {
+          "name": "idx_plan_latest_per_property",
+          "columns": [
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "scenario_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "property_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "plan_portfolio_id_portfolio_id_fk": {
+          "name": "plan_portfolio_id_portfolio_id_fk",
+          "tableFrom": "plan",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "plan_property_id_property_id_fk": {
+          "name": "plan_property_id_property_id_fk",
+          "tableFrom": "plan",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "plan_scenario_id_scenario_id_fk": {
+          "name": "plan_scenario_id_scenario_id_fk",
+          "tableFrom": "plan",
+          "tableTo": "scenario",
+          "columnsFrom": [
+            "scenario_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.plan_recommendations": {
+      "name": "plan_recommendations",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan_id": {
+          "name": "plan_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "recommendation_id": {
+          "name": "recommendation_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "idx_plan_recommendations_plan_id": {
+          "name": "idx_plan_recommendations_plan_id",
+          "columns": [
+            {
+              "expression": "plan_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_plan_recommendations_plan_rec": {
+          "name": "idx_plan_recommendations_plan_rec",
+          "columns": [
+            {
+              "expression": "plan_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "recommendation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "plan_recommendations_plan_id_plan_id_fk": {
+          "name": "plan_recommendations_plan_id_plan_id_fk",
+          "tableFrom": "plan_recommendations",
+          "tableTo": "plan",
+          "columnsFrom": [
+            "plan_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "plan_recommendations_recommendation_id_recommendation_id_fk": {
+          "name": "plan_recommendations_recommendation_id_recommendation_id_fk",
+          "tableFrom": "plan_recommendations",
+          "tableTo": "recommendation",
+          "columnsFrom": [
+            "recommendation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.recommendation": {
+      "name": "recommendation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure_type": {
+          "name": "measure_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "estimated_cost": {
+          "name": "estimated_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "contingency_cost": {
+          "name": "contingency_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "default": {
+          "name": "default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "starting_u_value": {
+          "name": "starting_u_value",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "new_u_value": {
+          "name": "new_u_value",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sap_points": {
+          "name": "sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_demand": {
+          "name": "heat_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "kwh_savings": {
+          "name": "kwh_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_equivalent_savings": {
+          "name": "co2_equivalent_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_savings": {
+          "name": "energy_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_cost_savings": {
+          "name": "energy_cost_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_valuation_increase": {
+          "name": "property_valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rental_yield_increase": {
+          "name": "rental_yield_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_work_hours": {
+          "name": "total_work_hours",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_days": {
+          "name": "labour_days",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "already_installed": {
+          "name": "already_installed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        }
+      },
+      "indexes": {
+        "recommendation_property_id_idx": {
+          "name": "recommendation_property_id_idx",
+          "columns": [
+            {
+              "expression": "property_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_recommendation_active_defaults": {
+          "name": "idx_recommendation_active_defaults",
+          "columns": [
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"recommendation\".\"default\" = true AND \"recommendation\".\"already_installed\" = false",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_recommendation_active_id_property": {
+          "name": "idx_recommendation_active_id_property",
+          "columns": [
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "property_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"recommendation\".\"default\" = true AND \"recommendation\".\"already_installed\" = false",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "recommendation_property_id_property_id_fk": {
+          "name": "recommendation_property_id_property_id_fk",
+          "tableFrom": "recommendation",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.recommendation_materials": {
+      "name": "recommendation_materials",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "recommendation_id": {
+          "name": "recommendation_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "material_id": {
+          "name": "material_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "depth": {
+          "name": "depth",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quantity_unit": {
+          "name": "quantity_unit",
+          "type": "unit_quantity",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "estimated_cost": {
+          "name": "estimated_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "recommendation_materials_recommendation_id_idx": {
+          "name": "recommendation_materials_recommendation_id_idx",
+          "columns": [
+            {
+              "expression": "recommendation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "recommendation_materials_recommendation_id_recommendation_id_fk": {
+          "name": "recommendation_materials_recommendation_id_recommendation_id_fk",
+          "tableFrom": "recommendation_materials",
+          "tableTo": "recommendation",
+          "columnsFrom": [
+            "recommendation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "recommendation_materials_material_id_material_id_fk": {
+          "name": "recommendation_materials_material_id_material_id_fk",
+          "tableFrom": "recommendation_materials",
+          "tableTo": "material",
+          "columnsFrom": [
+            "material_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.scenario": {
+      "name": "scenario",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "budget": {
+          "name": "budget",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "housing_type": {
+          "name": "housing_type",
+          "type": "housing_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "goal": {
+          "name": "goal",
+          "type": "goal",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "goal_value": {
+          "name": "goal_value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ashp_cop": {
+          "name": "ashp_cop",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 2.8
+        },
+        "trigger_file_path": {
+          "name": "trigger_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "already_installed_file_path": {
+          "name": "already_installed_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "patches_file_path": {
+          "name": "patches_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "non_invasive_recommendations_file_path": {
+          "name": "non_invasive_recommendations_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "exclusions": {
+          "name": "exclusions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "multi_plan": {
+          "name": "multi_plan",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cost": {
+          "name": "cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "contingency": {
+          "name": "contingency",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "funding": {
+          "name": "funding",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_work_hours": {
+          "name": "total_work_hours",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_savings": {
+          "name": "energy_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_equivalent_savings": {
+          "name": "co2_equivalent_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_cost_savings": {
+          "name": "energy_cost_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_valuation_increase": {
+          "name": "property_valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_days": {
+          "name": "labour_days",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_breakdown_pre_retrofit": {
+          "name": "epc_breakdown_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_breakdown_post_retrofit": {
+          "name": "epc_breakdown_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_properties": {
+          "name": "number_of_properties",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "n_units_to_retrofit": {
+          "name": "n_units_to_retrofit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_pre_retrofit": {
+          "name": "co2_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_post_retrofit": {
+          "name": "co2_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_pre_retrofit": {
+          "name": "energy_bill_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_post_retrofit": {
+          "name": "energy_bill_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_pre_retrofit": {
+          "name": "energy_consumption_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_post_retrofit": {
+          "name": "energy_consumption_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_improvement_per_unit": {
+          "name": "valuation_improvement_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_unit": {
+          "name": "cost_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_co2_saved": {
+          "name": "cost_per_co2_saved",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_sap_point": {
+          "name": "cost_per_sap_point",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_return_on_investment": {
+          "name": "valuation_return_on_investment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "scenario_portfolio_id_portfolio_id_fk": {
+          "name": "scenario_portfolio_id_portfolio_id_fk",
+          "tableFrom": "scenario",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.solar": {
+      "name": "solar",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "longitude": {
+          "name": "longitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "latitude": {
+          "name": "latitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "google_api_response": {
+          "name": "google_api_response",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.solar_scenario": {
+      "name": "solar_scenario",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "solar_id": {
+          "name": "solar_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scenario_type": {
+          "name": "scenario_type",
+          "type": "scenario_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_panels": {
+          "name": "number_panels",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "array_kwhp": {
+          "name": "array_kwhp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lifetime_dc_kwh": {
+          "name": "lifetime_dc_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "yearly_dc_kwh": {
+          "name": "yearly_dc_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lifetime_ac_kwh": {
+          "name": "lifetime_ac_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "yearly_ac_kwh": {
+          "name": "yearly_ac_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expected_payback_years": {
+          "name": "expected_payback_years",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "panelled_roof_area": {
+          "name": "panelled_roof_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "solar_scenario_solar_id_solar_id_fk": {
+          "name": "solar_scenario_solar_id_solar_id_fk",
+          "tableFrom": "solar_scenario",
+          "tableTo": "solar",
+          "columnsFrom": [
+            "solar_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.sub_task": {
+      "name": "sub_task",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "job_started": {
+          "name": "job_started",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_completed": {
+          "name": "job_completed",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'In Progress'"
+        },
+        "inputs": {
+          "name": "inputs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "outputs": {
+          "name": "outputs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cloud_logs_url": {
+          "name": "cloud_logs_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "sub_task_task_id_tasks_id_fk": {
+          "name": "sub_task_task_id_tasks_id_fk",
+          "tableFrom": "sub_task",
+          "tableTo": "tasks",
+          "columnsFrom": [
+            "task_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.tasks": {
+      "name": "tasks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "task_source": {
+          "name": "task_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "job_started": {
+          "name": "job_started",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_completed": {
+          "name": "job_completed",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'In Progress'"
+        },
+        "service": {
+          "name": "service",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source": {
+          "name": "source",
+          "type": "source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_id": {
+          "name": "source_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.team": {
+      "name": "team",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "team_org_id_organisation_id_fk": {
+          "name": "team_org_id_organisation_id_fk",
+          "tableFrom": "team",
+          "tableTo": "organisation",
+          "columnsFrom": [
+            "org_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.team_members": {
+      "name": "team_members",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "team_id": {
+          "name": "team_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "team_members_user_id_user_id_fk": {
+          "name": "team_members_user_id_user_id_fk",
+          "tableFrom": "team_members",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "team_members_team_id_team_id_fk": {
+          "name": "team_members_team_id_team_id_fk",
+          "tableFrom": "team_members",
+          "tableTo": "team",
+          "columnsFrom": [
+            "team_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.team_portfolio_permissions": {
+      "name": "team_portfolio_permissions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "team_id": {
+          "name": "team_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "role",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "team_portfolio_permissions_team_id_team_id_fk": {
+          "name": "team_portfolio_permissions_team_id_team_id_fk",
+          "tableFrom": "team_portfolio_permissions",
+          "tableTo": "team",
+          "columnsFrom": [
+            "team_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "team_portfolio_permissions_portfolio_id_portfolio_id_fk": {
+          "name": "team_portfolio_permissions_portfolio_id_portfolio_id_fk",
+          "tableFrom": "team_portfolio_permissions",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.uploaded_files": {
+      "name": "uploaded_files",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "s3_file_bucket": {
+          "name": "s3_file_bucket",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_file_key": {
+          "name": "s3_file_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_upload_timestamp": {
+          "name": "s3_upload_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "landlord_property_id": {
+          "name": "landlord_property_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hubspot_deal_id": {
+          "name": "hubspot_deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hubspot_listing_id": {
+          "name": "hubspot_listing_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "file_type": {
+          "name": "file_type",
+          "type": "file_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "file_source": {
+          "name": "file_source",
+          "type": "file_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "measure_name": {
+          "name": "measure_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_by": {
+          "name": "uploaded_by",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "uploaded_files_uploaded_by_user_id_fk": {
+          "name": "uploaded_files_uploaded_by_user_id_fk",
+          "tableFrom": "uploaded_files",
+          "tableTo": "user",
+          "columnsFrom": [
+            "uploaded_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "userId": {
+          "name": "userId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "providerAccountId": {
+          "name": "providerAccountId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_type": {
+          "name": "token_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "session_state": {
+          "name": "session_state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "account_userId_user_id_fk": {
+          "name": "account_userId_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "account_provider_providerAccountId_pk": {
+          "name": "account_provider_providerAccountId_pk",
+          "columns": [
+            "provider",
+            "providerAccountId"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "sessionToken": {
+          "name": "sessionToken",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "userId": {
+          "name": "userId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_userId_user_id_fk": {
+          "name": "session_userId_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "firstName": {
+          "name": "firstName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "oauth_id": {
+          "name": "oauth_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "oauth_provider": {
+          "name": "oauth_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "onboarded": {
+          "name": "onboarded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "last_login": {
+          "name": "last_login",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_profiles": {
+      "name": "user_profiles",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_type": {
+          "name": "user_type",
+          "type": "user_profiles_user_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_count": {
+          "name": "property_count",
+          "type": "user_profiles_property_count",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "goals": {
+          "name": "goals",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "referral_source": {
+          "name": "referral_source",
+          "type": "user_profiles_referral_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "nrla_membership_id": {
+          "name": "nrla_membership_id",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "accepted_privacy": {
+          "name": "accepted_privacy",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "accepted_privacy_at": {
+          "name": "accepted_privacy_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "marketing_opt_in": {
+          "name": "marketing_opt_in",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "marketing_opt_in_at": {
+          "name": "marketing_opt_in_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_profiles_user_id_user_id_fk": {
+          "name": "user_profiles_user_id_user_id_fk",
+          "tableFrom": "user_profiles",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.verificationToken": {
+      "name": "verificationToken",
+      "schema": "",
+      "columns": {
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "verificationToken_identifier_token_pk": {
+          "name": "verificationToken_identifier_token_pk",
+          "columns": [
+            "identifier",
+            "token"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.whlg": {
+      "name": "whlg",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.aspect_type": {
+      "name": "aspect_type",
+      "schema": "public",
+      "values": [
+        "material",
+        "condition",
+        "type",
+        "area",
+        "configuration",
+        "presence",
+        "risk",
+        "severity",
+        "location",
+        "finish",
+        "insulation",
+        "pointing",
+        "spalling",
+        "lintels",
+        "cladding",
+        "category",
+        "quantity",
+        "adequacy",
+        "rating",
+        "strategy",
+        "extent",
+        "distribution",
+        "structure",
+        "covering",
+        "fire_rating",
+        "external_decoration",
+        "work_required",
+        "age_band",
+        "construction_type",
+        "classification",
+        "system"
+      ]
+    },
+    "public.element_type": {
+      "name": "element_type",
+      "schema": "public",
+      "values": [
+        "property",
+        "property_construction_type",
+        "property_classification",
+        "property_age_band",
+        "storey_count",
+        "floor_level",
+        "floor_level_front_door",
+        "accessible_housing_register",
+        "asbestos",
+        "quality_standard",
+        "ccu",
+        "passenger_lift",
+        "stairlift",
+        "disabled_hoist_tracking",
+        "disabled_facilities",
+        "steps_to_front_door",
+        "roof",
+        "pitched_roof_covering",
+        "flat_roof_covering",
+        "rainwater_goods",
+        "loft_insulation",
+        "porch_canopy",
+        "chimney",
+        "fascia",
+        "soffit",
+        "fascia_soffit_bargeboards",
+        "gutters",
+        "store_roof",
+        "garage_roof",
+        "garage_and_store_roof",
+        "external_wall",
+        "external_noise_insulation",
+        "primary_wall",
+        "secondary_wall",
+        "downpipes",
+        "external_decoration",
+        "cladding",
+        "spandrel_panels",
+        "garage_walls",
+        "party_wall_fire_break",
+        "external_brickwork_pointing",
+        "internal_downpipes_external_area",
+        "external_windows",
+        "communal_windows",
+        "secondary_glazing",
+        "store_windows",
+        "garage_windows",
+        "garage_and_store_windows",
+        "external_door",
+        "front_door",
+        "rear_door",
+        "store_door",
+        "garage_door",
+        "garage_and_store_door",
+        "communal_entrance_door",
+        "main_door",
+        "block_entrance_door",
+        "lintel",
+        "patio_french_door",
+        "door_entry_handset",
+        "paths_and_hardstandings",
+        "parking_areas",
+        "boundary_walls",
+        "front_fencing",
+        "rear_fencing",
+        "side_fencing",
+        "rear_gate",
+        "front_gate",
+        "gates",
+        "retaining_walls",
+        "private_balcony",
+        "balcony_balustrade",
+        "outbuildings",
+        "garage_structure",
+        "paving",
+        "roads",
+        "soil_and_vent",
+        "solar_thermals",
+        "drop_kerb",
+        "outbuilding_overhaul",
+        "external_structural_defects",
+        "access_ramp",
+        "kitchen",
+        "kitchen_space_layout",
+        "tenant_installed_kitchen",
+        "kitchen_extractor_fan",
+        "bathroom",
+        "secondary_bathroom",
+        "secondary_toilet",
+        "bathroom_extractor_fan",
+        "additional_wc_or_whb",
+        "bathroom_remaining_life_source",
+        "kitchen_remaining_life_source",
+        "central_heating",
+        "heating_boiler",
+        "heating_distribution",
+        "secondary_heating",
+        "hot_water_system",
+        "cold_water_storage",
+        "heating_system",
+        "boiler_fuel",
+        "water_heating",
+        "programmable_heating",
+        "community_heating",
+        "gas_available",
+        "heat_recovery_units",
+        "heating_improvements",
+        "electrical_wiring",
+        "consumer_unit",
+        "smoke_detection",
+        "heat_detection",
+        "carbon_monoxide_detection",
+        "fire_door_rating",
+        "fire_risk_assessment",
+        "internal_wiring",
+        "electrics",
+        "communal_heating",
+        "communal_boiler",
+        "communal_electrics",
+        "communal_fire_alarm",
+        "communal_emergency_lighting",
+        "communal_door_entry",
+        "communal_cctv",
+        "communal_bin_store",
+        "communal_bin_store_doors",
+        "communal_bin_store_walls",
+        "communal_bin_store_roof",
+        "communal_refuse_chute",
+        "communal_floor_covering",
+        "communal_kitchen",
+        "communal_bathroom",
+        "communal_toilets",
+        "communal_gates",
+        "communal_lift",
+        "communal_passenger_lift",
+        "communal_balcony_walkway",
+        "communal_entrance",
+        "communal_internal_decorations",
+        "communal_internal_floor",
+        "communal_walkways",
+        "communal_external_doors",
+        "communal_stairs",
+        "communal_aerial",
+        "communal_aov",
+        "communal_internal_doors",
+        "communal_lateral_mains",
+        "communal_lighting",
+        "communal_lighting_conductor",
+        "communal_store_roof",
+        "communal_store_walls",
+        "communal_store_doors",
+        "communal_warden_call_system",
+        "communal_bms",
+        "communal_booster_pump",
+        "communal_dry_riser",
+        "communal_wet_riser",
+        "communal_cold_water_storage",
+        "communal_sprinkler",
+        "communal_plug_sockets",
+        "communal_circulation_space",
+        "ffhh_damp",
+        "ffhh_hold_and_cold_water",
+        "ffhh_drainage_lavatories",
+        "ffhh_neglected",
+        "ffhh_natural_light",
+        "ffhh_ventilation",
+        "ffhh_food_prep_and_washup",
+        "ffhh_unsafe_layout",
+        "ffhh_unstable_building",
+        "hhsrs_damp_and_mould",
+        "hhsrs_excess_cold",
+        "hhsrs_excess_heat",
+        "hhsrs_asbestos_and_mmf",
+        "hhsrs_biocides",
+        "hhsrs_carbon_monoxide",
+        "hhsrs_lead",
+        "hhsrs_radiation",
+        "hhsrs_uncombusted_fuel_gas",
+        "hhsrs_volatile_organic_compounds",
+        "hhsrs_crowding_and_space",
+        "hhsrs_entry_by_intruders",
+        "hhsrs_lighting",
+        "hhsrs_noise",
+        "hhsrs_domestic_hygiene_pests_refuse",
+        "hhsrs_food_safety",
+        "hhsrs_personal_hygiene_sanitation",
+        "hhsrs_water_supply",
+        "hhsrs_falls_associated_with_baths",
+        "hhsrs_falls_on_level_surfaces",
+        "hhsrs_falls_on_stairs",
+        "hhsrs_falls_between_levels",
+        "hhsrs_electrical_hazards",
+        "hhsrs_fire",
+        "hhsrs_flames_hot_surfaces",
+        "hhsrs_collision_and_entrapment",
+        "hhsrs_collision_hazards_low_headroom",
+        "hhsrs_explosions",
+        "hhsrs_ergonomics",
+        "hhsrs_structural_collapse",
+        "hhsrs_amenities"
+      ]
+    },
+    "public.document_type": {
+      "name": "document_type",
+      "schema": "public",
+      "values": [
+        "EPR",
+        "Condition Report",
+        "Evidence Report",
+        "Summary Information",
+        "Floor Plan",
+        "Scenario Draft EPC",
+        "Scenario Site Notes"
+      ]
+    },
+    "public.scheme": {
+      "name": "scheme",
+      "schema": "public",
+      "values": [
+        "eco4",
+        "gbis",
+        "whlg",
+        "none"
+      ]
+    },
+    "public.inspection_archetype_2": {
+      "name": "inspection_archetype_2",
+      "schema": "public",
+      "values": [
+        "detached",
+        "mid-terrace",
+        "enclosed mid-terrace",
+        "end-terrace",
+        "enclosed end-terrace",
+        "semi-detached"
+      ]
+    },
+    "public.inspection_archetype": {
+      "name": "inspection_archetype",
+      "schema": "public",
+      "values": [
+        "Bungalow",
+        "Flat",
+        "Maisonette",
+        "House",
+        "non-domestic"
+      ]
+    },
+    "public.inspection_borescoped": {
+      "name": "inspection_borescoped",
+      "schema": "public",
+      "values": [
+        "yes",
+        "no",
+        "refused"
+      ]
+    },
+    "public.inspections_access_issues": {
+      "name": "inspections_access_issues",
+      "schema": "public",
+      "values": [
+        "see notes",
+        "damp issues",
+        "foliage on walls",
+        "bushes against wall",
+        "trees around/anove property",
+        "high rise block flats/maisonettes",
+        "conservatory",
+        "lean-to",
+        "garage",
+        "extension",
+        "decking",
+        "shed against wall"
+      ]
+    },
+    "public.inspections_cladding": {
+      "name": "inspections_cladding",
+      "schema": "public",
+      "values": [
+        "none",
+        "cladded with “sufficient space to fill the wall”",
+        "cladded with “insufficient space to fill the wall”"
+      ]
+    },
+    "public.inspections_insulation_material": {
+      "name": "inspections_insulation_material",
+      "schema": "public",
+      "values": [
+        "empty 50-90",
+        "empty 100+",
+        "empty 30-40",
+        "empty less than 30",
+        "loose fibre/wool",
+        "eps/celo/king",
+        "fibre batts - with cavity",
+        "fibre batts - no cavity",
+        "loose bead",
+        "glued bead",
+        "formaldehyde",
+        "bubble wrap",
+        "poly chunks"
+      ]
+    },
+    "public.inspections_rendered": {
+      "name": "inspections_rendered",
+      "schema": "public",
+      "values": [
+        "no render",
+        "rendered with “insufficient” space between dpc and render",
+        "rendered with “sufficient” space between dpc and render"
+      ]
+    },
+    "public.inspections_roof_orientation": {
+      "name": "inspections_roof_orientation",
+      "schema": "public",
+      "values": [
+        "north",
+        "east",
+        "south",
+        "west",
+        "north-east",
+        "north-west",
+        "south-east",
+        "south-west",
+        "n/s split",
+        "e/w split",
+        "ne/sw split",
+        "nw/se split",
+        "flat roof",
+        "no roof",
+        "roof too small",
+        "already has solar pv"
+      ]
+    },
+    "public.inspections_tile_hung": {
+      "name": "inspections_tile_hung",
+      "schema": "public",
+      "values": [
+        "yes",
+        "no",
+        "first floor flats are tile hung"
+      ]
+    },
+    "public.inspections_wall_construction": {
+      "name": "inspections_wall_construction",
+      "schema": "public",
+      "values": [
+        "cavity",
+        "solid",
+        "system built",
+        "timber framed",
+        "steel framed",
+        "re-walled cavity",
+        "mansard pre-fab",
+        "mansard ewi",
+        "mansard re-walled"
+      ]
+    },
+    "public.inspections_wall_insulation": {
+      "name": "inspections_wall_insulation",
+      "schema": "public",
+      "values": [
+        "empty cavity",
+        "filled at build",
+        "partial",
+        "retro drilled",
+        "ewi",
+        "iwi",
+        "solid non-cavity",
+        "system built",
+        "timber framed",
+        "steel framed"
+      ]
+    },
+    "public.cost_unit": {
+      "name": "cost_unit",
+      "schema": "public",
+      "values": [
+        "gbp_sq_meter",
+        "gbp_per_unit",
+        "gbp_per_m2",
+        "gbp_per_m"
+      ]
+    },
+    "public.depth_unit": {
+      "name": "depth_unit",
+      "schema": "public",
+      "values": [
+        "mm"
+      ]
+    },
+    "public.type": {
+      "name": "type",
+      "schema": "public",
+      "values": [
+        "suspended_floor_insulation",
+        "solid_floor_insulation",
+        "external_wall_insulation",
+        "internal_wall_insulation",
+        "cavity_wall_insulation",
+        "mechanical_ventilation",
+        "loft_insulation",
+        "exposed_floor_insulation",
+        "flat_roof_insulation",
+        "room_roof_insulation",
+        "cavity_wall_extraction",
+        "iwi_wall_demolition",
+        "iwi_vapour_barrier",
+        "iwi_redecoration",
+        "suspended_floor_demolition",
+        "suspended_floor_redecoration",
+        "suspended_floor_vapour_barrier",
+        "solid_floor_demolition",
+        "solid_floor_preparation",
+        "solid_floor_vapour_barrier",
+        "solid_floor_redecoration",
+        "ewi_wall_demolition",
+        "ewi_wall_preparation",
+        "ewi_wall_redecoration",
+        "low_energy_lighting_installation",
+        "flat_roof_preparation",
+        "flat_roof_vapour_barrier",
+        "flat_roof_waterproofing",
+        "windows_glazing",
+        "secondary_glazing",
+        "double_glazing",
+        "trickle_vent",
+        "door_undercut",
+        "solar_pv",
+        "solar_battery",
+        "scaffolding",
+        "high_heat_retention_storage_heaters",
+        "air_source_heat_pump",
+        "boiler_upgrade",
+        "roomstat_programmer_trvs",
+        "time_temperature_zone_control",
+        "sealing_fireplace"
+      ]
+    },
+    "public.r_value_unit": {
+      "name": "r_value_unit",
+      "schema": "public",
+      "values": [
+        "square_meter_kelvin_per_watt"
+      ]
+    },
+    "public.size_unit": {
+      "name": "size_unit",
+      "schema": "public",
+      "values": [
+        "kWp",
+        "kW",
+        "watt",
+        "storey"
+      ]
+    },
+    "public.thermal_conductivity_unit": {
+      "name": "thermal_conductivity_unit",
+      "schema": "public",
+      "values": [
+        "watt_per_meter_kelvin"
+      ]
+    },
+    "public.goal": {
+      "name": "goal",
+      "schema": "public",
+      "values": [
+        "Valuation Improvement",
+        "Increasing EPC",
+        "Reducing CO2 emissions",
+        "Energy Savings",
+        "None"
+      ]
+    },
+    "public.portfolio_capability": {
+      "name": "portfolio_capability",
+      "schema": "public",
+      "values": [
+        "approver",
+        "contractor"
+      ]
+    },
+    "public.role": {
+      "name": "role",
+      "schema": "public",
+      "values": [
+        "creator",
+        "admin",
+        "read",
+        "write"
+      ]
+    },
+    "public.status": {
+      "name": "status",
+      "schema": "public",
+      "values": [
+        "scoping",
+        "survey",
+        "assessment",
+        "tendering",
+        "project underway",
+        "completion; status: on track",
+        "completion; status: delayed",
+        "completion; status: at risk",
+        "completion; status: completed",
+        "needs review"
+      ]
+    },
+    "public.epc": {
+      "name": "epc",
+      "schema": "public",
+      "values": [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G"
+      ]
+    },
+    "public.creation_status": {
+      "name": "creation_status",
+      "schema": "public",
+      "values": [
+        "LOADING",
+        "READY",
+        "ERROR"
+      ]
+    },
+    "public.housing_type": {
+      "name": "housing_type",
+      "schema": "public",
+      "values": [
+        "Private",
+        "Social"
+      ]
+    },
+    "public.measure_type": {
+      "name": "measure_type",
+      "schema": "public",
+      "values": [
+        "air_source_heat_pump",
+        "boiler_upgrade",
+        "high_heat_retention_storage_heaters",
+        "secondary_heating",
+        "roomstat_programmer_trvs",
+        "time_temperature_zone_control",
+        "cylinder_thermostat",
+        "cavity_wall_insulation",
+        "extension_cavity_wall_insulation",
+        "external_wall_insulation",
+        "internal_wall_insulation",
+        "loft_insulation",
+        "flat_roof_insulation",
+        "room_roof_insulation",
+        "solid_floor_insulation",
+        "suspended_floor_insulation",
+        "double_glazing",
+        "secondary_glazing",
+        "draught_proofing",
+        "mechanical_ventilation",
+        "low_energy_lighting",
+        "solar_pv",
+        "hot_water_tank_insulation",
+        "sealing_open_fireplace",
+        "damp_mould",
+        "door_undercut",
+        "extractor_fan",
+        "loft_board",
+        "trickle_vent"
+      ]
+    },
+    "public.plan_type": {
+      "name": "plan_type",
+      "schema": "public",
+      "values": [
+        "solar_eco4",
+        "solar_hhrsh_eco4",
+        "empty_cavity_eco",
+        "partial_cavity_eco",
+        "extraction_eco"
+      ]
+    },
+    "public.unit_quantity": {
+      "name": "unit_quantity",
+      "schema": "public",
+      "values": [
+        "m2",
+        "part",
+        "kwp"
+      ]
+    },
+    "public.scenario_type": {
+      "name": "scenario_type",
+      "schema": "public",
+      "values": [
+        "unit",
+        "building"
+      ]
+    },
+    "public.source": {
+      "name": "source",
+      "schema": "public",
+      "values": [
+        "portfolio_id"
+      ]
+    },
+    "public.file_source": {
+      "name": "file_source",
+      "schema": "public",
+      "values": [
+        "pas hub",
+        "sharepoint",
+        "hubspot",
+        "ecmk",
+        "contractor"
+      ]
+    },
+    "public.file_type": {
+      "name": "file_type",
+      "schema": "public",
+      "values": [
+        "photo_pack",
+        "site_note",
+        "rd_sap_site_note",
+        "pas_2023_ventilation",
+        "pas_2023_condition",
+        "pas_significance",
+        "par_photo_pack",
+        "pas_2023_property",
+        "pas_2023_occupancy",
+        "ecmk_site_note",
+        "ecmk_rd_sap_site_note",
+        "ecmk_survey_xml",
+        "pre_photo",
+        "mid_photo",
+        "post_photo",
+        "pre_installation_building_inspection",
+        "claim_of_compliance",
+        "handover_pack",
+        "insurance_guarantee",
+        "installer_qualifications",
+        "mcs_compliance_certificate",
+        "minor_works_electrical_certificate",
+        "point_of_work_risk_assessment",
+        "installer_feedback",
+        "workmanship_warranty",
+        "g98_notification",
+        "certificate_of_conformity",
+        "ventilation_assessment_checklist",
+        "contractor_other"
+      ]
+    },
+    "public.user_profiles_property_count": {
+      "name": "user_profiles_property_count",
+      "schema": "public",
+      "values": [
+        "1",
+        "2–5",
+        "6–20",
+        "21+",
+        "1–50",
+        "51–100",
+        "101–300",
+        "301–1000",
+        "1000+"
+      ]
+    },
+    "public.user_profiles_referral_source": {
+      "name": "user_profiles_referral_source",
+      "schema": "public",
+      "values": [
+        "search",
+        "social_media",
+        "NRLA",
+        "partner",
+        "word_of_mouth",
+        "other"
+      ]
+    },
+    "public.user_profiles_user_type": {
+      "name": "user_profiles_user_type",
+      "schema": "public",
+      "values": [
+        "private_landlord",
+        "private_tenant",
+        "social_landlord",
+        "social_tenant",
+        "homeowner",
+        "other"
+      ]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/src/app/db/migrations/meta/_journal.json b/src/app/db/migrations/meta/_journal.json
index 5a0cdd73..274de392 100644
--- a/src/app/db/migrations/meta/_journal.json
+++ b/src/app/db/migrations/meta/_journal.json
@@ -1233,6 +1233,20 @@
       "when": 1776434096854,
       "tag": "0175_sweet_otto_octavius",
       "breakpoints": true
+    },
+    {
+      "idx": 176,
+      "version": "7",
+      "when": 1776900120000,
+      "tag": "0176_bulk_upload_combined_output",
+      "breakpoints": true
+    },
+    {
+      "idx": 177,
+      "version": "7",
+      "when": 1776451871348,
+      "tag": "0177_wooden_dexter_bennett",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/src/app/db/schema/bulk_address_uploads.ts b/src/app/db/schema/bulk_address_uploads.ts
index 1bacb104..52f32110 100644
--- a/src/app/db/schema/bulk_address_uploads.ts
+++ b/src/app/db/schema/bulk_address_uploads.ts
@@ -12,6 +12,7 @@ export const bulkAddressUploads = pgTable("bulk_address_uploads", {
   sourceHeaders: text("source_headers").array().notNull().default(sql`'{}'`),
   columnMapping: jsonb("column_mapping").$type<Record<string, string>>(),
   taskId: uuid("task_id"),
+  combinedOutputS3Uri: text("combined_output_s3_uri"),
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
   updatedAt: timestamp("updated_at", { withTimezone: true })
     .notNull()
diff --git a/src/app/portfolio/[slug]/(portfolio)/bulk-upload/[uploadId]/OnboardingProgress.tsx b/src/app/portfolio/[slug]/(portfolio)/bulk-upload/[uploadId]/OnboardingProgress.tsx
index 24999b56..552d4a40 100644
--- a/src/app/portfolio/[slug]/(portfolio)/bulk-upload/[uploadId]/OnboardingProgress.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/bulk-upload/[uploadId]/OnboardingProgress.tsx
@@ -15,11 +15,12 @@ interface TaskData {
 interface Props {
   taskId: string;
   portfolioSlug: string;
+  isDomnaUser: boolean;
 }
 
 const TERMINAL_STATUSES = new Set(["complete", "completed", "failed", "failure", "error"]);
 
-export default function OnboardingProgress({ taskId, portfolioSlug }: Props) {
+export default function OnboardingProgress({ taskId, portfolioSlug, isDomnaUser }: Props) {
   const [data, setData] = useState<TaskData | null>(null);
   const [fetchError, setFetchError] = useState(false);
   const intervalRef = useRef<ReturnType<typeof setInterval> | null>(null);
@@ -27,7 +28,7 @@ export default function OnboardingProgress({ taskId, portfolioSlug }: Props) {
   useEffect(() => {
     async function poll() {
       try {
-        const res = await fetch(`/api/tasks/${taskId}`);
+        const res = await fetch(`/api/tasks/${taskId}/summary`);
         if (!res.ok) { setFetchError(true); return; }
         const json: TaskData = await res.json();
         setData(json);
@@ -98,12 +99,14 @@ export default function OnboardingProgress({ taskId, portfolioSlug }: Props) {
         )}
       </div>
 
-      <Link
-        href={`/portfolio/${portfolioSlug}/settings/logs`}
-        className="text-xs text-gray-400 hover:text-gray-700 underline underline-offset-2 transition-colors"
-      >
-        View detailed logs
-      </Link>
+      {isDomnaUser && (
+        <Link
+          href={`/portfolio/${portfolioSlug}/settings/logs`}
+          className="text-xs text-gray-400 hover:text-gray-700 underline underline-offset-2 transition-colors"
+        >
+          View detailed logs
+        </Link>
+      )}
     </div>
   );
 }
diff --git a/src/app/portfolio/[slug]/(portfolio)/bulk-upload/[uploadId]/page.tsx b/src/app/portfolio/[slug]/(portfolio)/bulk-upload/[uploadId]/page.tsx
index 0c35f762..a85440f3 100644
--- a/src/app/portfolio/[slug]/(portfolio)/bulk-upload/[uploadId]/page.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/bulk-upload/[uploadId]/page.tsx
@@ -77,6 +77,7 @@ export default async function BulkUploadDetailPage(props: {
   const { slug, uploadId } = await props.params;
   const session = await getServerSession(AuthOptions);
   if (!session) redirect("/login");
+  const isDomnaUser = !!session.user?.email?.endsWith("@domna.homes");
 
   const [upload] = await db
     .select()
@@ -151,7 +152,7 @@ export default async function BulkUploadDetailPage(props: {
 
             {(statusKey === "processing" || statusKey === "complete" || statusKey === "failed") &&
               upload.taskId && (
-                <OnboardingProgress taskId={upload.taskId} portfolioSlug={slug} />
+                <OnboardingProgress taskId={upload.taskId} portfolioSlug={slug} isDomnaUser={isDomnaUser} />
               )}
           </div>
         </div>