diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7137bac53..3fca56810 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.0.0-95
+
+
+### 🚀 Enhancements
+
+- Update template data ([5f12779](https://github.com/undb-io/undb/commit/5f12779))
+
+### ❤️ Contributors
+
+- Nichenqin ([@nichenqin](http://github.com/nichenqin))
+
 ## v1.0.0-94
 
 
diff --git a/apps/backend/assets/templates/crm/cover.jpg b/apps/backend/assets/templates/crm/cover.jpg
new file mode 100644
index 000000000..bedb128a6
Binary files /dev/null and b/apps/backend/assets/templates/crm/cover.jpg differ
diff --git a/apps/backend/assets/templates/crm/image1.jpeg b/apps/backend/assets/templates/crm/image1.jpeg
new file mode 100644
index 000000000..a361e83bb
Binary files /dev/null and b/apps/backend/assets/templates/crm/image1.jpeg differ
diff --git a/apps/backend/assets/templates/crm/image2.jpeg b/apps/backend/assets/templates/crm/image2.jpeg
new file mode 100644
index 000000000..984b9aad6
Binary files /dev/null and b/apps/backend/assets/templates/crm/image2.jpeg differ
diff --git a/apps/backend/assets/templates/crm/image3.jpeg b/apps/backend/assets/templates/crm/image3.jpeg
new file mode 100644
index 000000000..17dc17667
Binary files /dev/null and b/apps/backend/assets/templates/crm/image3.jpeg differ
diff --git a/apps/backend/assets/templates/crm/image4.jpeg b/apps/backend/assets/templates/crm/image4.jpeg
new file mode 100644
index 000000000..48600a278
Binary files /dev/null and b/apps/backend/assets/templates/crm/image4.jpeg differ
diff --git a/apps/backend/assets/templates/eventPlanning/cover.jpg b/apps/backend/assets/templates/eventPlanning/cover.jpg
new file mode 100644
index 000000000..f0c9cfd66
Binary files /dev/null and b/apps/backend/assets/templates/eventPlanning/cover.jpg differ
diff --git a/apps/backend/assets/templates/eventPlanning/image1.png b/apps/backend/assets/templates/eventPlanning/image1.png
new file mode 100644
index 000000000..09503af17
Binary files /dev/null and b/apps/backend/assets/templates/eventPlanning/image1.png differ
diff --git a/apps/backend/assets/templates/eventPlanning/image2.png b/apps/backend/assets/templates/eventPlanning/image2.png
new file mode 100644
index 000000000..596450b19
Binary files /dev/null and b/apps/backend/assets/templates/eventPlanning/image2.png differ
diff --git a/apps/backend/assets/templates/eventPlanning/image3.png b/apps/backend/assets/templates/eventPlanning/image3.png
new file mode 100644
index 000000000..e4b54404c
Binary files /dev/null and b/apps/backend/assets/templates/eventPlanning/image3.png differ
diff --git a/apps/backend/assets/templates/eventPlanning/image4.png b/apps/backend/assets/templates/eventPlanning/image4.png
new file mode 100644
index 000000000..75f6a5a3f
Binary files /dev/null and b/apps/backend/assets/templates/eventPlanning/image4.png differ
diff --git a/apps/backend/assets/templates/officeInventoryManagement/cover.jpg b/apps/backend/assets/templates/officeInventoryManagement/cover.jpg
new file mode 100644
index 000000000..86cf51d4d
Binary files /dev/null and b/apps/backend/assets/templates/officeInventoryManagement/cover.jpg differ
diff --git a/apps/backend/assets/templates/officeInventoryManagement/image1.png b/apps/backend/assets/templates/officeInventoryManagement/image1.png
new file mode 100644
index 000000000..6954ea0b0
Binary files /dev/null and b/apps/backend/assets/templates/officeInventoryManagement/image1.png differ
diff --git a/apps/backend/assets/templates/officeInventoryManagement/image2.png b/apps/backend/assets/templates/officeInventoryManagement/image2.png
new file mode 100644
index 000000000..738adc92b
Binary files /dev/null and b/apps/backend/assets/templates/officeInventoryManagement/image2.png differ
diff --git a/apps/backend/assets/templates/officeInventoryManagement/image3.png b/apps/backend/assets/templates/officeInventoryManagement/image3.png
new file mode 100644
index 000000000..854b39733
Binary files /dev/null and b/apps/backend/assets/templates/officeInventoryManagement/image3.png differ
diff --git a/apps/backend/assets/templates/officeInventoryManagement/image4.png b/apps/backend/assets/templates/officeInventoryManagement/image4.png
new file mode 100644
index 000000000..40a1e2506
Binary files /dev/null and b/apps/backend/assets/templates/officeInventoryManagement/image4.png differ
diff --git a/apps/backend/assets/templates/projectManagement/cover.jpg b/apps/backend/assets/templates/projectManagement/cover.jpg
new file mode 100644
index 000000000..4a2d09aac
Binary files /dev/null and b/apps/backend/assets/templates/projectManagement/cover.jpg differ
diff --git a/apps/backend/assets/templates/projectManagement/image1.jpeg b/apps/backend/assets/templates/projectManagement/image1.jpeg
new file mode 100644
index 000000000..fbf010b45
Binary files /dev/null and b/apps/backend/assets/templates/projectManagement/image1.jpeg differ
diff --git a/apps/backend/assets/templates/projectManagement/image2.jpeg b/apps/backend/assets/templates/projectManagement/image2.jpeg
new file mode 100644
index 000000000..ee3b6a668
Binary files /dev/null and b/apps/backend/assets/templates/projectManagement/image2.jpeg differ
diff --git a/apps/backend/assets/templates/projectManagement/image3.jpeg b/apps/backend/assets/templates/projectManagement/image3.jpeg
new file mode 100644
index 000000000..2dbe8352d
Binary files /dev/null and b/apps/backend/assets/templates/projectManagement/image3.jpeg differ
diff --git a/apps/backend/assets/templates/salesCrm/cover.jpg b/apps/backend/assets/templates/salesCrm/cover.jpg
new file mode 100644
index 000000000..fafd172be
Binary files /dev/null and b/apps/backend/assets/templates/salesCrm/cover.jpg differ
diff --git a/apps/backend/assets/templates/salesCrm/image1.png b/apps/backend/assets/templates/salesCrm/image1.png
new file mode 100644
index 000000000..dd239a0cd
Binary files /dev/null and b/apps/backend/assets/templates/salesCrm/image1.png differ
diff --git a/apps/backend/assets/templates/salesCrm/image2.png b/apps/backend/assets/templates/salesCrm/image2.png
new file mode 100644
index 000000000..fc5e1819b
Binary files /dev/null and b/apps/backend/assets/templates/salesCrm/image2.png differ
diff --git a/apps/backend/assets/templates/socialMediaContent/cover.jpg b/apps/backend/assets/templates/socialMediaContent/cover.jpg
new file mode 100644
index 000000000..b65a5bdc6
Binary files /dev/null and b/apps/backend/assets/templates/socialMediaContent/cover.jpg differ
diff --git a/apps/backend/assets/templates/socialMediaContent/image1.png b/apps/backend/assets/templates/socialMediaContent/image1.png
new file mode 100644
index 000000000..4d9f6a166
Binary files /dev/null and b/apps/backend/assets/templates/socialMediaContent/image1.png differ
diff --git a/apps/backend/assets/templates/socialMediaContent/image2.png b/apps/backend/assets/templates/socialMediaContent/image2.png
new file mode 100644
index 000000000..dda5990c0
Binary files /dev/null and b/apps/backend/assets/templates/socialMediaContent/image2.png differ
diff --git a/apps/backend/assets/templates/todo/cover.jpg b/apps/backend/assets/templates/todo/cover.jpg
new file mode 100644
index 000000000..3307c1c95
Binary files /dev/null and b/apps/backend/assets/templates/todo/cover.jpg differ
diff --git a/apps/backend/assets/templates/todo/image1.png b/apps/backend/assets/templates/todo/image1.png
new file mode 100644
index 000000000..6f84f76a5
Binary files /dev/null and b/apps/backend/assets/templates/todo/image1.png differ
diff --git a/apps/backend/assets/templates/todo/image2.png b/apps/backend/assets/templates/todo/image2.png
new file mode 100644
index 000000000..037531c7c
Binary files /dev/null and b/apps/backend/assets/templates/todo/image2.png differ
diff --git a/apps/backend/drizzle/0006_mature_madame_web.sql b/apps/backend/drizzle/0006_mature_madame_web.sql
new file mode 100644
index 000000000..87fb919b1
--- /dev/null
+++ b/apps/backend/drizzle/0006_mature_madame_web.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `undb_outbox` ADD `user_id` text;--> statement-breakpoint
+ALTER TABLE `undb_outbox` DROP COLUMN `operator_id`;
\ No newline at end of file
diff --git a/apps/backend/drizzle/meta/0006_snapshot.json b/apps/backend/drizzle/meta/0006_snapshot.json
new file mode 100644
index 000000000..ce0cf1094
--- /dev/null
+++ b/apps/backend/drizzle/meta/0006_snapshot.json
@@ -0,0 +1,1789 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "f4f5f7dd-cbf3-45de-a072-b086f2e2c170",
+  "prevId": "be381a5a-37d4-4834-b6bb-3bfe2853da01",
+  "tables": {
+    "undb_api_token": {
+      "name": "undb_api_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "undb_api_token_token_unique": {
+          "name": "undb_api_token_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        },
+        "api_token_space_id_idx": {
+          "name": "api_token_space_id_idx",
+          "columns": [
+            "space_id"
+          ],
+          "isUnique": false
+        },
+        "api_token_user_id_idx": {
+          "name": "api_token_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "undb_api_token_user_id_undb_user_id_fk": {
+          "name": "undb_api_token_user_id_undb_user_id_fk",
+          "tableFrom": "undb_api_token",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_api_token_space_id_undb_space_id_fk": {
+          "name": "undb_api_token_space_id_undb_space_id_fk",
+          "tableFrom": "undb_api_token",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_attachment_mapping": {
+      "name": "undb_attachment_mapping",
+      "columns": {
+        "attachment_id": {
+          "name": "attachment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "record_id": {
+          "name": "record_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "field_id": {
+          "name": "field_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "undb_attachment_mapping_attachment_id_undb_attachment_id_fk": {
+          "name": "undb_attachment_mapping_attachment_id_undb_attachment_id_fk",
+          "tableFrom": "undb_attachment_mapping",
+          "tableTo": "undb_attachment",
+          "columnsFrom": [
+            "attachment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_attachment_mapping_table_id_undb_table_id_fk": {
+          "name": "undb_attachment_mapping_table_id_undb_table_id_fk",
+          "tableFrom": "undb_attachment_mapping",
+          "tableTo": "undb_table",
+          "columnsFrom": [
+            "table_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "undb_attachment_mapping_attachment_id_table_id_record_id_field_id_pk": {
+          "columns": [
+            "attachment_id",
+            "table_id",
+            "record_id",
+            "field_id"
+          ],
+          "name": "undb_attachment_mapping_attachment_id_table_id_record_id_field_id_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "undb_attachment": {
+      "name": "undb_attachment",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "mime_type": {
+          "name": "mime_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "attachment_size_idx": {
+          "name": "attachment_size_idx",
+          "columns": [
+            "size"
+          ],
+          "isUnique": false
+        },
+        "attachment_space_id_idx": {
+          "name": "attachment_space_id_idx",
+          "columns": [
+            "space_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "undb_attachment_created_by_undb_user_id_fk": {
+          "name": "undb_attachment_created_by_undb_user_id_fk",
+          "tableFrom": "undb_attachment",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "created_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_attachment_space_id_undb_space_id_fk": {
+          "name": "undb_attachment_space_id_undb_space_id_fk",
+          "tableFrom": "undb_attachment",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_audit": {
+      "name": "undb_audit",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "detail": {
+          "name": "detail",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "meta": {
+          "name": "meta",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "op": {
+          "name": "op",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "record_id": {
+          "name": "record_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "operator_id": {
+          "name": "operator_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "audit_table_id_idx": {
+          "name": "audit_table_id_idx",
+          "columns": [
+            "table_id"
+          ],
+          "isUnique": false
+        },
+        "audit_space_id_idx": {
+          "name": "audit_space_id_idx",
+          "columns": [
+            "space_id"
+          ],
+          "isUnique": false
+        },
+        "audit_record_id_idx": {
+          "name": "audit_record_id_idx",
+          "columns": [
+            "record_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "undb_audit_space_id_undb_space_id_fk": {
+          "name": "undb_audit_space_id_undb_space_id_fk",
+          "tableFrom": "undb_audit",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_base": {
+      "name": "undb_base",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(CURRENT_TIMESTAMP)"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_by": {
+          "name": "updated_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "base_space_id_idx": {
+          "name": "base_space_id_idx",
+          "columns": [
+            "space_id"
+          ],
+          "isUnique": false
+        },
+        "base_name_unique_idx": {
+          "name": "base_name_unique_idx",
+          "columns": [
+            "name",
+            "space_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "undb_base_space_id_undb_space_id_fk": {
+          "name": "undb_base_space_id_undb_space_id_fk",
+          "tableFrom": "undb_base",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_base_created_by_undb_user_id_fk": {
+          "name": "undb_base_created_by_undb_user_id_fk",
+          "tableFrom": "undb_base",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "created_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_base_updated_by_undb_user_id_fk": {
+          "name": "undb_base_updated_by_undb_user_id_fk",
+          "tableFrom": "undb_base",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "updated_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_email_verification_code": {
+      "name": "undb_email_verification_code",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "code": {
+          "name": "code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "undb_email_verification_code_user_id_unique": {
+          "name": "undb_email_verification_code_user_id_unique",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "undb_email_verification_code_user_id_undb_user_id_fk": {
+          "name": "undb_email_verification_code_user_id_undb_user_id_fk",
+          "tableFrom": "undb_email_verification_code",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_invitation": {
+      "name": "undb_invitation",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "invited_at": {
+          "name": "invited_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "invitation_space_id_idx": {
+          "name": "invitation_space_id_idx",
+          "columns": [
+            "space_id"
+          ],
+          "isUnique": false
+        },
+        "invitation_unique_idx": {
+          "name": "invitation_unique_idx",
+          "columns": [
+            "email",
+            "space_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "undb_invitation_space_id_undb_space_id_fk": {
+          "name": "undb_invitation_space_id_undb_space_id_fk",
+          "tableFrom": "undb_invitation",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_invitation_inviter_id_undb_user_id_fk": {
+          "name": "undb_invitation_inviter_id_undb_user_id_fk",
+          "tableFrom": "undb_invitation",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "inviter_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_oauth_account": {
+      "name": "undb_oauth_account",
+      "columns": {
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider_user_id": {
+          "name": "provider_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "undb_oauth_account_user_id_undb_user_id_fk": {
+          "name": "undb_oauth_account_user_id_undb_user_id_fk",
+          "tableFrom": "undb_oauth_account",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "undb_oauth_account_provider_id_provider_user_id_pk": {
+          "columns": [
+            "provider_id",
+            "provider_user_id"
+          ],
+          "name": "undb_oauth_account_provider_id_provider_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "undb_outbox": {
+      "name": "undb_outbox",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "meta": {
+          "name": "meta",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "outbox_space_id_idx": {
+          "name": "outbox_space_id_idx",
+          "columns": [
+            "space_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "undb_outbox_space_id_undb_space_id_fk": {
+          "name": "undb_outbox_space_id_undb_space_id_fk",
+          "tableFrom": "undb_outbox",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_password_reset_token": {
+      "name": "undb_password_reset_token",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "undb_password_reset_token_token_unique": {
+          "name": "undb_password_reset_token_token_unique",
+          "columns": [
+            "token"
+          ],
+          "isUnique": true
+        },
+        "password_reset_token_user_id_idx": {
+          "name": "password_reset_token_user_id_idx",
+          "columns": [
+            "user_id"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "undb_password_reset_token_user_id_undb_user_id_fk": {
+          "name": "undb_password_reset_token_user_id_undb_user_id_fk",
+          "tableFrom": "undb_password_reset_token",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_reference_id_mapping": {
+      "name": "undb_reference_id_mapping",
+      "columns": {
+        "field_id": {
+          "name": "field_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "symmetric_field_id": {
+          "name": "symmetric_field_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "foreign_table_id": {
+          "name": "foreign_table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "reference_id_mapping_unique_idx": {
+          "name": "reference_id_mapping_unique_idx",
+          "columns": [
+            "field_id",
+            "table_id",
+            "symmetric_field_id",
+            "foreign_table_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "undb_reference_id_mapping_table_id_undb_table_id_fk": {
+          "name": "undb_reference_id_mapping_table_id_undb_table_id_fk",
+          "tableFrom": "undb_reference_id_mapping",
+          "tableTo": "undb_table",
+          "columnsFrom": [
+            "table_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_reference_id_mapping_foreign_table_id_undb_table_id_fk": {
+          "name": "undb_reference_id_mapping_foreign_table_id_undb_table_id_fk",
+          "tableFrom": "undb_reference_id_mapping",
+          "tableTo": "undb_table",
+          "columnsFrom": [
+            "foreign_table_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_rollup_id_mapping": {
+      "name": "undb_rollup_id_mapping",
+      "columns": {
+        "field_id": {
+          "name": "field_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rollup_id": {
+          "name": "rollup_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rollup_table_id": {
+          "name": "rollup_table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "undb_rollup_id_mapping_table_id_undb_table_id_fk": {
+          "name": "undb_rollup_id_mapping_table_id_undb_table_id_fk",
+          "tableFrom": "undb_rollup_id_mapping",
+          "tableTo": "undb_table",
+          "columnsFrom": [
+            "table_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_rollup_id_mapping_rollup_table_id_undb_table_id_fk": {
+          "name": "undb_rollup_id_mapping_rollup_table_id_undb_table_id_fk",
+          "tableFrom": "undb_rollup_id_mapping",
+          "tableTo": "undb_table",
+          "columnsFrom": [
+            "rollup_table_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "undb_rollup_id_mapping_field_id_rollup_id_pk": {
+          "columns": [
+            "field_id",
+            "rollup_id"
+          ],
+          "name": "undb_rollup_id_mapping_field_id_rollup_id_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "undb_session": {
+      "name": "undb_session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "undb_session_user_id_undb_user_id_fk": {
+          "name": "undb_session_user_id_undb_user_id_fk",
+          "tableFrom": "undb_session",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_session_space_id_undb_space_id_fk": {
+          "name": "undb_session_space_id_undb_space_id_fk",
+          "tableFrom": "undb_session",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_share": {
+      "name": "undb_share",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "target_type": {
+          "name": "target_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "target_id": {
+          "name": "target_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "share_space_id_idx": {
+          "name": "share_space_id_idx",
+          "columns": [
+            "space_id"
+          ],
+          "isUnique": false
+        },
+        "share_unique_idx": {
+          "name": "share_unique_idx",
+          "columns": [
+            "target_type",
+            "target_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "undb_share_space_id_undb_space_id_fk": {
+          "name": "undb_share_space_id_undb_space_id_fk",
+          "tableFrom": "undb_share",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_space": {
+      "name": "undb_space",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "is_personal": {
+          "name": "is_personal",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "avatar": {
+          "name": "avatar",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(CURRENT_TIMESTAMP)"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_by": {
+          "name": "updated_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deleted_by": {
+          "name": "deleted_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "space_name_idx": {
+          "name": "space_name_idx",
+          "columns": [
+            "name"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "undb_space_created_by_undb_user_id_fk": {
+          "name": "undb_space_created_by_undb_user_id_fk",
+          "tableFrom": "undb_space",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "created_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_space_updated_by_undb_user_id_fk": {
+          "name": "undb_space_updated_by_undb_user_id_fk",
+          "tableFrom": "undb_space",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "updated_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_space_deleted_by_undb_user_id_fk": {
+          "name": "undb_space_deleted_by_undb_user_id_fk",
+          "tableFrom": "undb_space",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "deleted_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_space_member": {
+      "name": "undb_space_member",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "space_member_unique_idx": {
+          "name": "space_member_unique_idx",
+          "columns": [
+            "user_id",
+            "space_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "undb_space_member_user_id_undb_user_id_fk": {
+          "name": "undb_space_member_user_id_undb_user_id_fk",
+          "tableFrom": "undb_space_member",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_space_member_space_id_undb_space_id_fk": {
+          "name": "undb_space_member_space_id_undb_space_id_fk",
+          "tableFrom": "undb_space_member",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_table_id_mapping": {
+      "name": "undb_table_id_mapping",
+      "columns": {
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_id": {
+          "name": "subject_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "undb_table_id_mapping_table_id_undb_table_id_fk": {
+          "name": "undb_table_id_mapping_table_id_undb_table_id_fk",
+          "tableFrom": "undb_table_id_mapping",
+          "tableTo": "undb_table",
+          "columnsFrom": [
+            "table_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "undb_table_id_mapping_table_id_subject_id_pk": {
+          "columns": [
+            "table_id",
+            "subject_id"
+          ],
+          "name": "undb_table_id_mapping_table_id_subject_id_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "undb_table": {
+      "name": "undb_table",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "base_id": {
+          "name": "base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "schema": {
+          "name": "schema",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "views": {
+          "name": "views",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "forms": {
+          "name": "forms",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "rls": {
+          "name": "rls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(CURRENT_TIMESTAMP)"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_by": {
+          "name": "updated_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "table_base_id_idx": {
+          "name": "table_base_id_idx",
+          "columns": [
+            "base_id"
+          ],
+          "isUnique": false
+        },
+        "table_space_id_idx": {
+          "name": "table_space_id_idx",
+          "columns": [
+            "space_id"
+          ],
+          "isUnique": false
+        },
+        "table_name_unique_idx": {
+          "name": "table_name_unique_idx",
+          "columns": [
+            "name",
+            "base_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "undb_table_base_id_undb_base_id_fk": {
+          "name": "undb_table_base_id_undb_base_id_fk",
+          "tableFrom": "undb_table",
+          "tableTo": "undb_base",
+          "columnsFrom": [
+            "base_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_table_space_id_undb_space_id_fk": {
+          "name": "undb_table_space_id_undb_space_id_fk",
+          "tableFrom": "undb_table",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_table_created_by_undb_user_id_fk": {
+          "name": "undb_table_created_by_undb_user_id_fk",
+          "tableFrom": "undb_table",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "created_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_table_updated_by_undb_user_id_fk": {
+          "name": "undb_table_updated_by_undb_user_id_fk",
+          "tableFrom": "undb_table",
+          "tableTo": "undb_user",
+          "columnsFrom": [
+            "updated_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_user": {
+      "name": "undb_user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "avatar": {
+          "name": "avatar",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "undb_user_email_unique": {
+          "name": "undb_user_email_unique",
+          "columns": [
+            "email"
+          ],
+          "isUnique": true
+        },
+        "user_username_idx": {
+          "name": "user_username_idx",
+          "columns": [
+            "username"
+          ],
+          "isUnique": false
+        },
+        "user_email_idx": {
+          "name": "user_email_idx",
+          "columns": [
+            "email"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "undb_webhook": {
+      "name": "undb_webhook",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "method": {
+          "name": "method",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "headers": {
+          "name": "headers",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "condition": {
+          "name": "condition",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "event": {
+          "name": "event",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "space_id": {
+          "name": "space_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "webhook_table_id_idx": {
+          "name": "webhook_table_id_idx",
+          "columns": [
+            "table_id"
+          ],
+          "isUnique": false
+        },
+        "webhook_space_id_idx": {
+          "name": "webhook_space_id_idx",
+          "columns": [
+            "space_id"
+          ],
+          "isUnique": false
+        },
+        "webhook_url_idx": {
+          "name": "webhook_url_idx",
+          "columns": [
+            "url"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "undb_webhook_table_id_undb_table_id_fk": {
+          "name": "undb_webhook_table_id_undb_table_id_fk",
+          "tableFrom": "undb_webhook",
+          "tableTo": "undb_table",
+          "columnsFrom": [
+            "table_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "undb_webhook_space_id_undb_space_id_fk": {
+          "name": "undb_webhook_space_id_undb_space_id_fk",
+          "tableFrom": "undb_webhook",
+          "tableTo": "undb_space",
+          "columnsFrom": [
+            "space_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/apps/backend/drizzle/meta/_journal.json b/apps/backend/drizzle/meta/_journal.json
index 82ce24026..8b955642d 100644
--- a/apps/backend/drizzle/meta/_journal.json
+++ b/apps/backend/drizzle/meta/_journal.json
@@ -43,6 +43,13 @@
       "when": 1724391158180,
       "tag": "0005_narrow_khan",
       "breakpoints": true
+    },
+    {
+      "idx": 6,
+      "version": "6",
+      "when": 1728358607342,
+      "tag": "0006_mature_madame_web",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/reference-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/reference-cell.svelte
index 1dd2aa1d6..e5eb49590 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/reference-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/reference-cell.svelte
@@ -2,12 +2,17 @@
   import type { ReferenceField } from "@undb/table"
   import ForeignRecordsPickerDropdown from "../../reference/foreign-records-picker-dropdown.svelte"
   import { Button } from "$lib/components/ui/button"
-  import { writable, type Writable } from "svelte/store"
+  import { writable, type Readable, type Writable } from "svelte/store"
+  import { getRecordsStore } from "$lib/store/records.store"
+  import { getTable } from "$lib/store/table.store"
+
+  const table = getTable()
 
   export let tableId: string
   export let field: ReferenceField
   export let value: string[] = []
   export let displayValue: string[]
+  export let viewId: Readable<string | undefined>
   export let isEditing: boolean
   export let isSelected: boolean
   export let recordId: string
@@ -24,6 +29,14 @@
   $: if (hasValue && !hasValueReactive) {
     hasValue = hasValueReactive
   }
+
+  const recordStore = getRecordsStore()
+
+  function onSuccess(id?: string) {
+    if (id) {
+      recordStore.invalidateRecord($table, id, $viewId)
+    }
+  }
 </script>
 
 <div class={$$restProps.class}>
@@ -36,6 +49,7 @@
             hasValue = hasValueReactive
           }
         }}
+        {onValueChange}
         {field}
         {tableId}
         {recordId}
@@ -43,6 +57,7 @@
         bind:isSelected={hasValue}
         bind:selected
         let:builder
+        {onSuccess}
       >
         {#if hasValueReactive}
           <Button size="xs" variant="link" class="px-0" builders={[builder]}>
@@ -57,6 +72,7 @@
     {#if (isSelected || isEditing) && hasValueReactive}
       <ForeignRecordsPickerDropdown
         {onValueChange}
+        {onSuccess}
         shouldUpdate
         {field}
         {tableId}
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/grid-view-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/grid-view-cell.svelte
index 5f3181849..ab3ac9b73 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/grid-view-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/grid-view-cell.svelte
@@ -27,6 +27,7 @@
   import ButtonCell from "./editable-cell/button-cell.svelte"
   import DurationCell from "./editable-cell/duration-cell.svelte"
   import PercentageCell from "./editable-cell/percentage-cell.svelte"
+  import type { Readable } from "svelte/store"
 
   const table = getTable()
   const recordsStore = getRecordsStore()
@@ -34,6 +35,7 @@
   export let value: any
   export let displayValue: any
   export let index: number
+  export let viewId: Readable<string | undefined>
   export let field: Field
   export let recordId: string
   export let record: RecordDO | undefined
@@ -80,6 +82,7 @@
   {isSelected}
   {recordId}
   {record}
+  {viewId}
   readonly={field.isSystem || readonly}
   tableId={$table.id.value}
   class={cn(
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/grid-view-data-table.svelte b/apps/frontend/src/lib/components/blocks/grid-view/grid-view-data-table.svelte
index 48ff22ee7..e9767214f 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/grid-view-data-table.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/grid-view-data-table.svelte
@@ -122,7 +122,7 @@
             const record = $store.records.get(item.row.original.id)
             const displayValue = record?.displayValues?.toJSON()?.[field.id.value]
             return createRender(GridViewCell, {
-              r,
+              viewId,
               index,
               value: item.value,
               field,
diff --git a/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-lane.svelte b/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-lane.svelte
index ad8c0e42f..92d15fcf8 100644
--- a/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-lane.svelte
+++ b/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-lane.svelte
@@ -289,6 +289,18 @@
         </DropdownMenu.Trigger>
         <DropdownMenu.Content class="w-48">
           <DropdownMenu.Group>
+            <DropdownMenu.Item
+              class="text-xs text-gray-700"
+              on:click={() => {
+                if (!$viewId) {
+                  return
+                }
+                kanbanStore.toggleLane($viewId, option?.id ?? "")
+              }}
+            >
+              <Maximize2Icon class="mr-2 h-3 w-3" />
+              Collapse Lane
+            </DropdownMenu.Item>
             {#if !shareId && !readonly && option}
               <DropdownMenu.Item class="text-xs text-gray-700" on:click={() => (updateOptionDialogOpen = true)}>
                 <PencilIcon class="mr-2 h-3 w-3" />
@@ -296,25 +308,13 @@
               </DropdownMenu.Item>
               <DropdownMenu.Item
                 disabled={field.options.length <= 1}
-                class="text-xs text-gray-700"
+                class="text-xs hover:!bg-red-200 hover:!text-red-700"
                 on:click={() => (deleteOptionDialogOpen = true)}
               >
                 <TrashIcon class="mr-2 h-3 w-3" />
                 Delete option
               </DropdownMenu.Item>
             {/if}
-            <DropdownMenu.Item
-              class="text-xs text-gray-700"
-              on:click={() => {
-                if (!$viewId) {
-                  return
-                }
-                kanbanStore.toggleLane($viewId, option?.id ?? "")
-              }}
-            >
-              <Maximize2Icon class="mr-2 h-3 w-3" />
-              Collapse Lane
-            </DropdownMenu.Item>
           </DropdownMenu.Group>
         </DropdownMenu.Content>
       </DropdownMenu.Root>
@@ -423,7 +423,12 @@
       </AlertDialog.Header>
       <AlertDialog.Footer>
         <AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
-        <AlertDialog.Action on:click={() => deleteOption()}>Continue</AlertDialog.Action>
+        <AlertDialog.Action asChild let:builder>
+          <Button builders={[builder]} variant="destructive" on:click={() => deleteOption()}>
+            <TrashIcon class="mr-2 size-4" />
+            Delete</Button
+          >
+        </AlertDialog.Action>
       </AlertDialog.Footer>
     </AlertDialog.Content>
   </AlertDialog.Root>
diff --git a/apps/frontend/src/lib/components/blocks/nav/nav-tools.svelte b/apps/frontend/src/lib/components/blocks/nav/nav-tools.svelte
index 8b3a5e977..28172dd89 100644
--- a/apps/frontend/src/lib/components/blocks/nav/nav-tools.svelte
+++ b/apps/frontend/src/lib/components/blocks/nav/nav-tools.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Button } from "$lib/components/ui/button"
-  import { PlusIcon, SearchIcon, SettingsIcon, PanelLeftCloseIcon, PackageIcon } from "lucide-svelte"
+  import { CirclePlusIcon, SearchIcon, SettingsIcon, PanelLeftCloseIcon, PackageIcon } from "lucide-svelte"
   import { commandOpen } from "../command/command.store"
   import { CREATE_BASE_MODAL, IMPORT_TEMPLATE_MODAL, toggleModal } from "$lib/store/modal.store"
   import { page } from "$app/stores"
@@ -52,7 +52,7 @@
       variant="link"
       size="xs"
     >
-      <SettingsIcon class="mr-2 h-4 w-4" />
+      <SettingsIcon class="mr-2 size-4" />
       {#if space?.isPersonal}
         Settings
       {:else}
@@ -67,7 +67,7 @@
         variant="link"
         size="xs"
       >
-        <PlusIcon class="mr-2 h-3 w-3" />
+        <CirclePlusIcon class="mr-2 size-4" />
         Create New Base
       </Button>
 
@@ -77,7 +77,7 @@
         variant="link"
         size="xs"
       >
-        <PackageIcon class="mr-2 h-3 w-3" />
+        <PackageIcon class="mr-2 size-4" />
         Import From Template
       </Button>
     {/if}
diff --git a/apps/frontend/src/lib/components/blocks/reference/foreign-records-picker-dropdown.svelte b/apps/frontend/src/lib/components/blocks/reference/foreign-records-picker-dropdown.svelte
index 1f12cbc7f..b944c3594 100644
--- a/apps/frontend/src/lib/components/blocks/reference/foreign-records-picker-dropdown.svelte
+++ b/apps/frontend/src/lib/components/blocks/reference/foreign-records-picker-dropdown.svelte
@@ -20,6 +20,7 @@
   export let selected = writable<string[]>()
   export let onValueChange = (value: string[]) => {}
   export let onOpenChange: (open: boolean) => void = () => {}
+  export let onSuccess: (id?: string) => void = () => {}
 
   const foreignTableStore = new GetForeignTableStore()
 
@@ -57,6 +58,7 @@
         {foreignTable}
         bind:selected
         {onValueChange}
+        {onSuccess}
       />
     {/if}
   </Popover.Content>
diff --git a/apps/frontend/src/lib/components/blocks/reference/foreign-records-picker.svelte b/apps/frontend/src/lib/components/blocks/reference/foreign-records-picker.svelte
index 215c077a4..c00e7f27a 100644
--- a/apps/frontend/src/lib/components/blocks/reference/foreign-records-picker.svelte
+++ b/apps/frontend/src/lib/components/blocks/reference/foreign-records-picker.svelte
@@ -29,6 +29,8 @@
   export let recordId: string | undefined = undefined
   export let field: ReferenceField
   export let onValueChange = (value: string[]) => {}
+  export let onSuccess: (id?: string) => void
+
   let linkAfterCreate = true
 
   const perPage = writable(20)
@@ -92,6 +94,7 @@
     mutationFn: trpc.record.update.mutate,
     async onSuccess(data, variables, context) {
       await client.invalidateQueries({ queryKey: ["records", field.foreignTableId] })
+      onSuccess?.(recordId)
     },
     onError(error: Error) {
       toast.error(error.message)
diff --git a/apps/frontend/src/lib/components/blocks/template/template-card.svelte b/apps/frontend/src/lib/components/blocks/template/template-card.svelte
index e09991f25..460b44de8 100644
--- a/apps/frontend/src/lib/components/blocks/template/template-card.svelte
+++ b/apps/frontend/src/lib/components/blocks/template/template-card.svelte
@@ -82,27 +82,33 @@
               {template.description}
             </Dialog.Description>
           </div>
-          <div class="mr-10 space-y-2">
-            <Button
-              class="w-44"
-              disabled={$createFromTemplate.isPending}
-              on:click={() => $createFromTemplate.mutate({ id: template.id, includeData })}
-            >
-              {#if $createFromTemplate.isPending}
-                <LoaderCircleIcon class="mr-2 size-4 animate-spin" />
-              {/if}
-              Use this Template
-            </Button>
-
-            <div class="flex items-center space-x-2">
-              <Checkbox id="terms" bind:checked={includeData} />
-              <Label
-                for="terms"
-                class="text-xs font-medium leading-none text-gray-500 peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+          <div class="mr-10 flex flex-row gap-2">
+            <div class="space-y-2">
+              <Button
+                class="w-44"
+                disabled={$createFromTemplate.isPending}
+                on:click={() => $createFromTemplate.mutate({ id: template.id, includeData })}
               >
-                Include data.
-              </Label>
+                {#if $createFromTemplate.isPending}
+                  <LoaderCircleIcon class="mr-2 size-4 animate-spin" />
+                {/if}
+                Use this Template
+              </Button>
+
+              <div class="flex items-center space-x-2">
+                <Checkbox id="terms" bind:checked={includeData} />
+                <Label
+                  for="terms"
+                  class="text-xs font-medium leading-none text-gray-500 peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+                >
+                  Include data.
+                </Label>
+              </div>
             </div>
+
+            <Button size="icon" href={`/templates/${template.id}`}>
+              <FullscreenIcon class="size-4" />
+            </Button>
           </div>
         </Dialog.Header>
 
diff --git a/apps/frontend/src/lib/store/records.store.ts b/apps/frontend/src/lib/store/records.store.ts
index 71a5a19ae..d44db2d38 100644
--- a/apps/frontend/src/lib/store/records.store.ts
+++ b/apps/frontend/src/lib/store/records.store.ts
@@ -94,8 +94,13 @@ export const createRecordsStore = () => {
   const hasRecord = derived(store, ($store) => !!$store.records.size)
   const count = derived(store, ($store) => $store.ids.length)
 
-  const invalidateRecord = async (table: TableDo, recordId: string) => {
-    const result = await trpc.record.get.query({ tableId: table.id.value, id: recordId })
+  const invalidateRecord = async (table: TableDo, recordId: string, viewId?: string) => {
+    const view = viewId ? table.views.getViewById(viewId) : undefined
+    const result = await trpc.record.get.query({
+      tableId: table.id.value,
+      id: recordId,
+      viewId: view?.id.value,
+    })
     const record = (result as any)?.record
     if (!record) return
     const r = RecordDO.fromJSON(table, record)
diff --git a/apps/frontend/src/routes/(share)/s/f/[shareId]/+page.svelte b/apps/frontend/src/routes/(share)/s/f/[shareId]/+page.svelte
index ee7cd562f..eb44da362 100644
--- a/apps/frontend/src/routes/(share)/s/f/[shareId]/+page.svelte
+++ b/apps/frontend/src/routes/(share)/s/f/[shareId]/+page.svelte
@@ -38,7 +38,7 @@
 
   const createRecordMutation = createMutation(
     derived([table], ([$table]) => ({
-      mutationFn: trpc.record.create.mutate,
+      mutationFn: trpc.table.form.submit.mutate,
       onSuccess: () => {
         closeModal(CREATE_RECORD_MODAL)
         client.invalidateQueries({
@@ -54,8 +54,13 @@
   )
 
   const createRecord = (values: any) => {
+    const formId = form?.id
+        if (!formId) {
+          return
+        }
     $createRecordMutation.mutate({
       tableId: $table.id.value,
+      form: formId,
       values,
     })
   }
diff --git a/bun.lockb b/bun.lockb
index ab22ab765..5e7e2db6a 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index fc463d597..8ae2b78ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "undb",
-  "version": "1.0.0-94",
+  "version": "1.0.0-95",
   "private": true,
   "scripts": {
     "build": "NODE_ENV=production bun --bun turbo build",
diff --git a/packages/command-handlers/src/handlers/submit-form.command-handler.ts b/packages/command-handlers/src/handlers/submit-form.command-handler.ts
index 59728442b..e002a537c 100644
--- a/packages/command-handlers/src/handlers/submit-form.command-handler.ts
+++ b/packages/command-handlers/src/handlers/submit-form.command-handler.ts
@@ -1,8 +1,10 @@
 import { SubmitFormCommand } from "@undb/commands"
+import { setContextValue } from "@undb/context/server"
 import { commandHandler } from "@undb/cqrs"
 import { singleton } from "@undb/di"
 import type { ICommandHandler } from "@undb/domain"
 import { createLogger } from "@undb/logger"
+import { injectSpaceService, type ISpaceService } from "@undb/space"
 import { injectRecordsService, type IRecordsService } from "@undb/table"
 
 @commandHandler(SubmitFormCommand)
@@ -12,10 +14,15 @@ export class SubmitFormCommandHandler implements ICommandHandler<SubmitFormComma
   constructor(
     @injectRecordsService()
     private readonly service: IRecordsService,
+    @injectSpaceService()
+    private readonly spaceService: ISpaceService,
   ) {}
 
   async execute(command: SubmitFormCommand): Promise<any> {
     this.logger.debug(command, "executing submit form command")
+
+    await this.spaceService.setSpaceContext(setContextValue, { tableId: command.tableId })
+
     const record = await this.service.submitForm(command, { form: command.form, values: command.values })
 
     return record.id.value
diff --git a/packages/persistence/src/abstract-qb.visitor.ts b/packages/persistence/src/abstract-qb.visitor.ts
index 76d557615..e52ab3f03 100644
--- a/packages/persistence/src/abstract-qb.visitor.ts
+++ b/packages/persistence/src/abstract-qb.visitor.ts
@@ -1,4 +1,4 @@
-import type { ISpecVisitor, ISpecification } from "@undb/domain"
+import type { ISpecVisitor, ISpecification, Option } from "@undb/domain"
 import type { CompiledQuery, Expression, ExpressionBuilder } from "kysely"
 
 type TExpression = Expression<any>
@@ -42,6 +42,14 @@ export abstract class AbstractQBVisitor<T> implements IAbastractQBVisitor, ISpec
     return cond
   }
 
+  exec(spec: Option<ISpecification<T, ISpecVisitor>>) {
+    if (spec.isSome()) {
+      spec.unwrap().accept(this)
+    }
+
+    return this.cond
+  }
+
   and(left: ISpecification<T, ISpecVisitor>, right: ISpecification<T, ISpecVisitor>): this {
     const lv = this.clone()
     left.accept(lv)
diff --git a/packages/persistence/src/outbox.mapper.ts b/packages/persistence/src/outbox.mapper.ts
index 08ff9d5d6..09f873447 100644
--- a/packages/persistence/src/outbox.mapper.ts
+++ b/packages/persistence/src/outbox.mapper.ts
@@ -13,7 +13,7 @@ export class OutboxMapper {
       payload: json(event.payload),
       space_id: spaceId,
       meta: event.meta ? json(event.meta) : null,
-      operator_id: event.operatorId ?? user,
+      user_id: event.operatorId ?? user,
       timestamp: event.timestamp.getTime(),
     }
   }
diff --git a/packages/persistence/src/record/record.repository.ts b/packages/persistence/src/record/record.repository.ts
index 5f0d1b512..917f04d6a 100644
--- a/packages/persistence/src/record/record.repository.ts
+++ b/packages/persistence/src/record/record.repository.ts
@@ -146,8 +146,9 @@ export class RecordRepository implements IRecordRepository {
   }
 
   async findOne(table: TableDo, spec: Option<RecordComositeSpecification>): Promise<Option<RecordDO>> {
-    const foreignTables = await this.getForeignTables(table, table.schema.fields)
-    const qb = this.helper.createQuery(table, foreignTables, table.schema.fields, spec)
+    const selected = table.getSelectFields()
+    const foreignTables = await this.getForeignTables(table, selected)
+    const qb = this.helper.createQuery(table, foreignTables, selected, spec)
 
     const record = await qb.limit(1).executeTakeFirst()
     const dto = record ? getRecordDTOFromEntity(table, record, foreignTables) : undefined
@@ -155,8 +156,9 @@ export class RecordRepository implements IRecordRepository {
   }
 
   async find(table: TableDo, spec: Option<RecordComositeSpecification>): Promise<RecordDO[]> {
-    const foreignTables = await this.getForeignTables(table, table.schema.fields)
-    const qb = this.helper.createQuery(table, foreignTables, table.schema.fields, spec)
+    const selected = table.getSelectFields()
+    const foreignTables = await this.getForeignTables(table, selected)
+    const qb = this.helper.createQuery(table, foreignTables, selected, spec)
     const records = await qb.where(this.helper.handleWhere(table, spec)).execute()
 
     return records.map((record) => {
@@ -166,8 +168,9 @@ export class RecordRepository implements IRecordRepository {
   }
 
   async findOneById(table: TableDo, recordId: RecordId): Promise<Option<RecordDO>> {
-    const foreignTables = await this.getForeignTables(table, table.schema.fields)
-    const qb = this.helper.createQuery(table, foreignTables, table.schema.fields, None)
+    const selected = table.getSelectFields()
+    const foreignTables = await this.getForeignTables(table, selected)
+    const qb = this.helper.createQuery(table, foreignTables, selected, None)
 
     const records = await qb.where(`${table.id.value}.${ID_TYPE}`, "=", recordId.value).limit(1).execute()
 
@@ -180,9 +183,9 @@ export class RecordRepository implements IRecordRepository {
   }
 
   async findByIds(table: TableDo, ids: RecordId[]): Promise<RecordDO[]> {
-    const t = new UnderlyingTable(table)
-    const foreignTables = await this.getForeignTables(table, table.schema.fields)
-    const qb = this.helper.createQuery(table, foreignTables, table.schema.fields, None)
+    const selected = table.getSelectFields()
+    const foreignTables = await this.getForeignTables(table, selected)
+    const qb = this.helper.createQuery(table, foreignTables, selected, None)
 
     const records = await qb
       .where(
diff --git a/packages/persistence/src/space/space.filter-visitor.ts b/packages/persistence/src/space/space.filter-visitor.ts
index b610d098c..08957813a 100644
--- a/packages/persistence/src/space/space.filter-visitor.ts
+++ b/packages/persistence/src/space/space.filter-visitor.ts
@@ -8,6 +8,7 @@ import type {
   WithSpaceIsPersonal,
   WithSpaceName,
   WithSpaceShareId,
+  WithSpaceTableId,
   WithSpaceUserId,
 } from "@undb/space"
 import type { ExpressionBuilder } from "kysely"
@@ -36,6 +37,15 @@ export class SpaceFilterVisitor extends AbstractQBVisitor<Space> implements ISpa
     const cond = this.eb.eb("undb_space.id", "=", v.id.value)
     this.addCond(cond)
   }
+  withTableId(v: WithSpaceTableId): void {
+    const subQuery = this.qb
+      .selectFrom("undb_table")
+      .select(["undb_table.space_id"])
+      .where("undb_table.id", "=", v.tableId)
+
+    const cond = this.eb.eb("undb_space.id", "in", subQuery)
+    this.addCond(cond)
+  }
   withApiToken(v: WithSpaceApiToken): void {
     const subQuery = this.qb
       .selectFrom("undb_api_token")
@@ -55,7 +65,10 @@ export class SpaceFilterVisitor extends AbstractQBVisitor<Space> implements ISpa
     this.addCond(cond)
   }
   withBaseId(v: WithSpaceBaseId): void {
-    throw new Error("Method not implemented.")
+    const subQuery = this.qb.selectFrom("undb_base").select(["undb_base.space_id"]).where("undb_base.id", "=", v.baseId)
+
+    const cond = this.eb.eb("undb_space.id", "in", subQuery)
+    this.addCond(cond)
   }
   withIsPersonal(v: WithSpaceIsPersonal): void {
     throw new Error("Method not implemented.")
diff --git a/packages/persistence/src/space/space.mutate-visitor.ts b/packages/persistence/src/space/space.mutate-visitor.ts
index e7dbddd67..6e3ad7c27 100644
--- a/packages/persistence/src/space/space.mutate-visitor.ts
+++ b/packages/persistence/src/space/space.mutate-visitor.ts
@@ -7,6 +7,7 @@ import type {
   WithSpaceIsPersonal,
   WithSpaceName,
   WithSpaceShareId,
+  WithSpaceTableId,
   WithSpaceUserId,
 } from "@undb/space"
 import { AbstractQBMutationVisitor } from "../abstract-qb.visitor"
@@ -18,6 +19,9 @@ export class SpaceMutateVisitor extends AbstractQBMutationVisitor implements ISp
   withUserId(v: WithSpaceUserId): void {
     throw new Error("Method not implemented.")
   }
+  withTableId(v: WithSpaceTableId): void {
+    throw new Error("Method not implemented.")
+  }
   withBaseId(v: WithSpaceBaseId): void {
     throw new Error("Method not implemented.")
   }
diff --git a/packages/persistence/src/space/space.repository.ts b/packages/persistence/src/space/space.repository.ts
index b2fa9edc4..093c820ff 100644
--- a/packages/persistence/src/space/space.repository.ts
+++ b/packages/persistence/src/space/space.repository.ts
@@ -38,11 +38,7 @@ export class SpaceRepostitory implements ISpaceRepository {
     const space = await (getCurrentTransaction() ?? this.qb)
       .selectFrom("undb_space")
       .selectAll()
-      .where((eb) => {
-        const visitor = new SpaceFilterVisitor(this.qb, eb)
-        spec.accept(visitor)
-        return visitor.cond
-      })
+      .where((eb) => new SpaceFilterVisitor(this.qb, eb).exec(Some(spec)))
       .executeTakeFirst()
 
     if (!space) {
diff --git a/packages/persistence/src/tables.ts b/packages/persistence/src/tables.ts
index ddd0c99b0..3c3cad5f3 100644
--- a/packages/persistence/src/tables.ts
+++ b/packages/persistence/src/tables.ts
@@ -185,7 +185,7 @@ export const outbox = sqliteTable(
     payload: text("payload", { mode: "json" }).notNull(),
     meta: text("meta", { mode: "json" }),
     timestamp: integer("timestamp", { mode: "timestamp_ms" }).notNull(),
-    operatorId: text("operator_id").notNull(),
+    userId: text("user_id"),
     name: text("name").notNull(),
     spaceId: text("space_id")
       .notNull()
diff --git a/packages/persistence/src/template/template-data.ts b/packages/persistence/src/template/template-data.ts
index ac416f08f..5638b2411 100644
--- a/packages/persistence/src/template/template-data.ts
+++ b/packages/persistence/src/template/template-data.ts
@@ -1,13 +1,44 @@
+import { env } from "@undb/env"
 import { templates, type IBaseTemplateDTO, type ITemplateDTO } from "@undb/template"
 
+function getTemplateImage(folder: string, file: string) {
+  return env.UNDB_BASE_URL + "/assets/templates/" + folder + "/" + file
+}
+
 export const templateData: ITemplateDTO[] = [
   {
     id: "550e8400-e29b-41d4-a716-446655440000",
     icon: "🚀",
     name: "Project Management",
-    categories: ["it"],
+    categories: ["it", "project", "startup"],
+    cover: getTemplateImage("projectManagement", "cover.jpg"),
+    images: [
+      getTemplateImage("projectManagement", "image1.jpeg"),
+      getTemplateImage("projectManagement", "image2.jpeg"),
+      getTemplateImage("projectManagement", "image3.jpeg"),
+    ],
     description:
       "A comprehensive template for managing projects, tasks, and team collaboration. It includes features for tracking project progress, assigning tasks, managing resources, and facilitating team communication, helping you achieve project goals more efficiently.",
+    detail: `
+      <h1>Streamline Your Projects with UnDB's Project Management Template</h1>
+      <h2>Comprehensive Project Management Features</h2>
+      <p>UnDB's Project Management template offers a powerful set of tools to enhance your team's productivity and project success:</p>
+      <ul>
+        <li>Task Tracking: Easily create, assign, and monitor project tasks</li>
+        <li>Resource Management: Efficiently allocate team members and resources</li>
+        <li>Insightful Reporting: Generate detailed project analytics and reports</li>
+        <li>Time Optimization: Track task completion times to improve workflows</li>
+      </ul>
+      <h2>Why Choose UnDB for Project Management?</h2>
+      <p>UnDB offers unique advantages for your project management needs:</p>
+      <ul>
+        <li>Customizable: Tailor the template to fit your specific project requirements</li>
+        <li>User-Friendly: Intuitive interface for easy adoption across your team</li>
+        <li>Scalable: Grows with your projects, from small tasks to complex initiatives</li>
+        <li>Integration-Ready: Seamlessly connects with other UnDB templates and tools</li>
+        <li>Data-Driven: Make informed decisions with real-time project insights</li>
+      </ul>
+    `,
     template: {
       type: "base",
       template: templates.projectManagement as IBaseTemplateDTO,
@@ -18,7 +49,35 @@ export const templateData: ITemplateDTO[] = [
     icon: "💼",
     name: "CRM",
     categories: ["sales"],
+    cover: getTemplateImage("crm", "cover.jpg"),
     description: "A template for managing customer relationships, deals, and activities.",
+    images: [
+      getTemplateImage("crm", "image1.jpeg"),
+      getTemplateImage("crm", "image2.jpeg"),
+      getTemplateImage("crm", "image3.jpeg"),
+      getTemplateImage("crm", "image4.jpeg"),
+    ],
+    detail: `
+      <h1>Maximize Your Sales with UnDB's CRM Template</h1>
+      <h2>Comprehensive CRM Features</h2>
+      <p>UnDB's CRM template provides a comprehensive set of tools to enhance your sales and customer relationship management:</p>
+      <ul>
+        <li>Customer Relationship Management: Track customer interactions, preferences, and history</li>
+        <li>Deal Tracking: Monitor and manage sales opportunities and deals</li>
+        <li>Activity Management: Track and manage customer activities and communications</li>
+        <li>Insightful Reporting: Generate detailed sales analytics and reports</li>
+        <li>Data-Driven Insights: Make informed decisions with real-time customer data</li>
+      </ul>
+      <h2>Why Choose UnDB for CRM?</h2>
+      <p>UnDB offers unique advantages for your CRM needs:</p>
+      <ul>
+        <li>Customizable: Tailor the template to fit your specific sales and customer relationship management requirements</li>
+        <li>User-Friendly: Intuitive interface for easy adoption across your team</li>
+        <li>Scalable: Grows with your sales and customer relationships, from small deals to complex customer interactions</li>
+        <li>Integration-Ready: Seamlessly connects with other UnDB templates and tools</li>
+        <li>Data-Driven: Make informed decisions with real-time customer data</li>
+      </ul>
+    `,
     template: {
       type: "base",
       template: templates.crm as IBaseTemplateDTO,
@@ -28,9 +87,32 @@ export const templateData: ITemplateDTO[] = [
     id: "f47ac10b-58cc-4372-a567-0e02b2c3d479",
     icon: "💼",
     name: "Sales CRM",
+    cover: getTemplateImage("salesCrm", "cover.jpg"),
     categories: ["sales", "crm"],
+    images: [getTemplateImage("salesCrm", "image1.png"), getTemplateImage("salesCrm", "image2.png")],
     description:
       "A CRM for sales. It includes features for tracking customer interactions, managing deals, and analyzing sales data.",
+    detail: `
+      <h1>Maximize Your Sales with UnDB's CRM Template</h1>
+      <h2>Comprehensive CRM Features</h2>
+      <p>UnDB's CRM template provides a comprehensive set of tools to enhance your sales and customer relationship management:</p>
+      <ul>
+        <li>Customer Relationship Management: Track customer interactions, preferences, and history</li>
+        <li>Deal Tracking: Monitor and manage sales opportunities and deals</li>
+        <li>Activity Management: Track and manage customer activities and communications</li>
+        <li>Insightful Reporting: Generate detailed sales analytics and reports</li>
+        <li>Data-Driven Insights: Make informed decisions with real-time customer data</li>
+      </ul>
+      <h2>Why Choose UnDB for CRM?</h2>
+      <p>UnDB offers unique advantages for your CRM needs:</p>
+      <ul>
+        <li>Customizable: Tailor the template to fit your specific sales and customer relationship management requirements</li>
+        <li>User-Friendly: Intuitive interface for easy adoption across your team</li>
+        <li>Scalable: Grows with your sales and customer relationships, from small deals to complex customer interactions</li>
+        <li>Integration-Ready: Seamlessly connects with other UnDB templates and tools</li>
+        <li>Data-Driven: Make informed decisions with real-time customer data</li>
+      </ul>
+    `,
     template: {
       type: "base",
       template: templates.salesCrm as IBaseTemplateDTO,
@@ -40,8 +122,35 @@ export const templateData: ITemplateDTO[] = [
     id: "6ba7b810-9dad-11d1-80b4-00c04fd430c8",
     icon: "🎉",
     name: "Event Planning List",
+    cover: getTemplateImage("eventPlanning", "cover.jpg"),
+    images: [
+      getTemplateImage("eventPlanning", "image1.png"),
+      getTemplateImage("eventPlanning", "image2.png"),
+      getTemplateImage("eventPlanning", "image3.png"),
+      getTemplateImage("eventPlanning", "image4.png"),
+    ],
     description: "A template for planning events, including tasks, deadlines, and resources.",
-    categories: ["sales"],
+    detail: `
+      <h1>Streamline Your Event Planning with UnDB's Event Planning Template</h1>
+      <h2>Comprehensive Event Planning Features</h2>
+      <p>UnDB's Event Planning template offers a powerful set of tools to enhance your event planning process:</p>
+      <ul>
+        <li>Task Tracking: Easily create, assign, and monitor event planning tasks</li>
+        <li>Resource Management: Efficiently allocate resources such as venues, catering, and entertainment</li>
+        <li>Insightful Reporting: Generate detailed event analytics and reports</li>
+        <li>Time Optimization: Track task completion times to improve event planning efficiency</li>
+      </ul>
+      <h2>Why Choose UnDB for Event Planning?</h2>
+      <p>UnDB offers unique advantages for your event planning needs:</p>
+      <ul>
+        <li>Customizable: Tailor the template to fit your specific event planning requirements</li>
+        <li>User-Friendly: Intuitive interface for easy adoption across your team</li>
+        <li>Scalable: Grows with your events, from small gatherings to large-scale conferences</li>
+        <li>Integration-Ready: Seamlessly connects with other UnDB templates and tools</li>
+        <li>Data-Driven: Make informed decisions with real-time event data</li>
+      </ul>
+    `,
+    categories: ["personal"],
     template: {
       type: "base",
       template: templates.eventPlaningList as IBaseTemplateDTO,
@@ -51,8 +160,21 @@ export const templateData: ITemplateDTO[] = [
     id: "6ba7b811-9dad-11d1-80b4-00c04fd430c8",
     icon: "📝",
     name: "To-Do List",
-    categories: ["other"],
+    categories: ["other", "personal"],
+    cover: getTemplateImage("todo", "cover.jpg"),
+    images: [getTemplateImage("todo", "image1.png"), getTemplateImage("todo", "image2.png")],
     description: "A simple template for managing daily tasks and reminders.",
+    detail: `
+      <h1>Streamline Your Daily Tasks with UnDB's To-Do List Template</h1>
+      <h2>Comprehensive To-Do List Features</h2>
+      <p>UnDB's To-Do List template offers a powerful set of tools to enhance your daily task management:</p>
+      <ul>
+        <li>Task Tracking: Easily create, assign, and monitor daily tasks</li>
+        <li>Resource Management: Efficiently allocate resources such as venues, catering, and entertainment</li>
+        <li>Insightful Reporting: Generate detailed event analytics and reports</li>
+        <li>Time Optimization: Track task completion times to improve event planning efficiency</li>
+      </ul>
+    `,
     template: {
       type: "base",
       template: templates.todoList as IBaseTemplateDTO,
@@ -63,7 +185,25 @@ export const templateData: ITemplateDTO[] = [
     icon: "📦",
     name: "Office Inventory Management",
     categories: ["finance"],
+    cover: getTemplateImage("officeInventoryManagement", "cover.jpg"),
+    images: [
+      getTemplateImage("officeInventoryManagement", "image1.png"),
+      getTemplateImage("officeInventoryManagement", "image2.png"),
+      getTemplateImage("officeInventoryManagement", "image3.png"),
+      getTemplateImage("officeInventoryManagement", "image4.png"),
+    ],
     description: "A template for managing office supplies, equipment, and inventory.",
+    detail: `
+      <h1>Streamline Your Office Inventory with UnDB's Office Inventory Management Template</h1>
+      <h2>Comprehensive Office Inventory Management Features</h2>
+      <p>UnDB's Office Inventory Management template offers a powerful set of tools to enhance your office inventory management:</p>
+      <ul>
+        <li>Inventory Tracking: Easily create, assign, and monitor office inventory</li>
+        <li>Resource Management: Efficiently allocate resources such as venues, catering, and entertainment</li>
+        <li>Insightful Reporting: Generate detailed event analytics and reports</li>
+        <li>Time Optimization: Track task completion times to improve event planning efficiency</li>
+      </ul>
+    `,
     template: {
       type: "base",
       template: templates.officeInventoryManagement as IBaseTemplateDTO,
@@ -74,7 +214,23 @@ export const templateData: ITemplateDTO[] = [
     icon: "📸",
     name: "Social Media Content",
     categories: ["marketing"],
+    cover: getTemplateImage("socialMediaContent", "cover.jpg"),
+    images: [
+      getTemplateImage("socialMediaContent", "image1.png"),
+      getTemplateImage("socialMediaContent", "image2.png"),
+    ],
     description: "A template for managing social media content, including posts, images, and videos.",
+    detail: `
+      <h1>Streamline Your Social Media Content with UnDB's Social Media Content Template</h1>
+      <h2>Comprehensive Social Media Content Features</h2>
+      <p>UnDB's Social Media Content template offers a powerful set of tools to enhance your social media content management:</p>
+      <ul>
+        <li>Content Creation: Easily create, assign, and monitor social media content</li>
+        <li>Resource Management: Efficiently allocate resources such as venues, catering, and entertainment</li>
+        <li>Insightful Reporting: Generate detailed event analytics and reports</li>
+        <li>Time Optimization: Track task completion times to improve event planning efficiency</li>
+      </ul>
+    `,
     template: {
       type: "base",
       template: templates.socialMediaContent as IBaseTemplateDTO,
diff --git a/packages/realtime/src/reply/reply-event.factory.ts b/packages/realtime/src/reply/reply-event.factory.ts
index eaf36ac4f..4ce056a1b 100644
--- a/packages/realtime/src/reply/reply-event.factory.ts
+++ b/packages/realtime/src/reply/reply-event.factory.ts
@@ -8,7 +8,7 @@ export class ReplyEventFactory {
     return RecordEventFactory.fromJSON(outbox.space_id, {
       ...outbox,
       spaceId: outbox.space_id,
-      operatorId: outbox.operator_id,
+      operatorId: outbox.user_id,
       timestamp: outbox.timestamp,
     } as IEventJSON)
   }
diff --git a/packages/space/package.json b/packages/space/package.json
index e2e3af8ea..e5da2ceaf 100644
--- a/packages/space/package.json
+++ b/packages/space/package.json
@@ -4,7 +4,8 @@
   "type": "module",
   "types": "src/index.d.ts",
   "dependencies": {
-    "@undb/context": "workspace:*"
+    "@undb/context": "workspace:*",
+    "ts-pattern": "^5.3.1"
   },
   "devDependencies": {
     "@types/bun": "latest"
diff --git a/packages/space/src/interface.ts b/packages/space/src/interface.ts
index 0fc1a94c5..64dabb638 100644
--- a/packages/space/src/interface.ts
+++ b/packages/space/src/interface.ts
@@ -7,12 +7,14 @@ import type { WithSpaceId } from "./specifications/space-id.specification.js"
 import type { WithSpaceIsPersonal } from "./specifications/space-is-personal.specification.js"
 import type { WithSpaceName } from "./specifications/space-name.specification.js"
 import type { WithSpaceShareId } from "./specifications/space-share-id.specification.js"
+import type { WithSpaceTableId } from "./specifications/space-table-id.specification.js"
 import type { WithSpaceUserId } from "./specifications/space-user-id.specification.js"
 
 export interface ISpaceSpecVisitor extends ISpecVisitor {
   withId(v: WithSpaceId): void
   withUserId(v: WithSpaceUserId): void
   withBaseId(v: WithSpaceBaseId): void
+  withTableId(v: WithSpaceTableId): void
   withShareId(v: WithSpaceShareId): void
   withApiToken(v: WithSpaceApiToken): void
   withIsPersonal(v: WithSpaceIsPersonal): void
diff --git a/packages/space/src/space.service.ts b/packages/space/src/space.service.ts
index d0ce4ac6f..6a9d1f106 100644
--- a/packages/space/src/space.service.ts
+++ b/packages/space/src/space.service.ts
@@ -1,6 +1,7 @@
 import type { SetContextValue } from "@undb/context"
 import { inject, singleton } from "@undb/di"
 import { None, Option, Some } from "oxide.ts"
+import { match, P } from "ts-pattern"
 import type { ICreateSpaceDTO, ISpaceDTO } from "./dto"
 import type { ISpaceSpecification } from "./interface"
 import type { Space } from "./space.do"
@@ -11,13 +12,13 @@ import {
   type ISpaceQueryRepository,
   type ISpaceRepository,
 } from "./space.repository"
-import { WithSpaceApiToken, WithSpaceBaseId, WithSpaceId } from "./specifications"
-import { WithSpaceShareId } from "./specifications/space-share-id.specification"
+import { WithSpaceApiToken, WithSpaceBaseId, WithSpaceId, WithSpaceShareId, WithSpaceTableId } from "./specifications"
 import { WithSpaceUserId } from "./specifications/space-user-id.specification"
 
 interface IGetSpaceInput {
   spaceId?: string
   baseId?: string
+  tableId?: string
   apiToken?: string
   shareId?: string
   userId?: string
@@ -60,19 +61,15 @@ export class SpaceService implements ISpaceService {
   }
 
   async getSpace(input: IGetSpaceInput): Promise<Option<Space>> {
-    let spec: Option<ISpaceSpecification> = None
-
-    if (input.spaceId) {
-      spec = Some(WithSpaceId.fromString(input.spaceId))
-    } else if (input.baseId) {
-      spec = Some(new WithSpaceBaseId(input.baseId))
-    } else if (input.apiToken) {
-      spec = Some(new WithSpaceApiToken(input.apiToken))
-    } else if (input.shareId) {
-      spec = Some(new WithSpaceShareId(input.shareId))
-    } else if (input.userId) {
-      spec = Some(new WithSpaceUserId(input.userId))
-    }
+    const spec = match(input)
+      .returnType<Option<ISpaceSpecification>>()
+      .with({ spaceId: P.string }, () => Some(WithSpaceId.fromString(input.spaceId!)))
+      .with({ baseId: P.string }, () => Some(new WithSpaceBaseId(input.baseId!)))
+      .with({ tableId: P.string }, () => Some(new WithSpaceTableId(input.tableId!)))
+      .with({ apiToken: P.string }, () => Some(new WithSpaceApiToken(input.apiToken!)))
+      .with({ shareId: P.string }, () => Some(new WithSpaceShareId(input.shareId!)))
+      .with({ userId: P.string }, () => Some(new WithSpaceUserId(input.userId!)))
+      .otherwise(() => None)
 
     if (spec.isNone()) {
       return None
diff --git a/packages/space/src/specifications/index.ts b/packages/space/src/specifications/index.ts
index ab74d811b..8fc35d9d5 100644
--- a/packages/space/src/specifications/index.ts
+++ b/packages/space/src/specifications/index.ts
@@ -5,4 +5,5 @@ export * from "./space-id.specification.js"
 export * from "./space-is-personal.specification.js"
 export * from "./space-name.specification.js"
 export * from "./space-share-id.specification.js"
+export * from "./space-table-id.specification.js"
 export * from "./space-user-id.specification.js"
diff --git a/packages/space/src/specifications/space-table-id.specification.ts b/packages/space/src/specifications/space-table-id.specification.ts
new file mode 100644
index 000000000..294635433
--- /dev/null
+++ b/packages/space/src/specifications/space-table-id.specification.ts
@@ -0,0 +1,19 @@
+import { CompositeSpecification, Ok, Result } from "@undb/domain"
+import type { ISpaceSpecVisitor } from "../interface.js"
+import type { Space } from "../space.do.js"
+
+export class WithSpaceTableId extends CompositeSpecification<Space, ISpaceSpecVisitor> {
+  constructor(public readonly tableId: string) {
+    super()
+  }
+  isSatisfiedBy(t: Space): boolean {
+    throw new Error("Method not implemented.")
+  }
+  mutate(t: Space): Result<Space, string> {
+    throw new Error("Method not implemented.")
+  }
+  accept(v: ISpaceSpecVisitor): Result<void, string> {
+    v.withTableId(this)
+    return Ok(undefined)
+  }
+}
diff --git a/packages/template/src/dto/template.dto.ts b/packages/template/src/dto/template.dto.ts
index fa824139b..8d6fd3b9c 100644
--- a/packages/template/src/dto/template.dto.ts
+++ b/packages/template/src/dto/template.dto.ts
@@ -8,7 +8,10 @@ export const templateDTO = z.object({
   id: templateId,
   icon: z.string().optional(),
   name: templateName,
+  cover: z.string().optional(),
+  images: z.array(z.string()).optional(),
   description: z.string().optional(),
+  detail: z.string().optional(),
   categories: templateCategory.array(),
   template: templateSchemaVariants,
 })
diff --git a/packages/template/src/template/value-objects/template-category.vo.ts b/packages/template/src/template/value-objects/template-category.vo.ts
index d58279228..0fed6d4ce 100644
--- a/packages/template/src/template/value-objects/template-category.vo.ts
+++ b/packages/template/src/template/value-objects/template-category.vo.ts
@@ -13,6 +13,9 @@ export const templateCategory = z.enum([
   "design",
   "customer-support",
   "other",
+  "startup",
+  "project",
+  "personal",
 ])
 
 export type ITemplateCategory = z.infer<typeof templateCategory>
diff --git a/packages/template/src/templates/eventPlaning.base.json b/packages/template/src/templates/eventPlaning.base.json
index ad148f934..b496b9c10 100644
--- a/packages/template/src/templates/eventPlaning.base.json
+++ b/packages/template/src/templates/eventPlaning.base.json
@@ -34,6 +34,71 @@
                   "color": "yellow",
                   "id": "networking",
                   "name": "Networking"
+                },
+                {
+                  "color": "green",
+                  "id": "workshop",
+                  "name": "Workshop"
+                },
+                {
+                  "color": "red",
+                  "id": "presentation",
+                  "name": "Presentation"
+                },
+                {
+                  "color": "orange",
+                  "id": "social",
+                  "name": "Social"
+                },
+                {
+                  "color": "pink",
+                  "id": "demo",
+                  "name": "Demo"
+                },
+                {
+                  "color": "teal",
+                  "id": "symposium",
+                  "name": "Symposium"
+                },
+                {
+                  "color": "indigo",
+                  "id": "competition",
+                  "name": "Competition"
+                },
+                {
+                  "color": "orange",
+                  "id": "career",
+                  "name": "Career"
+                },
+                {
+                  "color": "cyan",
+                  "id": "ceremony",
+                  "name": "Ceremony"
+                },
+                {
+                  "color": "lime",
+                  "id": "exhibition",
+                  "name": "Exhibition"
+                },
+                {
+                  "color": "yellow",
+                  "id": "discussion",
+                  "name": "Discussion"
+                },
+                {
+                  "color": "red",
+                  "id": "mentoring",
+                  "name": "Mentoring"
+                },
+                {
+                  "color": "green",
+                  "id": "break",
+                  "name": "Break"
+                },
+                {
+                  "color": "blue",
+                  "id": "seminar",
+                  "name": "Seminar"
                 }
               ]
             }
@@ -86,6 +151,285 @@
             "Location": "Auditorium",
             "Speakers": ["speaker-1"],
             "Notes": "Jane will be speaking about the future of technology"
+          },
+          {
+            "Activity": "Panel Discussion: AI Ethics",
+            "Type": "panel",
+            "Start": "2021-09-01T11:00:00.000Z",
+            "End": "2021-09-01T12:30:00.000Z",
+            "Location": "Conference Room B",
+            "Speakers": ["speaker-2", "speaker-3"],
+            "Notes": "Exploring ethical considerations in AI development"
+          },
+          {
+            "Activity": "Networking Lunch",
+            "Type": "meal",
+            "Start": "2021-09-01T12:30:00.000Z",
+            "End": "2021-09-01T14:00:00.000Z",
+            "Location": "Garden Terrace",
+            "Speakers": [],
+            "Notes": "Buffet lunch with vegetarian options available"
+          },
+          {
+            "Activity": "Workshop: Cloud Computing",
+            "Type": "workshop",
+            "Start": "2021-09-01T14:00:00.000Z",
+            "End": "2021-09-01T16:00:00.000Z",
+            "Location": "Tech Lab",
+            "Speakers": ["speaker-1"],
+            "Notes": "Hands-on session on cloud infrastructure"
+          },
+          {
+            "Activity": "Coffee Break",
+            "Type": "break",
+            "Start": "2021-09-01T16:00:00.000Z",
+            "End": "2021-09-01T16:30:00.000Z",
+            "Location": "Lobby",
+            "Speakers": [],
+            "Notes": "Refreshments and light snacks provided"
+          },
+          {
+            "Activity": "Closing Remarks",
+            "Type": "presentation",
+            "Start": "2021-09-01T16:30:00.000Z",
+            "End": "2021-09-01T17:00:00.000Z",
+            "Location": "Auditorium",
+            "Speakers": ["speaker-2"],
+            "Notes": "Summary of the day's events and future outlook"
+          },
+          {
+            "Activity": "VR Demo",
+            "Type": "demo",
+            "Start": "2021-09-02T09:00:00.000Z",
+            "End": "2021-09-02T11:00:00.000Z",
+            "Location": "Innovation Hub",
+            "Speakers": ["speaker-3"],
+            "Notes": "Showcasing latest VR technologies"
+          },
+          {
+            "Activity": "Blockchain Seminar",
+            "Type": "seminar",
+            "Start": "2021-09-02T11:30:00.000Z",
+            "End": "2021-09-02T13:00:00.000Z",
+            "Location": "Conference Room A",
+            "Speakers": ["speaker-1", "speaker-2"],
+            "Notes": "Exploring blockchain applications in various industries"
+          },
+          {
+            "Activity": "Startup Pitch Competition",
+            "Type": "competition",
+            "Start": "2021-09-02T14:00:00.000Z",
+            "End": "2021-09-02T16:00:00.000Z",
+            "Location": "Auditorium",
+            "Speakers": [],
+            "Notes": "10 startups competing for funding"
+          },
+          {
+            "Activity": "Gala Dinner",
+            "Type": "meal",
+            "Start": "2021-09-02T19:00:00.000Z",
+            "End": "2021-09-02T22:00:00.000Z",
+            "Location": "Grand Ballroom",
+            "Speakers": [],
+            "Notes": "Formal attire required, awards ceremony included"
+          },
+          {
+            "Activity": "IoT Workshop",
+            "Type": "workshop",
+            "Start": "2021-09-03T09:00:00.000Z",
+            "End": "2021-09-03T11:00:00.000Z",
+            "Location": "Tech Lab",
+            "Speakers": ["speaker-3"],
+            "Notes": "Practical session on IoT device programming"
+          },
+          {
+            "Activity": "Future of Work Panel",
+            "Type": "panel",
+            "Start": "2021-09-03T11:30:00.000Z",
+            "End": "2021-09-03T13:00:00.000Z",
+            "Location": "Conference Room B",
+            "Speakers": ["speaker-1", "speaker-2", "speaker-3"],
+            "Notes": "Discussing remote work trends and technologies"
+          },
+          {
+            "Activity": "Networking Lunch",
+            "Type": "meal",
+            "Start": "2021-09-03T13:00:00.000Z",
+            "End": "2021-09-03T14:30:00.000Z",
+            "Location": "Rooftop Garden",
+            "Speakers": [],
+            "Notes": "Casual lunch with scenic views"
+          },
+          {
+            "Activity": "Cybersecurity Masterclass",
+            "Type": "workshop",
+            "Start": "2021-09-03T15:00:00.000Z",
+            "End": "2021-09-03T17:00:00.000Z",
+            "Location": "Secure Lab",
+            "Speakers": ["speaker-2"],
+            "Notes": "Advanced techniques in network security"
+          },
+          {
+            "Activity": "Closing Keynote",
+            "Type": "keynote",
+            "Start": "2021-09-03T17:30:00.000Z",
+            "End": "2021-09-03T18:30:00.000Z",
+            "Location": "Auditorium",
+            "Speakers": ["speaker-1"],
+            "Notes": "Inspirational talk on innovation and future tech"
+          },
+          {
+            "Activity": "Farewell Cocktail Reception",
+            "Type": "networking",
+            "Start": "2021-09-03T19:00:00.000Z",
+            "End": "2021-09-03T21:00:00.000Z",
+            "Location": "Skyline Lounge",
+            "Speakers": [],
+            "Notes": "Casual networking event with drinks and canapés"
+          },
+          {
+            "Activity": "AI in Healthcare Symposium",
+            "Type": "symposium",
+            "Start": "2021-09-04T09:00:00.000Z",
+            "End": "2021-09-04T12:00:00.000Z",
+            "Location": "Medical Tech Center",
+            "Speakers": ["speaker-1", "speaker-3"],
+            "Notes": "Exploring AI applications in medical diagnosis and treatment"
+          },
+          {
+            "Activity": "Green Tech Showcase",
+            "Type": "exhibition",
+            "Start": "2021-09-04T13:00:00.000Z",
+            "End": "2021-09-04T16:00:00.000Z",
+            "Location": "Exhibition Hall",
+            "Speakers": [],
+            "Notes": "Displaying latest innovations in sustainable technology"
+          },
+          {
+            "Activity": "Quantum Computing Talk",
+            "Type": "presentation",
+            "Start": "2021-09-04T16:30:00.000Z",
+            "End": "2021-09-04T17:30:00.000Z",
+            "Location": "Lecture Hall",
+            "Speakers": ["speaker-2"],
+            "Notes": "Introduction to quantum computing principles and applications"
+          },
+          {
+            "Activity": "Tech Trivia Night",
+            "Type": "social",
+            "Start": "2021-09-04T20:00:00.000Z",
+            "End": "2021-09-04T22:00:00.000Z",
+            "Location": "Hotel Bar",
+            "Speakers": [],
+            "Notes": "Fun quiz night with tech-themed questions and prizes"
+          },
+          {
+            "Activity": "Robotics Demonstration",
+            "Type": "demo",
+            "Start": "2021-09-05T10:00:00.000Z",
+            "End": "2021-09-05T12:00:00.000Z",
+            "Location": "Robotics Lab",
+            "Speakers": ["speaker-3"],
+            "Notes": "Live demonstration of advanced robotics systems"
+          },
+          {
+            "Activity": "Women in Tech Luncheon",
+            "Type": "networking",
+            "Start": "2021-09-05T12:30:00.000Z",
+            "End": "2021-09-05T14:00:00.000Z",
+            "Location": "Executive Dining Room",
+            "Speakers": ["speaker-1"],
+            "Notes": "Celebrating and supporting women in technology fields"
+          },
+          {
+            "Activity": "5G and Beyond Panel",
+            "Type": "panel",
+            "Start": "2021-09-05T14:30:00.000Z",
+            "End": "2021-09-05T16:00:00.000Z",
+            "Location": "Conference Room A",
+            "Speakers": ["speaker-2", "speaker-3"],
+            "Notes": "Discussing the future of mobile networks and connectivity"
+          },
+          {
+            "Activity": "Augmented Reality Workshop",
+            "Type": "workshop",
+            "Start": "2021-09-05T16:30:00.000Z",
+            "End": "2021-09-05T18:30:00.000Z",
+            "Location": "AR/VR Studio",
+            "Speakers": ["speaker-1"],
+            "Notes": "Hands-on session creating AR applications"
+          },
+          {
+            "Activity": "Tech Ethics Roundtable",
+            "Type": "discussion",
+            "Start": "2021-09-06T09:00:00.000Z",
+            "End": "2021-09-06T11:00:00.000Z",
+            "Location": "Boardroom",
+            "Speakers": ["speaker-1", "speaker-2", "speaker-3"],
+            "Notes": "Open discussion on ethical challenges in technology"
+          },
+          {
+            "Activity": "Data Science Bootcamp",
+            "Type": "workshop",
+            "Start": "2021-09-06T11:30:00.000Z",
+            "End": "2021-09-06T15:30:00.000Z",
+            "Location": "Computer Lab",
+            "Speakers": ["speaker-2"],
+            "Notes": "Intensive session on data analysis and machine learning"
+          },
+          {
+            "Activity": "Tech Startup Mentoring",
+            "Type": "mentoring",
+            "Start": "2021-09-06T16:00:00.000Z",
+            "End": "2021-09-06T18:00:00.000Z",
+            "Location": "Meeting Rooms",
+            "Speakers": ["speaker-1", "speaker-3"],
+            "Notes": "One-on-one mentoring sessions for tech entrepreneurs"
+          },
+          {
+            "Activity": "Cybersecurity CTF Competition",
+            "Type": "competition",
+            "Start": "2021-09-07T09:00:00.000Z",
+            "End": "2021-09-07T17:00:00.000Z",
+            "Location": "Secure Lab",
+            "Speakers": [],
+            "Notes": "Capture The Flag competition for security enthusiasts"
+          },
+          {
+            "Activity": "Future of Transportation Symposium",
+            "Type": "symposium",
+            "Start": "2021-09-07T10:00:00.000Z",
+            "End": "2021-09-07T13:00:00.000Z",
+            "Location": "Auditorium",
+            "Speakers": ["speaker-1", "speaker-2"],
+            "Notes": "Exploring electric vehicles, autonomous driving, and urban mobility"
+          },
+          {
+            "Activity": "Open Source Contributors Meetup",
+            "Type": "networking",
+            "Start": "2021-09-07T14:00:00.000Z",
+            "End": "2021-09-07T16:00:00.000Z",
+            "Location": "Collaboration Space",
+            "Speakers": [],
+            "Notes": "Casual meetup for open source project contributors"
+          },
+          {
+            "Activity": "Tech Job Fair",
+            "Type": "career",
+            "Start": "2021-09-08T10:00:00.000Z",
+            "End": "2021-09-08T16:00:00.000Z",
+            "Location": "Exhibition Hall",
+            "Speakers": [],
+            "Notes": "Connect with tech companies and explore job opportunities"
+          },
+          {
+            "Activity": "Closing Ceremony",
+            "Type": "ceremony",
+            "Start": "2021-09-08T17:00:00.000Z",
+            "End": "2021-09-08T18:00:00.000Z",
+            "Location": "Grand Ballroom",
+            "Speakers": ["speaker-1", "speaker-2", "speaker-3"],
+            "Notes": "Wrapping up the event with final remarks and awards"
           }
         ]
       },
@@ -176,6 +520,349 @@
             "Role": "Product Manager",
             "Email": "test5@163.com",
             "Phone": "13890909090"
+          },
+          {
+            "Name": "Charlie Davis",
+            "Company": "Tech Solutions",
+            "Role": "CTO",
+            "Email": "charlie.davis@techsolutions.com",
+            "Phone": "13912345678"
+          },
+          {
+            "Name": "Diana Evans",
+            "Company": "Marketing Pros",
+            "Role": "Marketing Director",
+            "Email": "diana.evans@marketingpros.com",
+            "Phone": "13923456789"
+          },
+          {
+            "Name": "Ethan Foster",
+            "Company": "Data Insights",
+            "Role": "Data Analyst",
+            "Email": "ethan.foster@datainsights.com",
+            "Phone": "13934567890"
+          },
+          {
+            "Name": "Fiona Grant",
+            "Company": "Design Hub",
+            "Role": "UX Designer",
+            "Email": "fiona.grant@designhub.com",
+            "Phone": "13945678901"
+          },
+          {
+            "Name": "George Harris",
+            "Company": "Cloud Systems",
+            "Role": "Cloud Architect",
+            "Email": "george.harris@cloudsystems.com",
+            "Phone": "13956789012"
+          },
+          {
+            "Name": "Hannah Irving",
+            "Company": "AI Innovations",
+            "Role": "AI Researcher",
+            "Email": "hannah.irving@aiinnovations.com",
+            "Phone": "13967890123"
+          },
+          {
+            "Name": "Ian Johnson",
+            "Company": "Security First",
+            "Role": "Cybersecurity Specialist",
+            "Email": "ian.johnson@securityfirst.com",
+            "Phone": "13978901234"
+          },
+          {
+            "Name": "Julia King",
+            "Company": "Web Wizards",
+            "Role": "Frontend Developer",
+            "Email": "julia.king@webwizards.com",
+            "Phone": "13989012345"
+          },
+          {
+            "Name": "Kevin Lee",
+            "Company": "Mobile Masters",
+            "Role": "Mobile App Developer",
+            "Email": "kevin.lee@mobilemasters.com",
+            "Phone": "13990123456"
+          },
+          {
+            "Name": "Laura Miller",
+            "Company": "Network Nexus",
+            "Role": "Network Engineer",
+            "Email": "laura.miller@networknexus.com",
+            "Phone": "13901234567"
+          },
+          {
+            "Name": "Michael Nelson",
+            "Company": "DevOps Dynamo",
+            "Role": "DevOps Engineer",
+            "Email": "michael.nelson@devopsdynamo.com",
+            "Phone": "13912345670"
+          },
+          {
+            "Name": "Natalie Owen",
+            "Company": "Quality Quest",
+            "Role": "QA Tester",
+            "Email": "natalie.owen@qualityquest.com",
+            "Phone": "13923456781"
+          },
+          {
+            "Name": "Oscar Parker",
+            "Company": "Blockchain Builders",
+            "Role": "Blockchain Developer",
+            "Email": "oscar.parker@blockchainbuilders.com",
+            "Phone": "13934567892"
+          },
+          {
+            "Name": "Penny Quinn",
+            "Company": "Project Pros",
+            "Role": "Project Manager",
+            "Email": "penny.quinn@projectpros.com",
+            "Phone": "13945678903"
+          },
+          {
+            "Name": "Quentin Ross",
+            "Company": "VR Ventures",
+            "Role": "VR Developer",
+            "Email": "quentin.ross@vrventures.com",
+            "Phone": "13956789014"
+          },
+          {
+            "Name": "Rachel Scott",
+            "Company": "Data Driven",
+            "Role": "Data Scientist",
+            "Email": "rachel.scott@datadriven.com",
+            "Phone": "13967890125"
+          },
+          {
+            "Name": "Samuel Taylor",
+            "Company": "IoT Innovators",
+            "Role": "IoT Specialist",
+            "Email": "samuel.taylor@iotinnovators.com",
+            "Phone": "13978901236"
+          },
+          {
+            "Name": "Tina Underwood",
+            "Company": "UI United",
+            "Role": "UI Designer",
+            "Email": "tina.underwood@uiunited.com",
+            "Phone": "13989012347"
+          },
+          {
+            "Name": "Ulysses Vance",
+            "Company": "Backend Builders",
+            "Role": "Backend Developer",
+            "Email": "ulysses.vance@backendbuilders.com",
+            "Phone": "13990123458"
+          },
+          {
+            "Name": "Victoria White",
+            "Company": "Agile Aces",
+            "Role": "Scrum Master",
+            "Email": "victoria.white@agileaces.com",
+            "Phone": "13901234569"
+          },
+          {
+            "Name": "William Xavier",
+            "Company": "ML Mavericks",
+            "Role": "Machine Learning Engineer",
+            "Email": "william.xavier@mlmavericks.com",
+            "Phone": "13912345671"
+          },
+          {
+            "Name": "Xena Young",
+            "Company": "Code Crafters",
+            "Role": "Software Architect",
+            "Email": "xena.young@codecrafters.com",
+            "Phone": "13923456782"
+          },
+          {
+            "Name": "Yannick Zane",
+            "Company": "API Artisans",
+            "Role": "API Developer",
+            "Email": "yannick.zane@apiartisans.com",
+            "Phone": "13934567893"
+          },
+          {
+            "Name": "Zoe Adams",
+            "Company": "Testing Titans",
+            "Role": "Test Automation Engineer",
+            "Email": "zoe.adams@testingtitans.com",
+            "Phone": "13945678904"
+          },
+          {
+            "Name": "Adam Baker",
+            "Company": "Cloud Champions",
+            "Role": "Cloud Engineer",
+            "Email": "adam.baker@cloudchampions.com",
+            "Phone": "13956789015"
+          },
+          {
+            "Name": "Bella Carter",
+            "Company": "Security Sentinels",
+            "Role": "Information Security Analyst",
+            "Email": "bella.carter@securitysentinels.com",
+            "Phone": "13967890126"
+          },
+          {
+            "Name": "Cameron Dixon",
+            "Company": "UX Universe",
+            "Role": "UX Researcher",
+            "Email": "cameron.dixon@uxuniverse.com",
+            "Phone": "13978901237"
+          },
+          {
+            "Name": "Daisy Ellis",
+            "Company": "Data Detectives",
+            "Role": "Business Intelligence Analyst",
+            "Email": "daisy.ellis@datadetectives.com",
+            "Phone": "13989012348"
+          },
+          {
+            "Name": "Eli Fisher",
+            "Company": "Mobile Mavericks",
+            "Role": "iOS Developer",
+            "Email": "eli.fisher@mobilemavericks.com",
+            "Phone": "13990123459"
+          },
+          {
+            "Name": "Faye Graham",
+            "Company": "Web Warriors",
+            "Role": "Full Stack Developer",
+            "Email": "faye.graham@webwarriors.com",
+            "Phone": "13901234570"
+          },
+          {
+            "Name": "Gavin Hughes",
+            "Company": "AI Architects",
+            "Role": "AI Engineer",
+            "Email": "gavin.hughes@aiarchitects.com",
+            "Phone": "13912345672"
+          },
+          {
+            "Name": "Holly Ingram",
+            "Company": "DevSecOps Defenders",
+            "Role": "DevSecOps Engineer",
+            "Email": "holly.ingram@devsecopsdefenders.com",
+            "Phone": "13923456783"
+          },
+          {
+            "Name": "Isaac James",
+            "Company": "Quantum Questers",
+            "Role": "Quantum Computing Researcher",
+            "Email": "isaac.james@quantumquesters.com",
+            "Phone": "13934567894"
+          },
+          {
+            "Name": "Jasmine Kelly",
+            "Company": "AR Adventurers",
+            "Role": "AR Developer",
+            "Email": "jasmine.kelly@aradventurers.com",
+            "Phone": "13945678905"
+          },
+          {
+            "Name": "Kyle Lawrence",
+            "Company": "Ethical Hackers",
+            "Role": "Penetration Tester",
+            "Email": "kyle.lawrence@ethicalhackers.com",
+            "Phone": "13956789016"
+          },
+          {
+            "Name": "Lily Morgan",
+            "Company": "Cloud Native Ninjas",
+            "Role": "Kubernetes Specialist",
+            "Email": "lily.morgan@cloudnativeninjas.com",
+            "Phone": "13967890127"
+          },
+          {
+            "Name": "Mason Newton",
+            "Company": "Big Data Brainiacs",
+            "Role": "Big Data Engineer",
+            "Email": "mason.newton@bigdatabrainiacs.com",
+            "Phone": "13978901238"
+          },
+          {
+            "Name": "Nora Oliver",
+            "Company": "Serverless Sages",
+            "Role": "Serverless Architect",
+            "Email": "nora.oliver@serverlesssages.com",
+            "Phone": "13989012349"
+          },
+          {
+            "Name": "Owen Patterson",
+            "Company": "Microservices Maestros",
+            "Role": "Microservices Developer",
+            "Email": "owen.patterson@microservicesmaestros.com",
+            "Phone": "13990123460"
+          },
+          {
+            "Name": "Paige Quinn",
+            "Company": "Blockchain Brainiacs",
+            "Role": "Smart Contract Developer",
+            "Email": "paige.quinn@blockchainbrainiacs.com",
+            "Phone": "13901234571"
+          },
+          {
+            "Name": "Quinn Reynolds",
+            "Company": "Edge Computing Experts",
+            "Role": "Edge Computing Specialist",
+            "Email": "quinn.reynolds@edgecomputingexperts.com",
+            "Phone": "13912345673"
+          },
+          {
+            "Name": "Ryan Sanders",
+            "Company": "NLP Ninjas",
+            "Role": "NLP Engineer",
+            "Email": "ryan.sanders@nlpninjas.com",
+            "Phone": "13923456784"
+          },
+          {
+            "Name": "Sophia Turner",
+            "Company": "Robotic Process Automation Rockstars",
+            "Role": "RPA Developer",
+            "Email": "sophia.turner@rparockstars.com",
+            "Phone": "13934567895"
+          },
+          {
+            "Name": "Tyler Underwood",
+            "Company": "Quantum Encryption Experts",
+            "Role": "Quantum Cryptographer",
+            "Email": "tyler.underwood@quantumencryptionexperts.com",
+            "Phone": "13945678906"
+          },
+          {
+            "Name": "Uma Vaughn",
+            "Company": "5G Gurus",
+            "Role": "5G Network Engineer",
+            "Email": "uma.vaughn@5ggurus.com",
+            "Phone": "13956789017"
+          },
+          {
+            "Name": "Victor Watson",
+            "Company": "Digital Twin Developers",
+            "Role": "Digital Twin Specialist",
+            "Email": "victor.watson@digitaltwindevelopers.com",
+            "Phone": "13967890128"
+          },
+          {
+            "Name": "Wendy Xavier",
+            "Company": "Predictive Analytics Pros",
+            "Role": "Predictive Analytics Specialist",
+            "Email": "wendy.xavier@predictiveanalyticspros.com",
+            "Phone": "13978901239"
+          },
+          {
+            "Name": "Xavier Young",
+            "Company": "Quantum ML Experts",
+            "Role": "Quantum Machine Learning Researcher",
+            "Email": "xavier.young@quantummlexperts.com",
+            "Phone": "13989012350"
+          },
+          {
+            "Name": "Yvonne Zhang",
+            "Company": "Zero Trust Zealots",
+            "Role": "Zero Trust Security Architect",
+            "Email": "yvonne.zhang@zerotrustzealots.com",
+            "Phone": "13990123461"
           }
         ]
       },
@@ -319,6 +1006,466 @@
             "Total budget": 1000,
             "Under budget": "true",
             "Notes": ""
+          },
+          {
+            "Name": "Audio equipment rental",
+            "Estimated": 2000,
+            "Actual": 1850,
+            "Quantity": 1,
+            "Total cost": 1850,
+            "Total budget": 2000,
+            "Under budget": "true",
+            "Notes": "Found a better deal with a local supplier"
+          },
+          {
+            "Name": "Video production",
+            "Estimated": 5000,
+            "Actual": 5200,
+            "Quantity": 1,
+            "Total cost": 5200,
+            "Total budget": 5000,
+            "Under budget": "false",
+            "Notes": "Added an extra camera for better coverage"
+          },
+          {
+            "Name": "Event insurance",
+            "Estimated": 1500,
+            "Actual": 1500,
+            "Quantity": 1,
+            "Total cost": 1500,
+            "Total budget": 1500,
+            "Under budget": "true",
+            "Notes": ""
+          },
+          {
+            "Name": "Security personnel",
+            "Estimated": 800,
+            "Actual": 750,
+            "Quantity": 5,
+            "Total cost": 3750,
+            "Total budget": 4000,
+            "Under budget": "true",
+            "Notes": "Negotiated a better rate with the security company"
+          },
+          {
+            "Name": "Transportation",
+            "Estimated": 3000,
+            "Actual": 3200,
+            "Quantity": 1,
+            "Total cost": 3200,
+            "Total budget": 3000,
+            "Under budget": "false",
+            "Notes": "Had to add an extra shuttle due to increased attendance"
+          },
+          {
+            "Name": "Signage and banners",
+            "Estimated": 1200,
+            "Actual": 1150,
+            "Quantity": 1,
+            "Total cost": 1150,
+            "Total budget": 1200,
+            "Under budget": "true",
+            "Notes": "Found a more cost-effective printing option"
+          },
+          {
+            "Name": "Event app development",
+            "Estimated": 4000,
+            "Actual": 4200,
+            "Quantity": 1,
+            "Total cost": 4200,
+            "Total budget": 4000,
+            "Under budget": "false",
+            "Notes": "Added some additional features requested by sponsors"
+          },
+          {
+            "Name": "Wi-Fi upgrade",
+            "Estimated": 1500,
+            "Actual": 1600,
+            "Quantity": 1,
+            "Total cost": 1600,
+            "Total budget": 1500,
+            "Under budget": "false",
+            "Notes": "Needed higher bandwidth due to increased attendee numbers"
+          },
+          {
+            "Name": "Stage design",
+            "Estimated": 3500,
+            "Actual": 3300,
+            "Quantity": 1,
+            "Total cost": 3300,
+            "Total budget": 3500,
+            "Under budget": "true",
+            "Notes": "Found some cost-effective decorative elements"
+          },
+          {
+            "Name": "Photography services",
+            "Estimated": 2000,
+            "Actual": 2000,
+            "Quantity": 1,
+            "Total cost": 2000,
+            "Total budget": 2000,
+            "Under budget": "true",
+            "Notes": ""
+          },
+          {
+            "Name": "Social media promotion",
+            "Estimated": 1000,
+            "Actual": 950,
+            "Quantity": 1,
+            "Total cost": 950,
+            "Total budget": 1000,
+            "Under budget": "true",
+            "Notes": "Utilized more organic reach than initially planned"
+          },
+          {
+            "Name": "Event staff uniforms",
+            "Estimated": 50,
+            "Actual": 45,
+            "Quantity": 30,
+            "Total cost": 1350,
+            "Total budget": 1500,
+            "Under budget": "true",
+            "Notes": "Found a bulk discount on uniforms"
+          },
+          {
+            "Name": "Attendee badges",
+            "Estimated": 2,
+            "Actual": 1.8,
+            "Quantity": 1000,
+            "Total cost": 1800,
+            "Total budget": 2000,
+            "Under budget": "true",
+            "Notes": "Negotiated a better price with the supplier"
+          },
+          {
+            "Name": "Event management software",
+            "Estimated": 2500,
+            "Actual": 2500,
+            "Quantity": 1,
+            "Total cost": 2500,
+            "Total budget": 2500,
+            "Under budget": "true",
+            "Notes": ""
+          },
+          {
+            "Name": "Venue decoration",
+            "Estimated": 3000,
+            "Actual": 3100,
+            "Quantity": 1,
+            "Total cost": 3100,
+            "Total budget": 3000,
+            "Under budget": "false",
+            "Notes": "Added some last-minute decorative elements"
+          },
+          {
+            "Name": "First aid services",
+            "Estimated": 800,
+            "Actual": 800,
+            "Quantity": 1,
+            "Total cost": 800,
+            "Total budget": 800,
+            "Under budget": "true",
+            "Notes": ""
+          },
+          {
+            "Name": "Interpretation services",
+            "Estimated": 2500,
+            "Actual": 2600,
+            "Quantity": 1,
+            "Total cost": 2600,
+            "Total budget": 2500,
+            "Under budget": "false",
+            "Notes": "Added an extra language due to international attendees"
+          },
+          {
+            "Name": "Event insurance",
+            "Estimated": 1500,
+            "Actual": 1500,
+            "Quantity": 1,
+            "Total cost": 1500,
+            "Total budget": 1500,
+            "Under budget": "true",
+            "Notes": ""
+          },
+          {
+            "Name": "Parking management",
+            "Estimated": 1000,
+            "Actual": 950,
+            "Quantity": 1,
+            "Total cost": 950,
+            "Total budget": 1000,
+            "Under budget": "true",
+            "Notes": "Efficient planning reduced staff needs"
+          },
+          {
+            "Name": "VIP lounge setup",
+            "Estimated": 2000,
+            "Actual": 2100,
+            "Quantity": 1,
+            "Total cost": 2100,
+            "Total budget": 2000,
+            "Under budget": "false",
+            "Notes": "Added some premium refreshments for VIP guests"
+          },
+          {
+            "Name": "Event mobile app",
+            "Estimated": 3500,
+            "Actual": 3400,
+            "Quantity": 1,
+            "Total cost": 3400,
+            "Total budget": 3500,
+            "Under budget": "true",
+            "Notes": "Developers completed the project under estimated hours"
+          },
+          {
+            "Name": "Networking area setup",
+            "Estimated": 1500,
+            "Actual": 1550,
+            "Quantity": 1,
+            "Total cost": 1550,
+            "Total budget": 1500,
+            "Under budget": "false",
+            "Notes": "Added more seating options for comfort"
+          },
+          {
+            "Name": "Event website",
+            "Estimated": 2000,
+            "Actual": 1900,
+            "Quantity": 1,
+            "Total cost": 1900,
+            "Total budget": 2000,
+            "Under budget": "true",
+            "Notes": "Used some pre-built templates to save costs"
+          },
+          {
+            "Name": "Speaker gifts",
+            "Estimated": 100,
+            "Actual": 95,
+            "Quantity": 10,
+            "Total cost": 950,
+            "Total budget": 1000,
+            "Under budget": "true",
+            "Notes": "Found a good deal on bulk purchase"
+          },
+          {
+            "Name": "Event feedback system",
+            "Estimated": 800,
+            "Actual": 800,
+            "Quantity": 1,
+            "Total cost": 800,
+            "Total budget": 800,
+            "Under budget": "true",
+            "Notes": ""
+          },
+          {
+            "Name": "Breakout session equipment",
+            "Estimated": 1500,
+            "Actual": 1600,
+            "Quantity": 1,
+            "Total cost": 1600,
+            "Total budget": 1500,
+            "Under budget": "false",
+            "Notes": "Needed extra microphones for Q&A sessions"
+          },
+          {
+            "Name": "Event registration system",
+            "Estimated": 1200,
+            "Actual": 1150,
+            "Quantity": 1,
+            "Total cost": 1150,
+            "Total budget": 1200,
+            "Under budget": "true",
+            "Notes": "Annual subscription discount applied"
+          },
+          {
+            "Name": "Sponsor booth setup",
+            "Estimated": 5000,
+            "Actual": 5100,
+            "Quantity": 1,
+            "Total cost": 5100,
+            "Total budget": 5000,
+            "Under budget": "false",
+            "Notes": "Last-minute requests from sponsors for additional equipment"
+          },
+          {
+            "Name": "Event marketing materials",
+            "Estimated": 3000,
+            "Actual": 2900,
+            "Quantity": 1,
+            "Total cost": 2900,
+            "Total budget": 3000,
+            "Under budget": "true",
+            "Notes": "Bulk printing discount applied"
+          },
+          {
+            "Name": "Speaker travel arrangements",
+            "Estimated": 5000,
+            "Actual": 5200,
+            "Quantity": 1,
+            "Total cost": 5200,
+            "Total budget": 5000,
+            "Under budget": "false",
+            "Notes": "Last-minute flight changes for one speaker"
+          },
+          {
+            "Name": "Event sustainability initiatives",
+            "Estimated": 2000,
+            "Actual": 1950,
+            "Quantity": 1,
+            "Total cost": 1950,
+            "Total budget": 2000,
+            "Under budget": "true",
+            "Notes": "Found cost-effective eco-friendly alternatives"
+          },
+          {
+            "Name": "Post-event survey tool",
+            "Estimated": 500,
+            "Actual": 500,
+            "Quantity": 1,
+            "Total cost": 500,
+            "Total budget": 500,
+            "Under budget": "true",
+            "Notes": ""
+          },
+          {
+            "Name": "Event hashtag campaign",
+            "Estimated": 1000,
+            "Actual": 950,
+            "Quantity": 1,
+            "Total cost": 950,
+            "Total budget": 1000,
+            "Under budget": "true",
+            "Notes": "Leveraged more organic reach than expected"
+          },
+          {
+            "Name": "Virtual event platform",
+            "Estimated": 4000,
+            "Actual": 4100,
+            "Quantity": 1,
+            "Total cost": 4100,
+            "Total budget": 4000,
+            "Under budget": "false",
+            "Notes": "Added some premium features for better engagement"
+          },
+          {
+            "Name": "Event signage",
+            "Estimated": 1500,
+            "Actual": 1450,
+            "Quantity": 1,
+            "Total cost": 1450,
+            "Total budget": 1500,
+            "Under budget": "true",
+            "Notes": "Found a local supplier with competitive prices"
+          },
+          {
+            "Name": "Networking event entertainment",
+            "Estimated": 2000,
+            "Actual": 2100,
+            "Quantity": 1,
+            "Total cost": 2100,
+            "Total budget": 2000,
+            "Under budget": "false",
+            "Notes": "Added an extra hour of entertainment due to popular demand"
+          },
+          {
+            "Name": "Event photography",
+            "Estimated": 1500,
+            "Actual": 1500,
+            "Quantity": 1,
+            "Total cost": 1500,
+            "Total budget": 1500,
+            "Under budget": "true",
+            "Notes": ""
+          },
+          {
+            "Name": "Social media wall",
+            "Estimated": 1000,
+            "Actual": 950,
+            "Quantity": 1,
+            "Total cost": 950,
+            "Total budget": 1000,
+            "Under budget": "true",
+            "Notes": "Found a more cost-effective solution"
+          },
+          {
+            "Name": "Event gamification",
+            "Estimated": 2500,
+            "Actual": 2600,
+            "Quantity": 1,
+            "Total cost": 2600,
+            "Total budget": 2500,
+            "Under budget": "false",
+            "Notes": "Added more prize incentives to increase participation"
+          },
+          {
+            "Name": "Speaker preparation room",
+            "Estimated": 1000,
+            "Actual": 950,
+            "Quantity": 1,
+            "Total cost": 950,
+            "Total budget": 1000,
+            "Under budget": "true",
+            "Notes": "Used existing venue amenities effectively"
+          },
+          {
+            "Name": "Event mobile charging stations",
+            "Estimated": 800,
+            "Actual": 850,
+            "Quantity": 1,
+            "Total cost": 850,
+            "Total budget": 800,
+            "Under budget": "false",
+            "Notes": "Added more stations due to high demand"
+          },
+          {
+            "Name": "Event videography",
+            "Estimated": 3000,
+            "Actual": 2900,
+            "Quantity": 1,
+            "Total cost": 2900,
+            "Total budget": 3000,
+            "Under budget": "true",
+            "Notes": "Negotiated a package deal with the videographer"
+          },
+          {
+            "Name": "Event app push notifications",
+            "Estimated": 500,
+            "Actual": 500,
+            "Quantity": 1,
+            "Total cost": 500,
+            "Total budget": 500,
+            "Under budget": "true",
+            "Notes": ""
+          },
+          {
+            "Name": "Simultaneous interpretation equipment",
+            "Estimated": 2000,
+            "Actual": 2100,
+            "Quantity": 1,
+            "Total cost": 2100,
+            "Total budget": 2000,
+            "Under budget": "false",
+            "Notes": "Needed additional headsets due to increased international attendance"
+          },
+          {
+            "Name": "Event social media management",
+            "Estimated": 1500,
+            "Actual": 1450,
+            "Quantity": 1,
+            "Total cost": 1450,
+            "Total budget": 1500,
+            "Under budget": "true",
+            "Notes": "Efficient planning reduced work hours"
+          },
+          {
+            "Name": "Event live streaming",
+            "Estimated": 3000,
+            "Actual": 3100,
+            "Quantity": 1,
+            "Total cost": 3100,
+            "Total budget": 3000,
+            "Under budget": "false",
+            "Notes": "Added backup internet connection for reliability"
           }
         ]
       }
diff --git a/packages/trpc/src/router.ts b/packages/trpc/src/router.ts
index e6b41af00..4bb7cd8bd 100644
--- a/packages/trpc/src/router.ts
+++ b/packages/trpc/src/router.ts
@@ -172,7 +172,7 @@ const formRouter = t.router({
     .use(authz("form:delete"))
     .input(deleteFormCommand)
     .mutation(({ input }) => commandBus.execute(new DeleteFormCommand(input))),
-  submit: privateProcedure
+  submit: publicProcedure
     .input(submitFormCommand)
     .mutation(({ input }) => commandBus.execute(new SubmitFormCommand(input))),
 })