diff --git a/apps/frontend/src/lib/components/blocks/aggregate/aggregate.svelte b/apps/frontend/src/lib/components/blocks/aggregate/aggregate.svelte
index 75f24897f..8f4084d85 100644
--- a/apps/frontend/src/lib/components/blocks/aggregate/aggregate.svelte
+++ b/apps/frontend/src/lib/components/blocks/aggregate/aggregate.svelte
@@ -7,8 +7,7 @@
   import { TriangleAlertIcon } from "lucide-svelte"
   import * as Tooltip from "$lib/components/ui/tooltip"
   import type { TableDo } from "@undb/table"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string | undefined
   export let table: TableDo | undefined
@@ -22,8 +21,7 @@
 
   $: isValid = isValidWidget(widget) && !!tableId
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const getAggregate = createQuery({
     queryKey: ["aggregate", widget.id],
@@ -43,7 +41,6 @@
           ignoreView,
         })
       }
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.records.getAggregates({
         tableId: tableId!,
         viewId,
diff --git a/apps/frontend/src/lib/components/blocks/bulk-update-records/bulk-update-records.svelte b/apps/frontend/src/lib/components/blocks/bulk-update-records/bulk-update-records.svelte
index cf38522f9..261c5c663 100644
--- a/apps/frontend/src/lib/components/blocks/bulk-update-records/bulk-update-records.svelte
+++ b/apps/frontend/src/lib/components/blocks/bulk-update-records/bulk-update-records.svelte
@@ -28,9 +28,7 @@
   import autoAnimate from "@formkit/auto-animate"
   import type { Readable } from "svelte/store"
   import { LL } from "@undb/i18n/client"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-
+  import { getDataService } from "$lib/store/data-service.store"
 
   const table = getTable()
   export let viewId: Readable<string | undefined>
@@ -44,17 +42,15 @@
   export let filter: IViewFilterGroup | undefined = undefined
   export let onSuccess: (data: IBulkUpdateRecordsCommandOutput) => void = () => {}
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
-
   let selectedFieldIds: string[] = []
   $: selectedFields = selectedFieldIds.map((id) => $table.schema.getFieldById(new FieldIdVo(id)).unwrap())
 
   const client = useQueryClient()
 
+  const dataService = getDataService()
+
   const updateRecordMutation = createMutation({
     mutationFn: async (command: IBulkUpdateRecordsCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.records.updateRecords(command)
     },
     onSuccess: async (data) => {
diff --git a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-date-remove-button.svelte b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-date-remove-button.svelte
index c78830001..e9b68b94c 100644
--- a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-date-remove-button.svelte
+++ b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-date-remove-button.svelte
@@ -8,8 +8,7 @@
   import { useQueryClient } from "@tanstack/svelte-query"
   import { cn } from "$lib/utils"
   import { calendarStore } from "$lib/store/calendar.store"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type IUpdateRecordCommand } from "@undb/commands"
 
   export let view: CalendarView
@@ -21,12 +20,10 @@
 
   let field = fieldId ? $t.schema.getFieldById(new FieldIdVo(fieldId)).into(undefined) : undefined
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateRecord = createMutation({
     mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.records.updateRecord(command)
     },
   })
diff --git a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-field-form.svelte b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-field-form.svelte
index c410fc062..0af576ea5 100644
--- a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-field-form.svelte
+++ b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-field-form.svelte
@@ -6,15 +6,13 @@
   import { defaults, superForm } from "sveltekit-superforms"
   import { zodClient } from "sveltekit-superforms/adapters"
   import CreateFieldButton from "../create-field/create-field-button.svelte"
-  import { trpc } from "$lib/trpc/client"
   import { createMutation } from "@tanstack/svelte-query"
   import { toast } from "svelte-sonner"
   import { invalidate } from "$app/navigation"
   import { hasPermission } from "$lib/store/space-member.store"
   import { CircleCheckBigIcon } from "lucide-svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type IUpdateViewCommand } from "@undb/commands"
 
   export let readonly = false
@@ -52,12 +50,10 @@
 
   const { enhance, form: formData } = form
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateViewMutation = createMutation({
     mutationFn: async (command: IUpdateViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.table.view.updateView(command)
     },
     mutationKey: ["updateView"],
diff --git a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-timescale-picker.svelte b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-timescale-picker.svelte
index 8f97ff3e5..7e1af333b 100644
--- a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-timescale-picker.svelte
+++ b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-timescale-picker.svelte
@@ -10,13 +10,10 @@
   import { LL } from "@undb/i18n/client"
   import { calendarTimeScales, type CalendarTimeScale, type CalendarView } from "@undb/table"
   import { createMutation } from "@tanstack/svelte-query"
-  import { trpc } from "$lib/trpc/client"
-  import { toast } from "svelte-sonner"
   import { getTable } from "$lib/store/table.store"
   import { invalidate } from "$app/navigation"
   import { type ICalendarViewDTO } from "@undb/table"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type IUpdateViewCommand } from "@undb/commands"
 
   export let view: CalendarView
@@ -41,12 +38,10 @@
     })
   }
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateViewMutation = createMutation({
     mutationFn: async (command: IUpdateViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.table.view.updateView(command)
     },
     mutationKey: ["updateView"],
diff --git a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-day-timeline.svelte b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-day-timeline.svelte
index 2ac271aa1..d504d6c1d 100644
--- a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-day-timeline.svelte
+++ b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-day-timeline.svelte
@@ -29,8 +29,7 @@
   import { CREATE_RECORD_MODAL, openModal } from "$lib/store/modal.store"
   import { tick } from "svelte"
   import { hasPermission } from "$lib/store/space-member.store"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type IUpdateRecordCommand } from "@undb/commands"
 
   export let viewId: Readable<string | undefined>
@@ -106,8 +105,7 @@
   const t = getTable()
   const q = queryParam("q")
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const getRecords = createQuery(
     derived([t, viewId, q, date], ([$table, $viewId, $q, $date]) => {
@@ -116,7 +114,6 @@
         queryKey: ["records", $table?.id.value, $viewId, $q, $date.toISOString()],
         enabled: view?.type === "calendar" && !disableRecordQuery,
         queryFn: async () => {
-          const dataService = await getDataService(isLocal, isPlayground)
           const value = format($date, "yyyy-MM-dd")
           if (shareId) {
             return trpc.shareData.records.query({
@@ -258,10 +255,7 @@
   let overMinutes: number | undefined = undefined
 
   const updateRecord = createMutation({
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
   })
 
   const client = useQueryClient()
diff --git a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month-date.svelte b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month-date.svelte
index 9fa8a3c49..96dc10473 100644
--- a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month-date.svelte
+++ b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month-date.svelte
@@ -10,16 +10,13 @@
   import { isToday } from "date-fns/isToday"
   import { isWeekend } from "date-fns/isWeekend"
   import { createMutation, useQueryClient } from "@tanstack/svelte-query"
-  import { trpc } from "$lib/trpc/client"
   import { dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter"
   import { format } from "date-fns/format"
   import { cn } from "$lib/utils"
   import { CREATE_RECORD_MODAL, openModal } from "$lib/store/modal.store"
   import { defaultRecordValues } from "$lib/store/records.store"
   import { type Readable } from "svelte/store"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let field: DateField | DateRangeField
   export let date: Date
@@ -36,8 +33,7 @@
   const isSelected = calendarStore.isSelected
   const getIsSameMonth = calendarStore.getIsSameMonth
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   $: color = $viewId ? $table.views.getViewById($viewId)?.color.into(undefined) : undefined
 
@@ -90,10 +86,7 @@
   }
 
   const updateRecord = createMutation({
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
   })
 
   const client = useQueryClient()
diff --git a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month-records.svelte b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month-records.svelte
index ffdc89e82..e44deb7fd 100644
--- a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month-records.svelte
+++ b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month-records.svelte
@@ -20,8 +20,7 @@
   import { CalendarView } from "@undb/table"
   import { type MaybeConditionGroup, type IViewFilterOptionSchema } from "@undb/table"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let viewId: Readable<string | undefined>
   export let view: CalendarView
@@ -31,8 +30,8 @@
   export let readonly = false
 
   const t = getTable()
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+
+  const dataService = getDataService()
 
   let defaultField = $t.schema.getDefaultDisplayField().into(undefined)
 
@@ -102,7 +101,6 @@
         return {
           queryKey: ["records", $table?.id.value, $viewId, $scope, dateString, $search],
           queryFn: async ({ pageParam = 1 }) => {
-            const dataService = await getDataService(isLocal, isPlayground)
             if (shareId) {
               return trpc.shareData.records.query({
                 shareId,
diff --git a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month.svelte b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month.svelte
index f02d2b0f1..d61720548 100644
--- a/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month.svelte
+++ b/apps/frontend/src/lib/components/blocks/calendar-view/calendar-view-month.svelte
@@ -9,11 +9,9 @@
   import { createQuery } from "@tanstack/svelte-query"
   import { queryParam } from "sveltekit-search-params"
   import CalendarDateRemoveButton from "./calendar-date-remove-button.svelte"
-  import CalendarViewMiniMonth from "./calendar-view-mini-month.svelte"
   import CalendarViewMonthRecords from "./calendar-view-month-records.svelte"
   import CalendarViewMonthDate from "./calendar-view-month-date.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let viewId: Readable<string | undefined>
   export let view: CalendarView
@@ -28,8 +26,7 @@
 
   const t = getTable()
   const q = queryParam("q")
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const getRecords = createQuery(
     derived([t, viewId, q, startTimestamp, endTimestamp], ([$table, $viewId, $q, $startTimestamp, $endTimestamp]) => {
@@ -45,7 +42,6 @@
         ],
         enabled: view?.type === "calendar" && !!$startTimestamp && !!$endTimestamp && !disableRecordQuery,
         queryFn: async () => {
-          const dataService = await getDataService(isLocal, isPlayground)
           if (shareId) {
             return trpc.shareData.records.query({
               shareId,
diff --git a/apps/frontend/src/lib/components/blocks/calendar-view/select-calendar-field-form.svelte b/apps/frontend/src/lib/components/blocks/calendar-view/select-calendar-field-form.svelte
index a31a1d158..0c1e82e44 100644
--- a/apps/frontend/src/lib/components/blocks/calendar-view/select-calendar-field-form.svelte
+++ b/apps/frontend/src/lib/components/blocks/calendar-view/select-calendar-field-form.svelte
@@ -14,9 +14,7 @@
   import { CircleCheckBigIcon } from "lucide-svelte"
   import * as Form from "$lib/components/ui/form"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateViewCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let readonly = false
 
@@ -64,14 +62,10 @@
 
   const { enhance, form: formData, validateForm } = form
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateViewMutation = createMutation({
-    mutationFn: async (command: IUpdateViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.updateView(command)
-    },
+    mutationFn: dataService.table.view.updateView,
     mutationKey: ["updateView"],
     async onSuccess(data, variables, context) {
       toast.success($LL.table.view.updated())
diff --git a/apps/frontend/src/lib/components/blocks/create-base/create-base.svelte b/apps/frontend/src/lib/components/blocks/create-base/create-base.svelte
index 924d9afdc..96318819c 100644
--- a/apps/frontend/src/lib/components/blocks/create-base/create-base.svelte
+++ b/apps/frontend/src/lib/components/blocks/create-base/create-base.svelte
@@ -11,17 +11,14 @@
   import { LoaderCircleIcon } from "lucide-svelte"
   import { getNextName } from "@undb/utils"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
+  import { getDataService } from "$lib/store/data-service.store"
   import { getIsPlayground } from "$lib/store/playground.svelte"
 
-  const isLocal = getIsLocal()
   const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const mutation = createMutation({
-    mutationFn: async (command: ICreateBaseCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.base.createBase(command)
-    },
+    mutationFn: dataService.base.createBase,
     async onSuccess(data) {
       form.reset()
       if (isPlayground) {
diff --git a/apps/frontend/src/lib/components/blocks/create-field/create-field.svelte b/apps/frontend/src/lib/components/blocks/create-field/create-field.svelte
index 2f77d843d..ca1c50cfb 100644
--- a/apps/frontend/src/lib/components/blocks/create-field/create-field.svelte
+++ b/apps/frontend/src/lib/components/blocks/create-field/create-field.svelte
@@ -15,9 +15,7 @@
   import FieldTypePicker from "../field-picker/field-type-picker.svelte"
   import { LL } from "@undb/i18n/client"
   import { BetweenVerticalStartIcon, LoaderCircleIcon } from "lucide-svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type ICreateFieldCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   const table = getTable()
 
@@ -25,17 +23,13 @@
 
   let name = ""
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const client = useQueryClient()
   const createFieldMutation = createMutation(
     derived([table], ([$table]) => ({
       mutationKey: ["table", $table.id.value, "createField"],
-      mutationFn: async (command: ICreateFieldCommand) => {
-        const dataService = await getDataService(isLocal, isPlayground)
-        return dataService.table.field.createField(command)
-      },
+      mutationFn: dataService.table.field.createField,
       async onSuccess() {
         toast.success($LL.table.field.created())
         reset()
diff --git a/apps/frontend/src/lib/components/blocks/create-record/create-record.svelte b/apps/frontend/src/lib/components/blocks/create-record/create-record.svelte
index 5c8d61e41..a5c30963b 100644
--- a/apps/frontend/src/lib/components/blocks/create-record/create-record.svelte
+++ b/apps/frontend/src/lib/components/blocks/create-record/create-record.svelte
@@ -16,9 +16,7 @@
   import type { ICreateRecordCommand, ICreateRecordCommandOutput } from "@undb/commands"
   import { onMount } from "svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-    import { getIsPlayground } from "$lib/store/playground.svelte"
-
+  import { getDataService } from "$lib/store/data-service.store"
 
   // beforeNavigate(({ cancel }) => {
   //   if ($tainted) {
@@ -42,15 +40,11 @@
   const client = useQueryClient()
 
   const mediaQuery = useMediaQuery("(max-width: 768px)")
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const createRecordMutation = createMutation(
     derived([table], ([$table]) => ({
-      mutationFn: async (command: ICreateRecordCommand) => {
-        const dataService = await getDataService(isLocal, isPlayground)
-        return dataService.records.createRecord(command)
-      },
+      mutationFn: dataService.records.createRecord,
       mutationKey: [$table.id.value, "createRecord"],
       onSuccess: (data: ICreateRecordCommandOutput) => {
         client.invalidateQueries({
diff --git a/apps/frontend/src/lib/components/blocks/create-table/create-table.svelte b/apps/frontend/src/lib/components/blocks/create-table/create-table.svelte
index f0d171610..4c13ace71 100644
--- a/apps/frontend/src/lib/components/blocks/create-table/create-table.svelte
+++ b/apps/frontend/src/lib/components/blocks/create-table/create-table.svelte
@@ -13,20 +13,15 @@
   import { CREATE_TABLE_MODAL, closeModal } from "$lib/store/modal.store"
   import { baseId, currentBase, currentBaseId } from "$lib/store/base.store"
   import { getNextName } from "@undb/utils"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const schema = createTableCommand.omit({ baseId: true })
   export let tableNames: string[]
 
   const mutation = createMutation({
-    mutationFn: async (command: ICreateTableCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.createTable(command)
-    },
+    mutationFn: dataService.table.createTable,
     mutationKey: ["createTable"],
     async onSuccess(data) {
       if (isPlayground) {
diff --git a/apps/frontend/src/lib/components/blocks/dashboard/dashboard-widget.svelte b/apps/frontend/src/lib/components/blocks/dashboard/dashboard-widget.svelte
index ca9718433..8d30dab56 100644
--- a/apps/frontend/src/lib/components/blocks/dashboard/dashboard-widget.svelte
+++ b/apps/frontend/src/lib/components/blocks/dashboard/dashboard-widget.svelte
@@ -4,10 +4,8 @@
   import Widget from "../widget/widget.svelte"
   import { setTable } from "$lib/store/table.store"
   import { writable } from "svelte/store"
-  import { getIsLocal } from "$lib/store/data-service.store"
   import { getDataService } from "$lib/store/data-service.store"
   import { createQuery } from "@tanstack/svelte-query"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
 
   export let tableId: string | undefined
   export let shareId: string | undefined = undefined
@@ -16,8 +14,7 @@
   export let movePointerDown: ((e: Event) => void) | undefined = undefined
   export let resizePointerDown: ((e: Event) => void) | undefined = undefined
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const shareStore = new GetDashboardWidgetShareTableStore()
 
@@ -28,10 +25,7 @@
   }
 
   const getTable = createQuery({
-    queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.getTable({ tableId: tableId! })
-    },
+    queryFn: () => dataService.table.getTable({ tableId: tableId! }),
     queryKey: ["dashboard-widget-table", tableId],
     enabled: !!tableId && !shareId,
   })
diff --git a/apps/frontend/src/lib/components/blocks/delete-table/delete-table-dialog.svelte b/apps/frontend/src/lib/components/blocks/delete-table/delete-table-dialog.svelte
index aae924105..9d0b8381f 100644
--- a/apps/frontend/src/lib/components/blocks/delete-table/delete-table-dialog.svelte
+++ b/apps/frontend/src/lib/components/blocks/delete-table/delete-table-dialog.svelte
@@ -10,13 +10,11 @@
   import { Label } from "$lib/components/ui/label"
   import { LL } from "@undb/i18n/client"
   import { type IDeleteTableCommand } from "@undb/commands"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let table = getTable()
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   // const foreignTableStore = new GetTableForeignTablesStore()
   // $: $isModalOpen(DELETE_TABLE_MODAL) &&
@@ -27,10 +25,7 @@
   // $: foreignTables = $foreignTableStore.data?.tableForeignTables ?? []
 
   const deleteTableMutation = createMutation({
-    mutationFn: async (command: IDeleteTableCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.deleteTable(command)
-    },
+    mutationFn: dataService.table.deleteTable,
     async onSuccess(data, variables, context) {
       await goto("/")
       await invalidateAll()
diff --git a/apps/frontend/src/lib/components/blocks/field-control/button-control.svelte b/apps/frontend/src/lib/components/blocks/field-control/button-control.svelte
index 308893d56..47dbd9b03 100644
--- a/apps/frontend/src/lib/components/blocks/field-control/button-control.svelte
+++ b/apps/frontend/src/lib/components/blocks/field-control/button-control.svelte
@@ -8,7 +8,7 @@
   import { getTable } from "$lib/store/table.store"
   import { gridViewStore } from "../grid-view/grid-view.store"
   import { getRecordsStore } from "$lib/store/records.store"
-  import { getIsLocal } from "$lib/store/data-service.store"
+  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
   import { getIsPlayground } from "$lib/store/playground.svelte"
   import { type IUpdateRecordCommand } from "@undb/commands"
 
@@ -22,16 +22,14 @@
   const client = useQueryClient()
   const recordsStore = getRecordsStore()
 
+  const dataService = getDataService()
+
   const isLocal = getIsLocal()
   const isPlayground = getIsPlayground()
 
-
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     async onSuccess(data, variables, context) {
       gridViewStore.exitEditing()
       await recordsStore?.invalidateRecord(isLocal, isPlayground, $table, recordId)
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 4823d5205..2818dd225 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
@@ -19,8 +19,7 @@
   import autoAnimate from "@formkit/auto-animate"
   import { isEqual } from "radash"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { createQuery } from "@tanstack/svelte-query"
 
   export let disabled = false
@@ -34,16 +33,12 @@
     condition: undefined,
   }
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   let allowCondition: boolean = !!option.condition
 
   const getForeignTable = createQuery({
-    queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.getTable({ tableId: option.foreignTableId! })
-    },
+    queryFn: () => dataService.table.getTable({ tableId: option.foreignTableId! }),
     queryKey: ["getForeignTable", option.foreignTableId],
     enabled: !!option.foreignTableId,
   })
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 e48bfcdc1..bccfabcc9 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
@@ -14,12 +14,10 @@
   import Label from "$lib/components/ui/label/label.svelte"
   import autoAnimate from "@formkit/auto-animate"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { createQuery } from "@tanstack/svelte-query"
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   export let disabled: boolean = false
 
@@ -36,7 +34,6 @@
 
   const getForeignTable = createQuery({
     queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.table.getTable({ tableId: foreignTableId! })
     },
     queryKey: ["getForeignTable", foreignTableId],
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 cca7356b0..a8c010c5a 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
@@ -21,8 +21,7 @@
   import { onMount } from "svelte"
   import { isEqual } from "radash"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { createQuery } from "@tanstack/svelte-query"
 
   export let constraint: IReferenceFieldConstraint | undefined = {
@@ -37,12 +36,10 @@
 
   let allowCondition: boolean = !!option.condition
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const getForeignTable = createQuery({
     queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.table.getTable({ tableId: option.foreignTableId! })
     },
     queryKey: ["getForeignTable", option.foreignTableId],
diff --git a/apps/frontend/src/lib/components/blocks/field/field-menu.svelte b/apps/frontend/src/lib/components/blocks/field/field-menu.svelte
index a97c90009..9358ed386 100644
--- a/apps/frontend/src/lib/components/blocks/field/field-menu.svelte
+++ b/apps/frontend/src/lib/components/blocks/field/field-menu.svelte
@@ -18,15 +18,12 @@
   import { preferences } from "$lib/store/persisted.store"
   import { hasPermission } from "$lib/store/space-member.store"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IDeleteFieldCommand, type IDuplicateFieldCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let field: Field
   const table = getTable()
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   export let update = false
   export let open = false
@@ -34,10 +31,7 @@
   const client = useQueryClient()
 
   const getForeignTable = createQuery({
-    queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.getTable({ tableId: (field as ReferenceField).foreignTableId })
-    },
+    queryFn: () => dataService.table.getTable({ tableId: $table.id.value }),
     queryKey: ["getForeignTable", $table.baseId],
     enabled: field.type === "reference",
   })
@@ -60,10 +54,7 @@
     })
 
   const deleteField = createMutation({
-    mutationFn: async (command: IDeleteFieldCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.field.deleteField(command)
-    },
+    mutationFn: dataService.table.field.deleteField,
     async onSuccess() {
       toast.success($LL.table.field.deleted())
       await invalidate(`undb:table:${$table.id.value}`)
@@ -77,10 +68,7 @@
   })
 
   const duplicateField = createMutation({
-    mutationFn: async (command: IDuplicateFieldCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.field.duplicateField(command)
-    },
+    mutationFn: dataService.table.field.duplicateField,
     async onSuccess() {
       toast.success("Duplicate field success")
       await invalidate(`undb:table:${$table.id.value}`)
diff --git a/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view-field-form.svelte b/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view-field-form.svelte
index 80db9f510..e4e4542f5 100644
--- a/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view-field-form.svelte
+++ b/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view-field-form.svelte
@@ -12,8 +12,7 @@
   import { invalidate } from "$app/navigation"
   import { CircleCheckBigIcon } from "lucide-svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type IUpdateViewCommand } from "@undb/commands"
 
   const table = getTable()
@@ -50,14 +49,10 @@
 
   const { enhance, form: formData } = form
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateViewMutation = createMutation({
-    mutationFn: async (command: IUpdateViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.updateView(command)
-    },
+    mutationFn: dataService.table.view.updateView,
     mutationKey: ["updateView"],
     async onSuccess(data, variables, context) {
       toast.success($LL.table.view.updated())
diff --git a/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view.svelte b/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view.svelte
index a1d8675a5..69b6c568c 100644
--- a/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view.svelte
@@ -13,8 +13,7 @@
   import { cn } from "$lib/utils"
   import GalleryViewLoading from "./gallery-view-loading.svelte"
   import GalleryViewOptionButton from "./gallery-option-button.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   const table = getTable()
   export let viewId: Readable<string | undefined>
@@ -31,8 +30,8 @@
   const perPage = writable(50)
   const currentPage = writable(1)
   const q = queryParam("q")
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+
+  const dataService = getDataService()
 
   const getRecords = async () => {
     if (shareId) {
@@ -44,7 +43,6 @@
         pagination: { limit: $perPage, page: $currentPage },
       })
     }
-    const dataService = await getDataService(isLocal, isPlayground)
     return dataService.records.getRecords({
       tableId: $table?.id.value,
       viewId: $viewId,
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/attachment-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/attachment-cell.svelte
index 0c15a15f6..fbb045ff3 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/attachment-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/attachment-cell.svelte
@@ -9,9 +9,7 @@
   import * as Dialog from "$lib/components/ui/dialog"
   import * as AlertDialog from "$lib/components/ui/alert-dialog"
   import { AspectRatio } from "$lib/components/ui/aspect-ratio"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let value: IAttachmentFieldValue | undefined = undefined
@@ -23,15 +21,11 @@
   $: max = field.max
   $: disabled = value?.length ?? 0 >= max
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onError(error: Error) {
       toast.error(error.message)
     },
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/checkbox-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/checkbox-cell.svelte
index bac7b976a..13ca891f9 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/checkbox-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/checkbox-cell.svelte
@@ -5,9 +5,7 @@
   import { createMutation } from "@tanstack/svelte-query"
   import type { CheckboxField } from "@undb/table"
   import { toast } from "svelte-sonner"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: CheckboxField
@@ -16,15 +14,11 @@
   export let readonly = false
   export let onValueChange: (value: boolean) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onError(error: Error) {
       toast.error(error.message)
     },
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/currency-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/currency-cell.svelte
index 9e89d128b..33e466b61 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/currency-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/currency-cell.svelte
@@ -1,14 +1,11 @@
 <script lang="ts">
-  import { trpc } from "$lib/trpc/client"
   import { cn } from "$lib/utils"
   import { createMutation } from "@tanstack/svelte-query"
   import { CurrencyField } from "@undb/table"
   import { toast } from "svelte-sonner"
   import { debounce, isNumber } from "radash"
   import { gridViewStore } from "../grid-view.store"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: CurrencyField
@@ -17,15 +14,11 @@
   export let recordId: string
   export let onValueChange: (value: number) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       el?.blur()
       gridViewStore.exitEditing()
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/date-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/date-cell.svelte
index 3741e847a..7044e9aa0 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/date-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/date-cell.svelte
@@ -10,9 +10,7 @@
   import { Button } from "$lib/components/ui/button"
   import TimePicker from "$lib/components/blocks/date/time-picker.svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: DateField
@@ -42,15 +40,11 @@
     open = false
   }
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       open = false
     },
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/date-range-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/date-range-cell.svelte
index e4bc133de..548e43b57 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/date-range-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/date-range-cell.svelte
@@ -11,9 +11,7 @@
   import Button from "$lib/components/ui/button/button.svelte"
   import TimePicker from "$lib/components/blocks/date/time-picker.svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   type Value = [string | Date | null | undefined, string | Date | null | undefined] | undefined
 
@@ -54,15 +52,11 @@
     open = true
   }
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       open = false
     },
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/duration-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/duration-cell.svelte
index 358ec2b5b..459836ceb 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/duration-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/duration-cell.svelte
@@ -7,9 +7,7 @@
   import { debounce, isNumber } from "radash"
   import { gridViewStore } from "../grid-view.store"
   import DurationInput from "$lib/components/blocks/duration/duration-input.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: DurationField
@@ -18,15 +16,11 @@
   export let recordId: string
   export let onValueChange: (value: number) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       gridViewStore.exitEditing()
     },
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/email-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/email-cell.svelte
index baaecee73..c7646c51b 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/email-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/email-cell.svelte
@@ -5,9 +5,7 @@
   import type { EmailField } from "@undb/table"
   import { toast } from "svelte-sonner"
   import { gridViewStore } from "../grid-view.store"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: EmailField
@@ -16,15 +14,11 @@
   export let isEditing: boolean
   export let onValueChange: (value: string) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       el?.blur()
       gridViewStore.exitEditing()
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/json-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/json-cell.svelte
index 4345fbbcd..ef3953795 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/json-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/json-cell.svelte
@@ -8,9 +8,7 @@
   import { createMutation } from "@tanstack/svelte-query"
   import { toast } from "svelte-sonner"
   import ScrollArea from "$lib/components/ui/scroll-area/scroll-area.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let value: JsonValue | undefined = undefined
@@ -19,15 +17,11 @@
   export let recordId: string
   export let onValueChange: (value: JsonValue | undefined) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onError(error: Error) {
       toast.error(error.message)
     },
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/long-text-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/long-text-cell.svelte
index 8f7a112a9..9785f2947 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/long-text-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/long-text-cell.svelte
@@ -8,9 +8,7 @@
   import { Maximize2Icon } from "lucide-svelte"
   import * as Dialog from "$lib/components/ui/dialog"
   import Tiptap from "$lib/components/tiptap/tiptap.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: LongTextField
@@ -21,15 +19,11 @@
   export let readonly: boolean
   export let onValueChange: (value: string) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       el?.blur()
       open = false
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/number-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/number-cell.svelte
index 0b6842d48..f50249edf 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/number-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/number-cell.svelte
@@ -1,14 +1,11 @@
 <script lang="ts">
-  import { trpc } from "$lib/trpc/client"
   import { cn } from "$lib/utils"
   import { createMutation } from "@tanstack/svelte-query"
   import { NumberField } from "@undb/table"
   import { toast } from "svelte-sonner"
   import { debounce, isNumber } from "radash"
   import { gridViewStore } from "../grid-view.store"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: NumberField
@@ -17,15 +14,11 @@
   export let recordId: string
   export let onValueChange: (value: number) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       el?.blur()
       gridViewStore.exitEditing()
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/percentage-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/percentage-cell.svelte
index fed591c2b..8d09df545 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/percentage-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/percentage-cell.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { trpc } from "$lib/trpc/client"
   import { cn } from "$lib/utils"
   import { createMutation } from "@tanstack/svelte-query"
   import { NumberField } from "@undb/table"
@@ -8,9 +7,7 @@
   import { gridViewStore } from "../grid-view.store"
   import { Slider } from "$lib/components/ui/slider"
   import * as Tooltip from "$lib/components/ui/tooltip"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: NumberField
@@ -19,15 +16,11 @@
   export let recordId: string
   export let onValueChange: (value: number) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       el?.blur()
       gridViewStore.exitEditing()
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/rating-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/rating-cell.svelte
index 6483ad88c..555ce47ee 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/rating-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/rating-cell.svelte
@@ -1,13 +1,10 @@
 <script lang="ts">
   import { Label } from "$lib/components/ui/label"
-  import { trpc } from "$lib/trpc/client"
   import { cn } from "$lib/utils"
   import { createMutation } from "@tanstack/svelte-query"
   import type { RatingField } from "@undb/table"
   import { toast } from "svelte-sonner"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let recordId: string
@@ -16,8 +13,7 @@
   export let readonly = false
   export let onValueChange: (value: number) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   $: max = field.max
 
@@ -35,10 +31,7 @@
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onError(error: Error) {
       toast.error(error.message)
     },
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/select-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/select-cell.svelte
index c1f5ccd83..32c1207f7 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/select-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/select-cell.svelte
@@ -3,17 +3,13 @@
 
   import Option from "../../option/option.svelte"
   import { cn } from "$lib/utils"
-  import { trpc } from "$lib/trpc/client"
   import { createMutation } from "@tanstack/svelte-query"
   import { toast } from "svelte-sonner"
   import { ChevronDownIcon } from "lucide-svelte"
   import OptionsPicker from "../../option/options-picker.svelte"
   import type { IOptionId } from "@undb/table/src/modules/schema/fields/option/option-id.vo"
   import OptionPicker from "../../option/option-picker.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
-
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: SelectField
@@ -24,8 +20,7 @@
   export let onValueChange: (id: IOptionId | IOptionId[] | null) => void
   export let readonly: boolean = false
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   $: selected = Array.isArray(value)
     ? value.map((v) => field.options.find((o) => o.id === v)).filter((v) => !!v)
@@ -38,10 +33,7 @@
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onError(error: Error) {
       toast.error(error.message)
     },
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/string-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/string-cell.svelte
index 7313503a3..9e59797d7 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/string-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/string-cell.svelte
@@ -1,13 +1,10 @@
 <script lang="ts">
-  import { trpc } from "$lib/trpc/client"
   import { cn } from "$lib/utils"
   import { createMutation } from "@tanstack/svelte-query"
   import type { StringField } from "@undb/table"
   import { toast } from "svelte-sonner"
   import { gridViewStore } from "../grid-view.store"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: StringField
@@ -17,15 +14,11 @@
   export let readonly: boolean
   export let onValueChange: (value: string) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       el?.blur()
       gridViewStore.exitEditing()
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/url-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/url-cell.svelte
index 6e82e556d..506eaf55b 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/url-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/url-cell.svelte
@@ -1,13 +1,10 @@
 <script lang="ts">
-  import { trpc } from "$lib/trpc/client"
   import { cn } from "$lib/utils"
   import { createMutation } from "@tanstack/svelte-query"
   import type { EmailField } from "@undb/table"
   import { toast } from "svelte-sonner"
   import { gridViewStore } from "../grid-view.store"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: EmailField
@@ -16,15 +13,11 @@
   export let isEditing: boolean
   export let onValueChange: (value: string) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onSuccess(data, variables, context) {
       el?.blur()
       gridViewStore.exitEditing()
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/user-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/user-cell.svelte
index c0000713f..9564610b0 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/user-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/user-cell.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import { isUserFieldMacro, UserField, type IUserFieldDisplayValue, type IUserFieldValue } from "@undb/table"
-  import { trpc } from "$lib/trpc/client"
   import { createMutation } from "@tanstack/svelte-query"
   import { toast } from "svelte-sonner"
   import UserFieldComponent from "$lib/components/blocks/field-value/user-field.svelte"
@@ -11,9 +10,7 @@
   import UserMacro from "../../user/user-macro.svelte"
   import { getRecordsStore } from "$lib/store/records.store"
   import { getTable } from "$lib/store/table.store"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let tableId: string
   export let field: UserField
@@ -33,15 +30,11 @@
 
   const store = getRecordsStore()
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     async onSuccess(data, variables) {
       const value = variables.values[field.id.value]
       if (isUserFieldMacro(value)) {
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/grid-view.svelte b/apps/frontend/src/lib/components/blocks/grid-view/grid-view.svelte
index 383e7230b..db452d669 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/grid-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/grid-view.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { derived, writable, type Readable, type Writable } from "svelte/store"
-  import { createRecordsStore, setRecordsStore, type RecordsStore } from "$lib/store/records.store"
+  import { derived, type Readable, type Writable } from "svelte/store"
+  import { createRecordsStore, setRecordsStore } from "$lib/store/records.store"
   import { Records, type IRecordsDTO, type IViewFilterGroup } from "@undb/table"
   import { createQuery } from "@tanstack/svelte-query"
   import { trpc } from "$lib/trpc/client"
@@ -9,8 +9,7 @@
   import GridViewDataTable from "./grid-view-data-table.svelte"
   import { preferences } from "$lib/store/persisted.store"
   import { aggregatesStore } from "$lib/store/aggregates.store"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let readonly = false
 
@@ -22,12 +21,11 @@
   const q = queryParam("q")
   export let filter: IViewFilterGroup | undefined = undefined
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
-
   const perPage = derived(preferences, ($preferences) => $preferences.gridViewPerPage ?? 50)
   const currentPage = queryParam("page", ssp.number())
 
+  const dataService = getDataService()
+
   const getRecords = createQuery(
     derived([t, viewId, perPage, currentPage, q], ([$table, $viewId, $perPage, $currentPage, $q]) => {
       const view = $table.views.getViewById($viewId)
@@ -35,8 +33,6 @@
         queryKey: ["records", $table?.id.value, $viewId, $q, $currentPage, $perPage],
         enabled: view?.type === "grid",
         queryFn: async () => {
-          const dataService = await getDataService(isLocal,isPlayground)
-
           return dataService.records.getRecords({
             tableId: $table?.id.value,
             viewId: $viewId,
@@ -71,9 +67,8 @@
       return {
         queryKey: ["aggregates", $table?.id.value, $viewId],
         queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
-
-          return dataService.records.getAggregates({ tableId: $table.id.value, viewId: $viewId })},
+          return dataService.records.getAggregates({ tableId: $table.id.value, viewId: $viewId })
+        },
         enabled: !!$table,
       }
     }),
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/selected-records-button.svelte b/apps/frontend/src/lib/components/blocks/grid-view/selected-records-button.svelte
index f865561a1..1a0b067eb 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/selected-records-button.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/selected-records-button.svelte
@@ -14,11 +14,9 @@
   import type { Readable } from "svelte/store"
   import { LL } from "@undb/i18n/client"
   import { type IBulkDeleteRecordsCommand, type IBulkDuplicateRecordsCommand } from "@undb/commands"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const table = getTable()
 
@@ -34,10 +32,7 @@
 
   const client = useQueryClient()
   const deleteRecordsMutation = createMutation({
-    mutationFn: async (command: IBulkDeleteRecordsCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.deleteRecords(command)
-    },
+    mutationFn: dataService.records.deleteRecords,
     onSuccess(data, variables, context) {
       client.invalidateQueries({
         queryKey: ["records", $table.id.value],
@@ -62,10 +57,7 @@
   }
 
   const duplicateRecordsMutation = createMutation({
-    mutationFn: async (command: IBulkDuplicateRecordsCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.duplicateRecords(command)
-    },
+    mutationFn: dataService.records.duplicateRecords,
     async onSuccess(data, variables, context) {
       await client.invalidateQueries({
         queryKey: ["records", $table.id.value],
diff --git a/apps/frontend/src/lib/components/blocks/import-table/import-table.svelte b/apps/frontend/src/lib/components/blocks/import-table/import-table.svelte
index 8605b5b0c..d34f71a20 100644
--- a/apps/frontend/src/lib/components/blocks/import-table/import-table.svelte
+++ b/apps/frontend/src/lib/components/blocks/import-table/import-table.svelte
@@ -35,8 +35,7 @@
   import FieldOptions from "../field-options/field-options.svelte"
   import FieldIcon from "../field-icon/field-icon.svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type ICreateRecordsCommand, type ICreateTableCommand } from "@undb/commands"
   import { tick } from "svelte"
 
@@ -53,15 +52,11 @@
   let schema: ICreateSchemaDTO | undefined
   let selectedFields: string[] = []
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const createRecords = createMutation({
     mutationKey: ["table", "import", "records"],
-    mutationFn: async (command: ICreateRecordsCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.createRecords(command)
-    },
+    mutationFn: dataService.records.createRecords,
     async onSuccess() {
       if (isPlayground) {
         await goto(`/playground/bases/${$currentBaseId}/t/${tableId}`)
@@ -81,10 +76,7 @@
 
   const createTable = createMutation({
     mutationKey: ["table", "import"],
-    mutationFn: async (command: ICreateTableCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.createTable(command)
-    },
+    mutationFn: dataService.table.createTable,
     async onSuccess(tableId) {
       const rs = data?.data.slice(1).map((r) => r.map((v) => String(v))) ?? []
       if (importData && rs.length && schema) {
diff --git a/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-field-form.svelte b/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-field-form.svelte
index f782d4982..db27fb027 100644
--- a/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-field-form.svelte
+++ b/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-field-form.svelte
@@ -6,16 +6,13 @@
   import { defaults, superForm } from "sveltekit-superforms"
   import { zodClient } from "sveltekit-superforms/adapters"
   import CreateFieldButton from "../create-field/create-field-button.svelte"
-  import { trpc } from "$lib/trpc/client"
   import { createMutation } from "@tanstack/svelte-query"
   import { toast } from "svelte-sonner"
   import { invalidate } from "$app/navigation"
   import { hasPermission } from "$lib/store/space-member.store"
   import { CircleCheckBigIcon } from "lucide-svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateViewCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let readonly = false
 
@@ -52,14 +49,10 @@
 
   const { enhance, form: formData } = form
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateViewMutation = createMutation({
-    mutationFn: async (command: IUpdateViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.updateView(command)
-    },
+    mutationFn: dataService.table.view.updateView,
     mutationKey: ["updateView"],
     async onSuccess(data, variables, context) {
       toast.success($LL.table.view.updated())
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 dcef83897..dd6aa7f35 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
@@ -45,8 +45,7 @@
   import SelectKanbanCollapsedLane from "./select-kanban-collapsed-lane.svelte"
   import { queryParam } from "sveltekit-search-params"
   import { LL } from "@undb/i18n/client"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type IUpdateRecordCommand } from "@undb/commands"
   import { type IUpdateFieldCommand } from "@undb/commands"
 
@@ -71,8 +70,7 @@
   let getIsLaneCollapsed = kanbanStore.getIsLaneCollapsed
   $: isLaneCollapsed = $viewId ? ($getIsLaneCollapsed($viewId, option?.id ?? "") ?? false) : false
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const query = createInfiniteQuery(
     derived([table, viewId, q], ([$table, $viewId, $q]) => {
@@ -80,7 +78,6 @@
       return {
         queryKey: ["records", $table.id.value, $viewId, fieldId, option?.id, $q],
         queryFn: async ({ pageParam = 1 }) => {
-          const dataService = await getDataService(isLocal, isPlayground)
           if (shareId) {
             return trpc.shareData.records.getRecords({
               shareId,
@@ -134,20 +131,14 @@
   const spec = Some(new SelectEqual(option?.id ?? null, new FieldIdVo(fieldId)))
 
   const updateRecord = createMutation({
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     onError: (error, variables, context) => {
       toast.error(error.message)
     },
   })
 
   const updateFieldMutation = createMutation({
-    mutationFn: async (command: IUpdateFieldCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.field.updateField(command)
-    },
+    mutationFn: dataService.table.field.updateField,
     onSuccess: async (data, variables, context) => {
       toast.success("Option updated")
       updateOptionDialogOpen = false
diff --git a/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-view.svelte b/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-view.svelte
index 7e374c453..12a9b39ad 100644
--- a/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/kanban-view/select-kanban-view.svelte
@@ -23,9 +23,7 @@
   import { invalidate } from "$app/navigation"
   import type { Writable } from "svelte/store"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateFieldCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   const table = getTable()
 
@@ -42,14 +40,10 @@
   let lanesContainer: HTMLElement
   $: options = field.options ?? []
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateFieldMudation = createMutation({
-    mutationFn: async (command: IUpdateFieldCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.field.updateField(command)
-    },
+    mutationFn: dataService.table.field.updateField,
     mutationKey: ["table", $table.id.value, "field", fieldId, "update"],
     async onSuccess(data) {
       await invalidate(`undb:table:${$table.id.value}`)
diff --git a/apps/frontend/src/lib/components/blocks/list-view/list-view.svelte b/apps/frontend/src/lib/components/blocks/list-view/list-view.svelte
index 100d037d4..307347dcf 100644
--- a/apps/frontend/src/lib/components/blocks/list-view/list-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/list-view/list-view.svelte
@@ -11,8 +11,7 @@
   import { cn } from "$lib/utils"
   import ListViewLoading from "./list-view-loading.svelte"
   import ListViewList from "./list-view-list.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   const table = getTable()
   export let viewId: Readable<string | undefined>
@@ -25,8 +24,7 @@
   const perPage = writable(50)
   const currentPage = writable(1)
   const q = queryParam("q")
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const getRecords = async () => {
     if (shareId) {
@@ -38,7 +36,6 @@
         pagination: { limit: $perPage, page: $currentPage },
       })
     }
-    const dataService = await getDataService(isLocal, isPlayground)
     return dataService.records.getRecords({
       tableId: $table?.id.value,
       viewId: $viewId,
diff --git a/apps/frontend/src/lib/components/blocks/pivot-view/pivot-view-option-form.svelte b/apps/frontend/src/lib/components/blocks/pivot-view/pivot-view-option-form.svelte
index 340cf440e..28379cf9d 100644
--- a/apps/frontend/src/lib/components/blocks/pivot-view/pivot-view-option-form.svelte
+++ b/apps/frontend/src/lib/components/blocks/pivot-view/pivot-view-option-form.svelte
@@ -14,8 +14,7 @@
   import { derived } from "svelte/store"
   import * as Tooltip from "$lib/components/ui/tooltip"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type IUpdateViewCommand } from "@undb/commands"
 
   const table = getTable()
@@ -72,14 +71,10 @@
     isValidColumnLabel(rowField) &&
     isValidRowLabel(columnField)
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateViewMutation = createMutation({
-    mutationFn: async (command: IUpdateViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.updateView(command)
-    },
+    mutationFn: dataService.table.view.updateView,
     mutationKey: ["updateView"],
     async onSuccess(data, variables, context) {
       toast.success($LL.table.view.updated())
diff --git a/apps/frontend/src/lib/components/blocks/record-detail/record-detail.svelte b/apps/frontend/src/lib/components/blocks/record-detail/record-detail.svelte
index 169c615fc..fccb8aeca 100644
--- a/apps/frontend/src/lib/components/blocks/record-detail/record-detail.svelte
+++ b/apps/frontend/src/lib/components/blocks/record-detail/record-detail.svelte
@@ -18,9 +18,9 @@
   import { getRecordsStore } from "$lib/store/records.store"
   import { type Writable, type Readable } from "svelte/store"
   import { LL } from "@undb/i18n/client"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
+  import { getDataService } from "$lib/store/data-service.store"
+  import { getIsLocal } from "$lib/store/data-service.store"
   import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateRecordCommand } from "@undb/commands"
 
   const recordsStore = getRecordsStore()
 
@@ -29,8 +29,7 @@
   export let record: RecordDO
   export let viewId: Readable<string | undefined>
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   beforeNavigate(({ cancel }) => {
     if (mutableFieldTainted) {
@@ -51,11 +50,11 @@
 
   const client = useQueryClient()
 
+  const isLocal = getIsLocal()
+  const isPlayground = getIsPlayground()
+
   const updateRecordMutation = createMutation({
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     mutationKey: ["updateRecord"],
     onSuccess: async () => {
       toast.success("Record updated")
diff --git a/apps/frontend/src/lib/components/blocks/record-detail/table-record-detail-sheet.svelte b/apps/frontend/src/lib/components/blocks/record-detail/table-record-detail-sheet.svelte
index ac629f828..247154989 100644
--- a/apps/frontend/src/lib/components/blocks/record-detail/table-record-detail-sheet.svelte
+++ b/apps/frontend/src/lib/components/blocks/record-detail/table-record-detail-sheet.svelte
@@ -7,29 +7,24 @@
   import RecordDetailSheet from "./record-detail-sheet.svelte"
   import { r } from "$lib/store/records.store"
   import type { Readable } from "svelte/store"
-  import { trpc } from "$lib/trpc/client"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let readonly = false
   export let viewId: Readable<string | undefined>
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const table = getTable()
 
   const record = createQuery(
     derived([table, r, preferences], ([$table, $recordId, $preferences]) => ({
       queryKey: [$recordId, "get", $preferences.showHiddenFields],
-      queryFn: async () => {
-        const dataService = await getDataService(isLocal, isPlayground)
-        return dataService.records.getRecordById({
+      queryFn: () =>
+        dataService.records.getRecordById({
           tableId: $table?.id.value,
           id: $recordId!,
           ignoreView: $preferences.showHiddenFields,
-        })
-      },
+        }),
       enabled: !!$recordId,
     })),
   )
diff --git a/apps/frontend/src/lib/components/blocks/reference/foreign-record-detail-button.svelte b/apps/frontend/src/lib/components/blocks/reference/foreign-record-detail-button.svelte
index 13fa2dfd2..099a19a77 100644
--- a/apps/frontend/src/lib/components/blocks/reference/foreign-record-detail-button.svelte
+++ b/apps/frontend/src/lib/components/blocks/reference/foreign-record-detail-button.svelte
@@ -10,11 +10,8 @@
   import AuditList from "../audit/audit-list.svelte"
   import RecordDetail from "../record-detail/record-detail.svelte"
   import { cn } from "$lib/utils"
-  import { trpc } from "$lib/trpc/client"
   import { createQuery, useQueryClient } from "@tanstack/svelte-query"
   import { getDataService } from "$lib/store/data-service.store"
-  import { getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
 
   export let foreignTable: Readable<TableDo>
   export let r: Writable<string | null>
@@ -28,20 +25,17 @@
   const open = writable(false)
   let disabled = false
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const record = createQuery(
     derived([foreignTable, recordId, preferences, open], ([$table, $recordId, $preferences, $open]) => ({
       queryKey: [$recordId, "get", $preferences.showHiddenFields, $open],
-      queryFn: async () => {
-        const dataService = await getDataService(isLocal, isPlayground)
-        return dataService.records.getRecordById({
+      queryFn: () =>
+        dataService.records.getRecordById({
           tableId: $table?.id.value,
           id: $recordId!,
           select: $preferences.showHiddenFields ? undefined : $table?.getOrderedVisibleFields().map((f) => f.id.value),
-        })
-      },
+        }),
       enabled: !!$recordId && !!$open,
     })),
   )
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 a6bd5bfe8..1a8383d9f 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
@@ -8,8 +8,7 @@
   import { type Writable } from "svelte/store"
   import { LL } from "@undb/i18n/client"
   import { createQuery } from "@tanstack/svelte-query"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let isSelected = false
 
@@ -27,13 +26,11 @@
 
   let open = false
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const getForeignTable = createQuery({
     queryKey: ["foreignTable", foreignTableId, open],
     queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.table.getTable({ tableId: foreignTableId })
     },
   })
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 024ca6088..4c873b1f1 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
@@ -1,6 +1,5 @@
 <script lang="ts">
   import { createMutation, createQuery, useQueryClient } from "@tanstack/svelte-query"
-  import { trpc } from "$lib/trpc/client"
   import { ID_TYPE, Records, ReferenceField, TableDo, type IRecordsDTO } from "@undb/table"
   import { derived, readable, writable, type Readable, type Writable } from "svelte/store"
   import { ScrollArea } from "$lib/components/ui/scroll-area"
@@ -18,8 +17,7 @@
   import Label from "$lib/components/ui/label/label.svelte"
   import Checkbox from "$lib/components/ui/checkbox/checkbox.svelte"
   import ForeignRecordDetailButton from "./foreign-record-detail-button.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type IUpdateRecordCommand } from "@undb/commands"
 
   export let foreignTable: Readable<TableDo>
@@ -34,8 +32,7 @@
   export let onValueChange = (value: string[]) => {}
   export let onSuccess: (id?: string) => void
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   let linkAfterCreate = true
 
@@ -53,9 +50,8 @@
       return {
         queryKey: ["records", $table.id.value, $q, $currentPage, $selected?.length],
         enabled: !!$table,
-        queryFn: async () => {
-          const dataService = await getDataService(isLocal, isPlayground)
-          return dataService.records.getRecords({
+        queryFn: () =>
+          dataService.records.getRecords({
             tableId: $table.id.value,
             q: $q || undefined,
             ignoreView: true,
@@ -82,8 +78,7 @@
               : field.condition,
             select: fields.map((f) => f.id.value),
             pagination: { limit: $perPage, page: $currentPage },
-          })
-        },
+          }),
       }
     }),
   )
@@ -100,10 +95,7 @@
   const client = useQueryClient()
   const updateCell = createMutation({
     mutationKey: ["record", tableId, field.id.value, recordId],
-    mutationFn: async (command: IUpdateRecordCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.records.updateRecord(command)
-    },
+    mutationFn: dataService.records.updateRecord,
     async onSuccess(data, variables, context) {
       await client.invalidateQueries({ queryKey: ["records", field.foreignTableId] })
       onSuccess?.(recordId)
@@ -291,7 +283,7 @@
                           {foreignTable}
                           {r}
                           recordId={readable(record.id)}
-                          readonly={readonly}
+                          {readonly}
                           viewId={readable(undefined)}
                         />
                         {#if !readonly}
diff --git a/apps/frontend/src/lib/components/blocks/reference/foreign-table-picker.svelte b/apps/frontend/src/lib/components/blocks/reference/foreign-table-picker.svelte
index 0941cf03f..ed505a899 100644
--- a/apps/frontend/src/lib/components/blocks/reference/foreign-table-picker.svelte
+++ b/apps/frontend/src/lib/components/blocks/reference/foreign-table-picker.svelte
@@ -9,14 +9,12 @@
   import { getTable } from "$lib/store/table.store"
   import { DatabaseIcon, ExternalLinkIcon } from "lucide-svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { createQuery } from "@tanstack/svelte-query"
 
   const table = getTable()
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   let open = false
   export let value: string | undefined = undefined
@@ -24,7 +22,6 @@
 
   const getForeignTable = createQuery({
     queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.table.getTable({ tableId: value! })
     },
     queryKey: ["getForeignTable", value],
@@ -33,7 +30,6 @@
 
   const getForeignTables = createQuery({
     queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.table.getTables({})
     },
     queryKey: ["getForeignTables", $table.baseId],
@@ -83,7 +79,10 @@
         <CaretSort class="ml-2 h-4 w-4 shrink-0 opacity-50" />
       </Button>
       {#if value}
-        <a href={isPlayground ? `/playground/bases/${$table.baseId}/t/${value}` : `/t/${value}`} class="text-muted-foreground">
+        <a
+          href={isPlayground ? `/playground/bases/${$table.baseId}/t/${value}` : `/t/${value}`}
+          class="text-muted-foreground"
+        >
           <ExternalLinkIcon class="mr-2 h-3 w-3" />
         </a>
       {/if}
diff --git a/apps/frontend/src/lib/components/blocks/table-picker/table-picker.svelte b/apps/frontend/src/lib/components/blocks/table-picker/table-picker.svelte
index 63fa5078c..4c35bb89f 100644
--- a/apps/frontend/src/lib/components/blocks/table-picker/table-picker.svelte
+++ b/apps/frontend/src/lib/components/blocks/table-picker/table-picker.svelte
@@ -9,19 +9,16 @@
   import { DatabaseIcon } from "lucide-svelte"
   import { LL } from "@undb/i18n/client"
   import { createQuery } from "@tanstack/svelte-query"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let value: string | undefined = undefined
   export let disabled: boolean = false
   export let baseId: string
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const getTables = createQuery({
     queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
       return dataService.table.getTables({ baseId })
     },
     queryKey: ["tables", baseId],
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 6e1c91aa9..a7ff06ea3 100644
--- a/apps/frontend/src/lib/components/blocks/template/template-card.svelte
+++ b/apps/frontend/src/lib/components/blocks/template/template-card.svelte
@@ -1,9 +1,7 @@
 <script lang="ts">
-  import type { ITemplateDTO } from "@undb/template"
   import * as Card from "$lib/components/ui/card"
   import { Button } from "$lib/components/ui/button"
   import { createMutation } from "@tanstack/svelte-query"
-  import { trpc } from "$lib/trpc/client"
   import { toast } from "svelte-sonner"
   import { invalidateAll, goto } from "$app/navigation"
   import { IMPORT_TEMPLATE_MODAL, closeModal } from "$lib/store/modal.store"
@@ -14,23 +12,26 @@
   import { Checkbox } from "$lib/components/ui/checkbox/index.js"
   import Label from "$lib/components/ui/label/label.svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
+  import { setDataService } from "$lib/store/data-service.store"
+  import { DataService } from "@undb/data-service"
   import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type ICreateFromTemplateCommand } from "@undb/commands"
-
+  import { setTemplate } from "$lib/store/template.store.svelte"
+  import { type ITemplateDTO } from "@undb/template"
+  import { writable } from "svelte/store"
 
+  export let dataService: DataService
   export let template: ITemplateDTO
 
-  const isLocal = getIsLocal()
   const isPlayground = getIsPlayground()
 
+  setDataService(dataService)
+
   let includeData = !!isPlayground
 
+  setTemplate(writable(template))
+
   const createFromTemplate = createMutation({
-    mutationFn: async (command: ICreateFromTemplateCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.template.createFromTemplate(command)
-    },
+    mutationFn: dataService.template.createFromTemplate,
     async onSuccess(data, variables, context) {
       toast.success($LL.base.created())
       closeModal(IMPORT_TEMPLATE_MODAL)
diff --git a/apps/frontend/src/lib/components/blocks/template/template-list.svelte b/apps/frontend/src/lib/components/blocks/template/template-list.svelte
index b64dea055..71e1d5927 100644
--- a/apps/frontend/src/lib/components/blocks/template/template-list.svelte
+++ b/apps/frontend/src/lib/components/blocks/template/template-list.svelte
@@ -2,21 +2,25 @@
   import type { ITemplateDTO } from "@undb/template"
   import { createQuery } from "@tanstack/svelte-query"
   import TemplateCard from "./template-card.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
+  import { getDataService, setIsLocal } from "$lib/store/data-service.store"
+  import { Registry } from "$lib/registry.svelte"
   import { getIsPlayground } from "$lib/store/playground.svelte"
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const getTemplates = createQuery({
     queryKey: ["templates"],
-    queryFn: async () => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.template.listTemplates({})
-    },
+    queryFn: () => dataService.template.listTemplates({}),
   })
 
   $: templates = ($getTemplates.data ?? []) as ITemplateDTO[]
+
+  let isLocal = true
+  setIsLocal(isLocal)
+
+  let isPlayground = getIsPlayground()
+
+  let registry = new Registry()
 </script>
 
 <div class="grid grid-cols-1 gap-4 sm:grid-cols-1 md:grid-cols-3 lg:grid-cols-4">
@@ -28,8 +32,12 @@
       </div>
     {/each}
   {:else}
-    {#each templates as template}
-      <TemplateCard {template} />
-    {/each}
+    {#await registry.register(isLocal, isPlayground)}
+      loading
+    {:then dataService}
+      {#each templates as template}
+        <TemplateCard {dataService} {template} />
+      {/each}
+    {/await}
   {/if}
 </div>
diff --git a/apps/frontend/src/lib/components/blocks/template/template-preview.svelte b/apps/frontend/src/lib/components/blocks/template/template-preview.svelte
index 7416a3349..74b87d581 100644
--- a/apps/frontend/src/lib/components/blocks/template/template-preview.svelte
+++ b/apps/frontend/src/lib/components/blocks/template/template-preview.svelte
@@ -10,16 +10,13 @@
   import RecordDetailSheet from "$lib/components/blocks/record-detail/record-detail-sheet.svelte"
   import View from "$lib/components/blocks/view/view.svelte"
   import { onMount } from "svelte"
-  import { registry } from "$lib/registry.svelte"
-  import { setIsLocal } from "$lib/store/data-service.store"
-  import { type DataService, getDataService } from "@undb/data-service"
+  import { getDataService, setIsLocal } from "$lib/store/data-service.store"
   import { createQuery } from "@tanstack/svelte-query"
   import { preferences } from "$lib/store/persisted.store"
   import { RecordDO } from "@undb/table"
   import { templateStore } from "$lib/store/template.store.svelte"
   import { setDashboard } from "$lib/store/dashboard.store"
   import DashboardWidgets from "$lib/components/blocks/dashboard/dashboard-widgets.svelte"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
 
   export let template: ITemplateDTO
 
@@ -43,14 +40,13 @@
 
   let r = writable<string | null>(null)
 
-  const isPlayground = getIsPlayground()
+  let dataService = getDataService()
 
   const record = createQuery(
     derived([currentTable, r, preferences], ([$table, $recordId, $preferences]) => ({
       queryKey: [$recordId, "get", $preferences.showHiddenFields],
       enabled: !!$table && !!$recordId,
       queryFn: async () => {
-        const dataService = getDataService(true, isPlayground)
         return dataService.records.getRecordById({
           tableId: $table?.id.value,
           id: $recordId!,
@@ -78,17 +74,13 @@
         }
       : {}
 
-  let dataService: DataService
   let saved = false
   onMount(async () => {
-    await registry.register(true)
-
     if (templateStore.isTemplateSaved(template.id)) {
       saved = true
       return
     }
 
-    dataService = getDataService(true, isPlayground)
     await dataService.template.save(t, true)
     templateStore.saveTemplate(template.id, t)
     saved = true
diff --git a/apps/frontend/src/lib/components/blocks/update-field/update-field.svelte b/apps/frontend/src/lib/components/blocks/update-field/update-field.svelte
index dbbfd546a..afc6004b6 100644
--- a/apps/frontend/src/lib/components/blocks/update-field/update-field.svelte
+++ b/apps/frontend/src/lib/components/blocks/update-field/update-field.svelte
@@ -28,8 +28,7 @@
   import { LoaderCircleIcon, PencilIcon } from "lucide-svelte"
   import { LL } from "@undb/i18n/client"
   import { getIsFieldCanCastTo } from "@undb/table"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type IUpdateFieldCommand } from "@undb/commands"
 
   const table = getTable()
@@ -43,17 +42,13 @@
 
   $: isTypeChanged = type !== updatedType
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const client = useQueryClient()
   const updateFieldMutation = createMutation(
     derived([table], ([$table]) => ({
       mutationKey: ["table", $table.id.value, "updateField"],
-      mutationFn: async (command: IUpdateFieldCommand) => {
-        const dataService = await getDataService(isLocal, isPlayground)
-        return dataService.table.field.updateField(command)
-      },
+      mutationFn: dataService.table.field.updateField,
       async onSuccess() {
         onSuccess()
         toast.success($LL.table.field.updated())
diff --git a/apps/frontend/src/lib/components/blocks/view-color-editor/view-color-editor.svelte b/apps/frontend/src/lib/components/blocks/view-color-editor/view-color-editor.svelte
index 7215b8358..91b82e428 100644
--- a/apps/frontend/src/lib/components/blocks/view-color-editor/view-color-editor.svelte
+++ b/apps/frontend/src/lib/components/blocks/view-color-editor/view-color-editor.svelte
@@ -4,7 +4,6 @@
   import { FilterXIcon, PaintBucketIcon } from "lucide-svelte"
   import FiltersEditor from "../filters-editor/filters-editor.svelte"
   import { getTable } from "$lib/store/table.store"
-  import { trpc } from "$lib/trpc/client"
   import { createMutation } from "@tanstack/svelte-query"
   import { invalidate } from "$app/navigation"
   import { writable } from "svelte/store"
@@ -20,15 +19,12 @@
   import { hasPermission } from "$lib/store/space-member.store"
   import type { Readable } from "svelte/store"
   import { LL } from "@undb/i18n/client"
-  import type { ISetViewColorCommand } from "@undb/commands"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let readonly = false
   export let viewId: Readable<string | undefined>
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const table = getTable()
   $: color = $table.views.getViewById($viewId).color.into(undefined)
@@ -43,10 +39,7 @@
 
   const mutation = createMutation({
     mutationKey: ["table", $table.id.value, "setColor"],
-    mutationFn: async (command: ISetViewColorCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.setColor(command)
-    },
+    mutationFn: dataService.table.view.setColor,
     onSuccess: async () => {
       await invalidate(`undb:table:${$table.id.value}`)
       open = false
diff --git a/apps/frontend/src/lib/components/blocks/view-fields/view-fields.svelte b/apps/frontend/src/lib/components/blocks/view-fields/view-fields.svelte
index f9a73d21b..8c9dcd8bd 100644
--- a/apps/frontend/src/lib/components/blocks/view-fields/view-fields.svelte
+++ b/apps/frontend/src/lib/components/blocks/view-fields/view-fields.svelte
@@ -19,9 +19,7 @@
   import CreateFieldButton from "../create-field/create-field-button.svelte"
   import { LL } from "@undb/i18n/client"
   import { EyeIcon, EyeOffIcon } from "lucide-svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type ISetViewFieldsCommand, type ISetViewOptionCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let readonly = false
   export let viewId: Readable<string | undefined>
@@ -44,15 +42,11 @@
     return field && field.name.value.toLowerCase().includes($q.toLowerCase())
   })
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const client = useQueryClient()
   const setViewFieldsMutation = createMutation({
-    mutationFn: async (command: ISetViewFieldsCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.setFields(command)
-    },
+    mutationFn: dataService.table.view.setFields,
     mutationKey: ["table", $table.id.value, "setFields"],
     async onSuccess(data, variables, context) {
       await invalidate(`undb:table:${$table.id.value}`)
@@ -84,10 +78,7 @@
   $: viewOption = $table.getViewOption($viewId)
 
   const setViewOptionMutation = createMutation({
-    mutationFn: async (command: ISetViewOptionCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.setOption(command)
-    },
+    mutationFn: dataService.table.view.setOption,
     mutationKey: ["table", $table.id.value, "setOption"],
     async onSuccess(data, variables, context) {
       await invalidate(`undb:table:${$table.id.value}`)
diff --git a/apps/frontend/src/lib/components/blocks/view-filter-editor/view-filter-editor.svelte b/apps/frontend/src/lib/components/blocks/view-filter-editor/view-filter-editor.svelte
index 4958af0b2..26e57ce8c 100644
--- a/apps/frontend/src/lib/components/blocks/view-filter-editor/view-filter-editor.svelte
+++ b/apps/frontend/src/lib/components/blocks/view-filter-editor/view-filter-editor.svelte
@@ -19,9 +19,7 @@
   import { hasPermission } from "$lib/store/space-member.store"
   import type { Readable } from "svelte/store"
   import { LL } from "@undb/i18n/client"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import type { ISetViewFilterCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let readonly = false
   export let viewId: Readable<string | undefined>
@@ -36,20 +34,15 @@
 
   $: $table, value.set(filter?.toMaybeConditionGroup())
 
-  $: visibleFields = $table.getOrderedVisibleFields()
   let open = false
 
   const client = useQueryClient()
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const mutation = createMutation({
     mutationKey: ["table", $table.id.value, "setFilters"],
-    mutationFn: async (command: ISetViewFilterCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.setFilter(command)
-    },
+    mutationFn: dataService.table.view.setFilter,
     onSuccess: async () => {
       await invalidate(`undb:table:${$table.id.value}`)
       await client.invalidateQueries({ queryKey: ["records", $table.id.value] })
diff --git a/apps/frontend/src/lib/components/blocks/view-sort/view-sort.svelte b/apps/frontend/src/lib/components/blocks/view-sort/view-sort.svelte
index fc991f2e9..cc139ad9a 100644
--- a/apps/frontend/src/lib/components/blocks/view-sort/view-sort.svelte
+++ b/apps/frontend/src/lib/components/blocks/view-sort/view-sort.svelte
@@ -28,9 +28,7 @@
   import { hasPermission } from "$lib/store/space-member.store"
   import { LL } from "@undb/i18n/client"
   import SortPicker from "./sort-picker.svelte"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import type { ISetViewSortCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   export let readonly = false
   export let viewId: Readable<string | undefined>
@@ -54,8 +52,7 @@
 
   let open = false
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   function addSort() {
     if (disabled) {
@@ -67,10 +64,7 @@
   const client = useQueryClient()
   const setViewSortMutation = createMutation({
     mutationKey: ["table", $table.id.value, "setSort"],
-    mutationFn: async (command: ISetViewSortCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.setSort(command)
-    },
+    mutationFn: dataService.table.view.setSort,
     async onSettled() {
       await invalidate(`undb:table:${$table.id.value}`)
       await client.invalidateQueries({ queryKey: ["records", $table.id.value] })
diff --git a/apps/frontend/src/lib/components/blocks/view/create-view-button.svelte b/apps/frontend/src/lib/components/blocks/view/create-view-button.svelte
index 901106ad0..d54a218f3 100644
--- a/apps/frontend/src/lib/components/blocks/view/create-view-button.svelte
+++ b/apps/frontend/src/lib/components/blocks/view/create-view-button.svelte
@@ -21,8 +21,7 @@
   import * as Tooltip from "$lib/components/ui/tooltip"
   import { CircleHelpIcon } from "lucide-svelte"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type ICreateViewCommand } from "@undb/commands"
 
   let open = false
@@ -32,14 +31,10 @@
   export let tableId: string
   export let viewNames: string[]
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const createViewMutation = createMutation({
-    mutationFn: async (command: ICreateViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.createView(command)
-    },
+    mutationFn: dataService.table.view.createView,
     mutationKey: ["table", tableId, "createView"],
     async onSuccess(data) {
       viewNames = [...viewNames, $formData.name]
diff --git a/apps/frontend/src/lib/components/blocks/view/delete-view-dialog.svelte b/apps/frontend/src/lib/components/blocks/view/delete-view-dialog.svelte
index 93622177d..d7bca187c 100644
--- a/apps/frontend/src/lib/components/blocks/view/delete-view-dialog.svelte
+++ b/apps/frontend/src/lib/components/blocks/view/delete-view-dialog.svelte
@@ -5,23 +5,17 @@
   import { getTable } from "$lib/store/table.store"
   import { toast } from "svelte-sonner"
   import { goto, invalidate } from "$app/navigation"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import type { IDeleteViewCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
   import { type Readable } from "svelte/store"
 
   const table = getTable()
   export let viewId: Readable<string | undefined>
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const deleteViewMutation = createMutation({
     mutationKey: ["table", $viewId, "deleteView"],
-    mutationFn: async (command: IDeleteViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.deleteView(command)
-    },
+    mutationFn: dataService.table.view.deleteView,
     async onSuccess(data, variables, context) {
       await invalidate(`undb:table:${$table.id.value}`)
       if (isPlayground) {
diff --git a/apps/frontend/src/lib/components/blocks/view/duplicate-view.svelte b/apps/frontend/src/lib/components/blocks/view/duplicate-view.svelte
index abcd50e2e..9e77cd988 100644
--- a/apps/frontend/src/lib/components/blocks/view/duplicate-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/view/duplicate-view.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import { getTable } from "$lib/store/table.store"
-  import { trpc } from "$lib/trpc/client"
   import { createMutation } from "@tanstack/svelte-query"
   import { LoaderCircleIcon } from "lucide-svelte"
   import { duplicateViewCommand } from "@undb/commands"
@@ -13,27 +12,28 @@
   import { toast } from "svelte-sonner"
   import { invalidate, goto } from "$app/navigation"
   import type { Readable } from "svelte/store"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
+  import { getDataService } from "$lib/store/data-service.store"
   import { getIsPlayground } from "$lib/store/playground.svelte"
-  import type { IDuplicateViewCommand } from "@undb/commands"
 
   const table = getTable()
   export let viewId: Readable<string | undefined>
 
-  const isLocal = getIsLocal()
   const isPlayground = getIsPlayground()
 
+  const dataService = getDataService()
+
   const duplicateViewMutation = createMutation({
-    mutationFn: async (command: IDuplicateViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.duplicateView(command)
-    },
+    mutationFn: dataService.table.view.duplicateView,
     mutationKey: ["table", $viewId, "duplicateView"],
     async onSuccess(data, variables, context) {
       closeModal(DUPLICATE_VIEW)
       toast.success("View duplicated")
       await invalidate(`undb:table:${data.tableId}`)
-      await goto(`/t/${data.tableId}/${data.viewId}`)
+      if (isPlayground) {
+        await goto(`/playground/bases/${data.baseId}/t/${data.tableId}/${data.viewId}`)
+      } else {
+        await goto(`/t/${data.tableId}/${data.viewId}`)
+      }
     },
     onError(error, variables, context) {
       toast.error(error.message)
diff --git a/apps/frontend/src/lib/components/blocks/view/update-view.svelte b/apps/frontend/src/lib/components/blocks/view/update-view.svelte
index 0c3f24e10..262d1e3e8 100644
--- a/apps/frontend/src/lib/components/blocks/view/update-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/view/update-view.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import { getTable } from "$lib/store/table.store"
-  import { trpc } from "$lib/trpc/client"
   import { createMutation } from "@tanstack/svelte-query"
   import { updateViewCommand } from "@undb/commands"
   import { defaults, superForm } from "sveltekit-superforms"
@@ -12,22 +11,16 @@
   import type { Readable } from "svelte/store"
   import { invalidate } from "$app/navigation"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
-  import { type IUpdateViewCommand } from "@undb/commands"
+  import { getDataService } from "$lib/store/data-service.store"
 
   const table = getTable()
   export let viewId: Readable<string | undefined>
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   const updateViewMutation = createMutation({
     mutationKey: ["table", $viewId, "updateView"],
-    mutationFn: async (command: IUpdateViewCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.updateView(command)
-    },
+    mutationFn: dataService.table.view.updateView,
     async onSuccess(data, variables, context) {
       toggleModal(UPDATE_VIEW)
       toast.success($LL.table.view.updated())
diff --git a/apps/frontend/src/lib/components/blocks/widget/add-dashboard-widget.svelte b/apps/frontend/src/lib/components/blocks/widget/add-dashboard-widget.svelte
index 84b42ef63..9d5c92cf0 100644
--- a/apps/frontend/src/lib/components/blocks/widget/add-dashboard-widget.svelte
+++ b/apps/frontend/src/lib/components/blocks/widget/add-dashboard-widget.svelte
@@ -16,13 +16,12 @@
   import TablePicker from "../table-picker/table-picker.svelte"
   import { invalidate, invalidateAll } from "$app/navigation"
   import { LL } from "@undb/i18n/client"
-  import { getDataService, getIsLocal } from "$lib/store/data-service.store"
+  import { getDataService } from "$lib/store/data-service.store"
   import { getIsPlayground } from "$lib/store/playground.svelte"
 
   const dashboard = getDashboard()
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   let widgets = derived([dashboard], ([$dashboard]) => $dashboard?.widgets.value ?? [])
   let widgetNames = derived([widgets], ([$widgets]) => $widgets.map((w) => w.widget.name))
@@ -72,11 +71,10 @@
 
   const { form: formData, enhance, validateForm } = form
 
+  const isPlayground = getIsPlayground()
+
   const addDashboardWidgetMutation = createMutation({
-    mutationFn: async (input: IAddDashboardWidgetCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.dashboard.addWidget(input)
-    },
+    mutationFn: dataService.dashboard.addWidget,
     async onSuccess(data) {
       onSuccess()
       if (isPlayground) {
diff --git a/apps/frontend/src/lib/components/blocks/widget/create-view-widget-form.svelte b/apps/frontend/src/lib/components/blocks/widget/create-view-widget-form.svelte
index 4eae62aa4..7cae5d8f3 100644
--- a/apps/frontend/src/lib/components/blocks/widget/create-view-widget-form.svelte
+++ b/apps/frontend/src/lib/components/blocks/widget/create-view-widget-form.svelte
@@ -17,13 +17,11 @@
   import { getNextName } from "@undb/utils"
   import { toast } from "svelte-sonner"
   import { LL } from "@undb/i18n/client"
-  import { getIsLocal, getDataService } from "$lib/store/data-service.store"
-  import { getIsPlayground } from "$lib/store/playground.svelte"
+  import { getDataService } from "$lib/store/data-service.store"
 
   const table = getTable()
 
-  const isLocal = getIsLocal()
-  const isPlayground = getIsPlayground()
+  const dataService = getDataService()
 
   export let viewId: string
 
@@ -63,10 +61,7 @@
   const { form: formData, enhance, validateForm, allErrors, tainted, reset, errors } = form
 
   const createViewWidgetMutation = createMutation({
-    mutationFn: async (command: ICreateViewWidgetCommand) => {
-      const dataService = await getDataService(isLocal, isPlayground)
-      return dataService.table.view.createViewWidget(command)
-    },
+    mutationFn: dataService.table.view.createViewWidget,
     async onSuccess(data) {
       await invalidate(`undb:table:${$table.id.value}`)
       onSuccess()
diff --git a/apps/frontend/src/lib/registry.svelte.ts b/apps/frontend/src/lib/registry.svelte.ts
index 0bde77407..8e6fb8198 100644
--- a/apps/frontend/src/lib/registry.svelte.ts
+++ b/apps/frontend/src/lib/registry.svelte.ts
@@ -1,4 +1,4 @@
-import { ISpaceMemberService, SPACE_MEMBER_SERVICE } from "@undb/authz"
+import { ISpaceMemberService,SPACE_MEMBER_SERVICE } from "@undb/authz"
 import {
   AddDashboardWidgetCommandHandler,
   BulkDeleteRecordsCommandHandler,
@@ -27,9 +27,9 @@ import {
   UpdateTableFieldCommandHandler,
   UpdateViewCommandHandler,
 } from "@undb/command-handlers"
-import { CONTEXT_TOKEN, IContext } from "@undb/context"
-import { CommandBus, QueryBus } from "@undb/cqrs"
-import { registerDataService, registerQueryBuilder } from "@undb/data-service"
+import { CONTEXT_TOKEN,IContext } from "@undb/context"
+import { CommandBus,QueryBus } from "@undb/cqrs"
+import { DataService,registerDataService,TRPC_CLIENT } from "@undb/data-service"
 import { container } from "@undb/di"
 import {
   GetAggregatesQueryHandler,
@@ -43,6 +43,7 @@ import {
   GetTablesQueryHandler,
   GetTemplatesQueryHandler,
 } from "@undb/query-handlers"
+import { trpc } from "./trpc/client"
 
 const commandHandlers = [
   AddDashboardWidgetCommandHandler,
@@ -86,35 +87,24 @@ const queryHandlers = [
   GetBasesQueryHandler,
 ]
 
-class Registry {
-  #registered = $state(false)
-  #registeredLocal = $state(false)
+export class Registry {
+  async register(isLocal: boolean, isPlayground: boolean): Promise<DataService> {
+    const childContainer = container.createChildContainer()
 
-  async register(isLocal = false) {
-    // if (isLocal) {
-    if (!this.#registeredLocal) {
-      await registerQueryBuilder()
-      this.#registeredLocal = true
-    }
-    // }
+    childContainer.register(TRPC_CLIENT, { useValue: trpc })
+    await registerDataService(childContainer, isLocal, isPlayground)
 
-    if (!this.#registered) {
-      registerDataService()
+    const commandBus = childContainer.resolve(CommandBus)
+    commandBus.register(commandHandlers, childContainer)
 
-      const commandBus = container.resolve(CommandBus)
-      commandBus.register(commandHandlers)
+    const queryBus = childContainer.resolve(QueryBus)
+    queryBus.register(queryHandlers, childContainer)
 
-      const queryBus = container.resolve(QueryBus)
-      queryBus.register(queryHandlers)
+    // TODO: move to other file
+    const context = childContainer.resolve<IContext>(CONTEXT_TOKEN)
+    const spaceMemberService = childContainer.resolve<ISpaceMemberService>(SPACE_MEMBER_SERVICE)
+    await spaceMemberService.createMember(context.mustGetCurrentUserId(), context.mustGetCurrentSpaceId(), "admin")
 
-      // TODO: move to other place
-      const context = container.resolve<IContext>(CONTEXT_TOKEN)
-      const spaceMemberService = container.resolve<ISpaceMemberService>(SPACE_MEMBER_SERVICE)
-      await spaceMemberService.createMember(context.mustGetCurrentUserId(), context.mustGetCurrentSpaceId(), "admin")
-
-      this.#registered = true
-    }
+    return childContainer.resolve(DataService)
   }
 }
-
-export const registry = new Registry()
diff --git a/apps/frontend/src/lib/store/data-service.store.ts b/apps/frontend/src/lib/store/data-service.store.ts
index 7d23388dd..bc95713ca 100644
--- a/apps/frontend/src/lib/store/data-service.store.ts
+++ b/apps/frontend/src/lib/store/data-service.store.ts
@@ -1,5 +1,4 @@
-import { registry } from "$lib/registry.svelte"
-import { getDataService as getDataServiceImpl } from "@undb/data-service"
+import { DataService } from "@undb/data-service"
 import { getContext, setContext } from "svelte"
 
 const IS_LOCAL = "IS_LOCAL"
@@ -12,7 +11,12 @@ export function getIsLocal() {
   return getContext<boolean>(IS_LOCAL) ?? false
 }
 
-export async function getDataService(isLocal: boolean, isPlayground: boolean) {
-  await registry.register(isLocal)
-  return getDataServiceImpl(isLocal, isPlayground)
+const DATA_SERVICE = "DATA_SERVICE"
+
+export function setDataService(dataService: DataService) {
+  setContext(DATA_SERVICE, dataService)
+}
+
+export function getDataService() {
+  return getContext<DataService>(DATA_SERVICE)
 }
diff --git a/apps/frontend/src/lib/store/records.store.ts b/apps/frontend/src/lib/store/records.store.ts
index e4023483c..712ba1ab6 100644
--- a/apps/frontend/src/lib/store/records.store.ts
+++ b/apps/frontend/src/lib/store/records.store.ts
@@ -1,4 +1,4 @@
-import { getDataService } from "$lib/store/data-service.store"
+import { DataService } from "@undb/data-service"
 import type { Option } from "@undb/domain"
 import {
   Field,
@@ -9,9 +9,9 @@ import {
   type IRecordValues,
   type Records,
 } from "@undb/table"
-import { getContext,setContext } from "svelte"
-import { derived,writable } from "svelte/store"
-import { queryParam,ssp } from "sveltekit-search-params"
+import { getContext, setContext } from "svelte"
+import { derived, writable } from "svelte/store"
+import { queryParam, ssp } from "sveltekit-search-params"
 
 type RecordStore = {
   lastUpdatedAt: number
@@ -113,8 +113,7 @@ export const createRecordsStore = () => {
   const hasRecord = derived(store, ($store) => !!$store.records.size)
   const count = derived(store, ($store) => $store.ids.length)
 
-  const invalidateRecord = async (isLocal: boolean, isPlayground: boolean, table: TableDo, recordId: string, viewId?: string) => {
-    const dataService = await getDataService(isLocal, isPlayground)
+  const invalidateRecord = async (dataService: DataService, table: TableDo, recordId: string, viewId?: string) => {
     const view = viewId ? table.views.getViewById(viewId) : undefined
     const result = await dataService.records.getRecordById({
       tableId: table.id.value,
diff --git a/apps/frontend/src/routes/+layout.svelte b/apps/frontend/src/routes/+layout.svelte
index 746008a49..3956171ae 100644
--- a/apps/frontend/src/routes/+layout.svelte
+++ b/apps/frontend/src/routes/+layout.svelte
@@ -16,6 +16,13 @@
     documentCookieDetector,
   } from "@undb/i18n/client"
   import { onMount } from "svelte"
+  import { setDataService } from "$lib/store/data-service.store"
+  import type { LayoutData } from "./$types"
+
+  export let data: LayoutData
+
+  setDataService(data.dataService)
+
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
diff --git a/apps/frontend/src/routes/+layout.ts b/apps/frontend/src/routes/+layout.ts
index b3844eb0d..e66c0c344 100644
--- a/apps/frontend/src/routes/+layout.ts
+++ b/apps/frontend/src/routes/+layout.ts
@@ -1,11 +1,16 @@
+import { Registry } from "$lib/registry.svelte"
 import "core-js"
 import "reflect-metadata"
-
-import { trpc } from "$lib/trpc/client"
-import { TRPC_CLIENT } from "@undb/data-service"
-import { container } from "@undb/di"
-
-container.register(TRPC_CLIENT, { useValue: trpc })
+import { LayoutLoad } from "./$types"
 
 export const ssr = false
 export const prerender = true
+
+export const load: LayoutLoad = async (event) => {
+  const registry = new Registry()
+  const dataService = await registry.register(false, false)
+
+  return {
+    dataService,
+  }
+}
diff --git a/apps/frontend/src/routes/playground/+layout.svelte b/apps/frontend/src/routes/playground/+layout.svelte
index 608eeecc6..91e9d4b07 100644
--- a/apps/frontend/src/routes/playground/+layout.svelte
+++ b/apps/frontend/src/routes/playground/+layout.svelte
@@ -1,7 +1,13 @@
 <script lang="ts">
-  import { setIsLocal } from "$lib/store/data-service.store"
+  import { setDataService, setIsLocal } from "$lib/store/data-service.store"
   import { setIsPlayground } from "$lib/store/playground.svelte"
   import PlaygroundAlert from "$lib/components/blocks/playground/playground-alert.svelte"
+  import type { LayoutData } from "./$types"
+
+  export let data: LayoutData
+
+  const dataService = data.dataService
+  setDataService(dataService)
 
   setIsLocal(true)
   setIsPlayground(true)
diff --git a/apps/frontend/src/routes/playground/+layout.ts b/apps/frontend/src/routes/playground/+layout.ts
index 41a8f3f53..869a8ee9e 100644
--- a/apps/frontend/src/routes/playground/+layout.ts
+++ b/apps/frontend/src/routes/playground/+layout.ts
@@ -1,15 +1,17 @@
-import { getDataService } from "$lib/store/data-service.store"
+import { Registry } from "$lib/registry.svelte"
 import { LayoutLoad } from "./$types"
 
 export const prerender = "auto"
 
-export const load: LayoutLoad = async ({ depends }) => {
-  depends("undb:playground")
+export const load: LayoutLoad = async (event) => {
+  event.depends("undb:playground")
+
+  const dataService = await new Registry().register(true, true)
 
-  const dataService = await getDataService(true, true)
   const bases = await dataService.base.listBases()
 
   return {
     bases,
+    dataService,
   }
 }
diff --git a/apps/frontend/src/routes/playground/bases/[baseId]/+layout.ts b/apps/frontend/src/routes/playground/bases/[baseId]/+layout.ts
index 790ede38a..343439e0a 100644
--- a/apps/frontend/src/routes/playground/bases/[baseId]/+layout.ts
+++ b/apps/frontend/src/routes/playground/bases/[baseId]/+layout.ts
@@ -1,4 +1,3 @@
-import { getDataService } from "$lib/store/data-service.store"
 import { redirect } from "@sveltejs/kit"
 import { tryit } from "radash"
 import { LayoutLoad } from "./$types"
@@ -6,7 +5,7 @@ import { LayoutLoad } from "./$types"
 export const load: LayoutLoad = async (event) => {
   const baseId = event.params.baseId
 
-  const dataService = await getDataService(true, true)
+  const dataService = (await event.parent()).dataService
 
   const getBase = tryit(dataService.base.getBase)
   const [err, base] = await getBase({ baseId })
diff --git a/apps/frontend/src/routes/playground/bases/[baseId]/d/[dashboardId]/+layout.ts b/apps/frontend/src/routes/playground/bases/[baseId]/d/[dashboardId]/+layout.ts
index c973866ca..ce29eb20c 100644
--- a/apps/frontend/src/routes/playground/bases/[baseId]/d/[dashboardId]/+layout.ts
+++ b/apps/frontend/src/routes/playground/bases/[baseId]/d/[dashboardId]/+layout.ts
@@ -1,16 +1,15 @@
-import { getDataService } from "$lib/store/data-service.store"
 import { redirect } from "@sveltejs/kit"
 import { tryit } from "radash"
 import { LayoutLoad } from "./$types"
 
 export const prerender = false
 
-export const load: LayoutLoad = async ({ params, depends }) => {
-  const { dashboardId } = params
+export const load: LayoutLoad = async (event) => {
+  const { dashboardId } = event.params
 
-  depends(`undb:dashboard:${dashboardId}`)
+  event.depends(`undb:dashboard:${dashboardId}`)
 
-  const dataService = await getDataService(true, true)
+  const dataService = (await event.parent()).dataService
   const getDashboardById = tryit(dataService.dashboard.getDashboardById)
   const [err, dashboard] = await getDashboardById({
     id: dashboardId,
diff --git a/apps/frontend/src/routes/playground/bases/[baseId]/t/[tableId]/[[viewId]]/+layout.ts b/apps/frontend/src/routes/playground/bases/[baseId]/t/[tableId]/[[viewId]]/+layout.ts
index 914c31236..ceac6d3fe 100644
--- a/apps/frontend/src/routes/playground/bases/[baseId]/t/[tableId]/[[viewId]]/+layout.ts
+++ b/apps/frontend/src/routes/playground/bases/[baseId]/t/[tableId]/[[viewId]]/+layout.ts
@@ -1,4 +1,3 @@
-import { getDataService } from "$lib/store/data-service.store"
 import { redirect } from "@sveltejs/kit"
 import { tryit } from "radash"
 import { LayoutLoad } from "./$types"
@@ -8,7 +7,7 @@ export const load: LayoutLoad = async (event) => {
 
   event.depends(`undb:table:${tableId}`)
 
-  const dataService = await getDataService(true, true)
+  const dataService = (await event.parent()).dataService
 
   const getTable = tryit(dataService.table.getTable)
   const [err, table] = await getTable({ tableId })
diff --git a/packages/cqrs/src/command-bus.ts b/packages/cqrs/src/command-bus.ts
index 69462fcd6..5a53eb03a 100644
--- a/packages/cqrs/src/command-bus.ts
+++ b/packages/cqrs/src/command-bus.ts
@@ -1,4 +1,4 @@
-import { container, singleton } from "@undb/di"
+import { container, singleton, type DependencyContainer } from "@undb/di"
 import type { Command, CommandMetadata, ICommandBus, ICommandHandler, ICommandPublisher } from "@undb/domain"
 import { createLogger } from "@undb/logger"
 import { Subject } from "rxjs"
@@ -34,15 +34,15 @@ export class CommandBus<C extends Command = Command> implements ICommandBus {
     }
   }
 
-  register(handlers: CommandHandlerType[] = []) {
-    handlers.forEach((handler) => this.registerHandler(handler))
+  register(handlers: CommandHandlerType[] = [], c = container) {
+    handlers.forEach((handler) => this.registerHandler(c, handler))
   }
 
   private bind<T extends C>(handler: ICommandHandler<T, any>, id: string) {
     this.#handlers.set(id, handler)
   }
 
-  protected registerHandler(handler: CommandHandlerType) {
+  protected registerHandler(container: DependencyContainer, handler: CommandHandlerType) {
     const instance = container.resolve(handler)
     if (!instance) {
       return
diff --git a/packages/cqrs/src/event-bus.ts b/packages/cqrs/src/event-bus.ts
index 8f9dccf13..5caa620f4 100644
--- a/packages/cqrs/src/event-bus.ts
+++ b/packages/cqrs/src/event-bus.ts
@@ -1,4 +1,4 @@
-import { container, singleton } from "@undb/di"
+import { container, singleton, type DependencyContainer } from "@undb/di"
 import type { BaseEvent, EventMetadata, IEventBus, IEventHandler, IEventPublisher } from "@undb/domain"
 import { Subject } from "rxjs"
 import type { Class } from "type-fest"
@@ -33,15 +33,15 @@ export class EventBus<TEvent extends BaseEvent = BaseEvent> implements IEventBus
     await Promise.all(events.map((event) => this.publish(event)))
   }
 
-  register(handlers: EventHandlerType[]) {
-    handlers.forEach((handler) => this.registerHandler(handler))
+  register(handlers: EventHandlerType[] = [], c = container) {
+    handlers.forEach((handler) => this.registerHandler(c, handler))
   }
 
   private bind<T extends TEvent>(handler: IEventHandler<T, any>, id: string) {
     this.#handlers.set(id, handler)
   }
 
-  protected registerHandler(handler: EventHandlerType) {
+  protected registerHandler(container: DependencyContainer, handler: EventHandlerType) {
     const instance = container.resolve(handler)
     if (!instance) {
       return
diff --git a/packages/cqrs/src/query-bus.ts b/packages/cqrs/src/query-bus.ts
index da3a58e45..d7c5fafe3 100644
--- a/packages/cqrs/src/query-bus.ts
+++ b/packages/cqrs/src/query-bus.ts
@@ -1,4 +1,4 @@
-import { container, singleton } from "@undb/di"
+import { container, singleton, type DependencyContainer } from "@undb/di"
 import type { IQueryBus, IQueryHandler, IQueryPublisher, Query, QueryMetadata } from "@undb/domain"
 import { createLogger } from "@undb/logger"
 import { Subject } from "rxjs"
@@ -34,15 +34,15 @@ export class QueryBus<Q extends Query = Query> implements IQueryBus {
     }
   }
 
-  register(handlers: QueryHandlerType[] = []) {
-    handlers.forEach((handler) => this.registerHandler(handler))
+  register(handlers: QueryHandlerType[] = [], c = container) {
+    handlers.forEach((handler) => this.registerHandler(c, handler))
   }
 
   private bind<T extends Q>(handler: IQueryHandler<T, any>, id: string) {
     this.#handlers.set(id, handler)
   }
 
-  protected registerHandler(handler: QueryHandlerType) {
+  protected registerHandler(container: DependencyContainer, handler: QueryHandlerType) {
     const instance = container.resolve(handler)
     if (!instance) {
       return
diff --git a/packages/data-service/src/data-service.impl.ts b/packages/data-service/src/data-service.impl.ts
index f83bdd0be..71288f258 100644
--- a/packages/data-service/src/data-service.impl.ts
+++ b/packages/data-service/src/data-service.impl.ts
@@ -50,6 +50,7 @@ import {
   type IDeleteViewCommand,
   type IDuplicateFieldCommand,
   type IDuplicateViewCommand,
+  type IDuplicateViewCommandOutput,
   type ISetViewColorCommand,
   type ISetViewFieldsCommand,
   type ISetViewFilterCommand,
@@ -60,8 +61,9 @@ import {
   type IUpdateViewCommand,
 } from "@undb/commands"
 import { CommandBus, QueryBus } from "@undb/cqrs"
-import { container, inject, injectable } from "@undb/di"
+import { inject, injectable } from "@undb/di"
 import type { ICommandBus, IQueryBus } from "@undb/domain"
+import { injectQueryBuilder, type IQueryBuilder } from "@undb/persistence/client"
 import {
   GetAggregatesQuery,
   GetBaseQuery,
@@ -96,14 +98,7 @@ import {
 } from "@undb/queries"
 import type { ITemplateService, TemplateDTO } from "@undb/template"
 import { TemplateService as TemplateServiceImpl } from "@undb/template"
-import {
-  injectIsLocal,
-  injectIsPlayground,
-  injectTrpcClient,
-  IS_LOCAL,
-  IS_PLAYGROUND,
-  type TrpcProxyClient,
-} from "./data-service.provider"
+import { injectIsLocal, injectIsPlayground, injectTrpcClient, type TrpcProxyClient } from "./data-service.provider"
 
 @injectable()
 class TemplateService {
@@ -133,7 +128,7 @@ class TemplateService {
     if (!this.isLocal) {
       throw new Error("Template service save is only supported in local mode")
     }
-    await this.templateService.save(template, includeData)
+    return this.templateService.save(template, includeData)
   }
 
   createFromTemplate = async (command: ICreateFromTemplateCommand): Promise<ICreateFromTemplateCommandOutput> => {
@@ -160,7 +155,7 @@ class BaseService {
 
   listBases = async (query: IGetBasesQuery): Promise<IGetBasesQueryOutput> => {
     if (this.isLocal) {
-      return await this.queryBus.execute(new GetBasesQuery(query))
+      return await this.queryBus.execute(new GetBasesQuery())
     }
     return (await this.trpc.base.list.query(query)) as IGetBasesQueryOutput
   }
@@ -212,11 +207,11 @@ class ViewService {
     await this.trpc.table.view.update.mutate(command)
   }
 
-  duplicateView = async (command: IDuplicateViewCommand): Promise<void> => {
+  duplicateView = async (command: IDuplicateViewCommand): Promise<IDuplicateViewCommandOutput> => {
     if (this.isLocal) {
       return this.commandBus.execute(new DuplicateViewCommand(command))
     }
-    await this.trpc.table.view.duplicate.mutate(command)
+    return this.trpc.table.view.duplicate.mutate(command)
   }
 
   deleteView = async (command: IDeleteViewCommand): Promise<void> => {
@@ -471,6 +466,12 @@ class RecordsService {
 @injectable()
 export class DataService {
   constructor(
+    @injectIsLocal()
+    public readonly isLocal: boolean,
+    @injectIsPlayground()
+    public readonly isPlayground: boolean,
+    @injectQueryBuilder()
+    public readonly queryBuilder: IQueryBuilder,
     @inject(TemplateService)
     public readonly template: TemplateService,
     @inject(RecordsService)
@@ -483,9 +484,3 @@ export class DataService {
     public readonly dashboard: DashboardService,
   ) {}
 }
-
-export const getDataService = (isLocal: boolean, isPlayground: boolean) => {
-  container.register(IS_LOCAL, { useValue: isLocal })
-  container.register(IS_PLAYGROUND, { useValue: isPlayground })
-  return container.resolve<DataService>(DataService)
-}
diff --git a/packages/data-service/src/data-service.registery.ts b/packages/data-service/src/data-service.registery.ts
index 7d57fedac..453bb8041 100644
--- a/packages/data-service/src/data-service.registery.ts
+++ b/packages/data-service/src/data-service.registery.ts
@@ -5,7 +5,7 @@ import {
   SPACE_MEMBER_SERVICE,
   SpaceMemberService,
 } from "@undb/authz"
-import { BASE_OUTBOX_SERVICE,BASE_QUERY_REPOSITORY,BASE_REPOSITORY } from "@undb/base"
+import { BASE_OUTBOX_SERVICE, BASE_QUERY_REPOSITORY, BASE_REPOSITORY } from "@undb/base"
 import { CONTEXT_TOKEN } from "@undb/context"
 import {
   DASHBOARD_OUTBOX_SERVICE,
@@ -14,8 +14,8 @@ import {
   DASHBOARD_REPOSITORY,
   DashboardQueryService,
 } from "@undb/dashboard"
-import { container } from "@undb/di"
-import { MAIL_SERVICE,type IMailService,type ISendInput } from "@undb/mail"
+import { type DependencyContainer } from "@undb/di"
+import { MAIL_SERVICE, type IMailService, type ISendInput } from "@undb/mail"
 import {
   BaseOutboxService,
   BaseQueryRepository,
@@ -39,7 +39,7 @@ import {
   TemplateQueryRepository,
   TX_CTX,
 } from "@undb/persistence/client"
-import { SPACE_QUERY_REPOSITORY,SPACE_REPOSITORY,SPACE_SERVICE,SpaceService } from "@undb/space"
+import { SPACE_QUERY_REPOSITORY, SPACE_REPOSITORY, SPACE_SERVICE, SpaceService } from "@undb/space"
 import {
   OBJECT_STORAGE,
   RECORD_OUTBOX_SERVICE,
@@ -57,7 +57,8 @@ import {
   type IPutObject,
 } from "@undb/table"
 import { TEMPLATE_QUERY_REPOSITORY } from "@undb/template"
-import { DataServiceContext,DataServicetTxContext } from "./data-service.context"
+import { DataServiceContext, DataServicetTxContext } from "./data-service.context"
+import { IS_LOCAL, IS_PLAYGROUND } from "./data-service.provider"
 
 class MailService implements IMailService {
   async send(input: ISendInput): Promise<void> {}
@@ -78,12 +79,11 @@ class LocalObjectStorage implements IObjectStorage {
   }
 }
 
-export const registerQueryBuilder = async () => {
-  const qb = await createSqljsQueryBuilder()
+export const registerDataService = async (container: DependencyContainer, isLocal: boolean, isPlayground: boolean) => {
+  container.register(IS_LOCAL, { useValue: isLocal })
+  container.register(IS_PLAYGROUND, { useValue: isPlayground })
+  const qb = isLocal ? await createSqljsQueryBuilder() : await createSqljsQueryBuilder()
   container.register(QUERY_BUILDER, { useValue: qb })
-}
-
-export const registerDataService = () => {
   container.register(TX_CTX, DataServicetTxContext)
   container.register(CONTEXT_TOKEN, DataServiceContext)
   container.register(BASE_OUTBOX_SERVICE, BaseOutboxService)
diff --git a/packages/di/src/index.ts b/packages/di/src/index.ts
index 184dcee1d..1ff9c81f1 100644
--- a/packages/di/src/index.ts
+++ b/packages/di/src/index.ts
@@ -1,4 +1,4 @@
 import "reflect-metadata"
 
 export { Lifecycle, container, inject, injectable, instanceCachingFactory, registry, singleton } from "tsyringe"
-export type { ClassProvider, FactoryProvider, Provider, ValueProvider } from "tsyringe"
+export type { ClassProvider, DependencyContainer, FactoryProvider, Provider, ValueProvider } from "tsyringe"
diff --git a/packages/persistence/src/base/base.repository.ts b/packages/persistence/src/base/base.repository.ts
index 3fa40bb92..fe93b692d 100644
--- a/packages/persistence/src/base/base.repository.ts
+++ b/packages/persistence/src/base/base.repository.ts
@@ -99,6 +99,7 @@ export class BaseRepository implements IBaseRepository {
         updated_at: new Date().toISOString(),
       })
       .execute()
+
     await this.outboxService.save(base)
   }
   async updateOneById(base: Base, spec: IBaseSpecification): Promise<void> {
diff --git a/packages/persistence/src/qb.client.ts b/packages/persistence/src/qb.client.ts
index 46c33e92a..ddac9684d 100644
--- a/packages/persistence/src/qb.client.ts
+++ b/packages/persistence/src/qb.client.ts
@@ -1,4 +1,5 @@
 import { drizzle } from "drizzle-orm/sql-js"
+import { DummyDriver, type Kysely, SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler } from "kysely"
 import { SqlJsDialect } from "kysely-wasm"
 import InitSqlJs from "sql.js"
 import { migrate } from "./migrate.client"
@@ -26,8 +27,7 @@ export const createSqljsQueryBuilder = async (db?: InitSqlJs.Database): Promise<
       return db
     },
     onWrite: {
-      func: (buffer) => {
-      },
+      func: (buffer) => {},
       isThrottle: true,
     },
   })
@@ -38,3 +38,20 @@ export const createSqljsQueryBuilder = async (db?: InitSqlJs.Database): Promise<
 
   return createQueryBuilderWithDialect(dialect)
 }
+
+export const createDummyQueryBuilder = (): IQueryBuilder => {
+  return createQueryBuilderWithDialect({
+    createAdapter() {
+      return new SqliteAdapter()
+    },
+    createDriver() {
+      return new DummyDriver()
+    },
+    createIntrospector(db: Kysely<unknown>) {
+      return new SqliteIntrospector(db)
+    },
+    createQueryCompiler() {
+      return new SqliteQueryCompiler()
+    },
+  })
+}