diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65bcea585..789998779 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.0.0-85
+
+
+### 🩹 Fixes
+
+- Fix create from share ([3906824](https://github.com/undb-io/undb/commit/3906824))
+
+### ❤️ Contributors
+
+- Nichenqin ([@nichenqin](http://github.com/nichenqin))
+
 ## v1.0.0-84
 
 
diff --git a/apps/backend/package.json b/apps/backend/package.json
index 9a9f176e3..b82a434f0 100644
--- a/apps/backend/package.json
+++ b/apps/backend/package.json
@@ -8,12 +8,12 @@
     "build:docker": "bun build --compile src/index.ts --target=bun --packages=external --sourcemap --outfile undb"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.637.0",
-    "@aws-sdk/s3-request-presigner": "^3.637.0",
+    "@aws-sdk/client-s3": "^3.654.0",
+    "@aws-sdk/s3-request-presigner": "^3.654.0",
     "@elysiajs/cors": "1.1.0",
     "@elysiajs/cron": "1.1.0",
     "@elysiajs/html": "1.1.0",
-    "@elysiajs/opentelemetry": "^1.1.4",
+    "@elysiajs/opentelemetry": "^1.1.5",
     "@elysiajs/static": "1.1.0",
     "@elysiajs/stream": "1.1.0",
     "@elysiajs/swagger": "^1.1.1",
@@ -40,7 +40,7 @@
     "@undb/trpc": "workspace:*",
     "@undb/webhook": "workspace:*",
     "arctic": "^1.9.2",
-    "bun": "^1.1.26",
+    "bun": "^1.1.29",
     "core-js": "^3.38.1",
     "elysia": "1.1.7",
     "got": "^14.4.2",
@@ -49,7 +49,7 @@
     "mailgun-nodemailer-transport": "^3.0.2",
     "minio": "^8.0.1",
     "nanoid": "^5.0.7",
-    "nodemailer": "^6.9.14",
+    "nodemailer": "^6.9.15",
     "oslo": "^1.2.1",
     "radash": "^12.1.0",
     "reflect-metadata": "^0.2.2",
@@ -57,7 +57,7 @@
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@types/nodemailer": "^6.4.15",
+    "@types/nodemailer": "^6.4.16",
     "@types/uuid": "^10.0.0",
     "bun-types": "latest",
     "kysely": "^0.27.4"
diff --git a/apps/backend/src/modules/web/web.tsx b/apps/backend/src/modules/web/web.tsx
index a04979682..c52a9dab2 100644
--- a/apps/backend/src/modules/web/web.tsx
+++ b/apps/backend/src/modules/web/web.tsx
@@ -26,6 +26,6 @@ export class Web {
       })
       .get("/verify-email", () => index)
       .get("/reset-password/*", () => index)
-      .get("/create-from-template/*", () => index)
+      .get("/create-from-share/*", () => index)
   }
 }
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index d677227f3..dca8320b8 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -13,8 +13,8 @@
     "@tauri-apps/api": "^1.6.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^1.6.1",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.3"
+    "@tauri-apps/cli": "^1.6.2",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.7"
   }
 }
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 4a94458ee..d637e4b33 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -13,22 +13,22 @@
     "format": "prettier --write ."
   },
   "devDependencies": {
-    "@fontsource/fira-mono": "^5.0.15",
+    "@fontsource/fira-mono": "^5.1.0",
     "@jhubbardsf/svelte-sortablejs": "latest",
     "@jimmyverburgt/svelte-input-otp": "^0.0.3",
     "@neoconfetti/svelte": "^2.2.1",
     "@svelte-put/copy": "^3.0.2",
     "@svelte-put/shortcut": "^3.1.1",
-    "@sveltejs/adapter-static": "^3.0.4",
-    "@sveltejs/kit": "^2.5.26",
+    "@sveltejs/adapter-static": "^3.0.5",
+    "@sveltejs/kit": "^2.5.28",
     "@sveltejs/vite-plugin-svelte": "^3.1.2",
-    "@tanstack/eslint-plugin-query": "^5.53.0",
+    "@tanstack/eslint-plugin-query": "^5.57.1",
     "@types/eslint": "^8.56.12",
     "@types/lodash.unzip": "^3.4.9",
     "@types/papaparse": "^5.3.14",
     "@types/sortablejs": "latest",
-    "@typescript-eslint/eslint-plugin": "^8.4.0",
-    "@typescript-eslint/parser": "^8.4.0",
+    "@typescript-eslint/eslint-plugin": "^8.6.0",
+    "@typescript-eslint/parser": "^8.6.0",
     "@undb/commands": "workspace:*",
     "@undb/domain": "workspace:*",
     "@undb/i18n": "workspace:*",
@@ -40,15 +40,15 @@
     "@undb/utils": "workspace:*",
     "array-move": "^4.0.0",
     "autoprefixer": "^10.4.20",
-    "date-fns": "^3.6.0",
-    "eslint": "^9.10.0",
+    "date-fns": "^4.1.0",
+    "eslint": "^9.11.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-svelte": "^2.43.0",
-    "houdini": "^1.2.56",
-    "houdini-svelte": "^1.2.56",
+    "eslint-plugin-svelte": "^2.44.0",
+    "houdini": "^1.2.62",
+    "houdini-svelte": "^1.2.62",
     "lodash.unzip": "^3.4.0",
     "papaparse": "^5.4.1",
-    "postcss": "^8.4.45",
+    "postcss": "^8.4.47",
     "postcss-load-config": "^6.0.1",
     "prettier": "^3.3.3",
     "prettier-plugin-svelte": "^3.2.6",
@@ -58,7 +58,7 @@
     "safe-flat": "^2.1.0",
     "sortablejs": "^1.15.3",
     "svelte": "^4.2.19",
-    "svelte-check": "^4.0.1",
+    "svelte-check": "^4.0.2",
     "svelte-dnd-action": "^0.9.50",
     "svelte-headless-table": "^0.18.2",
     "svelte-inview": "^4.0.2",
@@ -66,13 +66,13 @@
     "svelte-persisted-store": "^0.11.0",
     "sveltekit-search-params": "^3.0.0",
     "svelvet": "^10.0.2",
-    "tailwindcss": "^3.4.10",
+    "tailwindcss": "^3.4.12",
     "timeago.js": "^4.0.2",
     "tslib": "^2.7.0",
-    "type-fest": "^4.26.0",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.3",
-    "vitest": "^2.0.5",
+    "type-fest": "^4.26.1",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.7",
+    "vitest": "^2.1.1",
     "xlsx": "^0.18.5"
   },
   "type": "module",
