diff --git a/package.json b/package.json
index f45c2020..a27ff1c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weaverse-sdks",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "description": "Weaverse SDKs monorepo.",
   "license": "MIT",
   "scripts": {
diff --git a/packages/core/package.json b/packages/core/package.json
index 498ecaee..00d36349 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -2,7 +2,7 @@
   "name": "@weaverse/core",
   "author": "Weaverse Team",
   "description": "Weaverse Core",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 245a40d0..d5e4aa7c 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -96,7 +96,7 @@ export interface BasicInput<ConfigsType = AdditionalInputConfigs> {
    * `imagesPerRow.gt.1`
    */
   condition?: string
-  defaultValue?: string | number | boolean | Partial<WeaverseImage>
+  defaultValue?: string | number | boolean | Partial<WeaverseImage> | {[x: string]: any}
   placeholder?: string
   helpText?: string
 }
diff --git a/packages/hydrogen/package.json b/packages/hydrogen/package.json
index 99855d8e..2aca193f 100644
--- a/packages/hydrogen/package.json
+++ b/packages/hydrogen/package.json
@@ -2,7 +2,7 @@
   "name": "@weaverse/hydrogen",
   "author": "Weaverse Team",
   "description": "Components, hooks, and utilities for building Shopify Hydrogen websites with Weaverse",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -40,7 +40,7 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@weaverse/react": "2.8.2",
+    "@weaverse/react": "2.8.4",
     "react-error-boundary": "^4.0.11"
   },
   "devDependencies": {
diff --git a/packages/hydrogen/src/types.ts b/packages/hydrogen/src/types.ts
index f6e81f4a..6dceb9a2 100644
--- a/packages/hydrogen/src/types.ts
+++ b/packages/hydrogen/src/types.ts
@@ -295,13 +295,14 @@ export type HydrogenThemeEnv = {
   PUBLIC_CUSTOMER_ACCOUNT_API_CLIENT_ID: string;
   PUBLIC_CUSTOMER_ACCOUNT_API_URL: string;
 }
-
-export type WeaverseClientArgs = {
+export type CreateWeaverseClientArgs ={
   request: Request
   cache: Cache
   waitUntil: ExecutionContext['waitUntil']
   env: HydrogenThemeEnv
-  storefront: Storefront<I18nBase>
+  storefront: Storefront<I18nBase> | any
+}
+export type WeaverseClientArgs = CreateWeaverseClientArgs & {
   components: HydrogenComponent[]
   countries?: Localizations
   themeSchema: HydrogenThemeSchema
diff --git a/packages/react/package.json b/packages/react/package.json
index 131b91cd..4e234dec 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -2,7 +2,7 @@
   "name": "@weaverse/react",
   "author": "Weaverse Team",
   "description": "React bindings for Weaverse",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -30,8 +30,7 @@
   },
   "peerDependencies": {
     "react": ">=18",
-    "react-dom": ">=18",
-    "clsx": "*"
+    "react-dom": ">=18"
   },
   "prettier": {
     "printWidth": 80,
@@ -39,6 +38,7 @@
     "singleQuote": true
   },
   "dependencies": {
-    "@weaverse/core": "2.8.2"
+    "@weaverse/core": "2.8.4",
+    "clsx": "^2.0.0"
   }
 }
\ No newline at end of file
diff --git a/packages/shopify/package.json b/packages/shopify/package.json
index 10e27f94..6e0eff74 100644
--- a/packages/shopify/package.json
+++ b/packages/shopify/package.json
@@ -2,7 +2,7 @@
   "name": "@weaverse/shopify",
   "author": "Weaverse Team",
   "description": "Weaverse Components for Shopify Online Store 2.0 Section builder",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -40,7 +40,7 @@
   "dependencies": {
     "@radix-ui/react-dialog": "^1.0.5",
     "@stitches/react": "^1.2.8",
-    "@weaverse/react": "2.8.2",
+    "@weaverse/react": "2.8.4",
     "clsx": "^2.0.0",
     "keen-slider": "^6.8.6"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7c39af33..5b7e5f8f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -110,7 +110,7 @@ importers:
         specifier: ^2023.10.2
         version: 2023.10.2(@remix-run/react@2.1.0)(@types/react@18.2.42)(react-dom@18.2.0)(react@18.2.0)
       '@weaverse/react':
-        specifier: 2.8.1
+        specifier: 2.8.3
         version: link:../react
       react:
         specifier: '>=18'
@@ -129,10 +129,10 @@ importers:
   packages/react:
     dependencies:
       '@weaverse/core':
-        specifier: 2.8.1
+        specifier: 2.8.3
         version: link:../core
       clsx:
-        specifier: '*'
+        specifier: ^2.0.0
         version: 2.0.0
       react:
         specifier: '>=18'
@@ -150,7 +150,7 @@ importers:
         specifier: ^1.2.8
         version: 1.2.8(react@18.2.0)
       '@weaverse/react':
-        specifier: 2.8.1
+        specifier: 2.8.3
         version: link:../react
       clsx:
         specifier: ^2.0.0
@@ -189,7 +189,7 @@ importers:
         specifier: ^2.0.2
         version: 2.0.2(@remix-run/server-runtime@2.1.0)(@shopify/oxygen-workers-types@4.0.0)
       '@weaverse/hydrogen':
-        specifier: 2.8.1
+        specifier: 2.8.3
         version: link:../../packages/hydrogen
       clsx:
         specifier: 2.0.0
diff --git a/templates/pilot b/templates/pilot
index af2571bf..3f09dc46 160000
--- a/templates/pilot
+++ b/templates/pilot
@@ -1 +1 @@
-Subproject commit af2571bf1d6f65f56e81b5903e0bd9d4805b2c48
+Subproject commit 3f09dc4689ff7d154fd20403b64a9c7f683697fe