diff --git a/app/package.json b/app/package.json
index aedc873a..f5f2ccbd 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "sideEffects": false,
   "bin": "./dist/cli/index.js",
-  "version": "0.21.0-rc.1",
+  "version": "0.21.0-rc.3",
   "description": "Lightweight Firebase/Supabase alternative built to run anywhere — incl. Next.js, React Router, Astro, Cloudflare, Bun, Node, AWS Lambda & more.",
   "homepage": "https://bknd.io",
   "repository": {
@@ -88,7 +88,7 @@
     "@libsql/client": "^0.15.15",
     "@mantine/modals": "^7.17.1",
     "@mantine/notifications": "^7.17.1",
-    "@playwright/test": "^1.56.1",
+    "@playwright/test": "^1.63.0",
     "@rjsf/core": "5.22.2",
     "@rjsf/utils": "5.22.0",
     "@standard-schema/spec": "^1.0.0",
diff --git a/app/src/data/helper.ts b/app/src/data/helper.ts
index 0acc652a..432c7e47 100644
--- a/app/src/data/helper.ts
+++ b/app/src/data/helper.ts
@@ -25,7 +25,7 @@ export function getChangeSet(
          const field = fields.find((f) => f.name === key);
          // @todo: filtering virtual here, need to check (because of media)
          // @note: adding non-fillable here as it'll fail validaiton on backend
-         if (!field || field.isVirtual() || !field.isFillable()) return;
+         if (!field || field.isVirtual() || !field.isFillable(action as "create" | "update")) return;
          const value = _value === "" ? null : _value;
 
          // normalize to null if undefined
diff --git a/app/src/ui/client/BkndProvider.tsx b/app/src/ui/client/BkndProvider.tsx
index 056e52d1..463db053 100644
--- a/app/src/ui/client/BkndProvider.tsx
+++ b/app/src/ui/client/BkndProvider.tsx
@@ -182,7 +182,7 @@ export function useBknd({ withSecrets }: { withSecrets?: boolean } = {}): BkndCo
 export function useBkndOptions(): BkndAdminProps["config"] {
    const ctx = useContext(BkndContext);
    return (
-      ctx.options ?? {
+      ctx?.options ?? {
          basepath: "/",
       }
    );
diff --git a/app/tsconfig.json b/app/tsconfig.json
index ed133995..632b0653 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "compilerOptions": {
+"compilerOptions": {
     "composite": false,
     "incremental": true,
     "module": "esnext",
@@ -28,6 +28,7 @@
     "rootDir": ".",
     "outDir": "./dist/types",
     "paths": {
+      "Api": ["./src/Api"],
       "*": ["./src/*"],
       "bknd": ["./src/index.ts"],
       "bknd/utils": ["./src/core/utils/index.ts"],
@@ -35,7 +36,17 @@
       "bknd/adapter/*": ["./src/adapter/*/index.ts"],
       "bknd/client": ["./src/ui/client/index.ts"],
       "bknd/modes": ["./src/modes/index.ts"],
-      "bknd/elements": ["./src/ui/elements/index.ts"]
+      "bknd/elements": ["./src/ui/elements/index.ts"],
+      "core": ["./src/core"],
+      "auth": ["./src/auth"],
+      "data": ["./src/data"],
+      "media": ["./src/media"],
+      "modules": ["./src/modules"],
+      "core/*": ["./src/core/*"],
+      "auth/*": ["./src/auth/*"],
+      "data/*": ["./src/data/*"],
+      "media/*": ["./src/media/*"],
+      "modules/*": ["./src/modules/*"],
     }
   },
   "include": [