@@ -80,24 +80,24 @@
     "@formkit/auto-animate": "^0.8.2",
     "@internationalized/date": "^3.5.5",
     "@svelte-put/clickoutside": "^3.0.2",
-    "@tanstack/svelte-query": "^5.54.2",
-    "@tiptap/core": "^2.6.6",
-    "@tiptap/pm": "^2.6.6",
-    "@tiptap/starter-kit": "^2.6.6",
+    "@tanstack/svelte-query": "^5.56.2",
+    "@tiptap/core": "^2.7.2",
+    "@tiptap/pm": "^2.7.2",
+    "@tiptap/starter-kit": "^2.7.2",
     "@trpc/client": "^10.45.2",
     "@undb/zod": "workspace:*",
-    "bits-ui": "^0.21.13",
+    "bits-ui": "^0.21.15",
     "clsx": "^2.1.1",
     "cmdk-sv": "^0.0.18",
-    "embla-carousel-svelte": "^8.2.1",
+    "embla-carousel-svelte": "^8.3.0",
     "formsnap": "^1.0.1",
-    "lucide-svelte": "^0.439.0",
+    "lucide-svelte": "^0.445.0",
     "mode-watcher": "^0.4.1",
-    "paneforge": "^0.0.5",
+    "paneforge": "^0.0.6",
     "svelte-qrcode": "^1.0.0",
     "svelte-radix": "^1.1.1",
-    "svelte-sonner": "^0.3.27",
-    "sveltekit-superforms": "^2.17.0",
+    "svelte-sonner": "^0.3.28",
+    "sveltekit-superforms": "^2.19.0",
     "tailwind-merge": "^2.5.2",
     "tailwind-variants": "^0.2.1",
     "trpc-svelte-query-adapter": "^2.3.14",
diff --git a/apps/frontend/src/lib/components/blocks/field-options/create-reference-field-optioin.svelte b/apps/frontend/src/lib/components/blocks/field-options/create-reference-field-optioin.svelte
index 89af0c000..59e312ee2 100644
--- a/apps/frontend/src/lib/components/blocks/field-options/create-reference-field-optioin.svelte
+++ b/apps/frontend/src/lib/components/blocks/field-options/create-reference-field-optioin.svelte
@@ -2,7 +2,7 @@
   import {
     getIsFilterableFieldType,
     parseValidViewFilter,
-    TableCreator,
+    TableFactory,
     toMaybeConditionGroup,
     type ICreateReferenceFieldDTO,
     type IReferenceFieldConstraint,
@@ -43,7 +43,7 @@
   $: ft = $getForeignTableStore.data?.table
 
   // @ts-ignore
-  $: foreignTable = ft ? new TableCreator().fromJSON(ft) : undefined
+  $: foreignTable = ft ? TableFactory.fromJSON(ft) : undefined
 
   const value = writable<MaybeConditionGroup<IViewFilterOptionSchema> | undefined>()
   $: if ($value && foreignTable) {
diff --git a/apps/frontend/src/lib/components/blocks/field-options/rollup-field-option.svelte b/apps/frontend/src/lib/components/blocks/field-options/rollup-field-option.svelte
index 554de1714..b48206e40 100644
--- a/apps/frontend/src/lib/components/blocks/field-options/rollup-field-option.svelte
+++ b/apps/frontend/src/lib/components/blocks/field-options/rollup-field-option.svelte
@@ -3,7 +3,7 @@
   import {
     FieldIdVo,
     ReferenceField,
-    TableCreator,
+    TableFactory,
     TableDo,
     getIsFieldCanBeRollup,
     type IRollupFieldOption,
@@ -34,7 +34,7 @@
 
   $: foreignTable = $store.data?.table
   const foreignTableDo = writable<TableDo>()
-  $: if (foreignTable) foreignTableDo.set(new TableCreator().fromJSON(foreignTable))
+  $: if (foreignTable) foreignTableDo.set(TableFactory.fromJSON(foreignTable))
   $: schema = foreignTable?.schema
 
   $: fields = schema?.filter((f) => getIsFieldCanBeRollup(f.type))
@@ -71,7 +71,12 @@
     {#if $foreignTableDo && option.rollupFieldId}
       <div class="space-y-1">
         <Label class="text-xs font-normal">Aggregate function</Label>
-        <RollupFnPicker {disabled} foreignTable={$foreignTableDo} rollupFieldId={option.rollupFieldId} bind:value={option.fn} />
+        <RollupFnPicker
+          {disabled}
+          foreignTable={$foreignTableDo}
+          rollupFieldId={option.rollupFieldId}
+          bind:value={option.fn}
+        />
       </div>
     {/if}
   </div>
diff --git a/apps/frontend/src/lib/components/blocks/field-options/update-reference-field-optioin.svelte b/apps/frontend/src/lib/components/blocks/field-options/update-reference-field-optioin.svelte
index f441330f4..5e0f6b7f1 100644
--- a/apps/frontend/src/lib/components/blocks/field-options/update-reference-field-optioin.svelte
+++ b/apps/frontend/src/lib/components/blocks/field-options/update-reference-field-optioin.svelte
@@ -2,7 +2,7 @@
   import {
     getIsFilterableFieldType,
     parseValidViewFilter,
-    TableCreator,
+    TableFactory,
     toMaybeConditionGroup,
     type IReferenceFieldConstraint,
     type IUpdateReferenceFieldDTO,
@@ -43,7 +43,7 @@
   $: ft = $getForeignTableStore.data?.table
 
   // @ts-ignore
-  $: foreignTable = ft ? new TableCreator().fromJSON(ft) : undefined
+  $: foreignTable = ft ? TableFactory.fromJSON(ft) : undefined
 
   const value = writable<MaybeConditionGroup<IViewFilterOptionSchema> | undefined>()
   onMount(() => {
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 15e717693..c2099af55 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
@@ -3,7 +3,7 @@
   import * as Popover from "$lib/components/ui/popover"
   import ForeignRecordsPicker from "./foreign-records-picker.svelte"
   import { readable, writable } from "svelte/store"
-  import { ReferenceField, TableCreator } from "@undb/table"
+  import { ReferenceField, TableFactory } from "@undb/table"
   import Button from "$lib/components/ui/button/button.svelte"
   import { LoaderCircleIcon } from "lucide-svelte"
 
@@ -27,7 +27,7 @@
 
   $: table = $foreignTableStore.data?.table
 
-  $: foreignTable = table ? readable(new TableCreator().fromJSON(table)) : null
+  $: foreignTable = table ? readable(TableFactory.fromJSON(table)) : null
 </script>
 
 <Popover.Root portal="body" bind:open {onOpenChange}>
diff --git a/apps/frontend/src/lib/components/blocks/relations/relations.svelte b/apps/frontend/src/lib/components/blocks/relations/relations.svelte
index 07f95c17f..5af531b94 100644
--- a/apps/frontend/src/lib/components/blocks/relations/relations.svelte
+++ b/apps/frontend/src/lib/components/blocks/relations/relations.svelte
@@ -3,7 +3,7 @@
   import { Svelvet } from "svelvet"
   import TableNode from "./table-node.svelte"
   import { GetTableForeignTablesStore } from "$houdini"
-  import { TableCreator } from "@undb/table"
+  import { TableFactory } from "@undb/table"
 
   const table = getTable()
 
@@ -13,7 +13,7 @@
 
   $: foreignTablesDTO = $getForeignTablesStore.data?.tableForeignTables ?? []
   // @ts-ignore
-  $: foreignTables = foreignTablesDTO.map((table) => new TableCreator().fromJSON(table))
+  $: foreignTables = foreignTablesDTO.map((table) => TableFactory.fromJSON(table))
 </script>
 
 <Svelvet controls minimap>
diff --git a/apps/frontend/src/routes/(authed)/(space)/t/[tableId]/+layout.svelte b/apps/frontend/src/routes/(authed)/(space)/t/[tableId]/+layout.svelte
index bc67a525b..9b89625bc 100644
--- a/apps/frontend/src/routes/(authed)/(space)/t/[tableId]/+layout.svelte
+++ b/apps/frontend/src/routes/(authed)/(space)/t/[tableId]/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { page } from "$app/stores"
-  import { TableCreator, TableDo } from "@undb/table"
+  import { TableFactory, TableDo } from "@undb/table"
   import { setTable } from "$lib/store/table.store"
   import type { LayoutData } from "./$types"
   import { writable } from "svelte/store"
@@ -16,7 +16,7 @@
   const table = writable<TableDo>()
   $: {
     if (!fetching && tableDTO && $page.params.tableId === tableDTO.id) {
-      table.set(new TableCreator().fromJSON(tableDTO))
+      table.set(TableFactory.fromJSON(tableDTO))
       setTable(table)
     }
   }
diff --git a/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/+layout.svelte b/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/+layout.svelte
index e720d6040..3a34e12c5 100644
--- a/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/+layout.svelte
+++ b/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { TableCreator, TableDo } from "@undb/table"
+  import { TableFactory, TableDo } from "@undb/table"
   import { setTable } from "$lib/store/table.store"
   import type { LayoutData } from "./$types"
   import { writable } from "svelte/store"
@@ -18,7 +18,7 @@
   $: {
     if (!fetching && tableDTO) {
       // @ts-ignore
-      table.set(new TableCreator().fromJSON(tableDTO))
+      table.set(TableFactory.fromJSON(tableDTO))
       setTable(table)
     }
   }
diff --git a/apps/frontend/src/routes/(share)/s/f/[shareId]/+layout.svelte b/apps/frontend/src/routes/(share)/s/f/[shareId]/+layout.svelte
index 8b7f70c6e..6aff79cc0 100644
--- a/apps/frontend/src/routes/(share)/s/f/[shareId]/+layout.svelte
+++ b/apps/frontend/src/routes/(share)/s/f/[shareId]/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { TableCreator, TableDo } from "@undb/table"
+  import { TableFactory, TableDo } from "@undb/table"
   import { setTable } from "$lib/store/table.store"
   import type { LayoutData } from "./$types"
   import { writable } from "svelte/store"
@@ -16,7 +16,7 @@
   const table = writable<TableDo>()
   $: {
     if (!fetching && tableDTO) {
-      table.set(new TableCreator().fromJSON(tableDTO))
+      table.set(TableFactory.fromJSON(tableDTO))
       setTable(table)
     }
   }
diff --git a/apps/frontend/src/routes/(share)/s/v/[shareId]/+layout.svelte b/apps/frontend/src/routes/(share)/s/v/[shareId]/+layout.svelte
index 31383114b..580171790 100644
--- a/apps/frontend/src/routes/(share)/s/v/[shareId]/+layout.svelte
+++ b/apps/frontend/src/routes/(share)/s/v/[shareId]/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { TableCreator, TableDo } from "@undb/table"
+  import { TableFactory, TableDo } from "@undb/table"
   import { setTable, viewId } from "$lib/store/table.store"
   import type { LayoutData } from "./$types"
   import { derived, writable } from "svelte/store"
@@ -18,7 +18,7 @@
   const table = writable<TableDo>()
   $: {
     if (!fetching && tableDTO) {
-      table.set(new TableCreator().fromJSON(tableDTO))
+      table.set(TableFactory.fromJSON(tableDTO))
       setTable(table)
     }
   }
diff --git a/package.json b/package.json
index 49f8107f7..443878372 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "undb",
-  "version": "1.0.0-84",
+  "version": "1.0.0-85",
   "private": true,
   "scripts": {
     "build": "NODE_ENV=production bun --bun turbo build",
@@ -21,11 +21,11 @@
   },
   "devDependencies": {
     "drizzle-kit": "^0.24.2",
-    "husky": "^9.1.5",
+    "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
-    "npm-run-all2": "^6.2.2",
+    "npm-run-all2": "^6.2.3",
     "prettier": "^3.3.3",
-    "turbo": "^2.1.1"
+    "turbo": "^2.1.2"
   },
   "lint-staged": {
     "**/*": "bunx --bun prettier --write --ignore-unknown"
@@ -33,7 +33,7 @@
   "engines": {
     "node": ">=18"
   },
-  "packageManager": "bun@1.1.27",
+  "packageManager": "bun@1.1.29",
   "workspaces": [
     "apps/*",
     "packages/*"
diff --git a/packages/audit/package.json b/packages/audit/package.json
index e2772f247..a4e57a0d6 100644
--- a/packages/audit/package.json
+++ b/packages/audit/package.json
@@ -9,7 +9,7 @@
     "@undb/domain": "workspace:*",
     "@undb/table": "workspace:*",
     "@undb/zod": "workspace:*",
-    "date-fns": "^3.6.0",
+    "date-fns": "^4.1.0",
     "radash": "^12.1.0"
   },
   "devDependencies": {
diff --git a/packages/command-handlers/package.json b/packages/command-handlers/package.json
index 3aae4ceed..9dfa9824d 100644
--- a/packages/command-handlers/package.json
+++ b/packages/command-handlers/package.json
@@ -16,8 +16,8 @@
     "@undb/cqrs": "workspace:*",
     "@undb/di": "workspace:*",
     "@undb/logger": "workspace:*",
-    "@undb/template": "workspace:*",
     "@undb/openapi": "workspace:*",
+    "@undb/template": "workspace:*",
     "@undb/user": "workspace:*",
     "ts-pattern": "^5.3.1"
   }
diff --git a/packages/commands/package.json b/packages/commands/package.json
index d993de07b..5b97a1d84 100644
--- a/packages/commands/package.json
+++ b/packages/commands/package.json
@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@undb/base": "workspace:*",
-    "@undb/template": "workspace:*",
     "@undb/domain": "workspace:*",
     "@undb/openapi": "workspace:*",
     "@undb/share": "workspace:*",
     "@undb/table": "workspace:*",
+    "@undb/template": "workspace:*",
     "@undb/zod": "workspace:*"
   }
 }
diff --git a/packages/cqrs/package.json b/packages/cqrs/package.json
index c68451379..5913b1da1 100644
--- a/packages/cqrs/package.json
+++ b/packages/cqrs/package.json
@@ -6,7 +6,7 @@
   "devDependencies": {
     "@types/bun": "latest",
     "@types/uuid": "^10.0.0",
-    "type-fest": "^4.26.0"
+    "type-fest": "^4.26.1"
   },
   "peerDependencies": {
     "typescript": "^5.0.0"
diff --git a/packages/domain/package.json b/packages/domain/package.json
index 6be055787..a1b4ef7a5 100644
--- a/packages/domain/package.json
+++ b/packages/domain/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@undb/zod": "workspace:*",
     "array-move": "^4.0.0",
-    "date-fns": "^3.6.0",
+    "date-fns": "^4.1.0",
     "dequal": "^2.0.3",
     "nanoid": "^5.0.7",
     "oxide.ts": "^1.1.0",
diff --git a/packages/persistence/package.json b/packages/persistence/package.json
index 97754e2f7..97dff26c7 100644
--- a/packages/persistence/package.json
+++ b/packages/persistence/package.json
@@ -11,7 +11,7 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@libsql/client": "^0.10.0",
+    "@libsql/client": "^0.14.0",
     "@libsql/kysely-libsql": "^0.4.1",
     "@undb/audit": "workspace:*",
     "@undb/authz": "workspace:*",
@@ -24,9 +24,9 @@
     "@undb/table": "workspace:*",
     "@undb/user": "workspace:*",
     "@undb/webhook": "workspace:*",
-    "date-fns": "^3.6.0",
+    "date-fns": "^4.1.0",
     "drizzle-orm": "^0.33.0",
-    "es-toolkit": "^1.19.0",
+    "es-toolkit": "^1.20.0",
     "kysely": "^0.27.4",
     "kysely-bun-sqlite": "^0.3.2",
     "radash": "^12.1.0",
diff --git a/packages/table/package.json b/packages/table/package.json
index 0f9a05de2..e8a2e8676 100644
--- a/packages/table/package.json
+++ b/packages/table/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "devDependencies": {
     "@types/bun": "latest",
-    "type-fest": "^4.26.0"
+    "type-fest": "^4.26.1"
   },
   "peerDependencies": {
     "typescript": "^5.0.0"
@@ -19,7 +19,7 @@
     "@undb/space": "workspace:*",
     "@undb/utils": "workspace:*",
     "@undb/zod": "workspace:*",
-    "date-fns": "^3.6.0",
+    "date-fns": "^4.1.0",
     "radash": "^12.1.0",
     "ts-pattern": "^5.3.1"
   }
diff --git a/packages/table/src/methods/duplicate-table.method.ts b/packages/table/src/methods/duplicate-table.method.ts
index 548734792..b8e243682 100644
--- a/packages/table/src/methods/duplicate-table.method.ts
+++ b/packages/table/src/methods/duplicate-table.method.ts
@@ -2,7 +2,7 @@ import { getNextName } from "@undb/utils"
 import type { IDuplicateTableDTO } from "../dto/duplicate-table.dto"
 import { DuplicatedTableSpecification } from "../specifications"
 import { TableIdVo } from "../table-id.vo"
-import { TableCreator } from "../table.builder"
+import { TableFactory } from "../table.builder"
 import { TableDo } from "../table.do"
 
 export function duplicateTableMethod(
@@ -10,7 +10,7 @@ export function duplicateTableMethod(
   dto: IDuplicateTableDTO,
   tableNames: string[],
 ): DuplicatedTableSpecification {
-  const duplicated = new TableCreator().fromJSON({
+  const duplicated = TableFactory.fromJSON({
     ...this.toJSON(),
     id: dto.tableId ?? TableIdVo.create().value,
     baseId: dto.baseId ?? this.baseId,
diff --git a/packages/table/src/modules/forms/dto/create-form.dto.ts b/packages/table/src/modules/forms/dto/create-form.dto.ts
index 2f13bfb57..a2ab10dc7 100644
--- a/packages/table/src/modules/forms/dto/create-form.dto.ts
+++ b/packages/table/src/modules/forms/dto/create-form.dto.ts
@@ -1,7 +1,7 @@
 import { z } from "@undb/zod"
+import { tableId } from "../../../table-id.vo"
 import { formId } from "../form/form-id.vo"
 import { formName } from "../form/form-name.vo"
-import { tableId } from "../../../table-id.vo"
 
 export const createFormDTO = z.object({
   id: formId.optional(),
@@ -11,6 +11,9 @@ export const createFormDTO = z.object({
   // just using table fields
   // fields: formField.optional(),
 })
+
+export const createFormWithoutNameDTO = createFormDTO.omit({ name: true })
+
 export type ICreateFormDTO = z.infer<typeof createFormDTO>
 
 export const createTableFormDTO = createFormDTO.merge(z.object({ tableId }))
diff --git a/packages/table/src/modules/rls/dto/rls.dto.ts b/packages/table/src/modules/rls/dto/rls.dto.ts
index 0a7527b31..615f3e320 100644
--- a/packages/table/src/modules/rls/dto/rls.dto.ts
+++ b/packages/table/src/modules/rls/dto/rls.dto.ts
@@ -4,9 +4,11 @@ import { tableRLSCondition } from "../table-rls-condition.vo"
 import { rlsId } from "../table-rls-id.vo"
 import { tableRLSSubject } from "../table-rls-subject.vo"
 
+export const rlsName = z.string().min(2)
+
 export const rlsDTO = z.object({
   id: rlsId,
-  name: z.string().min(2),
+  name: rlsName,
   enabled: z.boolean(),
   action: tableRLSAction,
   allow: z.boolean(),
diff --git a/packages/table/src/modules/views/dto/create-view.dto.ts b/packages/table/src/modules/views/dto/create-view.dto.ts
index 159d96c5b..2f78818a6 100644
--- a/packages/table/src/modules/views/dto/create-view.dto.ts
+++ b/packages/table/src/modules/views/dto/create-view.dto.ts
@@ -8,6 +8,8 @@ export const createViewDTO = z.object({
   type: viewType,
 })
 
+export const createViewWithoutNameDTO = createViewDTO.omit({ name: true })
+
 export type ICreateViewDTO = z.infer<typeof createViewDTO>
 
 export const createTableViewDTO = createViewDTO.merge(z.object({ tableId }))
diff --git a/packages/table/src/services/table.service.ts b/packages/table/src/services/table.service.ts
index 313fc447f..662ed06e3 100644
--- a/packages/table/src/services/table.service.ts
+++ b/packages/table/src/services/table.service.ts
@@ -26,7 +26,7 @@ import {
   type View,
 } from "../modules"
 import type { ICreateTableFormDTO } from "../modules/forms/dto/create-form.dto"
-import { TableCreator } from "../table.builder"
+import { TableFactory } from "../table.builder"
 import type { TableDo } from "../table.do"
 import type { ITableRepository } from "../table.repository"
 import { injectTableRepository } from "../table.repository.provider"
@@ -73,7 +73,7 @@ export class TableService implements ITableService {
   readonly logger = createLogger(TableService.name)
 
   public get creator() {
-    return new TableCreator()
+    return TableFactory
   }
 
   constructor(
diff --git a/packages/table/src/table.builder.ts b/packages/table/src/table.builder.ts
index 21e08e4a9..069ef41da 100644
--- a/packages/table/src/table.builder.ts
+++ b/packages/table/src/table.builder.ts
@@ -111,12 +111,12 @@ export interface ITableCreator {
   create(dto: ICreateTableDTO): TableDo
 }
 
-export class TableCreator {
-  private get builder() {
+export class TableFactory {
+  private static get builder() {
     return new TableBuilder()
   }
 
-  create(dto: ICreateTableDTO): TableDo {
+  static create(dto: ICreateTableDTO): TableDo {
     dto = createTableDTO.parse(dto)
     const table = this.builder
       .setId(dto.id)
@@ -134,7 +134,7 @@ export class TableCreator {
     return table
   }
 
-  fromJSON(dto: ITableDTO): TableDo {
+  static fromJSON(dto: ITableDTO): TableDo {
     return this.builder
       .setId(dto.id)
       .setBaseId(dto.baseId)
diff --git a/packages/template/package.json b/packages/template/package.json
index ead1da7f6..2d4b2f9a8 100644
--- a/packages/template/package.json
+++ b/packages/template/package.json
@@ -5,10 +5,10 @@
   "type": "module",
   "dependencies": {
     "@undb/base": "workspace:*",
-    "@undb/table": "workspace:*",
-    "@undb/zod": "workspace:*",
     "@undb/di": "workspace:*",
     "@undb/logger": "workspace:*",
+    "@undb/table": "workspace:*",
+    "@undb/zod": "workspace:*",
     "zod-to-json-schema": "^3.23.3"
   },
   "devDependencies": {
diff --git a/packages/template/src/dto/template.dto.ts b/packages/template/src/dto/template.dto.ts
index d979de096..923fe78e0 100644
--- a/packages/template/src/dto/template.dto.ts
+++ b/packages/template/src/dto/template.dto.ts
@@ -1,11 +1,25 @@
 import { baseNameSchema } from "@undb/base"
-import { createFieldWithoutNameDTO, fieldId, tableName } from "@undb/table"
+import {
+  createFieldWithoutNameDTO,
+  createFormWithoutNameDTO,
+  createViewWithoutNameDTO,
+  fieldName,
+  formName,
+  tableId,
+  tableName,
+  viewName,
+} from "@undb/table"
 import { z } from "@undb/zod"
 
-const templateSchemaDTO = z.record(fieldId, createFieldWithoutNameDTO)
+const templateSchemaDTO = z.record(fieldName, createFieldWithoutNameDTO)
+const tempalteViewDTO = z.record(viewName, createViewWithoutNameDTO)
+const templateFormDTO = z.record(formName, createFormWithoutNameDTO)
 
 const basicTemplateTableDTO = z.object({
+  id: tableId.optional(),
   schema: templateSchemaDTO,
+  views: tempalteViewDTO.optional(),
+  forms: templateFormDTO.optional(),
 })
 
 export const baseTemplateDTO = z.record(
diff --git a/packages/template/src/template.factory.ts b/packages/template/src/template.factory.ts
index c8a93001b..aeb0c317f 100644
--- a/packages/template/src/template.factory.ts
+++ b/packages/template/src/template.factory.ts
@@ -1,5 +1,5 @@
 import { Base, BaseFactory } from "@undb/base"
-import { type ICreateSchemaDTO, TableCreator, TableDo } from "@undb/table"
+import { type ICreateSchemaDTO, TableDo, TableFactory } from "@undb/table"
 import { getNextName } from "@undb/utils"
 import { type IBaseTemplateDTO } from "./dto/template.dto"
 
@@ -15,7 +15,7 @@ export class TemplateFactory {
       for (const [name, table] of Object.entries(b.tables)) {
         const schema = Object.entries(table.schema).map(([name, field]) => ({ ...field, name })) as ICreateSchemaDTO
 
-        const t = new TableCreator().create({ baseId, name, schema, spaceId })
+        const t = TableFactory.create({ baseId, name, schema, spaceId })
         tables.push(t)
       }
 
diff --git a/packages/trpc/package.json b/packages/trpc/package.json
index b6d4e771e..b11ce345d 100644
--- a/packages/trpc/package.json
+++ b/packages/trpc/package.json
@@ -22,6 +22,6 @@
     "@undb/table": "workspace:*",
     "@undb/template": "workspace:*",
     "@undb/zod": "workspace:*",
-    "zod-validation-error": "^3.3.1"
+    "zod-validation-error": "^3.4.0"
   }
 }
diff --git a/packages/zod/package.json b/packages/zod/package.json
index a5d7b1641..5c3543603 100644
--- a/packages/zod/package.json
+++ b/packages/zod/package.json
@@ -10,9 +10,9 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "i18next": "^23.14.0",
+    "i18next": "^23.15.1",
     "zod": "^3.23.8",
     "zod-i18n-map": "^2.27.0",
-    "zod-validation-error": "^3.3.1"
+    "zod-validation-error": "^3.4.0"
   }
 }