diff --git a/.changeset/six-bikes-sit.md b/.changeset/six-bikes-sit.md
new file mode 100644
index 000000000..74a95ca6d
--- /dev/null
+++ b/.changeset/six-bikes-sit.md
@@ -0,0 +1,7 @@
+---
+"@shopware-pwa/nuxt3-module": major
+"@shopware-pwa/composables-next": major
+"@shopware-pwa/cms-base": major
+---
+
+Created Nuxt layer for `composables` and `cms-base`. This way overriding any part of that is now possible.
diff --git a/apps/docs/package.json b/apps/docs/package.json
index db26b724d..9ec0cd748 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -12,6 +12,7 @@
     "@shopware-pwa/api-client": "workspace:*",
     "@shopware-pwa/composables-next": "workspace:*",
     "@shopware-pwa/helpers-next": "workspace:*",
+    "@shopware-pwa/types": "workspace:*",
     "flexsearch": "^0.7.31",
     "markdown-it": "^13.0.2",
     "vitepress": "1.0.0-beta.7",
diff --git a/apps/docs/src/framework/composables/shared-composables.md b/apps/docs/src/framework/composables/shared-composables.md
index 34b9b0f42..7c1c83fcc 100644
--- a/apps/docs/src/framework/composables/shared-composables.md
+++ b/apps/docs/src/framework/composables/shared-composables.md
@@ -10,7 +10,7 @@ Example:
 ## How do I know which one is shared and what should I do with that?
 
 We're adding information that the composable is shared into the description with a link to this documentation page.
-There is no need to do anything with this information. The only difference is in [overwriting](#overwrite-extend-shared-composable)
+There is no need to do anything with this information. The only difference is in [overwriting](./overwriting-composables.md)
 
 ## Overwrite/extend shared composable
 
diff --git a/apps/docs/src/index.md b/apps/docs/src/index.md
index 79b9e9815..34dda844a 100644
--- a/apps/docs/src/index.md
+++ b/apps/docs/src/index.md
@@ -17,6 +17,10 @@ nav:
 
 Shopware Composable Frontends is Shopware's toolkit for creating platform-agnostic custom storefronts. The demo store implementation is based on Vue.js and Nuxt3.
 
+## Quick Links
+
+- **Announcements**: To keep yourself up to date with the latest news regarding the project, please regularly check our Github Discussions page: [shopware/frontends/dicsussions](https://github.com/shopware/frontends/discussions). Especially the [Announcements](https://github.com/shopware/frontends/discussions/categories/announcements) category.
+
 ## How Shopware Frontends work?
 
 Frontends is a collection of multiple packages that you can use to implement your custom storefront project.
diff --git a/examples/adyen-dropin-component/nuxt.config.ts b/examples/adyen-dropin-component/nuxt.config.ts
index 0cdef76a1..b0e1de43a 100644
--- a/examples/adyen-dropin-component/nuxt.config.ts
+++ b/examples/adyen-dropin-component/nuxt.config.ts
@@ -1,4 +1,8 @@
 export default defineNuxtConfig({
+  extends: [
+    "@shopware-pwa/composables-next/nuxt-layer",
+    "@shopware-pwa/cms-base",
+  ],
   runtimeConfig: {
     public: {
       loginData: {
@@ -23,6 +27,6 @@ export default defineNuxtConfig({
   css: [
     "@unocss/reset/tailwind-compat.css", // needed to reset styles see https://unocss.dev/guide/style-reset (@unocss/reset)
   ],
-  modules: ["@shopware-pwa/nuxt3-module", "@unocss/nuxt"],
+  modules: ["@unocss/nuxt", "@shopware-pwa/nuxt3-module"],
   devtools: { enabled: true },
 });
diff --git a/examples/adyen-dropin-component/package.json b/examples/adyen-dropin-component/package.json
index 58cb47817..49480a2e6 100644
--- a/examples/adyen-dropin-component/package.json
+++ b/examples/adyen-dropin-component/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "adyen-dropin-playground",
+  "name": "example-adyen-dropin-playground",
   "type": "module",
   "scripts": {
     "dev": "nuxi dev",
@@ -8,7 +8,9 @@
     "generate": "nuxi generate"
   },
   "devDependencies": {
-    "@adyen/adyen-web": "^5.53.2",
+    "@adyen/adyen-web": "^5.53.3",
+    "@shopware/api-client": "canary",
+    "@shopware-pwa/composables-next": "canary",
     "@shopware-pwa/nuxt3-module": "canary",
     "@shopware-pwa/types": "canary",
     "@unocss/nuxt": "^0.57.6",
diff --git a/examples/blank-playground/src/App.vue b/examples/blank-playground/src/App.vue
index 8f50002eb..7bb70fe5e 100644
--- a/examples/blank-playground/src/App.vue
+++ b/examples/blank-playground/src/App.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useSessionContext } from "@shopware-pwa/composables-next";
+import { useSessionContext } from "@shopware-pwa/composables-next/dist";
 
 const { refreshSessionContext, sessionContext } = useSessionContext();
 refreshSessionContext();
diff --git a/examples/blank-playground/src/main.ts b/examples/blank-playground/src/main.ts
index 3d1b57022..f50524f10 100644
--- a/examples/blank-playground/src/main.ts
+++ b/examples/blank-playground/src/main.ts
@@ -1,5 +1,5 @@
 import { createApp, ref } from "vue";
-import { createShopwareContext } from "@shopware-pwa/composables-next";
+import { createShopwareContext } from "@shopware-pwa/composables-next/dist";
 import { createInstance } from "@shopware-pwa/api-client";
 import Cookies from "js-cookie";
 
diff --git a/examples/commercial-quick-order/README.md b/examples/commercial-quick-order/README.md
index 724df890a..4fbb3777a 100644
--- a/examples/commercial-quick-order/README.md
+++ b/examples/commercial-quick-order/README.md
@@ -24,7 +24,7 @@ In order to use the example, you need to:
   ```
   VITE_SHOPWARE_API="https://201023-quick-order.swstage.store/"
   VITE_SHOPWARE_ACCESS_KEY="SWSCBHFSNTVMAWNZDNFKSHLAYW"
-  ``` 
+  ```
 
 - Have a customer account with B2B Quick Order feature activated.
 
@@ -45,16 +45,16 @@ or...
 
 [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/shopware/frontends/tree/main/examples/commercial-quick-order?file=README.md)
 
-⚠️ Remember to prepare your app first, see __Configuration__ chapter above.
+⚠️ Remember to prepare your app first, see **Configuration** chapter above.
 
 ## 📁 Import file feature
 
-
 file upload can be tested in that format:
+
 ```
 product_number,quantity
 SW10096.3,2
 SW10079,5
 ```
 
-You can use [products.csv](./products.csv)
\ No newline at end of file
+You can use [products.csv](./products.csv)
diff --git a/examples/commercial-quick-order/src/App.vue b/examples/commercial-quick-order/src/App.vue
index 25ff8b192..d01ab21bd 100644
--- a/examples/commercial-quick-order/src/App.vue
+++ b/examples/commercial-quick-order/src/App.vue
@@ -4,7 +4,7 @@ import {
   useSessionContext,
   useShopwareContext,
   useUser,
-} from "@shopware-pwa/composables-next";
+} from "@shopware-pwa/composables-next/dist";
 import { addCartItems } from "@shopware-pwa/api-client";
 import { onClickOutside, useDebounceFn } from "@vueuse/core";
 
diff --git a/examples/commercial-quick-order/src/main.ts b/examples/commercial-quick-order/src/main.ts
index a85dfbd3e..621494f5d 100644
--- a/examples/commercial-quick-order/src/main.ts
+++ b/examples/commercial-quick-order/src/main.ts
@@ -1,5 +1,5 @@
 import { createApp, ref } from "vue";
-import { createShopwareContext } from "@shopware-pwa/composables-next";
+import { createShopwareContext } from "@shopware-pwa/composables-next/dist";
 import { createInstance } from "@shopware-pwa/api-client";
 import Cookies from "js-cookie";
 
diff --git a/examples/commercial-quick-order/vite.config.js b/examples/commercial-quick-order/vite.config.js
index de5cb31c6..4d60b3a5d 100644
--- a/examples/commercial-quick-order/vite.config.js
+++ b/examples/commercial-quick-order/vite.config.js
@@ -1,14 +1,14 @@
-import { fileURLToPath, URL } from 'node:url'
+import { fileURLToPath, URL } from "node:url";
 
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
   resolve: {
     alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
-    }
-  }
-})
+      "@": fileURLToPath(new URL("./src", import.meta.url)),
+    },
+  },
+});
diff --git a/examples/express-checkout/imports.d.ts b/examples/express-checkout/imports.d.ts
new file mode 100644
index 000000000..628c37a6c
--- /dev/null
+++ b/examples/express-checkout/imports.d.ts
@@ -0,0 +1 @@
+export * from "@shopware-pwa/composables-next";
diff --git a/examples/express-checkout/vite.config.js b/examples/express-checkout/vite.config.js
index de5cb31c6..aab5e16ca 100644
--- a/examples/express-checkout/vite.config.js
+++ b/examples/express-checkout/vite.config.js
@@ -1,14 +1,15 @@
-import { fileURLToPath, URL } from 'node:url'
+import { fileURLToPath, URL } from "node:url";
 
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
   resolve: {
     alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
-    }
-  }
-})
+      "@": fileURLToPath(new URL("./src", import.meta.url)),
+      "#imports": fileURLToPath(new URL("./imports.d.ts", import.meta.url)),
+    },
+  },
+});
diff --git a/examples/login-form/src/App.vue b/examples/login-form/src/App.vue
index ddb188bdb..40d74f057 100644
--- a/examples/login-form/src/App.vue
+++ b/examples/login-form/src/App.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useUser } from "@shopware-pwa/composables-next";
+import { useUser } from "@shopware-pwa/composables-next/dist";
 import type { ClientApiError, ShopwareError } from "@shopware-pwa/types";
 import { reactive, ref } from "vue";
 const { logout, login, isLoggedIn, user } = useUser();
diff --git a/examples/login-form/src/main.ts b/examples/login-form/src/main.ts
index 764405762..3072b05e2 100644
--- a/examples/login-form/src/main.ts
+++ b/examples/login-form/src/main.ts
@@ -1,5 +1,5 @@
 import { createApp, ref } from "vue";
-import { createShopwareContext } from "@shopware-pwa/composables-next";
+import { createShopwareContext } from "@shopware-pwa/composables-next/dist";
 import { createInstance } from "@shopware-pwa/api-client";
 import Cookies from "js-cookie";
 
diff --git a/examples/mollie-credit-card/README.md b/examples/mollie-credit-card/README.md
index 9ebce7ac1..b137268fa 100644
--- a/examples/mollie-credit-card/README.md
+++ b/examples/mollie-credit-card/README.md
@@ -52,7 +52,7 @@ mollie: {
 
 ```html
 <script setup lang="ts">
-  import { useCheckout } from "@shopware-pwa/composables-next";
+  import { useCheckout } from "@shopware-pwa/composables-next/dist";
   const { selectedPaymentMethod } = useCheckout();
   // the name may vary, so first, please check what comes from API
   const showMollieCreditCardComponent = computed(
diff --git a/examples/mollie-credit-card/src/runtime/components/ShopwareFrontendsCreditCard.vue b/examples/mollie-credit-card/src/runtime/components/ShopwareFrontendsCreditCard.vue
index 50436224b..0737e94e5 100644
--- a/examples/mollie-credit-card/src/runtime/components/ShopwareFrontendsCreditCard.vue
+++ b/examples/mollie-credit-card/src/runtime/components/ShopwareFrontendsCreditCard.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
-import { useShopwareContext, useUser } from "@shopware-pwa/composables-next";
+import {
+  useShopwareContext,
+  useUser,
+} from "@shopware-pwa/composables-next/dist";
 const { apiInstance } = useShopwareContext();
 const { user } = useUser();
 import type { MollieLocale } from "../../types";
diff --git a/examples/mollie-credit-card/tsconfig.json b/examples/mollie-credit-card/tsconfig.json
index 0f0e53a2b..44384bb4d 100644
--- a/examples/mollie-credit-card/tsconfig.json
+++ b/examples/mollie-credit-card/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
-    "module": "esnext"
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
   },
   "extends": "./playground/.nuxt/tsconfig.json"
 }
diff --git a/examples/new-api-client/shopware.d.ts b/examples/new-api-client/shopware.d.ts
new file mode 100644
index 000000000..3a97b2df6
--- /dev/null
+++ b/examples/new-api-client/shopware.d.ts
@@ -0,0 +1,36 @@
+declare module "#shopware" {
+  import type { createAPIClient } from "@shopware/api-client";
+  import type {
+    operationPaths as defaultOperationPaths,
+    operations as defaultOperations,
+    components as defaultComponents,
+  } from "@shopware/api-client/api-types";
+  import type {
+    RequestParameters as DefaultRequestParameters,
+    RequestReturnType as DefaultRequestReturnType,
+  } from "@shopware/api-client";
+
+  type changedComponents = defaultComponents;
+  // example how to extend Cart schema:
+  // type changedComponents = components & {
+  //   schemas: {
+  //     Cart: defaultComponents["schemas"]["Cart"] & {
+  //       myspecialfield: "hello field";
+  //     };
+  //   };
+  // };
+
+  export type operations = defaultOperations<changedComponents>;
+  export type operationPaths = defaultOperationPaths;
+  export type Schemas = changedComponents["schemas"];
+
+  // we're exporting our own Api Client definition as it depends on our own instance
+  export type ApiClient = ReturnType<
+    typeof createAPIClient<operations, operationPaths>
+  >;
+  export type RequestParameters<T extends keyof operations> =
+    DefaultRequestParameters<T, operations>;
+
+  export type RequestReturnType<T extends keyof operations> =
+    DefaultRequestReturnType<T, operations>;
+}
diff --git a/examples/new-api-client/src/App.vue b/examples/new-api-client/src/App.vue
index b9c6a927a..420c12d47 100644
--- a/examples/new-api-client/src/App.vue
+++ b/examples/new-api-client/src/App.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
 import { onMounted, ref } from "vue";
-import { apiClient, ApiReturnType } from "./apiClient";
+import { apiClient } from "./apiClient";
 import HelloWorld from "./components/HelloWorld.vue";
 import LoginForm from "./components/LoginForm.vue";
 import AdminLoginForm from "./components/AdminLoginForm.vue";
 import { adminApiClient } from "./adminApiClient";
 import { ApiClientError } from "@shopware/api-client";
+import type { RequestReturnType } from "#shopware";
 
-const productsResponse = ref<ApiReturnType<"readProduct">>();
+const productsResponse = ref<RequestReturnType<"readProduct">>();
 
 onMounted(async () => {
   await apiClient.invoke("readContext get /context", {});
diff --git a/examples/new-api-client/src/apiClient.ts b/examples/new-api-client/src/apiClient.ts
index 51aa08ae7..9547973a5 100644
--- a/examples/new-api-client/src/apiClient.ts
+++ b/examples/new-api-client/src/apiClient.ts
@@ -1,13 +1,5 @@
-import {
-  RequestParameters,
-  RequestReturnType,
-  createAPIClient,
-} from "@shopware/api-client";
-import type {
-  operationPaths,
-  operations,
-  components,
-} from "@shopware/api-client/api-types";
+import { RequestParameters, createAPIClient } from "@shopware/api-client";
+import type { operationPaths, operations } from "#shopware";
 import Cookies from "js-cookie";
 
 export const apiClient = createAPIClient<operations, operationPaths>({
@@ -24,14 +16,8 @@ export const apiClient = createAPIClient<operations, operationPaths>({
   },
 });
 
-export type ApiSchemas = components["schemas"];
-export type ApiRequestParams<OPERATION_NAME extends keyof operations> =
-  RequestParameters<OPERATION_NAME, operations>;
-export type ApiReturnType<OPERATION_NAME extends keyof operations> =
-  RequestReturnType<OPERATION_NAME, operations>;
-
 // predefine navigation loading method with depth settings
-export const readNavigation = (params: ApiRequestParams<"readNavigation">) =>
+export const readNavigation = (params: RequestParameters<"readNavigation">) =>
   apiClient.invoke(
     "readNavigation post /navigation/{activeId}/{rootId} sw-include-seo-urls",
     {
diff --git a/examples/new-api-client/tsconfig.json b/examples/new-api-client/tsconfig.json
index cc374ff33..5551c3a3c 100644
--- a/examples/new-api-client/tsconfig.json
+++ b/examples/new-api-client/tsconfig.json
@@ -14,6 +14,12 @@
     "noEmit": true,
     "types": ["vite/client"]
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
+  "include": [
+    "src/**/*.ts",
+    "**/*.d.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "shopware.d.ts"
+  ],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/examples/product-detail-page/src/App.vue b/examples/product-detail-page/src/App.vue
index 948c512b4..346357807 100644
--- a/examples/product-detail-page/src/App.vue
+++ b/examples/product-detail-page/src/App.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { onMounted, ref } from "vue";
-import { useProductSearch } from "@shopware-pwa/composables-next";
+import { useProductSearch } from "@shopware-pwa/composables-next/dist";
 import type { Product } from "@shopware-pwa/types";
 import ProductView from "@/components/ProductView.vue";
 
diff --git a/examples/product-detail-page/src/components/ProductCard.vue b/examples/product-detail-page/src/components/ProductCard.vue
index dbcc4f52f..ca0de5fbc 100644
--- a/examples/product-detail-page/src/components/ProductCard.vue
+++ b/examples/product-detail-page/src/components/ProductCard.vue
@@ -8,7 +8,7 @@ import {
   useAddToCart,
   useProductPrice,
   usePrice,
-} from "@shopware-pwa/composables-next";
+} from "@shopware-pwa/composables-next/dist";
 import type { Product } from "@shopware-pwa/types";
 
 const props = defineProps<{
diff --git a/examples/product-detail-page/src/components/ProductView.vue b/examples/product-detail-page/src/components/ProductView.vue
index bbcab8def..addaa8123 100644
--- a/examples/product-detail-page/src/components/ProductView.vue
+++ b/examples/product-detail-page/src/components/ProductView.vue
@@ -10,7 +10,7 @@ import {
   useProductPrice,
   usePrice,
   useProductAssociations,
-} from "@shopware-pwa/composables-next";
+} from "@shopware-pwa/composables-next/dist";
 import ProductCard from "./ProductCard.vue";
 
 const props = defineProps<{
diff --git a/examples/product-detail-page/src/main.ts b/examples/product-detail-page/src/main.ts
index 5de351b3f..4ce4dcd52 100644
--- a/examples/product-detail-page/src/main.ts
+++ b/examples/product-detail-page/src/main.ts
@@ -1,5 +1,5 @@
 import { createApp, ref } from "vue";
-import { createShopwareContext } from "@shopware-pwa/composables-next";
+import { createShopwareContext } from "@shopware-pwa/composables-next/dist";
 import { createInstance } from "@shopware-pwa/api-client";
 import Cookies from "js-cookie";
 
diff --git a/examples/responsive-images/src/components/Image.vue b/examples/responsive-images/src/components/Image.vue
index 27d5b50ed..b78b3dc7f 100644
--- a/examples/responsive-images/src/components/Image.vue
+++ b/examples/responsive-images/src/components/Image.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from "vue";
-import { useProductSearch } from "@shopware-pwa/composables-next";
+import { useProductSearch } from "@shopware-pwa/composables-next/dist";
 
 const { search } = useProductSearch();
 // look for some product
diff --git a/examples/responsive-images/src/main.ts b/examples/responsive-images/src/main.ts
index 5de351b3f..4ce4dcd52 100644
--- a/examples/responsive-images/src/main.ts
+++ b/examples/responsive-images/src/main.ts
@@ -1,5 +1,5 @@
 import { createApp, ref } from "vue";
-import { createShopwareContext } from "@shopware-pwa/composables-next";
+import { createShopwareContext } from "@shopware-pwa/composables-next/dist";
 import { createInstance } from "@shopware-pwa/api-client";
 import Cookies from "js-cookie";
 
diff --git a/examples/responsive-images/tsconfig.json b/examples/responsive-images/tsconfig.json
index 9c6b947a2..45ce49c9f 100644
--- a/examples/responsive-images/tsconfig.json
+++ b/examples/responsive-images/tsconfig.json
@@ -1,20 +1,14 @@
 {
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "compilerOptions": {
+    "module": "esnext",
     "paths": {
       "@/*": [
         "./src/*" // set path `@/*` as alias of `src/*`
       ]
     },
     "esModuleInterop": true,
-    "lib": [
-      "esnext",
-      "DOM"
-    ],
-    "types": [
-      "vite/client"
-    ]
+    "lib": ["esnext", "DOM"],
+    "types": ["vite/client"]
   }
-}
\ No newline at end of file
+}
diff --git a/examples/use-add-to-cart/src/App.vue b/examples/use-add-to-cart/src/App.vue
index 41fbf62b0..43e360045 100644
--- a/examples/use-add-to-cart/src/App.vue
+++ b/examples/use-add-to-cart/src/App.vue
@@ -6,7 +6,7 @@ import {
   useProductPrice,
   useProductSearch,
   useCart,
-} from "@shopware-pwa/composables-next";
+} from "@shopware-pwa/composables-next/dist";
 
 const product = ref();
 
diff --git a/examples/use-add-to-cart/src/main.ts b/examples/use-add-to-cart/src/main.ts
index 5de351b3f..4ce4dcd52 100644
--- a/examples/use-add-to-cart/src/main.ts
+++ b/examples/use-add-to-cart/src/main.ts
@@ -1,5 +1,5 @@
 import { createApp, ref } from "vue";
-import { createShopwareContext } from "@shopware-pwa/composables-next";
+import { createShopwareContext } from "@shopware-pwa/composables-next/dist";
 import { createInstance } from "@shopware-pwa/api-client";
 import Cookies from "js-cookie";
 
diff --git a/examples/use-cart/src/App.vue b/examples/use-cart/src/App.vue
index 4df338cd8..909d81376 100644
--- a/examples/use-cart/src/App.vue
+++ b/examples/use-cart/src/App.vue
@@ -5,7 +5,7 @@ import {
   useProductPrice,
   useProductSearch,
   useCart,
-} from "@shopware-pwa/composables-next";
+} from "@shopware-pwa/composables-next/dist";
 
 const product = ref();
 
diff --git a/examples/use-cart/src/main.ts b/examples/use-cart/src/main.ts
index 5de351b3f..4ce4dcd52 100644
--- a/examples/use-cart/src/main.ts
+++ b/examples/use-cart/src/main.ts
@@ -1,5 +1,5 @@
 import { createApp, ref } from "vue";
-import { createShopwareContext } from "@shopware-pwa/composables-next";
+import { createShopwareContext } from "@shopware-pwa/composables-next/dist";
 import { createInstance } from "@shopware-pwa/api-client";
 import Cookies from "js-cookie";
 
diff --git a/examples/use-checkout/imports.d.ts b/examples/use-checkout/imports.d.ts
new file mode 100644
index 000000000..628c37a6c
--- /dev/null
+++ b/examples/use-checkout/imports.d.ts
@@ -0,0 +1 @@
+export * from "@shopware-pwa/composables-next";
diff --git a/examples/use-checkout/package.json b/examples/use-checkout/package.json
index 0d03c7e89..90166f7cc 100644
--- a/examples/use-checkout/package.json
+++ b/examples/use-checkout/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@shopware-pwa/api-client": "canary",
+    "@shopware/api-client": "canary",
     "@shopware-pwa/composables-next": "canary",
     "js-cookie": "^3.0.5",
     "vue": "^3.3.8"
diff --git a/examples/use-checkout/shopware.d.ts b/examples/use-checkout/shopware.d.ts
new file mode 100644
index 000000000..3a97b2df6
--- /dev/null
+++ b/examples/use-checkout/shopware.d.ts
@@ -0,0 +1,36 @@
+declare module "#shopware" {
+  import type { createAPIClient } from "@shopware/api-client";
+  import type {
+    operationPaths as defaultOperationPaths,
+    operations as defaultOperations,
+    components as defaultComponents,
+  } from "@shopware/api-client/api-types";
+  import type {
+    RequestParameters as DefaultRequestParameters,
+    RequestReturnType as DefaultRequestReturnType,
+  } from "@shopware/api-client";
+
+  type changedComponents = defaultComponents;
+  // example how to extend Cart schema:
+  // type changedComponents = components & {
+  //   schemas: {
+  //     Cart: defaultComponents["schemas"]["Cart"] & {
+  //       myspecialfield: "hello field";
+  //     };
+  //   };
+  // };
+
+  export type operations = defaultOperations<changedComponents>;
+  export type operationPaths = defaultOperationPaths;
+  export type Schemas = changedComponents["schemas"];
+
+  // we're exporting our own Api Client definition as it depends on our own instance
+  export type ApiClient = ReturnType<
+    typeof createAPIClient<operations, operationPaths>
+  >;
+  export type RequestParameters<T extends keyof operations> =
+    DefaultRequestParameters<T, operations>;
+
+  export type RequestReturnType<T extends keyof operations> =
+    DefaultRequestReturnType<T, operations>;
+}
diff --git a/examples/use-checkout/src/apiClient.ts b/examples/use-checkout/src/apiClient.ts
new file mode 100644
index 000000000..a7811e865
--- /dev/null
+++ b/examples/use-checkout/src/apiClient.ts
@@ -0,0 +1,16 @@
+import { createAPIClient } from "@shopware/api-client";
+import type { operationPaths, operations } from "#shopware";
+import Cookies from "js-cookie";
+
+export const apiClient = createAPIClient<operations, operationPaths>({
+  baseURL: "https://demo-frontends.shopware.store/store-api",
+  accessToken: "SWSCBHFSNTVMAWNZDNFKSHLAYW",
+  contextToken: Cookies.get("sw-context-token"),
+  onContextChanged(newContextToken) {
+    Cookies.set("sw-context-token", newContextToken, {
+      expires: 365, // days
+      path: "/",
+      sameSite: "lax",
+    });
+  },
+});
diff --git a/examples/use-checkout/src/main.ts b/examples/use-checkout/src/main.ts
index 5de351b3f..949ad56da 100644
--- a/examples/use-checkout/src/main.ts
+++ b/examples/use-checkout/src/main.ts
@@ -1,25 +1,15 @@
-import { createApp, ref } from "vue";
+import { createApp } from "vue";
 import { createShopwareContext } from "@shopware-pwa/composables-next";
-import { createInstance } from "@shopware-pwa/api-client";
-import Cookies from "js-cookie";
 
+// @ts-ignore import of the vue file
 import App from "./App.vue";
-
-const cookieContextToken = Cookies.get("sw-context-token");
-const cookieLanguageId = Cookies.get("sw-language-id");
-
-const contextToken = ref(cookieContextToken);
-const languageId = ref(cookieLanguageId);
+import { apiClient } from "./apiClient";
 
 const app = createApp(App);
 
-const shopwareContext = createShopwareContext(app, {
-  apiInstance: createInstance({
-    endpoint: "https://demo-frontends.shopware.store",
-    accessToken: "SWSCBHFSNTVMAWNZDNFKSHLAYW",
-    contextToken: contextToken.value,
-    languageId: languageId.value,
-  }),
-});
+const shopwareContext = createShopwareContext(app, {});
 app.use(shopwareContext);
+
+app.provide("apiClient", apiClient);
+
 app.mount("#app");
diff --git a/examples/use-checkout/tsconfig.json b/examples/use-checkout/tsconfig.json
index 1aa1d1cd1..c0027717d 100644
--- a/examples/use-checkout/tsconfig.json
+++ b/examples/use-checkout/tsconfig.json
@@ -1,10 +1,12 @@
 {
   "include": ["src/**/*"],
-    "compilerOptions": {
-      "esModuleInterop": true,
-      "lib": ["esnext"],
-      "types": [
-        "vite/client"
-      ]
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "lib": ["esnext"],
+    "types": ["vite/client"],
+    "paths": {
+      "#imports": ["./imports.d.ts"],
+      "#shopware": ["./shopware.d.ts"]
     }
-  }
\ No newline at end of file
+  }
+}
diff --git a/examples/use-checkout/vite.config.js b/examples/use-checkout/vite.config.js
index de5cb31c6..aab5e16ca 100644
--- a/examples/use-checkout/vite.config.js
+++ b/examples/use-checkout/vite.config.js
@@ -1,14 +1,15 @@
-import { fileURLToPath, URL } from 'node:url'
+import { fileURLToPath, URL } from "node:url";
 
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
+import { defineConfig } from "vite";
+import vue from "@vitejs/plugin-vue";
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
   resolve: {
     alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
-    }
-  }
-})
+      "@": fileURLToPath(new URL("./src", import.meta.url)),
+      "#imports": fileURLToPath(new URL("./imports.d.ts", import.meta.url)),
+    },
+  },
+});
diff --git a/packages/api-client-next/.eslintrc.js b/packages/api-client-next/.eslintrc.cjs
similarity index 100%
rename from packages/api-client-next/.eslintrc.js
rename to packages/api-client-next/.eslintrc.cjs
diff --git a/packages/api-client-next/admin-api-types/apiTypes-6.5.3.0.d.ts b/packages/api-client-next/admin-api-types/apiTypes-6.5.3.0.d.ts
index 966d3de95..06a809e2b 100644
--- a/packages/api-client-next/admin-api-types/apiTypes-6.5.3.0.d.ts
+++ b/packages/api-client-next/admin-api-types/apiTypes-6.5.3.0.d.ts
@@ -11,8 +11,8 @@ type XOR<T, U> = T | U extends object
 type OneOf<T extends any[]> = T extends [infer Only]
   ? Only
   : T extends [infer A, infer B, ...infer Rest]
-  ? OneOf<[XOR<A, B>, ...Rest]>
-  : never;
+    ? OneOf<[XOR<A, B>, ...Rest]>
+    : never;
 
 type GenericRecord = never | { [key: string]: GenericRecord };
 
diff --git a/packages/api-client-next/api-types/apiTypes-6.4.19.0.d.ts b/packages/api-client-next/api-types/apiTypes-6.4.19.0.d.ts
index 20a99265a..394bb67a8 100644
--- a/packages/api-client-next/api-types/apiTypes-6.4.19.0.d.ts
+++ b/packages/api-client-next/api-types/apiTypes-6.4.19.0.d.ts
@@ -11,8 +11,8 @@ type XOR<T, U> = T | U extends object
 type OneOf<T extends any[]> = T extends [infer Only]
   ? Only
   : T extends [infer A, infer B, ...infer Rest]
-  ? OneOf<[XOR<A, B>, ...Rest]>
-  : never;
+    ? OneOf<[XOR<A, B>, ...Rest]>
+    : never;
 
 export type paths = {
   "/account/address": {
diff --git a/packages/api-client-next/api-types/apiTypes-6.4.20.0.d.ts b/packages/api-client-next/api-types/apiTypes-6.4.20.0.d.ts
index 55f2f4a78..b438b9ac7 100644
--- a/packages/api-client-next/api-types/apiTypes-6.4.20.0.d.ts
+++ b/packages/api-client-next/api-types/apiTypes-6.4.20.0.d.ts
@@ -11,8 +11,8 @@ type XOR<T, U> = T | U extends object
 type OneOf<T extends any[]> = T extends [infer Only]
   ? Only
   : T extends [infer A, infer B, ...infer Rest]
-  ? OneOf<[XOR<A, B>, ...Rest]>
-  : never;
+    ? OneOf<[XOR<A, B>, ...Rest]>
+    : never;
 
 export type paths = {
   "/account/address": {
diff --git a/packages/api-client-next/api-types/apiTypes-6.5.0.0.d.ts b/packages/api-client-next/api-types/apiTypes-6.5.0.0.d.ts
index 6cc949c10..c37b924ed 100644
--- a/packages/api-client-next/api-types/apiTypes-6.5.0.0.d.ts
+++ b/packages/api-client-next/api-types/apiTypes-6.5.0.0.d.ts
@@ -11,8 +11,8 @@ type XOR<T, U> = T | U extends object
 type OneOf<T extends any[]> = T extends [infer Only]
   ? Only
   : T extends [infer A, infer B, ...infer Rest]
-  ? OneOf<[XOR<A, B>, ...Rest]>
-  : never;
+    ? OneOf<[XOR<A, B>, ...Rest]>
+    : never;
 
 export type paths = {
   "/account/address": {
diff --git a/packages/api-client-next/api-types/apiTypes-6.5.2.0.d.ts b/packages/api-client-next/api-types/apiTypes-6.5.2.0.d.ts
index 861aef3e5..47578cc25 100644
--- a/packages/api-client-next/api-types/apiTypes-6.5.2.0.d.ts
+++ b/packages/api-client-next/api-types/apiTypes-6.5.2.0.d.ts
@@ -11,8 +11,8 @@ type XOR<T, U> = T | U extends object
 type OneOf<T extends any[]> = T extends [infer Only]
   ? Only
   : T extends [infer A, infer B, ...infer Rest]
-  ? OneOf<[XOR<A, B>, ...Rest]>
-  : never;
+    ? OneOf<[XOR<A, B>, ...Rest]>
+    : never;
 
 type GenericRecord = never | { [key: string]: GenericRecord };
 
diff --git a/packages/api-client-next/api-types/apiTypes-6.5.3.0.d.ts b/packages/api-client-next/api-types/apiTypes-6.5.3.0.d.ts
index e87317893..f4426588a 100644
--- a/packages/api-client-next/api-types/apiTypes-6.5.3.0.d.ts
+++ b/packages/api-client-next/api-types/apiTypes-6.5.3.0.d.ts
@@ -11,10 +11,14 @@ type XOR<T, U> = T | U extends object
 type OneOf<T extends any[]> = T extends [infer Only]
   ? Only
   : T extends [infer A, infer B, ...infer Rest]
-  ? OneOf<[XOR<A, B>, ...Rest]>
-  : never;
+    ? OneOf<[XOR<A, B>, ...Rest]>
+    : never;
 
-type GenericRecord = never | { [key: string]: GenericRecord };
+type GenericRecord =
+  | never
+  | string
+  | string[]
+  | { [key: string]: GenericRecord }; // TODO: [OpenAPI] - define GenericRecord properly
 
 export type paths = {
   "/account/address": {
@@ -636,6 +640,31 @@ export type components = {
     ArrayStruct: components["schemas"]["Struct"];
     /** Members of the attributes object ("attributes") represent information about the resource object in which it's defined. */
     attributes: GenericRecord;
+    // TODO: [OpenAPI][CalculatedPrice] - define CalculatedPrice with proper fields + define calculated_cheapest_price entity as well
+    CalculatedPrice: {
+      apiAlias: "calculated_price";
+      unitPrice: number;
+      quantity: number;
+      totalPrice: number;
+      calculatedTaxes: GenericRecord[];
+      taxRules: GenericRecord[];
+      referencePrice?: {
+        price: number;
+        referenceUnit: number;
+        unitName: string;
+      };
+      hasRange?: boolean;
+      listPrice: {
+        price: number;
+        discount: number;
+        percentage: number;
+        apiAlias: string;
+      } | null;
+      regulationPrice: null | {
+        price: number;
+      };
+      variantId?: string;
+    };
     Cart: components["schemas"]["ArrayStruct"] & {
       /** An affiliate tracking code */
       affiliateCode?: string;
@@ -643,12 +672,27 @@ export type components = {
       campaignCode?: string;
       /** A comment that can be added to the cart. */
       customerComment?: string;
+      deliveries?: Array<components["schemas"]["OrderDelivery"]>; // TODO: [OpenAPI][Cart] - `deliveries` is missing in schema
       /** A list of all cart errors, such as insufficient stocks, invalid addresses or vouchers. */
-      errors?: {
-        key?: string;
-        level?: string;
-        message?: string;
-      }[];
+      errors: // TODO: [OpenAPI][Cart] - define errors properly, `key` and `message` should be required fields. `Errors` should be required field as well. Problem is that sometimes it's an array, and sometimes map object
+      | []
+        // | {
+        //     key: string;
+        //     code: string;
+        //     details: string;
+        //     level?: string;
+        //     message: string;
+        //   }[]
+        | Record<
+            string,
+            {
+              code: number;
+              key: string;
+              level: number;
+              message: string;
+              messageKey: string;
+            }
+          >;
       /** All items within the cart */
       lineItems?: components["schemas"]["LineItem"][];
       modified?: boolean;
@@ -685,13 +729,14 @@ export type components = {
     };
     /** Added since version: 6.0.0.0 */
     Category: {
+      apiAlias: "category"; // TODO: [OpenAPI][Category] - define apiAlias properly
       active?: boolean;
       afterCategoryId?: string;
       afterCategoryVersionId?: string;
-      breadcrumb?: readonly unknown[];
+      breadcrumb?: string[]; // TODO: [OpenAPI][Category] - define breadcrumb properly
       /** Format: int64 */
-      childCount?: number;
-      children?: components["schemas"]["Category"];
+      childCount: number; // TODO: [OpenAPI][Category] childCount field should be defined as required
+      children: Array<components["schemas"]["Category"]>; // TODO: [OpenAPI][Category] - define children as required array
       cmsPage?: components["schemas"]["CmsPage"];
       cmsPageId?: string;
       /** Runtime field, cannot be used as part of the criteria. */
@@ -704,7 +749,7 @@ export type components = {
       description?: string;
       displayNestedProducts: boolean;
       externalLink?: string;
-      id?: string;
+      id: string; // TODO: [OpenAPI][Category] - define id as required field
       internalLink?: string;
       keywords?: string;
       /** Format: int64 */
@@ -725,6 +770,7 @@ export type components = {
       translated?: {
         afterCategoryId?: string;
         afterCategoryVersionId?: string;
+        breadcrumb?: string[]; // TODO: [OpenAPI][Category] - define breadcrumb properly
         cmsPageId?: string;
         cmsPageVersionId?: string;
         customEntityTypeId?: string;
@@ -901,6 +947,7 @@ export type components = {
     };
     /** Added since version: 6.0.0.0 */
     CmsBlock: {
+      apiAlias: "cms_block"; // TODO: [OpenAPI][CmsBlock] - define apiAlias properly
       backgroundColor?: string;
       backgroundMedia?: components["schemas"]["Media"];
       backgroundMediaId?: string;
@@ -995,7 +1042,7 @@ export type components = {
       name?: string;
       previewMedia?: components["schemas"]["Media"];
       previewMediaId?: string;
-      sections?: components["schemas"]["CmsSection"];
+      sections?: Array<components["schemas"]["CmsSection"]>; // TODO: [OpenAPI][CmsPage] - define sections as required array
       translated?: {
         cssClass?: string;
         entity?: string;
@@ -1027,6 +1074,7 @@ export type components = {
     };
     /** Added since version: 6.0.0.0 */
     CmsSection: {
+      apiAlias: "cms_section"; // TODO: [OpenAPI][CmsSection] - define apiAlias properly
       backgroundColor?: string;
       backgroundMedia?: components["schemas"]["Media"];
       backgroundMediaId?: string;
@@ -1099,7 +1147,8 @@ export type components = {
     };
     ContextTokenResponse: {
       /** Context token identifying the current user session. */
-      contextToken?: string;
+      contextToken: string; // TODO: [OpenAPI][ContextTokenResponse] - define contextToken as required
+      redirectUrl?: string; // TODO: [OpenAPI][ContextTokenResponse] - define redirectUrl
     };
     /** Added since version: 6.0.0.0 */
     Country: {
@@ -1264,6 +1313,7 @@ export type components = {
         /** The type of aggregation */
         type: string;
       }[];
+      includes?: GenericRecord; // TODO: [OpenAPI][Criteria] - define includes properly
       /** Used to fetch associations which are not fetched by default. */
       associations?: GenericRecord;
       /** Fields which should be returned in the search result. */
@@ -1300,7 +1350,9 @@ export type components = {
       "total-count-mode"?: 0 | 1 | 2;
     };
     CrossSellingElementCollection: {
-      crossSelling?: {
+      // TODO: [OpenAPI][CrossSellingElementCollection] - define CrossSellingElement instead of collection
+      crossSelling: {
+        // TODO [OpenAPI][CrossSellingElementCollection] - define crossSelling as required
         active?: boolean;
         /** Format: int32 */
         limit?: number;
@@ -1313,7 +1365,7 @@ export type components = {
         sortDirection?: string;
         type?: string;
       };
-      products?: components["schemas"]["Product"][];
+      products: components["schemas"]["Product"][]; // TODO: [OpenAPI][CrossSellingElementCollection] - define products array as required
       /** Format: int32 */
       total?: number;
     }[];
@@ -1419,6 +1471,8 @@ export type components = {
     Customer: {
       accountType: string;
       active?: boolean;
+      activeBillingAddress: components["schemas"]["CustomerAddress"]; // TODO: [OpenAPI][Customer] - add `activeBillingAddress` definition to schema
+      activeShippingAddress: components["schemas"]["CustomerAddress"]; // TODO: [OpenAPI][Customer] - add `activeShippingAddress` definition to schema
       addresses?: components["schemas"]["CustomerAddress"];
       affiliateCode?: string;
       birthday?: string;
@@ -1490,7 +1544,7 @@ export type components = {
       customFields?: GenericRecord;
       department?: string;
       firstName: string;
-      id?: string;
+      id: string; // TODO: [OpenAPI][CustomerAddress] - make `id` required
       lastName: string;
       phoneNumber?: string;
       salutation?: components["schemas"]["Salutation"];
@@ -1514,7 +1568,8 @@ export type components = {
       registrationOnlyCompanyRegistration?: boolean;
       registrationSeoMetaDescription?: string;
       registrationTitle?: string;
-      translated?: {
+      // TODO: [OpenAPI][CustomerGroup] - make `translated` required
+      translated: {
         name?: string;
         registrationIntroduction?: string;
         registrationSeoMetaDescription?: string;
@@ -1623,7 +1678,11 @@ export type components = {
     };
     /** Added since version: 6.0.0.0 */
     Document: {
-      config: GenericRecord;
+      // TODO: [OpenAPI][Document] - define config properly
+      config: {
+        name: string;
+        title: string;
+      };
       /** Format: date-time */
       createdAt: string;
       customFields?: GenericRecord;
@@ -1634,7 +1693,7 @@ export type components = {
       documentType?: components["schemas"]["DocumentType"];
       documentTypeId: string;
       fileType: string;
-      id?: string;
+      id: string; // TODO: [OpenAPI][Document] - make `id` required
       order?: components["schemas"]["Order"];
       orderId: string;
       orderVersionId?: string;
@@ -1800,6 +1859,7 @@ export type components = {
     };
     /** Added since version: 6.4.0.0 */
     LandingPage: {
+      apiAlias: "landing_page"; // TODO: [OpenAPI][LandingPage] - add `apiAlias` definition to schema
       active?: boolean;
       cmsPage?: components["schemas"]["CmsPage"];
       cmsPageId?: string;
@@ -1985,15 +2045,55 @@ export type components = {
     LineItem: {
       description?: string;
       good?: boolean;
-      id?: string;
+      id: string; // TODO: [OpenAPI][LineItem] - make `id` required
+      cover?: components["schemas"]["ProductMedia"]; // TODO: [OpenAPI][LineItem] - add `cover` definition to schema
+      deliveryInformation: {
+        // TODO: [OpenAPI][LineItem] - define `deliveryInformation` object and find out what's inside (`cart_delivery_information` entity)
+        stock: number;
+      };
       label?: string;
       modified?: boolean;
       /** Format: int32 */
-      quantity?: number;
+      quantity: number; // TODO: [OpenAPI][LineItem] - make `quantity` required
+      payload: {
+        // TODO: [OpenAPI][LineItem] - add `payload` definition to schema (find out what's inside)
+        options: Array<{
+          group: string;
+          option: string;
+          translated: {
+            [key: string]: string;
+          };
+        }>;
+        name?: string;
+      };
+      price: {
+        // TODO: [OpenAPI][LineItem] - define price object, also UNIFY price objects across responses
+        listPrice?: {
+          /** Format: float */
+          discount?: number;
+          /** Format: float */
+          percentage?: number;
+          /** Format: float */
+          price?: number;
+        };
+        /** Format: int64 */
+        quantity: number;
+        referencePrice?: GenericRecord;
+        regulationPrice?: {
+          /** Format: float */
+          price?: number;
+        };
+        taxRules?: GenericRecord;
+        /** Format: float */
+        totalPrice: number;
+        /** Format: float */
+        unitPrice: number;
+      };
       referencedId?: string;
       removable?: boolean;
       stackable?: boolean;
-      type?: string;
+      states: string[]; // TODO: [OpenAPI][LineItem] - add definition of `states` array, also union type of possible states
+      type: "product" | "promotion" | "custom" | "credit"; // TODO: [OpenAPI][LineItem] - define type as required and string union type -> see also #456
     };
     /** A link **MUST** be represented as either: a string containing the link's URL or a link object. */
     link: OneOf<
@@ -2158,8 +2258,8 @@ export type components = {
           };
         };
       };
-      fileExtension?: string;
-      fileName?: string;
+      fileExtension: string; // TODO: [OpenAPI][Media] fileExtension field should be defined as required
+      fileName: string; // TODO: [OpenAPI][Media] fileName field should be defined as required
       /** Format: int64 */
       fileSize?: number;
       /** Runtime field, cannot be used as part of the criteria. */
@@ -2168,7 +2268,7 @@ export type components = {
       metaData?: GenericRecord;
       mimeType?: string;
       private?: boolean;
-      thumbnails?: components["schemas"]["MediaThumbnail"];
+      thumbnails?: Array<components["schemas"]["MediaThumbnail"]>; // TODO: [OpenAPI][Media] thumbnails field should be defined as an array
       title?: string;
       translated?: {
         alt?: string;
@@ -2184,7 +2284,7 @@ export type components = {
       /** Format: date-time */
       uploadedAt?: string;
       /** Runtime field, cannot be used as part of the criteria. */
-      url?: string;
+      url: string; // TODO: [OpenAPI][Media] url field should be defined as required
     };
     /** Added since version: */
     MediaAiTag: {
@@ -2241,7 +2341,7 @@ export type components = {
       /** Format: date-time */
       updatedAt?: string;
       /** Runtime field, cannot be used as part of the criteria. */
-      url?: string;
+      url: string; // TODO: [OpenAPI][MediaThumbnail] url should be defined as required
       /** Format: int64 */
       width: number;
     };
@@ -2261,6 +2361,8 @@ export type components = {
     /** Non-standard meta-information that can not be represented as an attribute or relationship. */
     meta: GenericRecord;
     NavigationRouteResponse: components["schemas"]["Category"][];
+    NavigationType: // TODO: [OpenAPI][NavigationType] - add `NavigationType` definition to schema
+    "main-navigation" | "footer-navigation" | "service-navigation";
     /** Added since version: 6.0.0.0 */
     NewsletterRecipient: {
       /** Format: date-time */
@@ -2277,6 +2379,11 @@ export type components = {
       /** Format: date-time */
       updatedAt?: string;
     };
+    NewsletterStatus: {
+      // TODO: [OpenAPI][NewsletterStatus] - add `NewsletterStatus` definition to schema
+      apiAlias: "account_newsletter_recipient";
+      status: "undefined" | "notSet" | "direct" | "optIn" | "optOut";
+    };
     /** Added since version: 6.4.7.0 */
     Notification: {
       /** Format: date-time */
@@ -2321,7 +2428,7 @@ export type components = {
     };
     /** Added since version: 6.0.0.0 */
     Order: {
-      addresses?: components["schemas"]["OrderAddress"];
+      addresses?: Array<components["schemas"]["OrderAddress"]>; // TODO: [OpenAPI][Order] addresses field should be defined as an array
       affiliateCode?: string;
       /** Format: float */
       amountNet?: number;
@@ -2341,8 +2448,8 @@ export type components = {
       customerComment?: string;
       customFields?: GenericRecord;
       deepLinkCode?: string;
-      deliveries?: components["schemas"]["OrderDelivery"];
-      documents?: components["schemas"]["Document"];
+      deliveries?: Array<components["schemas"]["OrderDelivery"]>; // TODO: [OpenAPI][Order] deliveries field should be defined as an array
+      documents: Array<components["schemas"]["Document"]>; // TODO: [OpenAPI][Order] documents field should be defined as an array and required field
       extensions?: {
         returns?: {
           data?: {
@@ -2360,12 +2467,12 @@ export type components = {
           };
         };
       };
-      id?: string;
+      id: string; // TODO: [OpenAPI][Order] id field should be defined as required
       language?: components["schemas"]["Language"];
       languageId: string;
-      lineItems?: components["schemas"]["OrderLineItem"];
+      lineItems?: Array<components["schemas"]["OrderLineItem"]>; // TODO: [OpenAPI][Order] lineItems field should be defined as an array
       orderCustomer?: components["schemas"]["OrderCustomer"];
-      orderDate?: string;
+      orderDate: string; // TODO: [OpenAPI][Order] orderDate field should be defined as required
       /** Format: date-time */
       orderDateTime: string;
       orderNumber?: string;
@@ -2410,10 +2517,10 @@ export type components = {
       };
       /** Format: float */
       shippingTotal?: number;
-      stateMachineState?: components["schemas"]["StateMachineState"];
+      stateMachineState: components["schemas"]["StateMachineState"]; // TODO: [OpenAPI][Order] stateMachineState field should be defined as required
       tags?: components["schemas"]["Tag"];
       taxStatus?: string;
-      transactions?: components["schemas"]["OrderTransaction"];
+      transactions?: Array<components["schemas"]["OrderTransaction"]>; // TODO: [OpenAPI][Order] transactions field should be defined as an array
       /** Format: date-time */
       updatedAt?: string;
       updatedById?: string;
@@ -2434,7 +2541,7 @@ export type components = {
       customFields?: GenericRecord;
       department?: string;
       firstName: string;
-      id?: string;
+      id: string; // TODO: [OpenAPI][OrderAddress] id field should be defined as required
       lastName: string;
       phoneNumber?: string;
       salutation?: components["schemas"]["Salutation"];
@@ -2565,7 +2672,7 @@ export type components = {
       createdAt: string;
       customFields?: GenericRecord;
       description?: string;
-      downloads?: components["schemas"]["OrderLineItemDownload"];
+      downloads?: Array<components["schemas"]["OrderLineItemDownload"]>; // TODO: [OpenAPI][OrderLineItem] downloads field should be defined as an array
       extensions?: {
         returns?: {
           data?: {
@@ -2608,7 +2715,7 @@ export type components = {
       parent?: components["schemas"]["OrderLineItem"];
       parentId?: string;
       parentVersionId?: string;
-      payload?: GenericRecord;
+      payload: components["schemas"]["Product"]; // TODO: [OpenAPI][OrderLineItem] define possible payloads for order line items
       /** Format: int64 */
       position: number;
       priceDefinition?: GenericRecord;
@@ -2635,8 +2742,8 @@ export type components = {
       /** Format: date-time */
       createdAt: string;
       customFields?: GenericRecord;
-      id?: string;
-      media?: components["schemas"]["Media"];
+      id: string; // TODO: [OpenAPI][OrderLineItemDownload] id should be defined as required
+      media: components["schemas"]["Media"]; // TODO: [OpenAPI][OrderLineItemDownload] media should be defined as required
       mediaId: string;
       orderLineItem?: components["schemas"]["OrderLineItem"];
       orderLineItemId: string;
@@ -2753,7 +2860,10 @@ export type components = {
       updatedAt?: string;
     };
     OrderRouteResponse: {
-      orders?: Record<string, never>;
+      orders: {
+        // TODO: [OpenAPI][OrderRouteResponse] orders field should be defined properly
+        elements: components["schemas"]["Order"][];
+      } & components["schemas"]["EntitySearchResult"];
       /** The key-value pairs contain the uuid of the order as key and a boolean as value, indicating that the payment method can still be changed. */
       paymentChangeable?: GenericRecord;
     };
@@ -2966,7 +3076,7 @@ export type components = {
       customFields?: GenericRecord;
       description?: string;
       distinguishableName?: string;
-      id?: string;
+      id: string; // TODO: [OpenAPI][PaymentMethod] id should be defined as required
       media?: components["schemas"]["Media"];
       mediaId?: string;
       name: string;
@@ -3050,20 +3160,23 @@ export type components = {
       /** Format: date-time */
       updatedAt?: string;
     };
+    // TODO: [OpenAPI][Product] - null shouls be undefined by default to decrease payload size
     /** Added since version: 6.0.0.0 */
     Product: {
+      apiAlias: "product"; // TODO: [OpenAPI][Product] apiAlias field should be defined in schema as string literal
       active?: boolean;
       available?: boolean;
       /** Format: int64 */
       availableStock?: number;
-      calculatedCheapestPrice?: GenericRecord;
+      calculatedCheapestPrice?: components["schemas"]["CalculatedPrice"]; // TODO: [OpenAPI][Product] calculatedCheapestPrice field should be defined exactly what it is
       /**
        * Format: int64
        * Runtime field, cannot be used as part of the criteria.
        */
       calculatedMaxPurchase?: number;
-      calculatedPrice?: GenericRecord;
-      calculatedPrices?: unknown[];
+      // TODO: [OpenAPI][Product] calculatedPrice field should be defined properly
+      calculatedPrice?: components["schemas"]["CalculatedPrice"];
+      calculatedPrices?: components["schemas"]["CalculatedPrice"][]; // TODO: [OpenAPI][Product] calculatedPrices field should be defined as an array and required!
       canonicalProduct?: components["schemas"]["Product"];
       canonicalProductId?: string;
       categories?: components["schemas"]["Category"];
@@ -3123,7 +3236,7 @@ export type components = {
       };
       /** Format: float */
       height?: number;
-      id?: string;
+      id: string; // TODO: [OpenAPI][Product] id field should be required in schema
       isCloseout?: boolean;
       /** Runtime field, cannot be used as part of the criteria. */
       isNew?: boolean;
@@ -3144,7 +3257,7 @@ export type components = {
       minPurchase?: number;
       name: string;
       optionIds?: readonly string[];
-      options?: components["schemas"]["PropertyGroupOption"];
+      options?: Array<components["schemas"]["PropertyGroupOption"]>; // TODO: [OpenAPI][Product] options field should be defined as array
       packUnit?: string;
       packUnitPlural?: string;
       parent?: components["schemas"]["Product"];
@@ -3153,8 +3266,8 @@ export type components = {
       productManufacturerVersionId?: string;
       productMediaVersionId?: string;
       productNumber: string;
-      productReviews?: components["schemas"]["ProductReview"];
-      properties?: components["schemas"]["PropertyGroupOption"];
+      productReviews?: Array<components["schemas"]["ProductReview"]>; // TODO: [OpenAPI][Product] productReviews field should be defined as array
+      properties?: Array<components["schemas"]["PropertyGroupOption"]>; // TODO: [OpenAPI][Product] properties field should be defined as array
       propertyIds?: readonly string[];
       /** Format: int64 */
       purchaseSteps?: number;
@@ -3170,8 +3283,8 @@ export type components = {
       restockTime?: number;
       /** Format: int64 */
       sales?: number;
-      seoCategory?: components["schemas"]["Category"];
-      seoUrls?: components["schemas"]["SeoUrl"];
+      seoCategory: components["schemas"]["Category"]; // TODO: [OpenAPI][Product] seoCategory field should be defined as required
+      seoUrls?: Array<components["schemas"]["SeoUrl"]>; // TODO: [OpenAPI][Product] seoUrls field should be defined as array
       shippingFree?: boolean;
       sortedProperties?: GenericRecord;
       states?: readonly string[];
@@ -3212,6 +3325,10 @@ export type components = {
       unitId?: string;
       /** Format: date-time */
       updatedAt?: string;
+      // TODO: [OpenAPI][Product] variantListingConfig field should be defined in schema
+      variantListingConfig?: {
+        displayParent: boolean;
+      };
       versionId?: string;
       /** Format: float */
       weight?: number;
@@ -3271,7 +3388,7 @@ export type components = {
     ProductDetailResponse: {
       /** List of property groups with their corresponding options and information on how to display them. */
       configurator?: components["schemas"]["PropertyGroup"][];
-      product?: components["schemas"]["Product"];
+      product: components["schemas"]["Product"]; // TODO: [OpenAPI][ProductDetailResponse] product field should be defined as required
     };
     /** Added since version: 6.4.19.0 */
     ProductDownload: {
@@ -3861,20 +3978,31 @@ export type components = {
     };
     ProductListingResult: components["schemas"]["EntitySearchResult"] & {
       /** Contains the available sorting. These can be used to show a sorting select-box in the product listing. */
-      availableSortings?: GenericRecord[];
+      availableSortings?: Array<{
+        // TODO: [OpenAPI][ProductListingResult] availableSortings field should be defined properly
+        label: string;
+        translated: {
+          label: string;
+        };
+        key: string;
+        priority: number;
+        apiAlias: "product_sorting";
+      }>;
       /** Contains the state of the filters. These can be used to create listing filters. */
-      currentFilters?: {
-        manufacturer?: GenericRecord[];
+      currentFilters: {
+        // TODO: [OpenAPI][ProductListingResult] currentFilters field should be required
+        manufacturer?: string[]; // TODO: [OpenAPI][ProductListingResult] currentFilters.manufacturer field should be defined properly
         navigationId?: string;
         price?: {
           max?: number;
           min?: number;
         };
-        properties?: GenericRecord[];
+        properties?: string[]; // TODO: [OpenAPI][ProductListingResult] currentFilters.properties field should be defined properly
         rating?: number;
         "shipping-free"?: boolean;
+        search: string; // TODO: [OpenAPI][ProductListingResult] search field should be defined properly
       };
-      elements?: components["schemas"]["Product"][];
+      elements: components["schemas"]["Product"][]; // TODO: [OpenAPI][ProductListingResult] elements field should be defined as required
       sorting?: string;
     };
     /** Added since version: 6.0.0.0 */
@@ -3914,6 +4042,7 @@ export type components = {
       /** Format: date-time */
       updatedAt?: string;
       versionId?: string;
+      thumbnails?: Array<components["schemas"]["MediaThumbnail"]>; // TODO: [OpenAPI][Product] thumbnails field should be defined in ProductMedia
     };
     /** Added since version: 6.0.0.0 */
     ProductPrice: {
@@ -3930,10 +4059,12 @@ export type components = {
       /** Format: date-time */
       createdAt: string;
       customFields?: GenericRecord;
-      id?: string;
+      customerId?: string; // TODO: [OpenAPI][ProductReview] customerId field should be defined
+      externalUser?: string; // TODO: [OpenAPI][ProductReview] externalUser field should be defined
+      id: string; // TODO: [OpenAPI][ProductReview] id field should be defined as required
       languageId: string;
       /** Format: float */
-      points?: number;
+      points: number; // TODO: [OpenAPI][ProductReview] points field should be defined as required
       productId: string;
       productVersionId?: string;
       salesChannelId: string;
@@ -4100,7 +4231,7 @@ export type components = {
       filterable?: boolean;
       id?: string;
       name: string;
-      options?: components["schemas"]["PropertyGroupOption"];
+      options?: Array<components["schemas"]["PropertyGroupOption"]>; // TODO: [OpenAPI][PropertyGroup] options field should be defined as array
       /** Format: int64 */
       position?: number;
       sortingType: string;
@@ -4120,12 +4251,16 @@ export type components = {
       /** Format: date-time */
       createdAt: string;
       customFields?: GenericRecord;
-      group?: components["schemas"]["PropertyGroup"];
+      group: {
+        // components["schemas"]["PropertyGroup"]; // TODO: [OpenAPI][PropertyGroupOption] group field should be defined and required
+        name: string;
+      };
       groupId: string;
-      id?: string;
+      id: string; // TODO: [OpenAPI][PropertyGroupOption] id field should be required in schema
       media?: components["schemas"]["Media"];
       mediaId?: string;
       name: string;
+      option: string; // TODO: [OpenAPI][PropertyGroupOption] option field should be defined; defined as string (?)
       /** Format: int64 */
       position?: number;
       translated?: {
@@ -4301,6 +4436,7 @@ export type components = {
         currencyId?: string;
         /** Format: int32 */
         currencyPrecision?: number;
+        languageIdChain?: string[]; // TODO: [OpenAPI][SalesChannelContext] languageIdChain field should be defined properly in context
         scope?: string;
         source?: string;
         taxState?: string;
@@ -4308,85 +4444,88 @@ export type components = {
         versionId?: string;
       };
       /** Currency associated with the current user */
-      currency?: {
-        /** Format: int32 */
-        decimalPrecision?: number;
-        factor?: number;
-        isoCode?: string;
-        isSystemDefault?: boolean;
-        name?: string;
-        /** Format: int32 */
-        position?: number;
-        shortName?: string;
-        symbol?: string;
-      };
+      currency?: components["schemas"]["Currency"]; // TODO: [OpenAPI][SalesChannelContext] currency field should be defined reusing Currency schema
+      // currency?: {
+      //   /** Format: int32 */
+      //   decimalPrecision?: number;
+      //   factor?: number;
+      //   isoCode?: string;
+      //   isSystemDefault?: boolean;
+      //   name?: string;
+      //   /** Format: int32 */
+      //   position?: number;
+      //   shortName?: string;
+      //   symbol?: string;
+      // };
       /** Customer group of the current user */
       currentCustomerGroup?: {
         displayGross?: boolean;
         name?: string;
       };
       /** Information about the current customer - `null` if the customer is not logged in */
-      customer?: {
-        active?: boolean;
-        affiliateCode?: string;
-        /** Format: int32 */
-        autoIncrement?: number;
-        /** Format: date-time */
-        birthday?: string;
-        campaignCode?: string;
-        company?: string;
-        customerNumber?: string;
-        defaultBillingAddressId?: string;
-        defaultPaymentMethodId?: string;
-        defaultShippingAddressId?: string;
-        /** Format: date-time */
-        doubleOptInConfirmDate?: string;
-        /** Format: date-time */
-        doubleOptInEmailSentDate?: string;
-        doubleOptInRegistration?: boolean;
-        email?: string;
-        /** Format: date-time */
-        firstLogin?: string;
-        firstName?: string;
-        groupId?: string;
-        guest?: boolean;
-        hash?: string;
-        languageId?: string;
-        /** Format: date-time */
-        lastLogin?: string;
-        lastName?: string;
-        /** Format: date-time */
-        lastOrderDate?: string;
-        lastPaymentMethodId?: string;
-        legacyEncoder?: string;
-        legacyPassword?: string;
-        newsletter?: boolean;
-        /** Format: int32 */
-        orderCount?: number;
-        password?: string;
-        remoteAddress?: string;
-        salesChannelId?: string;
-        salutationId?: string;
-        title?: string;
-      };
+      customer?: components["schemas"]["Customer"]; // TODO: [OpenAPI][SalesChannelContext] customer field should be defined reusing Customer schema
+      // customer?: {
+      //   active?: boolean;
+      //   affiliateCode?: string;
+      //   /** Format: int32 */
+      //   autoIncrement?: number;
+      //   /** Format: date-time */
+      //   birthday?: string;
+      //   campaignCode?: string;
+      //   company?: string;
+      //   customerNumber?: string;
+      //   defaultBillingAddressId?: string;
+      //   defaultPaymentMethodId?: string;
+      //   defaultShippingAddressId?: string;
+      //   /** Format: date-time */
+      //   doubleOptInConfirmDate?: string;
+      //   /** Format: date-time */
+      //   doubleOptInEmailSentDate?: string;
+      //   doubleOptInRegistration?: boolean;
+      //   email?: string;
+      //   /** Format: date-time */
+      //   firstLogin?: string;
+      //   firstName?: string;
+      //   groupId?: string;
+      //   guest?: boolean;
+      //   hash?: string;
+      //   languageId?: string;
+      //   /** Format: date-time */
+      //   lastLogin?: string;
+      //   lastName?: string;
+      //   /** Format: date-time */
+      //   lastOrderDate?: string;
+      //   lastPaymentMethodId?: string;
+      //   legacyEncoder?: string;
+      //   legacyPassword?: string;
+      //   newsletter?: boolean;
+      //   /** Format: int32 */
+      //   orderCount?: number;
+      //   password?: string;
+      //   remoteAddress?: string;
+      //   salesChannelId?: string;
+      //   salutationId?: string;
+      //   title?: string;
+      // };
       /** Fallback group if the default customer group is not applicable */
       fallbackCustomerGroup?: {
         displayGross?: boolean;
         name?: string;
       };
       /** Selected payment method */
-      paymentMethod?: {
-        active?: boolean;
-        availabilityRuleId?: string;
-        description?: string;
-        formattedHandlerIdentifier?: string;
-        handlerIdentifier?: string;
-        mediaId?: string;
-        name?: string;
-        pluginId?: string;
-        /** Format: int32 */
-        position?: number;
-      };
+      paymentMethod?: components["schemas"]["PaymentMethod"]; // TODO: [OpenAPI][SalesChannelContext] paymentMethod field should be defined properly reusing PaymentMethod schema
+      // paymentMethod?: {
+      //   active?: boolean;
+      //   availabilityRuleId?: string;
+      //   description?: string;
+      //   formattedHandlerIdentifier?: string;
+      //   handlerIdentifier?: string;
+      //   mediaId?: string;
+      //   name?: string;
+      //   pluginId?: string;
+      //   /** Format: int32 */
+      //   position?: number;
+      // };
       /** Information about the current sales channel */
       salesChannel?: {
         accessKey?: string;
@@ -4412,16 +4551,23 @@ export type components = {
         shortName?: string;
         typeId?: string;
       };
-      /** Selected shipping method */
-      shippingMethod?: {
-        active?: boolean;
-        availabilityRuleId?: string;
-        deliveryTimeId?: string;
-        description?: string;
-        mediaId?: string;
-        name?: string;
-        trackingUrl?: string;
+      shippingLocation?: {
+        // TODO: [OpenAPI][SalesChannelContext] shippingLocation field should be defined properly
+        apiAlias: "cart_delivery_shipping_location";
+        country: components["schemas"]["Country"];
+        address: components["schemas"]["Address"];
       };
+      /** Selected shipping method */
+      shippingMethod?: components["schemas"]["ShippingMethod"]; // TODO: [OpenAPI][SalesChannelContext] shippingMethod field should be defined properly reusing ShippingMethod schema
+      // shippingMethod?: {
+      //   active?: boolean;
+      //   availabilityRuleId?: string;
+      //   deliveryTimeId?: string;
+      //   description?: string;
+      //   mediaId?: string;
+      //   name?: string;
+      //   trackingUrl?: string;
+      // };
       /** Currently active tax rules and/or rates */
       taxRules?: {
         name?: string;
@@ -4522,7 +4668,10 @@ export type components = {
       isValid?: boolean;
       languageId: string;
       pathInfo: string;
-      routeName: string;
+      routeName: // TODO: [OpenAPI][SeoUrl] routeName field should be defined as union type
+      | "frontend.navigation.page"
+        | "frontend.landing.page"
+        | "frontend.detail.page";
       salesChannelId?: string;
       seoPathInfo: string;
       /** Format: date-time */
@@ -4573,7 +4722,7 @@ export type components = {
       deliveryTime?: components["schemas"]["DeliveryTime"];
       deliveryTimeId: string;
       description?: string;
-      id?: string;
+      id: string; // TODO: [OpenAPI][ShippingMethod] id field should be required in schema
       media?: components["schemas"]["Media"];
       mediaId?: string;
       name: string;
@@ -4853,8 +5002,8 @@ export type components = {
     };
     Sitemap: components["schemas"]["ArrayStruct"] & {
       /** Format: date-time */
-      created?: string;
-      filename?: string;
+      created: string; // TODO: [OpenAPI][Sitemap] created field should be defined as required
+      filename: string; // TODO: [OpenAPI][Sitemap] filename field should be defined as required
     };
     /** Added since version: 6.0.0.0 */
     Snippet: {
@@ -5935,7 +6084,7 @@ export type components = {
       updatedAt?: string;
     };
     WishlistLoadRouteResponse: {
-      products?: components["schemas"]["ProductListingResult"][];
+      products: components["schemas"]["ProductListingResult"]; // TODO: [OpenAPI][WishlistLoadRouteResponse] - products is listing result, not array
       wishlist?: {
         customerId?: string;
         salesChannelId?: string;
@@ -5987,7 +6136,8 @@ export type components = {
 
 export type external = Record<string, never>;
 
-export type operations = {
+// TODO: [api-gen]: issue for generator to create operations with generic parameters
+export type operations<components = components> = {
   /**
    * Create a new address for a customer
    * Creates a new address for a customer.
@@ -5995,7 +6145,11 @@ export type operations = {
   createCustomerAddress: {
     requestBody?: {
       content: {
-        "application/json": components["schemas"]["CustomerAddress"];
+        "application/json": Omit<
+          // TODO: [OpenAPI][createCustomerAddress] - omit id while creating address
+          components["schemas"]["CustomerAddress"],
+          "id" | "createdAt"
+        >;
       };
     };
     responses: {
@@ -6278,7 +6432,10 @@ export type operations = {
     responses: {
       200: {
         content: {
-          "application/json": components["schemas"]["CustomerAddress"][];
+          "application/json": {
+            // TODO: [OpenAPI][listAddress] add proper response type as EntitySearchResult
+            elements: components["schemas"]["CustomerAddress"][];
+          } & components["schemas"]["EntitySearchResult"];
         };
       };
     };
@@ -6341,7 +6498,8 @@ export type operations = {
     responses: {
       200: {
         content: {
-          "application/json": unknown;
+          // TODO: [OpenAPI][readNewsletterRecipient] add proper response type
+          "application/json": components["schemas"]["NewsletterStatus"];
         };
       };
     };
@@ -6417,7 +6575,10 @@ export type operations = {
           accountType?: string;
           /** Field can be used to store an affiliate tracking code */
           affiliateCode?: string;
-          billingAddress: components["schemas"]["CustomerAddress"];
+          billingAddress: Omit<
+            components["schemas"]["CustomerAddress"],
+            "createdAt" | "id" | "customerId" | "firstName" | "lastName"
+          >; // TODO: [OpenAPI][register] - omit id, createdAt, customerId, firstName, lastName while creating address (or better to reverse and pick required fields)
           /** Birthday day */
           birthdayDay?: number;
           /** Birthday month */
@@ -6578,7 +6739,15 @@ export type operations = {
   addLineItem: {
     requestBody?: {
       content: {
-        "application/json": components["schemas"]["CartItems"];
+        "application/json": {
+          // TODO: [OpenAPI][addLineItem] - add proper request body type with required fields
+          items: Array<{
+            id?: string; // TODO: check if this is used at all?
+            referencedId: string;
+            quantity?: number;
+            type: "product" | "promotion" | "custom" | "credit"; // TODO: [OpenAPI][addLineItem] - add proper type -> see also #456
+          }>;
+        };
       };
     };
     responses: {
@@ -6621,7 +6790,13 @@ export type operations = {
   updateLineItem: {
     requestBody?: {
       content: {
-        "application/json": components["schemas"]["CartItems"];
+        "application/json": {
+          // TODO: [OpenAPI][updateLineItem] - add proper request body type with required fields
+          items: Array<{
+            id: string;
+            quantity: number;
+          }>;
+        };
       };
     };
     responses: {
@@ -7019,12 +7194,19 @@ export type operations = {
           finishUrl?: string;
           /** Identifier of an order */
           orderId: string;
+          // paymentDetails -> TODO: [OpenAPI][handlePaymentMethod] check if `paymentDetails` property exist and what's for
         };
       };
     };
     responses: {
       /** Redirect to external payment provider */
-      200: never;
+      200: {
+        content: {
+          "application/json": {
+            redirectUrl: string; // TODO: [OpenAPI][handlePaymentMethod] add proper response type
+          };
+        };
+      };
     };
   };
   /**
@@ -7072,11 +7254,11 @@ export type operations = {
       };
     };
     responses: {
-      /** Entity search result containing languages. */
+      /** Entity search result containing languages. */ FrouteName;
       200: {
         content: {
           "application/json": {
-            elements?: components["schemas"]["Language"][];
+            elements: components["schemas"]["Language"][]; // TODO: [OpenAPI][readLanguages] add elements property as required
           } & components["schemas"]["EntitySearchResult"];
         };
       };
@@ -7100,9 +7282,11 @@ export type operations = {
       };
       path: {
         /** Identifier of the active category in the navigation tree (if not used, just set to the same as rootId). */
-        activeId: string;
+        activeId: // TODO: [OpenAPI][readNavigation] add union type in definition
+        components["schemas"]["NavigationType"] | string;
         /** Identifier of the root category for your desired navigation tree. You can use it to fetch sub-trees of your navigation tree. */
-        rootId: string;
+        rootId: // TODO: [OpenAPI][readNavigation] add union type in definition
+        components["schemas"]["NavigationType"] | string;
       };
     };
     requestBody: {
@@ -7284,7 +7468,7 @@ export type operations = {
       content: {
         "application/json": {
           /** The identifier of the order to be canceled. */
-          orderId?: string;
+          orderId: string; // TODO: [OpenAPI][cancelOrder] add orderId as required field
         };
       };
     };
@@ -7332,7 +7516,9 @@ export type operations = {
   readProduct: {
     requestBody?: {
       content: {
-        "application/json": components["schemas"]["Criteria"];
+        "application/json": components["schemas"]["Criteria"] & {
+          ids?: string[]; // TODO: [OpenAPI][readProduct]: add `ids` as field to criteria - (is required?)
+        };
       };
     };
     responses: {
@@ -7340,7 +7526,7 @@ export type operations = {
       200: {
         content: {
           "application/json": {
-            elements?: components["schemas"]["Product"][];
+            elements: components["schemas"]["Product"][]; // TODO: [OpenAPI][readProduct]: add elements property as required
           } & components["schemas"]["EntitySearchResult"];
         };
       };
@@ -7394,7 +7580,7 @@ export type operations = {
     parameters: {
       path: {
         /** Product ID */
-        productId: string;
+        productId: string; // TODO: [OpenAPI][readProductDetails]: add cmsAssociations to product detail parameters
       };
     };
     responses: {
@@ -7613,7 +7799,7 @@ export type operations = {
       200: {
         content: {
           "application/json": {
-            elements?: components["schemas"]["SeoUrl"][];
+            elements: components["schemas"]["SeoUrl"][]; // TODO: [OpenAPI][readSeoUrl]: response should be `EntitySearchResult` and elements should be required
           } & components["schemas"]["EntitySearchResult"];
         };
       };
@@ -7642,7 +7828,7 @@ export type operations = {
           "application/json": {
             /** aggregation result */
             aggregations?: GenericRecord;
-            elements?: components["schemas"]["ShippingMethod"][];
+            elements: components["schemas"]["ShippingMethod"][]; // TODO: [OpenAPI][readShippingMethod]: response should be `EntitySearchResult` and elements should be required
             /** Total amount */
             total?: number;
           };
diff --git a/packages/api-client-next/package.json b/packages/api-client-next/package.json
index 4044ef994..a349cfe97 100644
--- a/packages/api-client-next/package.json
+++ b/packages/api-client-next/package.json
@@ -3,6 +3,7 @@
   "version": "0.5.0",
   "description": "Shopware client for API connection.",
   "author": "Shopware",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shopware/frontends.git"
diff --git a/packages/api-client-next/src/errorInterceptor.ts b/packages/api-client-next/src/errorInterceptor.ts
index 6bbc82691..83b3b3a33 100644
--- a/packages/api-client-next/src/errorInterceptor.ts
+++ b/packages/api-client-next/src/errorInterceptor.ts
@@ -43,13 +43,17 @@ export class ApiClientError<
 
   constructor(response: FetchResponse<T>) {
     let message = "Failed request";
-    message += response._data?.errors.reduce((message, error) => {
-      let pointer = "";
-      if (error.source?.pointer) {
-        pointer = `[${error.source.pointer}]`;
-      }
-      return `${message}\n - [${error.title}]${pointer} ${error.detail ?? ""}`;
-    }, "");
+
+    message +=
+      response._data?.errors?.reduce((message, error) => {
+        let pointer = "";
+        if (error.source?.pointer) {
+          pointer = `[${error.source.pointer}]`;
+        }
+        return `${message}\n - [${error.title}]${pointer} ${
+          error.detail ?? ""
+        }`;
+      }, "") ?? "";
     super(message);
 
     this.name = "ApiClientError";
diff --git a/packages/api-client-next/src/index.ts b/packages/api-client-next/src/index.ts
index 11f6369e2..be9737f0c 100644
--- a/packages/api-client-next/src/index.ts
+++ b/packages/api-client-next/src/index.ts
@@ -288,3 +288,4 @@ export function createAdminAPIClient<
 }
 
 export { ApiClientError } from "./errorInterceptor";
+export type { ApiError } from "./errorInterceptor";
diff --git a/packages/api-client-next/src/playground.ts b/packages/api-client-next/src/playground.ts
index 2d280e7e5..d0e558c63 100644
--- a/packages/api-client-next/src/playground.ts
+++ b/packages/api-client-next/src/playground.ts
@@ -2,7 +2,8 @@
  * This file is just a temporary for playground and testing IDE support, it has no connections and will be removed, fell free to experiment here with the API
  */
 
-import { RequestParameters, createAPIClient } from ".";
+import { createAPIClient } from ".";
+import type { RequestParameters } from ".";
 import type {
   operationPaths,
   operations,
diff --git a/packages/api-client-next/src/tests/RequestParameters.test-d.ts b/packages/api-client-next/src/tests/RequestParameters.test-d.ts
index 001cde780..218d1e567 100644
--- a/packages/api-client-next/src/tests/RequestParameters.test-d.ts
+++ b/packages/api-client-next/src/tests/RequestParameters.test-d.ts
@@ -1,5 +1,5 @@
 import { describe, it, assertType } from "vitest";
-import { RequestParameters } from "..";
+import type { RequestParameters } from "..";
 
 import type { operations } from "../../admin-api-types";
 
diff --git a/packages/api-client/.eslintrc.js b/packages/api-client/.eslintrc.cjs
similarity index 100%
rename from packages/api-client/.eslintrc.js
rename to packages/api-client/.eslintrc.cjs
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index c81a4d9cc..5d33f3a4b 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -3,6 +3,7 @@
   "version": "0.7.0",
   "description": "Shopware Store API client",
   "author": "Shopware",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shopware/frontends.git"
diff --git a/packages/api-client/src/services/cartService.ts b/packages/api-client/src/services/cartService.ts
index 532596176..73738ce47 100644
--- a/packages/api-client/src/services/cartService.ts
+++ b/packages/api-client/src/services/cartService.ts
@@ -25,7 +25,7 @@ export async function clearCart(
 ): Promise<ContextTokenResponse> {
   const resp = await contextInstance.invoke.post(getCheckoutCartEndpoint());
   const contextToken = resp.data["sw-context-token"];
-  return { contextToken };
+  return { contextToken, apiAlias: "array_struct" };
 }
 
 /**
diff --git a/packages/api-client/src/services/contextService.ts b/packages/api-client/src/services/contextService.ts
index 665f8a8a8..9b23cd8b5 100644
--- a/packages/api-client/src/services/contextService.ts
+++ b/packages/api-client/src/services/contextService.ts
@@ -39,7 +39,11 @@ async function updateContext(
 ): Promise<ContextTokenResponse> {
   const resp = await contextInstance.invoke.patch(getContextEndpoint(), params);
   const contextToken = extractContextToken(resp);
-  return { contextToken, redirectUrl: resp.data.redirectUrl };
+  return {
+    contextToken,
+    redirectUrl: resp.data.redirectUrl,
+    apiAlias: "array_struct",
+  };
 }
 
 /**
diff --git a/packages/api-client/src/services/customerService.ts b/packages/api-client/src/services/customerService.ts
index 62b331191..e6e7d9c92 100644
--- a/packages/api-client/src/services/customerService.ts
+++ b/packages/api-client/src/services/customerService.ts
@@ -78,7 +78,7 @@ export async function login(
   );
   const contextToken =
     resp.data["sw-context-token"] || resp.data["contextToken"];
-  return { contextToken };
+  return { contextToken, apiAlias: "array_struct" };
 }
 
 /**
diff --git a/packages/api-gen/.eslintrc.js b/packages/api-gen/.eslintrc.cjs
similarity index 100%
rename from packages/api-gen/.eslintrc.js
rename to packages/api-gen/.eslintrc.cjs
diff --git a/packages/api-gen/package.json b/packages/api-gen/package.json
index 135b84d2c..ab4b4a902 100644
--- a/packages/api-gen/package.json
+++ b/packages/api-gen/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.1",
   "description": "Shopware CLI for API client generation.",
   "author": "Shopware",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shopware/frontends.git"
diff --git a/packages/api-gen/src/commands/generate.ts b/packages/api-gen/src/commands/generate.ts
index 0dc9e6ebe..b4e36b50b 100644
--- a/packages/api-gen/src/commands/generate.ts
+++ b/packages/api-gen/src/commands/generate.ts
@@ -3,7 +3,7 @@ import { resolve } from "node:path";
 import openapiTS from "openapi-typescript";
 import type { OpenAPI3 } from "openapi-typescript";
 import * as dotenv from "dotenv";
-import * as c from "picocolors";
+import c from "picocolors";
 import { format } from "prettier";
 import { patches } from "../patches";
 import semver from "semver";
diff --git a/packages/cms-base/.eslintrc.js b/packages/cms-base/.eslintrc.cjs
similarity index 100%
rename from packages/cms-base/.eslintrc.js
rename to packages/cms-base/.eslintrc.cjs
diff --git a/packages/cms-base/auto-imports.d.ts b/packages/cms-base/auto-imports.d.ts
deleted file mode 100644
index 577c2845a..000000000
--- a/packages/cms-base/auto-imports.d.ts
+++ /dev/null
@@ -1,584 +0,0 @@
-// Generated by auto imports
-export {};
-declare global {
-  const abortNavigation: (typeof import("../../node_modules/nuxt/dist/app"))["abortNavigation"];
-  const addRouteMiddleware: (typeof import("../../node_modules/nuxt/dist/app"))["addRouteMiddleware"];
-  const asyncComputed: (typeof import("@vueuse/core"))["asyncComputed"];
-  const autoResetRef: (typeof import("@vueuse/core"))["autoResetRef"];
-  const clearError: (typeof import("../../node_modules/nuxt/dist/app"))["clearError"];
-  const computed: (typeof import("vue"))["computed"];
-  const computedAsync: (typeof import("@vueuse/core"))["computedAsync"];
-  const computedEager: (typeof import("@vueuse/core"))["computedEager"];
-  const computedInject: (typeof import("@vueuse/core"))["computedInject"];
-  const computedWithControl: (typeof import("@vueuse/core"))["computedWithControl"];
-  const controlledComputed: (typeof import("@vueuse/core"))["controlledComputed"];
-  const controlledRef: (typeof import("@vueuse/core"))["controlledRef"];
-  const createEventHook: (typeof import("@vueuse/core"))["createEventHook"];
-  const createGlobalState: (typeof import("@vueuse/core"))["createGlobalState"];
-  const createInjectionState: (typeof import("@vueuse/core"))["createInjectionState"];
-  const createReactiveFn: (typeof import("@vueuse/core"))["createReactiveFn"];
-  const createSharedComposable: (typeof import("@vueuse/core"))["createSharedComposable"];
-  const createUnrefFn: (typeof import("@vueuse/core"))["createUnrefFn"];
-  const customRef: (typeof import("vue"))["customRef"];
-  const debouncedRef: (typeof import("@vueuse/core"))["debouncedRef"];
-  const debouncedWatch: (typeof import("@vueuse/core"))["debouncedWatch"];
-  const defineAsyncComponent: (typeof import("vue"))["defineAsyncComponent"];
-  const defineComponent: (typeof import("vue"))["defineComponent"];
-  const defineNuxtComponent: (typeof import("../../node_modules/nuxt/dist/app"))["defineNuxtComponent"];
-  const defineNuxtLink: (typeof import("../../node_modules/nuxt/dist/app"))["defineNuxtLink"];
-  const defineNuxtPlugin: (typeof import("../../node_modules/nuxt/dist/app"))["defineNuxtPlugin"];
-  const defineNuxtRouteMiddleware: (typeof import("../../node_modules/nuxt/dist/app"))["defineNuxtRouteMiddleware"];
-  const definePageMeta: (typeof import("../../node_modules/nuxt/dist/pages/runtime/composables"))["definePageMeta"];
-  const eagerComputed: (typeof import("@vueuse/core"))["eagerComputed"];
-  const effect: (typeof import("vue"))["effect"];
-  const effectScope: (typeof import("vue"))["effectScope"];
-  const extendRef: (typeof import("@vueuse/core"))["extendRef"];
-  const getCurrentInstance: (typeof import("vue"))["getCurrentInstance"];
-  const getCurrentScope: (typeof import("vue"))["getCurrentScope"];
-  const h: (typeof import("vue"))["h"];
-  const ignorableWatch: (typeof import("@vueuse/core"))["ignorableWatch"];
-  const inject: (typeof import("vue"))["inject"];
-  const isDefined: (typeof import("@vueuse/core"))["isDefined"];
-  const isProxy: (typeof import("vue"))["isProxy"];
-  const isReactive: (typeof import("vue"))["isReactive"];
-  const isReadonly: (typeof import("vue"))["isReadonly"];
-  const isRef: (typeof import("vue"))["isRef"];
-  const isShallow: (typeof import("vue"))["isShallow"];
-  const isVue2: (typeof import("../../node_modules/nuxt/dist/app/compat/vue-demi"))["isVue2"];
-  const isVue3: (typeof import("../../node_modules/nuxt/dist/app/compat/vue-demi"))["isVue3"];
-  const logicAnd: (typeof import("@vueuse/core"))["logicAnd"];
-  const logicNot: (typeof import("@vueuse/core"))["logicNot"];
-  const logicOr: (typeof import("@vueuse/core"))["logicOr"];
-  const makeDestructurable: (typeof import("@vueuse/core"))["makeDestructurable"];
-  const markRaw: (typeof import("vue"))["markRaw"];
-  const navigateTo: (typeof import("../../node_modules/nuxt/dist/app"))["navigateTo"];
-  const nextTick: (typeof import("vue"))["nextTick"];
-  const onActivated: (typeof import("vue"))["onActivated"];
-  const onBeforeMount: (typeof import("vue"))["onBeforeMount"];
-  const onBeforeUnmount: (typeof import("vue"))["onBeforeUnmount"];
-  const onBeforeUpdate: (typeof import("vue"))["onBeforeUpdate"];
-  const onClickOutside: (typeof import("@vueuse/core"))["onClickOutside"];
-  const onDeactivated: (typeof import("vue"))["onDeactivated"];
-  const onErrorCaptured: (typeof import("vue"))["onErrorCaptured"];
-  const onKeyStroke: (typeof import("@vueuse/core"))["onKeyStroke"];
-  const onLongPress: (typeof import("@vueuse/core"))["onLongPress"];
-  const onMounted: (typeof import("vue"))["onMounted"];
-  const onRenderTracked: (typeof import("vue"))["onRenderTracked"];
-  const onRenderTriggered: (typeof import("vue"))["onRenderTriggered"];
-  const onScopeDispose: (typeof import("vue"))["onScopeDispose"];
-  const onServerPrefetch: (typeof import("vue"))["onServerPrefetch"];
-  const onStartTyping: (typeof import("@vueuse/core"))["onStartTyping"];
-  const onUnmounted: (typeof import("vue"))["onUnmounted"];
-  const onUpdated: (typeof import("vue"))["onUpdated"];
-  const pausableWatch: (typeof import("@vueuse/core"))["pausableWatch"];
-  const provide: (typeof import("vue"))["provide"];
-  const proxyRefs: (typeof import("vue"))["proxyRefs"];
-  const reactify: (typeof import("@vueuse/core"))["reactify"];
-  const reactifyObject: (typeof import("@vueuse/core"))["reactifyObject"];
-  const reactive: (typeof import("vue"))["reactive"];
-  const reactiveComputed: (typeof import("@vueuse/core"))["reactiveComputed"];
-  const reactiveOmit: (typeof import("@vueuse/core"))["reactiveOmit"];
-  const reactivePick: (typeof import("@vueuse/core"))["reactivePick"];
-  const readonly: (typeof import("vue"))["readonly"];
-  const ref: (typeof import("vue"))["ref"];
-  const refAutoReset: (typeof import("@vueuse/core"))["refAutoReset"];
-  const refDebounced: (typeof import("@vueuse/core"))["refDebounced"];
-  const refDefault: (typeof import("@vueuse/core"))["refDefault"];
-  const refThrottled: (typeof import("@vueuse/core"))["refThrottled"];
-  const refWithControl: (typeof import("@vueuse/core"))["refWithControl"];
-  const refreshNuxtData: (typeof import("../../node_modules/nuxt/dist/app"))["refreshNuxtData"];
-  const resolveComponent: (typeof import("vue"))["resolveComponent"];
-  const shallowReactive: (typeof import("vue"))["shallowReactive"];
-  const shallowReadonly: (typeof import("vue"))["shallowReadonly"];
-  const shallowRef: (typeof import("vue"))["shallowRef"];
-  const syncRef: (typeof import("@vueuse/core"))["syncRef"];
-  const syncRefs: (typeof import("@vueuse/core"))["syncRefs"];
-  const templateRef: (typeof import("@vueuse/core"))["templateRef"];
-  const throttledRef: (typeof import("@vueuse/core"))["throttledRef"];
-  const throttledWatch: (typeof import("@vueuse/core"))["throttledWatch"];
-  const throwError: (typeof import("../../node_modules/nuxt/dist/app"))["throwError"];
-  const toRaw: (typeof import("vue"))["toRaw"];
-  const toReactive: (typeof import("@vueuse/core"))["toReactive"];
-  const toRef: (typeof import("vue"))["toRef"];
-  const toRefs: (typeof import("vue"))["toRefs"];
-  const triggerRef: (typeof import("vue"))["triggerRef"];
-  const tryOnBeforeMount: (typeof import("@vueuse/core"))["tryOnBeforeMount"];
-  const tryOnBeforeUnmount: (typeof import("@vueuse/core"))["tryOnBeforeUnmount"];
-  const tryOnMounted: (typeof import("@vueuse/core"))["tryOnMounted"];
-  const tryOnScopeDispose: (typeof import("@vueuse/core"))["tryOnScopeDispose"];
-  const tryOnUnmounted: (typeof import("@vueuse/core"))["tryOnUnmounted"];
-  const unref: (typeof import("vue"))["unref"];
-  const unrefElement: (typeof import("@vueuse/core"))["unrefElement"];
-  const until: (typeof import("@vueuse/core"))["until"];
-  const useActiveElement: (typeof import("@vueuse/core"))["useActiveElement"];
-  const useActiveRoute: (typeof import("../../node_modules/nuxt/dist/app"))["useActiveRoute"];
-  const useAddToCart: (typeof import("@shopware-pwa/composables-next"))["useAddToCart"];
-  const useCmsElementConfig: (typeof import("@shopware-pwa/composables-next"))["useCmsElementConfig"];
-  const useNotifications: (typeof import("@shopware-pwa/composables-next"))["useNotifications"];
-  const useCart: (typeof import("@shopware-pwa/composables-next"))["useCart"];
-  const useCountries: (typeof import("@shopware-pwa/composables-next"))["useCountries"];
-  const useSalutations: (typeof import("@shopware-pwa/composables-next"))["useSalutations"];
-  const useCheckout: (typeof import("@shopware-pwa/composables-next"))["useCheckout"];
-  const useSessionContext: (typeof import("@shopware-pwa/composables-next"))["useSessionContext"];
-  const useNotifications: (typeof import("@shopware-pwa/composables-next"))["useNotifications"];
-  const useWishlist: (typeof import("@shopware-pwa/composables-next"))["useWishlist"];
-  const usePrice: (typeof import("@shopware-pwa/composables-next"))["usePrice"];
-  const useAsyncData: (typeof import("../../node_modules/nuxt/dist/app"))["useAsyncData"];
-  const useAsyncQueue: (typeof import("@vueuse/core"))["useAsyncQueue"];
-  const useAsyncState: (typeof import("@vueuse/core"))["useAsyncState"];
-  const useAttrs: (typeof import("vue"))["useAttrs"];
-  const useBase64: (typeof import("@vueuse/core"))["useBase64"];
-  const useBattery: (typeof import("@vueuse/core"))["useBattery"];
-  const useBluetooth: (typeof import("@vueuse/core"))["useBluetooth"];
-  const useBreadcrumbs: (typeof import("@shopware-pwa/composables-next"))["useBreadcrumbs"];
-  const useBreakpoints: (typeof import("@vueuse/core"))["useBreakpoints"];
-  const useBroadcastChannel: (typeof import("@vueuse/core"))["useBroadcastChannel"];
-  const useBrowserLocation: (typeof import("@vueuse/core"))["useBrowserLocation"];
-  const useCached: (typeof import("@vueuse/core"))["useCached"];
-  const useClamp: (typeof import("@vueuse/core"))["useClamp"];
-  const useClipboard: (typeof import("@vueuse/core"))["useClipboard"];
-  const useCms: (typeof import("@shopware-pwa/composables-next"))["useCms"];
-  const useCmsBlock: (typeof import("@shopware-pwa/composables-next"))["useCmsBlock"];
-  const useColorMode: (typeof import("@vueuse/core"))["useColorMode"];
-  const useConfirmDialog: (typeof import("@vueuse/core"))["useConfirmDialog"];
-  const useCookie: (typeof import("../../node_modules/nuxt/dist/app"))["useCookie"];
-  const useCounter: (typeof import("@vueuse/core"))["useCounter"];
-  const useCssModule: (typeof import("vue"))["useCssModule"];
-  const useCssVar: (typeof import("@vueuse/core"))["useCssVar"];
-  const useCssVars: (typeof import("vue"))["useCssVars"];
-  const useCurrentElement: (typeof import("@vueuse/core"))["useCurrentElement"];
-  const useCycleList: (typeof import("@vueuse/core"))["useCycleList"];
-  const useDark: (typeof import("@vueuse/core"))["useDark"];
-  const useDateFormat: (typeof import("@vueuse/core"))["useDateFormat"];
-  const useDebounce: (typeof import("@vueuse/core"))["useDebounce"];
-  const useDebounceFn: (typeof import("@vueuse/core"))["useDebounceFn"];
-  const useDebouncedRefHistory: (typeof import("@vueuse/core"))["useDebouncedRefHistory"];
-  const useDeviceMotion: (typeof import("@vueuse/core"))["useDeviceMotion"];
-  const useDeviceOrientation: (typeof import("@vueuse/core"))["useDeviceOrientation"];
-  const useDevicePixelRatio: (typeof import("@vueuse/core"))["useDevicePixelRatio"];
-  const useDevicesList: (typeof import("@vueuse/core"))["useDevicesList"];
-  const useDisplayMedia: (typeof import("@vueuse/core"))["useDisplayMedia"];
-  const useDocumentVisibility: (typeof import("@vueuse/core"))["useDocumentVisibility"];
-  const useDraggable: (typeof import("@vueuse/core"))["useDraggable"];
-  const useDropZone: (typeof import("@vueuse/core"))["useDropZone"];
-  const useElementBounding: (typeof import("@vueuse/core"))["useElementBounding"];
-  const useElementByPoint: (typeof import("@vueuse/core"))["useElementByPoint"];
-  const useElementHover: (typeof import("@vueuse/core"))["useElementHover"];
-  const useElementSize: (typeof import("@vueuse/core"))["useElementSize"];
-  const useElementVisibility: (typeof import("@vueuse/core"))["useElementVisibility"];
-  const useError: (typeof import("../../node_modules/nuxt/dist/app"))["useError"];
-  const useEventBus: (typeof import("@vueuse/core"))["useEventBus"];
-  const useEventListener: (typeof import("@vueuse/core"))["useEventListener"];
-  const useEventSource: (typeof import("@vueuse/core"))["useEventSource"];
-  const useEyeDropper: (typeof import("@vueuse/core"))["useEyeDropper"];
-  const useFavicon: (typeof import("@vueuse/core"))["useFavicon"];
-  const useFetch: (typeof import("../../node_modules/nuxt/dist/app"))["useFetch"];
-  const useFileSystemAccess: (typeof import("@vueuse/core"))["useFileSystemAccess"];
-  const useFocus: (typeof import("@vueuse/core"))["useFocus"];
-  const useFocusWithin: (typeof import("@vueuse/core"))["useFocusWithin"];
-  const useFps: (typeof import("@vueuse/core"))["useFps"];
-  const useFullscreen: (typeof import("@vueuse/core"))["useFullscreen"];
-  const useGamepad: (typeof import("@vueuse/core"))["useGamepad"];
-  const useGeolocation: (typeof import("@vueuse/core"))["useGeolocation"];
-  const useHead: (typeof import("../../node_modules/nuxt/dist/head/runtime"))["useHead"];
-  const useIdle: (typeof import("@vueuse/core"))["useIdle"];
-  const useImage: (typeof import("@vueuse/core"))["useImage"];
-  const useInfiniteScroll: (typeof import("@vueuse/core"))["useInfiniteScroll"];
-  const useIntersectionObserver: (typeof import("@vueuse/core"))["useIntersectionObserver"];
-  const useInterval: (typeof import("@vueuse/core"))["useInterval"];
-  const useIntervalFn: (typeof import("@vueuse/core"))["useIntervalFn"];
-  const useKeyModifier: (typeof import("@vueuse/core"))["useKeyModifier"];
-  const useLastChanged: (typeof import("@vueuse/core"))["useLastChanged"];
-  const useLazyAsyncData: (typeof import("../../node_modules/nuxt/dist/app"))["useLazyAsyncData"];
-  const useLazyFetch: (typeof import("../../node_modules/nuxt/dist/app"))["useLazyFetch"];
-  const useListing: (typeof import("@shopware-pwa/composables-next"))["useListing"];
-  const useLocalStorage: (typeof import("@vueuse/core"))["useLocalStorage"];
-  const useMagicKeys: (typeof import("@vueuse/core"))["useMagicKeys"];
-  const useManualRefHistory: (typeof import("@vueuse/core"))["useManualRefHistory"];
-  const useMediaControls: (typeof import("@vueuse/core"))["useMediaControls"];
-  const useMediaQuery: (typeof import("@vueuse/core"))["useMediaQuery"];
-  const useMemoize: (typeof import("@vueuse/core"))["useMemoize"];
-  const useMemory: (typeof import("@vueuse/core"))["useMemory"];
-  const useMounted: (typeof import("@vueuse/core"))["useMounted"];
-  const useMouse: (typeof import("@vueuse/core"))["useMouse"];
-  const useMouseInElement: (typeof import("@vueuse/core"))["useMouseInElement"];
-  const useMousePressed: (typeof import("@vueuse/core"))["useMousePressed"];
-  const useMutationObserver: (typeof import("@vueuse/core"))["useMutationObserver"];
-  const useNavigation: (typeof import("@shopware-pwa/composables-next"))["useNavigation"];
-  const useNavigatorLanguage: (typeof import("@vueuse/core"))["useNavigatorLanguage"];
-  const useNetwork: (typeof import("@vueuse/core"))["useNetwork"];
-  const useNow: (typeof import("@vueuse/core"))["useNow"];
-  const useNuxtApp: (typeof import("../../node_modules/nuxt/dist/app"))["useNuxtApp"];
-  const useOffsetPagination: (typeof import("@vueuse/core"))["useOffsetPagination"];
-  const useOnline: (typeof import("@vueuse/core"))["useOnline"];
-  const usePageLeave: (typeof import("@vueuse/core"))["usePageLeave"];
-  const useParallax: (typeof import("@vueuse/core"))["useParallax"];
-  const usePermission: (typeof import("@vueuse/core"))["usePermission"];
-  const usePointer: (typeof import("@vueuse/core"))["usePointer"];
-  const usePointerSwipe: (typeof import("@vueuse/core"))["usePointerSwipe"];
-  const usePreferredColorScheme: (typeof import("@vueuse/core"))["usePreferredColorScheme"];
-  const usePreferredDark: (typeof import("@vueuse/core"))["usePreferredDark"];
-  const usePreferredLanguages: (typeof import("@vueuse/core"))["usePreferredLanguages"];
-  const useProduct: (typeof import("@shopware-pwa/composables-next"))["useProduct"];
-  const useCategory: (typeof import("@shopware-pwa/composables-next"))["useCategory"];
-  const useProductConfigurator: (typeof import("@shopware-pwa/composables-next"))["useProductConfigurator"];
-  const useProductReviews: (typeof import("@shopware-pwa/composables-next"))["useProductReviews"];
-  const useProductAssociations: (typeof import("@shopware-pwa/composables-next"))["useProductAssociations"];
-  const useProductWishlist: (typeof import("@shopware-pwa/composables-next"))["useProductWishlist"];
-  const useRafFn: (typeof import("@vueuse/core"))["useRafFn"];
-  const useRefHistory: (typeof import("@vueuse/core"))["useRefHistory"];
-  const useRequestEvent: (typeof import("../../node_modules/nuxt/dist/app"))["useRequestEvent"];
-  const useRequestHeaders: (typeof import("../../node_modules/nuxt/dist/app"))["useRequestHeaders"];
-  const useResizeObserver: (typeof import("@vueuse/core"))["useResizeObserver"];
-  const useRoute: (typeof import("../../node_modules/nuxt/dist/app"))["useRoute"];
-  const useRouter: (typeof import("../../node_modules/nuxt/dist/app"))["useRouter"];
-  const useRuntimeConfig: (typeof import("../../node_modules/nuxt/dist/app"))["useRuntimeConfig"];
-  const useScreenOrientation: (typeof import("@vueuse/core"))["useScreenOrientation"];
-  const useScreenSafeArea: (typeof import("@vueuse/core"))["useScreenSafeArea"];
-  const useScriptTag: (typeof import("@vueuse/core"))["useScriptTag"];
-  const useScroll: (typeof import("@vueuse/core"))["useScroll"];
-  const useScrollLock: (typeof import("@vueuse/core"))["useScrollLock"];
-  const useSessionStorage: (typeof import("@vueuse/core"))["useSessionStorage"];
-  const useShare: (typeof import("@vueuse/core"))["useShare"];
-  const useShopwareContext: (typeof import("@shopware-pwa/composables-next"))["useShopwareContext"];
-  const useSlots: (typeof import("vue"))["useSlots"];
-  const useSpeechRecognition: (typeof import("@vueuse/core"))["useSpeechRecognition"];
-  const useSpeechSynthesis: (typeof import("@vueuse/core"))["useSpeechSynthesis"];
-  const useState: (typeof import("../../node_modules/nuxt/dist/app"))["useState"];
-  const useStorageAsync: (typeof import("@vueuse/core"))["useStorageAsync"];
-  const useStyleTag: (typeof import("@vueuse/core"))["useStyleTag"];
-  const useSwipe: (typeof import("@vueuse/core"))["useSwipe"];
-  const useTemplateRefsList: (typeof import("@vueuse/core"))["useTemplateRefsList"];
-  const useTextSelection: (typeof import("@vueuse/core"))["useTextSelection"];
-  const useThrottle: (typeof import("@vueuse/core"))["useThrottle"];
-  const useThrottleFn: (typeof import("@vueuse/core"))["useThrottleFn"];
-  const useThrottledRefHistory: (typeof import("@vueuse/core"))["useThrottledRefHistory"];
-  const useTimeAgo: (typeof import("@vueuse/core"))["useTimeAgo"];
-  const useTimeout: (typeof import("@vueuse/core"))["useTimeout"];
-  const useTimeoutFn: (typeof import("@vueuse/core"))["useTimeoutFn"];
-  const useTimeoutPoll: (typeof import("@vueuse/core"))["useTimeoutPoll"];
-  const useTimestamp: (typeof import("@vueuse/core"))["useTimestamp"];
-  const useToggle: (typeof import("@vueuse/core"))["useToggle"];
-  const useTransition: (typeof import("@vueuse/core"))["useTransition"];
-  const useTransitionState: (typeof import("vue"))["useTransitionState"];
-  const useUrlSearchParams: (typeof import("@vueuse/core"))["useUrlSearchParams"];
-  const useUser: (typeof import("@shopware-pwa/composables-next"))["useUser"];
-  const useNewsletter: (typeof import("@shopware-pwa/composables-next"))["useNewsletter"];
-  const useUserMedia: (typeof import("@vueuse/core"))["useUserMedia"];
-  const useVModel: (typeof import("@vueuse/core"))["useVModel"];
-  const useVModels: (typeof import("@vueuse/core"))["useVModels"];
-  const useVibrate: (typeof import("@vueuse/core"))["useVibrate"];
-  const useVirtualList: (typeof import("@vueuse/core"))["useVirtualList"];
-  const useWakeLock: (typeof import("@vueuse/core"))["useWakeLock"];
-  const useWebNotification: (typeof import("@vueuse/core"))["useWebNotification"];
-  const useWebSocket: (typeof import("@vueuse/core"))["useWebSocket"];
-  const useWebWorker: (typeof import("@vueuse/core"))["useWebWorker"];
-  const useWebWorkerFn: (typeof import("@vueuse/core"))["useWebWorkerFn"];
-  const useWindowFocus: (typeof import("@vueuse/core"))["useWindowFocus"];
-  const useWindowScroll: (typeof import("@vueuse/core"))["useWindowScroll"];
-  const useWindowSize: (typeof import("@vueuse/core"))["useWindowSize"];
-  const watch: (typeof import("vue"))["watch"];
-  const watchAtMost: (typeof import("@vueuse/core"))["watchAtMost"];
-  const watchDebounced: (typeof import("@vueuse/core"))["watchDebounced"];
-  const watchEffect: (typeof import("vue"))["watchEffect"];
-  const watchIgnorable: (typeof import("@vueuse/core"))["watchIgnorable"];
-  const watchOnce: (typeof import("@vueuse/core"))["watchOnce"];
-  const watchPausable: (typeof import("@vueuse/core"))["watchPausable"];
-  const watchThrottled: (typeof import("@vueuse/core"))["watchThrottled"];
-  const watchWithFilter: (typeof import("@vueuse/core"))["watchWithFilter"];
-  const whenever: (typeof import("@vueuse/core"))["whenever"];
-  const withCtx: (typeof import("vue"))["withCtx"];
-  const withDirectives: (typeof import("vue"))["withDirectives"];
-  const withKeys: (typeof import("vue"))["withKeys"];
-  const withMemo: (typeof import("vue"))["withMemo"];
-  const withModifiers: (typeof import("vue"))["withModifiers"];
-  const withScopeId: (typeof import("vue"))["withScopeId"];
-}
-// for vue template auto import
-declare module "vue" {
-  interface ComponentCustomProperties {
-    abortNavigation: (typeof import("../../node_modules/nuxt/dist/app"))["abortNavigation"];
-    addRouteMiddleware: (typeof import("../../node_modules/nuxt/dist/app"))["addRouteMiddleware"];
-    asyncComputed: (typeof import("@vueuse/core"))["asyncComputed"];
-    autoResetRef: (typeof import("@vueuse/core"))["autoResetRef"];
-    clearError: (typeof import("../../node_modules/nuxt/dist/app"))["clearError"];
-    computed: (typeof import("vue"))["computed"];
-    computedAsync: (typeof import("@vueuse/core"))["computedAsync"];
-    computedEager: (typeof import("@vueuse/core"))["computedEager"];
-    computedInject: (typeof import("@vueuse/core"))["computedInject"];
-    computedWithControl: (typeof import("@vueuse/core"))["computedWithControl"];
-    controlledComputed: (typeof import("@vueuse/core"))["controlledComputed"];
-    controlledRef: (typeof import("@vueuse/core"))["controlledRef"];
-    createEventHook: (typeof import("@vueuse/core"))["createEventHook"];
-    createGlobalState: (typeof import("@vueuse/core"))["createGlobalState"];
-    createInjectionState: (typeof import("@vueuse/core"))["createInjectionState"];
-    createReactiveFn: (typeof import("@vueuse/core"))["createReactiveFn"];
-    createSharedComposable: (typeof import("@vueuse/core"))["createSharedComposable"];
-    createUnrefFn: (typeof import("@vueuse/core"))["createUnrefFn"];
-    customRef: (typeof import("vue"))["customRef"];
-    debouncedRef: (typeof import("@vueuse/core"))["debouncedRef"];
-    debouncedWatch: (typeof import("@vueuse/core"))["debouncedWatch"];
-    defineAsyncComponent: (typeof import("vue"))["defineAsyncComponent"];
-    defineComponent: (typeof import("vue"))["defineComponent"];
-    defineNuxtComponent: (typeof import("../../node_modules/nuxt/dist/app"))["defineNuxtComponent"];
-    defineNuxtLink: (typeof import("../../node_modules/nuxt/dist/app"))["defineNuxtLink"];
-    defineNuxtPlugin: (typeof import("../../node_modules/nuxt/dist/app"))["defineNuxtPlugin"];
-    defineNuxtRouteMiddleware: (typeof import("../../node_modules/nuxt/dist/app"))["defineNuxtRouteMiddleware"];
-    definePageMeta: (typeof import("../../node_modules/nuxt/dist/pages/runtime/composables"))["definePageMeta"];
-    eagerComputed: (typeof import("@vueuse/core"))["eagerComputed"];
-    effect: (typeof import("vue"))["effect"];
-    effectScope: (typeof import("vue"))["effectScope"];
-    extendRef: (typeof import("@vueuse/core"))["extendRef"];
-    getCurrentInstance: (typeof import("vue"))["getCurrentInstance"];
-    getCurrentScope: (typeof import("vue"))["getCurrentScope"];
-    h: (typeof import("vue"))["h"];
-    ignorableWatch: (typeof import("@vueuse/core"))["ignorableWatch"];
-    inject: (typeof import("vue"))["inject"];
-    isDefined: (typeof import("@vueuse/core"))["isDefined"];
-    isProxy: (typeof import("vue"))["isProxy"];
-    isReactive: (typeof import("vue"))["isReactive"];
-    isReadonly: (typeof import("vue"))["isReadonly"];
-    isRef: (typeof import("vue"))["isRef"];
-    isShallow: (typeof import("vue"))["isShallow"];
-    isVue2: (typeof import("../../node_modules/nuxt/dist/app/compat/vue-demi"))["isVue2"];
-    isVue3: (typeof import("../../node_modules/nuxt/dist/app/compat/vue-demi"))["isVue3"];
-    logicAnd: (typeof import("@vueuse/core"))["logicAnd"];
-    logicNot: (typeof import("@vueuse/core"))["logicNot"];
-    logicOr: (typeof import("@vueuse/core"))["logicOr"];
-    makeDestructurable: (typeof import("@vueuse/core"))["makeDestructurable"];
-    markRaw: (typeof import("vue"))["markRaw"];
-    navigateTo: (typeof import("../../node_modules/nuxt/dist/app"))["navigateTo"];
-    nextTick: (typeof import("vue"))["nextTick"];
-    onActivated: (typeof import("vue"))["onActivated"];
-    onBeforeMount: (typeof import("vue"))["onBeforeMount"];
-    onBeforeUnmount: (typeof import("vue"))["onBeforeUnmount"];
-    onBeforeUpdate: (typeof import("vue"))["onBeforeUpdate"];
-    onClickOutside: (typeof import("@vueuse/core"))["onClickOutside"];
-    onDeactivated: (typeof import("vue"))["onDeactivated"];
-    onErrorCaptured: (typeof import("vue"))["onErrorCaptured"];
-    onKeyStroke: (typeof import("@vueuse/core"))["onKeyStroke"];
-    onLongPress: (typeof import("@vueuse/core"))["onLongPress"];
-    onMounted: (typeof import("vue"))["onMounted"];
-    onRenderTracked: (typeof import("vue"))["onRenderTracked"];
-    onRenderTriggered: (typeof import("vue"))["onRenderTriggered"];
-    onScopeDispose: (typeof import("vue"))["onScopeDispose"];
-    onServerPrefetch: (typeof import("vue"))["onServerPrefetch"];
-    onStartTyping: (typeof import("@vueuse/core"))["onStartTyping"];
-    onUnmounted: (typeof import("vue"))["onUnmounted"];
-    onUpdated: (typeof import("vue"))["onUpdated"];
-    pausableWatch: (typeof import("@vueuse/core"))["pausableWatch"];
-    provide: (typeof import("vue"))["provide"];
-    proxyRefs: (typeof import("vue"))["proxyRefs"];
-    reactify: (typeof import("@vueuse/core"))["reactify"];
-    reactifyObject: (typeof import("@vueuse/core"))["reactifyObject"];
-    reactive: (typeof import("vue"))["reactive"];
-    reactiveComputed: (typeof import("@vueuse/core"))["reactiveComputed"];
-    reactiveOmit: (typeof import("@vueuse/core"))["reactiveOmit"];
-    reactivePick: (typeof import("@vueuse/core"))["reactivePick"];
-    readonly: (typeof import("vue"))["readonly"];
-    ref: (typeof import("vue"))["ref"];
-    refAutoReset: (typeof import("@vueuse/core"))["refAutoReset"];
-    refDebounced: (typeof import("@vueuse/core"))["refDebounced"];
-    refDefault: (typeof import("@vueuse/core"))["refDefault"];
-    refThrottled: (typeof import("@vueuse/core"))["refThrottled"];
-    refWithControl: (typeof import("@vueuse/core"))["refWithControl"];
-    refreshNuxtData: (typeof import("../../node_modules/nuxt/dist/app"))["refreshNuxtData"];
-    resolveComponent: (typeof import("vue"))["resolveComponent"];
-    shallowReactive: (typeof import("vue"))["shallowReactive"];
-    shallowReadonly: (typeof import("vue"))["shallowReadonly"];
-    shallowRef: (typeof import("vue"))["shallowRef"];
-    syncRef: (typeof import("@vueuse/core"))["syncRef"];
-    syncRefs: (typeof import("@vueuse/core"))["syncRefs"];
-    templateRef: (typeof import("@vueuse/core"))["templateRef"];
-    throttledRef: (typeof import("@vueuse/core"))["throttledRef"];
-    throttledWatch: (typeof import("@vueuse/core"))["throttledWatch"];
-    throwError: (typeof import("../../node_modules/nuxt/dist/app"))["throwError"];
-    toRaw: (typeof import("vue"))["toRaw"];
-    toReactive: (typeof import("@vueuse/core"))["toReactive"];
-    toRef: (typeof import("vue"))["toRef"];
-    toRefs: (typeof import("vue"))["toRefs"];
-    triggerRef: (typeof import("vue"))["triggerRef"];
-    tryOnBeforeMount: (typeof import("@vueuse/core"))["tryOnBeforeMount"];
-    tryOnBeforeUnmount: (typeof import("@vueuse/core"))["tryOnBeforeUnmount"];
-    tryOnMounted: (typeof import("@vueuse/core"))["tryOnMounted"];
-    tryOnScopeDispose: (typeof import("@vueuse/core"))["tryOnScopeDispose"];
-    tryOnUnmounted: (typeof import("@vueuse/core"))["tryOnUnmounted"];
-    unref: (typeof import("vue"))["unref"];
-    unrefElement: (typeof import("@vueuse/core"))["unrefElement"];
-    until: (typeof import("@vueuse/core"))["until"];
-    useActiveElement: (typeof import("@vueuse/core"))["useActiveElement"];
-    useActiveRoute: (typeof import("../../node_modules/nuxt/dist/app"))["useActiveRoute"];
-    useAddToCart: (typeof import("@shopware-pwa/composables-next"))["useAddToCart"];
-    useNotifications: (typeof import("@shopware-pwa/composables-next"))["useNotifications"];
-    useCountries: (typeof import("@shopware-pwa/composables-next"))["useCountries"];
-    useSalutations: (typeof import("@shopware-pwa/composables-next"))["useSalutations"];
-    useCheckout: (typeof import("@shopware-pwa/composables-next"))["useCheckout"];
-    useAsyncData: (typeof import("../../node_modules/nuxt/dist/app"))["useAsyncData"];
-    useAsyncQueue: (typeof import("@vueuse/core"))["useAsyncQueue"];
-    useAsyncState: (typeof import("@vueuse/core"))["useAsyncState"];
-    useAttrs: (typeof import("vue"))["useAttrs"];
-    useBase64: (typeof import("@vueuse/core"))["useBase64"];
-    useBattery: (typeof import("@vueuse/core"))["useBattery"];
-    useBluetooth: (typeof import("@vueuse/core"))["useBluetooth"];
-    useBreadcrumbs: (typeof import("@shopware-pwa/composables-next"))["useBreadcrumbs"];
-    useBreakpoints: (typeof import("@vueuse/core"))["useBreakpoints"];
-    useBroadcastChannel: (typeof import("@vueuse/core"))["useBroadcastChannel"];
-    useBrowserLocation: (typeof import("@vueuse/core"))["useBrowserLocation"];
-    useCached: (typeof import("@vueuse/core"))["useCached"];
-    useClamp: (typeof import("@vueuse/core"))["useClamp"];
-    useClipboard: (typeof import("@vueuse/core"))["useClipboard"];
-    useCms: (typeof import("@shopware-pwa/composables-next"))["useCms"];
-    useColorMode: (typeof import("@vueuse/core"))["useColorMode"];
-    useConfirmDialog: (typeof import("@vueuse/core"))["useConfirmDialog"];
-    useCookie: (typeof import("../../node_modules/nuxt/dist/app"))["useCookie"];
-    useCounter: (typeof import("@vueuse/core"))["useCounter"];
-    useCssModule: (typeof import("vue"))["useCssModule"];
-    useCssVar: (typeof import("@vueuse/core"))["useCssVar"];
-    useCssVars: (typeof import("vue"))["useCssVars"];
-    useCurrentElement: (typeof import("@vueuse/core"))["useCurrentElement"];
-    useCycleList: (typeof import("@vueuse/core"))["useCycleList"];
-    useDark: (typeof import("@vueuse/core"))["useDark"];
-    useDateFormat: (typeof import("@vueuse/core"))["useDateFormat"];
-    useDebounce: (typeof import("@vueuse/core"))["useDebounce"];
-    useDebounceFn: (typeof import("@vueuse/core"))["useDebounceFn"];
-    useDebouncedRefHistory: (typeof import("@vueuse/core"))["useDebouncedRefHistory"];
-    useDeviceMotion: (typeof import("@vueuse/core"))["useDeviceMotion"];
-    useDeviceOrientation: (typeof import("@vueuse/core"))["useDeviceOrientation"];
-    useDevicePixelRatio: (typeof import("@vueuse/core"))["useDevicePixelRatio"];
-    useDevicesList: (typeof import("@vueuse/core"))["useDevicesList"];
-    useDisplayMedia: (typeof import("@vueuse/core"))["useDisplayMedia"];
-    useDocumentVisibility: (typeof import("@vueuse/core"))["useDocumentVisibility"];
-    useDraggable: (typeof import("@vueuse/core"))["useDraggable"];
-    useDropZone: (typeof import("@vueuse/core"))["useDropZone"];
-    useElementBounding: (typeof import("@vueuse/core"))["useElementBounding"];
-    useElementByPoint: (typeof import("@vueuse/core"))["useElementByPoint"];
-    useElementHover: (typeof import("@vueuse/core"))["useElementHover"];
-    useElementSize: (typeof import("@vueuse/core"))["useElementSize"];
-    useElementVisibility: (typeof import("@vueuse/core"))["useElementVisibility"];
-    useError: (typeof import("../../node_modules/nuxt/dist/app"))["useError"];
-    useEventBus: (typeof import("@vueuse/core"))["useEventBus"];
-    useEventListener: (typeof import("@vueuse/core"))["useEventListener"];
-    useEventSource: (typeof import("@vueuse/core"))["useEventSource"];
-    useEyeDropper: (typeof import("@vueuse/core"))["useEyeDropper"];
-    useFavicon: (typeof import("@vueuse/core"))["useFavicon"];
-    useFetch: (typeof import("../../node_modules/nuxt/dist/app"))["useFetch"];
-    useFileSystemAccess: (typeof import("@vueuse/core"))["useFileSystemAccess"];
-    useFocus: (typeof import("@vueuse/core"))["useFocus"];
-    useFocusWithin: (typeof import("@vueuse/core"))["useFocusWithin"];
-    useFps: (typeof import("@vueuse/core"))["useFps"];
-    useFullscreen: (typeof import("@vueuse/core"))["useFullscreen"];
-    useGamepad: (typeof import("@vueuse/core"))["useGamepad"];
-    useGeolocation: (typeof import("@vueuse/core"))["useGeolocation"];
-    useHead: (typeof import("../../node_modules/nuxt/dist/head/runtime"))["useHead"];
-    useIdle: (typeof import("@vueuse/core"))["useIdle"];
-    useImage: (typeof import("@vueuse/core"))["useImage"];
-    useInfiniteScroll: (typeof import("@vueuse/core"))["useInfiniteScroll"];
-    useIntersectionObserver: (typeof import("@vueuse/core"))["useIntersectionObserver"];
-    useInterval: (typeof import("@vueuse/core"))["useInterval"];
-    useIntervalFn: (typeof import("@vueuse/core"))["useIntervalFn"];
-    useKeyModifier: (typeof import("@vueuse/core"))["useKeyModifier"];
-    useLastChanged: (typeof import("@vueuse/core"))["useLastChanged"];
-    useLazyAsyncData: (typeof import("../../node_modules/nuxt/dist/app"))["useLazyAsyncData"];
-    useLazyFetch: (typeof import("../../node_modules/nuxt/dist/app"))["useLazyFetch"];
-    useListing: (typeof import("@shopware-pwa/composables-next"))["useListing"];
-    useLocalStorage: (typeof import("@vueuse/core"))["useLocalStorage"];
-    useMagicKeys: (typeof import("@vueuse/core"))["useMagicKeys"];
-    useManualRefHistory: (typeof import("@vueuse/core"))["useManualRefHistory"];
-    useMediaControls: (typeof import("@vueuse/core"))["useMediaControls"];
-    useMediaQuery: (typeof import("@vueuse/core"))["useMediaQuery"];
-    useMemoize: (typeof import("@vueuse/core"))["useMemoize"];
-    useMemory: (typeof import("@vueuse/core"))["useMemory"];
-    useMounted: (typeof import("@vueuse/core"))["useMounted"];
-    useMouse: (typeof import("@vueuse/core"))["useMouse"];
-    useMouseInElement: (typeof import("@vueuse/core"))["useMouseInElement"];
-    useMousePressed: (typeof import("@vueuse/core"))["useMousePressed"];
-    useMutationObserver: (typeof import("@vueuse/core"))["useMutationObserver"];
-    useNavigation: (typeof import("@shopware-pwa/composables-next"))["useNavigation"];
-    useNavigatorLanguage: (typeof import("@vueuse/core"))["useNavigatorLanguage"];
-    useNetwork: (typeof import("@vueuse/core"))["useNetwork"];
-    useNow: (typeof import("@vueuse/core"))["useNow"];
-    useNuxtApp: (typeof import("../../node_modules/nuxt/dist/app"))["useNuxtApp"];
-    useOffsetPagination: (typeof import("@vueuse/core"))["useOffsetPagination"];
-    useOnline: (typeof import("@vueuse/core"))["useOnline"];
-    usePageLeave: (typeof import("@vueuse/core"))["usePageLeave"];
-    useParallax: (typeof import("@vueuse/core"))["useParallax"];
-    usePermission: (typeof import("@vueuse/core"))["usePermission"];
-    usePointer: (typeof import("@vueuse/core"))["usePointer"];
-    usePointerSwipe: (typeof import("@vueuse/core"))["usePointerSwipe"];
-    usePreferredColorScheme: (typeof import("@vueuse/core"))["usePreferredColorScheme"];
-    usePreferredDark: (typeof import("@vueuse/core"))["usePreferredDark"];
-    usePreferredLanguages: (typeof import("@vueuse/core"))["usePreferredLanguages"];
-    useProduct: (typeof import("@shopware-pwa/composables-next"))["useProduct"];
-    useProductConfigurator: (typeof import("@shopware-pwa/composables-next"))["useProductConfigurator"];
-    useProductReviews: (typeof import("@shopware-pwa/composables-next"))["useProductReviews"];
-    useRafFn: (typeof import("@vueuse/core"))["useRafFn"];
-    useRefHistory: (typeof import("@vueuse/core"))["useRefHistory"];
-    useRequestEvent: (typeof import("../../node_modules/nuxt/dist/app"))["useRequestEvent"];
-    useRequestHeaders: (typeof import("../../node_modules/nuxt/dist/app"))["useRequestHeaders"];
-    useResizeObserver: (typeof import("@vueuse/core"))["useResizeObserver"];
-    useRoute: (typeof import("../../node_modules/nuxt/dist/app"))["useRoute"];
-    useRouter: (typeof import("../../node_modules/nuxt/dist/app"))["useRouter"];
-    useRuntimeConfig: (typeof import("../../node_modules/nuxt/dist/app"))["useRuntimeConfig"];
-    useScreenOrientation: (typeof import("@vueuse/core"))["useScreenOrientation"];
-    useScreenSafeArea: (typeof import("@vueuse/core"))["useScreenSafeArea"];
-    useScriptTag: (typeof import("@vueuse/core"))["useScriptTag"];
-    useScroll: (typeof import("@vueuse/core"))["useScroll"];
-    useScrollLock: (typeof import("@vueuse/core"))["useScrollLock"];
-    useSessionContext: (typeof import("@shopware-pwa/composables-next"))["useSessionContext"];
-    useSessionStorage: (typeof import("@vueuse/core"))["useSessionStorage"];
-    useShare: (typeof import("@vueuse/core"))["useShare"];
-    useShopwareContext: (typeof import("@shopware-pwa/composables-next"))["useShopwareContext"];
-    useSlots: (typeof import("vue"))["useSlots"];
-    useSpeechRecognition: (typeof import("@vueuse/core"))["useSpeechRecognition"];
-    useSpeechSynthesis: (typeof import("@vueuse/core"))["useSpeechSynthesis"];
-    useState: (typeof import("../../node_modules/nuxt/dist/app"))["useState"];
-    useStorageAsync: (typeof import("@vueuse/core"))["useStorageAsync"];
-    useStyleTag: (typeof import("@vueuse/core"))["useStyleTag"];
-    useSwipe: (typeof import("@vueuse/core"))["useSwipe"];
-    useTemplateRefsList: (typeof import("@vueuse/core"))["useTemplateRefsList"];
-    useTextSelection: (typeof import("@vueuse/core"))["useTextSelection"];
-    useThrottle: (typeof import("@vueuse/core"))["useThrottle"];
-    useThrottleFn: (typeof import("@vueuse/core"))["useThrottleFn"];
-    useThrottledRefHistory: (typeof import("@vueuse/core"))["useThrottledRefHistory"];
-    useTimeAgo: (typeof import("@vueuse/core"))["useTimeAgo"];
-    useTimeout: (typeof import("@vueuse/core"))["useTimeout"];
-    useTimeoutFn: (typeof import("@vueuse/core"))["useTimeoutFn"];
-    useTimeoutPoll: (typeof import("@vueuse/core"))["useTimeoutPoll"];
-    useTimestamp: (typeof import("@vueuse/core"))["useTimestamp"];
-    useToggle: (typeof import("@vueuse/core"))["useToggle"];
-    useTransition: (typeof import("@vueuse/core"))["useTransition"];
-    useTransitionState: (typeof import("vue"))["useTransitionState"];
-    useUrlSearchParams: (typeof import("@vueuse/core"))["useUrlSearchParams"];
-    useUser: (typeof import("@shopware-pwa/composables-next"))["useUser"];
-    useNewsletter: (typeof import("@shopware-pwa/composables-next"))["useNewsletter"];
-    useUserMedia: (typeof import("@vueuse/core"))["useUserMedia"];
-    useVModel: (typeof import("@vueuse/core"))["useVModel"];
-    useVModels: (typeof import("@vueuse/core"))["useVModels"];
-    useVibrate: (typeof import("@vueuse/core"))["useVibrate"];
-    useVirtualList: (typeof import("@vueuse/core"))["useVirtualList"];
-    useWakeLock: (typeof import("@vueuse/core"))["useWakeLock"];
-    useWebNotification: (typeof import("@vueuse/core"))["useWebNotification"];
-    useWebSocket: (typeof import("@vueuse/core"))["useWebSocket"];
-    useWebWorker: (typeof import("@vueuse/core"))["useWebWorker"];
-    useWebWorkerFn: (typeof import("@vueuse/core"))["useWebWorkerFn"];
-    useWindowFocus: (typeof import("@vueuse/core"))["useWindowFocus"];
-    useWindowScroll: (typeof import("@vueuse/core"))["useWindowScroll"];
-    useWindowSize: (typeof import("@vueuse/core"))["useWindowSize"];
-    watch: (typeof import("vue"))["watch"];
-    watchAtMost: (typeof import("@vueuse/core"))["watchAtMost"];
-    watchDebounced: (typeof import("@vueuse/core"))["watchDebounced"];
-    watchEffect: (typeof import("vue"))["watchEffect"];
-    watchIgnorable: (typeof import("@vueuse/core"))["watchIgnorable"];
-    watchOnce: (typeof import("@vueuse/core"))["watchOnce"];
-    watchPausable: (typeof import("@vueuse/core"))["watchPausable"];
-    watchThrottled: (typeof import("@vueuse/core"))["watchThrottled"];
-    watchWithFilter: (typeof import("@vueuse/core"))["watchWithFilter"];
-    whenever: (typeof import("@vueuse/core"))["whenever"];
-    withCtx: (typeof import("vue"))["withCtx"];
-    withDirectives: (typeof import("vue"))["withDirectives"];
-    withKeys: (typeof import("vue"))["withKeys"];
-    withMemo: (typeof import("vue"))["withMemo"];
-    withModifiers: (typeof import("vue"))["withModifiers"];
-    withScopeId: (typeof import("vue"))["withScopeId"];
-  }
-}
diff --git a/packages/cms-base/build.config.ts b/packages/cms-base/build.config.ts
index be011f82a..0f42c06c8 100644
--- a/packages/cms-base/build.config.ts
+++ b/packages/cms-base/build.config.ts
@@ -7,5 +7,10 @@ export default defineBuildConfig({
     cjsBridge: true,
   },
   declaration: true,
-  externals: ["@nuxt/schema", "@nuxt/kit", "@shopware-pwa/composables-next"],
+  externals: [
+    "@nuxt/schema",
+    "@nuxt/kit",
+    "@shopware-pwa/composables-next",
+    "#imports",
+  ],
 });
diff --git a/packages/cms-base/components/SwCategoryNavigation.vue b/packages/cms-base/components/SwCategoryNavigation.vue
index fd094707e..82d970afb 100644
--- a/packages/cms-base/components/SwCategoryNavigation.vue
+++ b/packages/cms-base/components/SwCategoryNavigation.vue
@@ -4,14 +4,14 @@ import {
   getCategoryRoute,
   getTranslatedProperty,
 } from "@shopware-pwa/helpers-next";
-import type { Category, StoreNavigationElement } from "@shopware-pwa/types";
 import getUrlPrefix from "../helpers/getUrlPrefix";
 import buildUrlPrefix from "../helpers/buildUrlPrefix";
+import type { Schemas } from "#shopware";
 
 const props = withDefaults(
   defineProps<{
-    activeCategory: Category;
-    elements: StoreNavigationElement[];
+    activeCategory: Schemas["Category"];
+    elements: Schemas["Category"][];
     level: number;
   }>(),
   {
@@ -19,7 +19,7 @@ const props = withDefaults(
   },
 );
 
-function getHighlightCategory(navigationElement: Category) {
+function getHighlightCategory(navigationElement: Schemas["Category"]) {
   return (
     (props.activeCategory?.path || "").includes(navigationElement.id) ||
     navigationElement.id === props.activeCategory?.id
diff --git a/packages/cms-base/components/SwContactForm.vue b/packages/cms-base/components/SwContactForm.vue
index 14a744df3..70b549f4e 100644
--- a/packages/cms-base/components/SwContactForm.vue
+++ b/packages/cms-base/components/SwContactForm.vue
@@ -1,12 +1,17 @@
 <script setup lang="ts">
 import { useVuelidate } from "@vuelidate/core";
 import { required, email, minLength } from "@vuelidate/validators";
-import { sendContactForm } from "@shopware-pwa/api-client";
 import type { CmsElementForm } from "@shopware-pwa/composables-next";
-import { useNavigationContext } from "@shopware-pwa/composables-next";
-import type { ClientApiError } from "@shopware-pwa/types";
+import {
+  useCmsElementConfig,
+  useNavigationContext,
+  useSalutations,
+  useShopwareContext,
+} from "#imports";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
+import { computed, reactive, ref } from "vue";
+import { ApiClientError } from "@shopware/api-client";
 
 const props = defineProps<{
   content: CmsElementForm;
@@ -71,7 +76,7 @@ const formSent = ref<boolean>(false);
 const errorMessages = ref<any[]>([]);
 const { getSalutations } = useSalutations();
 const { foreignKey } = useNavigationContext();
-const { apiInstance } = useShopwareContext();
+const { apiClient } = useShopwareContext();
 const { getConfigValue } = useCmsElementConfig(props.content);
 
 const getConfirmationText = computed(
@@ -132,16 +137,15 @@ const invokeSubmit = async () => {
   if (valid) {
     loading.value = true;
     try {
-      await sendContactForm(
-        {
-          ...state,
-          navigationId: foreignKey.value,
-        },
-        apiInstance,
-      );
+      await apiClient.invoke("sendContactMail post /contact-form", {
+        ...state,
+        navigationId: foreignKey.value,
+      });
       formSent.value = true;
     } catch (e) {
-      errorMessages.value = (e as ClientApiError).messages;
+      if (e instanceof ApiClientError) {
+        errorMessages.value = e.details.errors;
+      }
     } finally {
       loading.value = false;
     }
diff --git a/packages/cms-base/components/SwListingProductPrice.vue b/packages/cms-base/components/SwListingProductPrice.vue
index e2d1dfdba..d8e1cc29d 100644
--- a/packages/cms-base/components/SwListingProductPrice.vue
+++ b/packages/cms-base/components/SwListingProductPrice.vue
@@ -4,6 +4,7 @@ import type { Product } from "@shopware-pwa/types";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
 import SwSharedPrice from "./SwSharedPrice.vue";
+import { computed, toRefs } from "vue";
 
 const props = defineProps<{
   product: Product;
diff --git a/packages/cms-base/components/SwNewsletterForm.vue b/packages/cms-base/components/SwNewsletterForm.vue
index ee6692b3d..fa7edf689 100644
--- a/packages/cms-base/components/SwNewsletterForm.vue
+++ b/packages/cms-base/components/SwNewsletterForm.vue
@@ -2,9 +2,11 @@
 import { useVuelidate } from "@vuelidate/core";
 import { required, email } from "@vuelidate/validators";
 import type { CmsElementForm } from "@shopware-pwa/composables-next";
-import type { ClientApiError } from "@shopware-pwa/types";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
+import { useCmsElementConfig, useNewsletter, useSalutations } from "#imports";
+import { computed, reactive, ref } from "vue";
+import { ApiClientError, type ApiError } from "@shopware/api-client";
 
 const props = defineProps<{
   content: CmsElementForm;
@@ -56,7 +58,7 @@ translations = deepMerge(translations, globalTranslations) as Translations;
 
 const loading = ref<boolean>();
 const formSent = ref<boolean>(false);
-const errorMessages = ref<any[]>([]);
+const errorMessages = ref<ApiError[]>([]);
 const subscriptionOptions: {
   label: string;
   value: "subscribe" | "unsubscribe";
@@ -130,7 +132,9 @@ const invokeSubmit = async () => {
       }
       formSent.value = true;
     } catch (e) {
-      errorMessages.value = (e as ClientApiError).messages;
+      if (e instanceof ApiClientError) {
+        errorMessages.value = e.details.errors;
+      }
     } finally {
       loading.value = false;
     }
@@ -152,8 +156,8 @@ const invokeSubmit = async () => {
         getFormTitle
           ? getFormTitle
           : state.option === "subscribe"
-          ? translations.form.subscribeLabel
-          : translations.form.unsubscribeLabel
+            ? translations.form.subscribeLabel
+            : translations.form.unsubscribeLabel
       }}
     </h3>
     <template v-if="!formSent">
diff --git a/packages/cms-base/components/SwProductAddToCart.vue b/packages/cms-base/components/SwProductAddToCart.vue
index f462cb0ef..b5fe2c002 100644
--- a/packages/cms-base/components/SwProductAddToCart.vue
+++ b/packages/cms-base/components/SwProductAddToCart.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
-import type { Product } from "@shopware-pwa/types";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
+import { useAddToCart, useNotifications } from "#imports";
+import { toRefs } from "vue";
+import type { Schemas } from "#shopware";
 
 const { pushSuccess } = useNotifications();
 const props = defineProps<{
-  product: Product;
+  product: Schemas["Product"];
 }>();
 
 type Translations = {
diff --git a/packages/cms-base/components/SwProductCard.vue b/packages/cms-base/components/SwProductCard.vue
index 3a2fefb8c..4b49b2c30 100644
--- a/packages/cms-base/components/SwProductCard.vue
+++ b/packages/cms-base/components/SwProductCard.vue
@@ -3,27 +3,26 @@ import { RouterLink } from "vue-router";
 import type { BoxLayout, DisplayMode } from "@shopware-pwa/composables-next";
 import {
   getProductName,
-  getProductThumbnailUrl,
   getProductRoute,
   getProductFromPrice,
+  getSmallestThumbnailUrl,
 } from "@shopware-pwa/helpers-next";
-import type {
-  ClientApiError,
-  Product,
-  PropertyGroupOption,
-} from "@shopware-pwa/types";
-import type { Ref } from "vue";
+import { toRefs, type Ref, computed, ref } from "vue";
 import SwListingProductPrice from "./SwListingProductPrice.vue";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
 import getUrlPrefix from "../helpers/getUrlPrefix";
 import buildUrlPrefix from "../helpers/buildUrlPrefix";
+import { useAddToCart, useNotifications, useProductWishlist } from "#imports";
+import { useElementSize } from "@vueuse/core";
+import type { Schemas } from "#shopware";
+import { ApiClientError } from "@shopware/api-client";
 
 const { pushSuccess, pushError } = useNotifications();
 
 const props = withDefaults(
   defineProps<{
-    product: Product;
+    product: Schemas["Product"];
     layoutType?: BoxLayout;
     isProductListing?: boolean;
     displayMode?: DisplayMode;
@@ -75,16 +74,17 @@ const toggleWishlistProduct = async () => {
         `${props.product?.translated?.name} ${translations.product.addedToWishlist}`,
       );
     } catch (error) {
-      const e = error as ClientApiError;
-      const reason = e?.messages?.[0]?.detail
-        ? `${translations.product.reason}: ${e?.messages?.[0]?.detail}`
-        : "";
-      return pushError(
-        `${props.product?.translated?.name} ${translations.product.cannotAddToWishlist}\n${reason}`,
-        {
-          timeout: 5000,
-        },
-      );
+      if (error instanceof ApiClientError) {
+        const reason = error.details.errors?.[0]?.detail
+          ? `${translations.product.reason}: ${error.details.errors?.[0]?.detail}`
+          : "";
+        return pushError(
+          `${props.product?.translated?.name} ${translations.product.cannotAddToWishlist}\n${reason}`,
+          {
+            timeout: 5000,
+          },
+        );
+      }
     }
   }
   removeFromWishlist();
@@ -112,9 +112,9 @@ function roundUp(num: number) {
 }
 
 const srcPath = computed(() => {
-  return `${getProductThumbnailUrl(product.value)}?&height=${roundUp(
-    height.value,
-  )}&fit=crop`;
+  return `${getSmallestThumbnailUrl(
+    product.value?.cover?.media,
+  )}?&height=${roundUp(height.value)}&fit=crop`;
 });
 </script>
 
@@ -181,10 +181,8 @@ const srcPath = computed(() => {
         :key="option.id"
         class="items-center line-clamp-2 rounded-md text-xs font-medium text-gray-600 mt-3"
       >
-        {{ (option as PropertyGroupOption).group.name }}:
-        <span class="font-bold"
-          >{{ (option as PropertyGroupOption).name }}
-        </span>
+        {{ option.group.name }}:
+        <span class="font-bold">{{ option.name }} </span>
       </p>
     </div>
     <div class="px-4 pb-4">
diff --git a/packages/cms-base/components/SwProductGallery.vue b/packages/cms-base/components/SwProductGallery.vue
index df493c477..109c6752e 100644
--- a/packages/cms-base/components/SwProductGallery.vue
+++ b/packages/cms-base/components/SwProductGallery.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { CmsElementImageGallery } from "@shopware-pwa/composables-next";
 import type { Product } from "@shopware-pwa/types";
+import { ref, watch } from "vue";
 
 const props = defineProps<{
   product: Product;
diff --git a/packages/cms-base/components/SwProductListingFilter.vue b/packages/cms-base/components/SwProductListingFilter.vue
index f17ec6254..a38667baa 100644
--- a/packages/cms-base/components/SwProductListingFilter.vue
+++ b/packages/cms-base/components/SwProductListingFilter.vue
@@ -1,5 +1,4 @@
-<script setup lang="ts">
-import type { ListingFilter } from "@shopware-pwa/types";
+<script setup lang="ts" generic="ListingFilter extends { code: string }">
 import SwFilterPropertiesVue from "./listing-filters/SwFilterProperties.vue";
 import SwFilterPriceVue from "./listing-filters/SwFilterPrice.vue";
 import SwFilterRatingVue from "./listing-filters/SwFilterRating.vue";
diff --git a/packages/cms-base/components/SwProductListingFilters.vue b/packages/cms-base/components/SwProductListingFilters.vue
index a43b651ed..50fa5d544 100644
--- a/packages/cms-base/components/SwProductListingFilters.vue
+++ b/packages/cms-base/components/SwProductListingFilters.vue
@@ -7,10 +7,12 @@ import type {
   CmsElementProductListing,
   CmsElementSidebarFilter,
 } from "@shopware-pwa/composables-next";
-import { useListing } from "@shopware-pwa/composables-next";
-import type { ShopwareSearchParams } from "@shopware-pwa/types";
+import { useCategory, useListing } from "#imports";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
+import { onClickOutside } from "@vueuse/core";
+import { useRoute, useRouter } from "vue-router";
+import type { RequestParameters } from "#shopware";
 
 const props = defineProps<{
   content: CmsElementProductListing | CmsElementSidebarFilter;
@@ -67,19 +69,19 @@ const sidebarSelectedFilters: UnwrapNestedRefs<{
   "shipping-free": undefined,
 });
 
-const searchCriteriaForRequest: ComputedRef<{
-  [code: string]: string | string[] | number | number[] | boolean | undefined;
-}> = computed(() => ({
-  // turn Set to array and then into string with | separator
-  manufacturer: [...sidebarSelectedFilters.manufacturer]?.join("|"),
-  // turn Set to array and then into string with | separator
-  properties: [...sidebarSelectedFilters.properties]?.join("|"),
-  "min-price": sidebarSelectedFilters["min-price"],
-  "max-price": sidebarSelectedFilters["max-price"],
-  order: getCurrentSortingOrder.value,
-  "shipping-free": sidebarSelectedFilters["shipping-free"],
-  rating: sidebarSelectedFilters["rating"],
-}));
+const searchCriteriaForRequest: ComputedRef<RequestParameters<"searchPage">> =
+  computed(() => ({
+    // turn Set to array and then into string with | separator
+    manufacturer: [...sidebarSelectedFilters.manufacturer]?.join("|"),
+    // turn Set to array and then into string with | separator
+    properties: [...sidebarSelectedFilters.properties]?.join("|"),
+    "min-price": sidebarSelectedFilters["min-price"],
+    "max-price": sidebarSelectedFilters["max-price"],
+    order: getCurrentSortingOrder.value,
+    "shipping-free": sidebarSelectedFilters["shipping-free"],
+    rating: sidebarSelectedFilters["rating"],
+    search: "",
+  }));
 
 for (const param in route.query) {
   if (sidebarSelectedFilters.hasOwnProperty(param)) {
@@ -150,7 +152,7 @@ const currentSortingOrder = computed({
 
     changeCurrentSortingOrder(
       order,
-      <Partial<ShopwareSearchParams>>route.query,
+      route.query as unknown as RequestParameters<"searchPage">,
     );
   },
 });
@@ -162,7 +164,7 @@ const selectedOptionIds = computed(() => [
 provide("selectedOptionIds", selectedOptionIds);
 
 async function invokeCleanFilters() {
-  await search({});
+  await search({ search: "" });
   clearFilters();
 }
 
diff --git a/packages/cms-base/components/SwProductPrice.vue b/packages/cms-base/components/SwProductPrice.vue
index c3c5b1d77..fc4a8bc58 100644
--- a/packages/cms-base/components/SwProductPrice.vue
+++ b/packages/cms-base/components/SwProductPrice.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
-import { useProductPrice } from "@shopware-pwa/composables-next";
 import type { Product } from "@shopware-pwa/types";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
 import SwSharedPrice from "./SwSharedPrice.vue";
+import { useProductPrice, usePrice } from "#imports";
+import { toRefs } from "vue";
+
 const props = defineProps<{
   product: Product;
 }>();
diff --git a/packages/cms-base/components/SwProductReviews.vue b/packages/cms-base/components/SwProductReviews.vue
index 3bdbe20d0..fde39b5fe 100644
--- a/packages/cms-base/components/SwProductReviews.vue
+++ b/packages/cms-base/components/SwProductReviews.vue
@@ -2,6 +2,8 @@
 import type { Product, ProductReview } from "@shopware-pwa/types";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
+import { useProductReviews } from "#imports";
+import { computed, onMounted, ref, toRefs } from "vue";
 
 const props = defineProps<{
   product: Product;
diff --git a/packages/cms-base/components/SwProductUnits.vue b/packages/cms-base/components/SwProductUnits.vue
index d0f64bd97..5f8b0a7cc 100644
--- a/packages/cms-base/components/SwProductUnits.vue
+++ b/packages/cms-base/components/SwProductUnits.vue
@@ -3,6 +3,7 @@ import type { Product } from "@shopware-pwa/types";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
 import SwSharedPrice from "./SwSharedPrice.vue";
+import { computed } from "vue";
 
 const props = withDefaults(
   defineProps<{
diff --git a/packages/cms-base/components/SwSharedPrice.vue b/packages/cms-base/components/SwSharedPrice.vue
index 526914912..a4eae57d5 100644
--- a/packages/cms-base/components/SwSharedPrice.vue
+++ b/packages/cms-base/components/SwSharedPrice.vue
@@ -1,4 +1,7 @@
 <script setup lang="ts">
+import { usePrice } from "#imports";
+import { computed } from "vue";
+
 const { getFormattedPrice } = usePrice();
 const props = defineProps<{
   value: number | undefined;
diff --git a/packages/cms-base/components/SwSlider.vue b/packages/cms-base/components/SwSlider.vue
index 159a8e0d2..8d46bf2df 100644
--- a/packages/cms-base/components/SwSlider.vue
+++ b/packages/cms-base/components/SwSlider.vue
@@ -1,8 +1,17 @@
 <script setup lang="ts">
 import type { SliderElementConfig } from "@shopware-pwa/composables-next";
-import { useCmsElementConfig } from "@shopware-pwa/composables-next";
+import { useCmsElementConfig } from "#imports";
 import type { CmsSlot } from "@shopware-pwa/types";
+import {
+  computed,
+  onBeforeUnmount,
+  onMounted,
+  ref,
+  useSlots,
+  watch,
+} from "vue";
 import type { VNodeArrayChildren } from "vue";
+import { useElementSize, useResizeObserver } from "@vueuse/core";
 
 const props = withDefaults(
   defineProps<{
diff --git a/packages/cms-base/components/SwVariantConfigurator.vue b/packages/cms-base/components/SwVariantConfigurator.vue
index 1ba62e6e3..c69e98278 100644
--- a/packages/cms-base/components/SwVariantConfigurator.vue
+++ b/packages/cms-base/components/SwVariantConfigurator.vue
@@ -1,8 +1,11 @@
 <script setup lang="ts">
 import { getProductRoute } from "@shopware-pwa/helpers-next";
+import { ref, computed, unref } from "vue";
 import type { ComputedRef } from "vue";
 import deepMerge from "../helpers/deepMerge";
 import getTranslations from "../helpers/getTranslations";
+import { useProductConfigurator } from "#imports";
+import { useRouter } from "vue-router";
 
 const props = withDefaults(
   defineProps<{
diff --git a/packages/cms-base/components/listing-filters/SwFilterPrice.vue b/packages/cms-base/components/listing-filters/SwFilterPrice.vue
index 93c3dc1ce..13fb712a1 100644
--- a/packages/cms-base/components/listing-filters/SwFilterPrice.vue
+++ b/packages/cms-base/components/listing-filters/SwFilterPrice.vue
@@ -1,8 +1,19 @@
-<script setup lang="ts">
-import type { ListingFilter } from "@shopware-pwa/types";
-import { reactive, ref, watch } from "vue";
+<script
+  setup
+  lang="ts"
+  generic="
+    ListingFilter extends {
+      code: string;
+      min?: number;
+      max?: number;
+      label: string;
+    }
+  "
+>
+import { onMounted, reactive, ref, watch } from "vue";
 import deepMerge from "../../helpers/deepMerge";
 import getTranslations from "../../helpers/getTranslations";
+import { onClickOutside, useDebounceFn } from "@vueuse/core";
 
 const emits = defineEmits<{
   (e: "select-value", value: { code: string; value: unknown }): void;
@@ -75,7 +86,7 @@ watch(() => prices.max, debounceMaxPriceUpdate);
         @click="toggle"
       >
         <span class="font-medium text-gray-900 text-left">{{
-          filter.label
+          props.filter.label
         }}</span>
         <span class="ml-6 flex items-center">
           <i
diff --git a/packages/cms-base/components/listing-filters/SwFilterProperties.vue b/packages/cms-base/components/listing-filters/SwFilterProperties.vue
index dcf79862a..fbf2fa856 100644
--- a/packages/cms-base/components/listing-filters/SwFilterProperties.vue
+++ b/packages/cms-base/components/listing-filters/SwFilterProperties.vue
@@ -1,9 +1,20 @@
-<script setup lang="ts">
-import type { ListingFilter } from "@shopware-pwa/types";
+<script
+  setup
+  lang="ts"
+  generic="
+    ListingFilter extends {
+      code: string;
+      label: string;
+      name: string;
+      options: Array<Schemas['PropertyGroupOption']>;
+    }
+  "
+>
 import { inject, ref } from "vue";
 import { getTranslatedProperty } from "@shopware-pwa/helpers-next";
+import type { Schemas } from "#shopware";
 
-defineProps<{
+const props = defineProps<{
   filter: ListingFilter;
 }>();
 
@@ -26,7 +37,7 @@ const toggle = () => {
         @click="toggle"
       >
         <span class="font-medium text-gray-900 text-left">{{
-          filter.label
+          props.filter.label
         }}</span>
         <span class="ml-6 flex items-center">
           <i
@@ -40,21 +51,24 @@ const toggle = () => {
       </button>
     </h2>
     <transition name="fade" mode="out-in">
-      <div v-show="isFilterVisible" :id="filter.code" class="pt-6">
+      <div v-show="isFilterVisible" :id="props.filter.code" class="pt-6">
         <fieldset class="space-y-4">
-          <legend class="sr-only">{{ filter.name }}</legend>
+          <legend class="sr-only">{{ props.filter.name }}</legend>
           <div
-            v-for="option in filter.options || filter.entities"
+            v-for="option in props.filter.options"
             :key="`${option.id}-${selectedOptionIds?.includes(option.id)}`"
             class="flex items-center"
             @click="
-              emits('select-value', { code: filter.code, value: option.id })
+              emits('select-value', {
+                code: props.filter.code,
+                value: option.id,
+              })
             "
           >
             <input
-              :id="`filter-mobile-${filter.code}-${option.id}`"
+              :id="`filter-mobile-${props.filter.code}-${option.id}`"
               :checked="selectedOptionIds?.includes(option.id)"
-              :name="filter.name"
+              :name="props.filter.name"
               :value="option.name"
               :aria-label="`${option.name} filter`"
               type="checkbox"
@@ -83,7 +97,7 @@ const toggle = () => {
               }"
             />
             <label
-              :for="`filter-mobile-${filter.code}-${option.id}`"
+              :for="`filter-mobile-${props.filter.code}-${option.id}`"
               class="ml-3 text-gray-600"
             >
               {{ getTranslatedProperty(option, "name") }}
diff --git a/packages/cms-base/components/listing-filters/SwFilterRating.vue b/packages/cms-base/components/listing-filters/SwFilterRating.vue
index 20da58eb3..1a65d85ae 100644
--- a/packages/cms-base/components/listing-filters/SwFilterRating.vue
+++ b/packages/cms-base/components/listing-filters/SwFilterRating.vue
@@ -1,10 +1,18 @@
-<script setup lang="ts">
+<script
+  setup
+  lang="ts"
+  generic="
+    ListingFilter extends {
+      code: string;
+      label: string;
+    }
+  "
+>
 import type {
   EntitiesAggregation,
   AggregationFilterEntity,
   PriceAggregation,
   MaxAggregation,
-  ListingFilter,
 } from "@shopware-pwa/types";
 import { computed, ref } from "vue";
 
@@ -56,7 +64,7 @@ const toggle = () => {
         @click="toggle"
       >
         <span class="font-medium text-gray-900 text-left">{{
-          filter.label
+          props.filter.label
         }}</span>
         <span class="ml-6 flex items-center">
           <i
diff --git a/packages/cms-base/components/listing-filters/SwFilterShippingFree.vue b/packages/cms-base/components/listing-filters/SwFilterShippingFree.vue
index e5524d4dd..b15b10386 100644
--- a/packages/cms-base/components/listing-filters/SwFilterShippingFree.vue
+++ b/packages/cms-base/components/listing-filters/SwFilterShippingFree.vue
@@ -1,12 +1,23 @@
-<script setup lang="ts">
+<script
+  setup
+  lang="ts"
+  generic="
+    ListingFilter extends {
+      id: string;
+      code: string;
+      label: string;
+      name: string;
+    }
+  "
+>
 import type {
   AggregationFilterEntity,
   EntitiesAggregation,
-  ListingFilter,
   MaxAggregation,
   PriceAggregation,
 } from "@shopware-pwa/types";
-import { computed } from "vue";
+import { onClickOutside } from "@vueuse/core";
+import { computed, ref } from "vue";
 
 const props = defineProps<{
   filter: ListingFilter;
@@ -50,7 +61,7 @@ onClickOutside(dropdownElement, () => (isFilterVisible.value = false));
         @click="toggle"
       >
         <span class="font-medium text-gray-900 text-left">{{
-          filter.label
+          props.filter.label
         }}</span>
         <span class="ml-6 flex items-center">
           <i
@@ -68,19 +79,19 @@ onClickOutside(dropdownElement, () => (isFilterVisible.value = false));
         <div class="space-y-4">
           <div class="flex items-center" @click="onChangeOption()">
             <input
-              :id="`filter-mobile-${filter.id || filter.code}`"
+              :id="`filter-mobile-${props.filter.id || props.filter.code}`"
               :checked="currentFilterData"
-              :name="filter.name"
-              :value="filter.name"
+              :name="props.filter.name"
+              :value="props.filter.name"
               type="checkbox"
               class="h-4 w-4 border-gray-300 rounded text-indigo-600 focus:ring-indigo-500"
             />
 
             <label
-              :for="`filter-mobile-${filter.id || filter.code}`"
+              :for="`filter-mobile-${props.filter.id || props.filter.code}`"
               class="ml-3 text-gray-600"
             >
-              {{ filter.label }}
+              {{ props.filter.label }}
             </label>
           </div>
         </div>
diff --git a/packages/cms-base/components/public/cms/CmsGenericBlock.vue b/packages/cms-base/components/public/cms/CmsGenericBlock.vue
index cc0b9cc51..360341abe 100644
--- a/packages/cms-base/components/public/cms/CmsGenericBlock.vue
+++ b/packages/cms-base/components/public/cms/CmsGenericBlock.vue
@@ -5,6 +5,8 @@ import {
   getBackgroundImageUrl,
 } from "@shopware-pwa/helpers-next";
 import { resolveCmsComponent } from "@shopware-pwa/composables-next";
+import { h } from "vue";
+
 const props = defineProps<{
   content: CmsBlock;
 }>();
diff --git a/packages/cms-base/components/public/cms/CmsGenericElement.vue b/packages/cms-base/components/public/cms/CmsGenericElement.vue
index 8571e32d3..b19af1db9 100644
--- a/packages/cms-base/components/public/cms/CmsGenericElement.vue
+++ b/packages/cms-base/components/public/cms/CmsGenericElement.vue
@@ -2,6 +2,7 @@
 import type { CmsSlot } from "@shopware-pwa/types";
 import { getCmsLayoutConfiguration } from "@shopware-pwa/helpers-next";
 import { resolveCmsComponent } from "@shopware-pwa/composables-next";
+import { h } from "vue";
 
 const props = defineProps<{
   content: CmsSlot;
diff --git a/packages/cms-base/components/public/cms/CmsNoComponent.vue b/packages/cms-base/components/public/cms/CmsNoComponent.vue
index fa55b8a21..96ce947c7 100644
--- a/packages/cms-base/components/public/cms/CmsNoComponent.vue
+++ b/packages/cms-base/components/public/cms/CmsNoComponent.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlock } from "@shopware-pwa/types";
+import { computed } from "vue";
 
 const props = defineProps<{
   content: CmsBlock;
@@ -9,8 +10,8 @@ const elementType = computed(() =>
   props.content.apiAlias === "cms_block"
     ? "Block"
     : props.content.apiAlias === "cms_section"
-    ? "Section"
-    : "Element",
+      ? "Section"
+      : "Element",
 );
 
 const componentName = computed(() => props.content.type);
diff --git a/packages/cms-base/components/public/cms/CmsPage.vue b/packages/cms-base/components/public/cms/CmsPage.vue
index a4974e866..6dcf799a5 100644
--- a/packages/cms-base/components/public/cms/CmsPage.vue
+++ b/packages/cms-base/components/public/cms/CmsPage.vue
@@ -5,7 +5,8 @@ import {
   getCmsLayoutConfiguration,
   getBackgroundImageUrl,
 } from "@shopware-pwa/helpers-next";
-import { useNavigationContext } from "@shopware-pwa/composables-next";
+import { useListing, useNavigationContext } from "#imports";
+import { computed, h, resolveComponent } from "vue";
 
 const props = defineProps<{
   content: CmsPage;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockCategoryNavigation.vue b/packages/cms-base/components/public/cms/block/CmsBlockCategoryNavigation.vue
index 1a49f8936..928fdd1b0 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockCategoryNavigation.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockCategoryNavigation.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockCategoryNavigation } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockCategoryNavigation;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockCenterText.vue b/packages/cms-base/components/public/cms/block/CmsBlockCenterText.vue
index f7f7b67f5..1fb3fd2c2 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockCenterText.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockCenterText.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockCenterText } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockCenterText;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockCrossSelling.vue b/packages/cms-base/components/public/cms/block/CmsBlockCrossSelling.vue
index 130ce80ab..029f9bac3 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockCrossSelling.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockCrossSelling.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockCrossSelling } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockCrossSelling;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockCustomForm.vue b/packages/cms-base/components/public/cms/block/CmsBlockCustomForm.vue
index a044765b9..a954c0af2 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockCustomForm.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockCustomForm.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockForm } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockForm;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockForm.vue b/packages/cms-base/components/public/cms/block/CmsBlockForm.vue
index a044765b9..a954c0af2 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockForm.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockForm.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockForm } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockForm;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockGalleryBuybox.vue b/packages/cms-base/components/public/cms/block/CmsBlockGalleryBuybox.vue
index 65e709aaf..cc28617c8 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockGalleryBuybox.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockGalleryBuybox.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockGalleryBuybox } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockGalleryBuybox;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImage.vue b/packages/cms-base/components/public/cms/block/CmsBlockImage.vue
index 37b010048..2dacef900 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImage.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImage.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImage } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImage;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageBubbleRow.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageBubbleRow.vue
index 5466c58a3..22c1326e6 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageBubbleRow.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageBubbleRow.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageBubbleRow } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageBubbleRow;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageCover.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageCover.vue
index 151bd4b21..1aed9e784 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageCover.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageCover.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageCover } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageCover;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageFourColumn.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageFourColumn.vue
index 46066a316..546b810a8 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageFourColumn.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageFourColumn.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageFourColumn } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageFourColumn;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageGallery.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageGallery.vue
index 76c8d4841..b22228504 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageGallery.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageGallery.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageGallery } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageGallery;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageHighlightRow.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageHighlightRow.vue
index f39e494e5..23b45a3d3 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageHighlightRow.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageHighlightRow.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageHighlightRow } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageHighlightRow;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageSimpleGrid.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageSimpleGrid.vue
index e516ad00d..57140d0eb 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageSimpleGrid.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageSimpleGrid.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageSimpleGrid } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageSimpleGrid;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageSlider.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageSlider.vue
index 3bbb3fb58..c1b7b72fa 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageSlider.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageSlider.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageSlider } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageSlider;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageText.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageText.vue
index 5c1238acc..e367741b4 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageText.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageText.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageText } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageText;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageTextBubble.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageTextBubble.vue
index 6019a199b..b62db9241 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageTextBubble.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageTextBubble.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageTextBubble } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageTextBubble;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageTextCover.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageTextCover.vue
index ac4df2e67..053a493b2 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageTextCover.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageTextCover.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageTextCover } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageTextCover;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageTextGallery.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageTextGallery.vue
index 403868ac1..f08587fac 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageTextGallery.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageTextGallery.vue
@@ -5,6 +5,7 @@ import type {
   CmsElementImage,
   CmsElementText,
 } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageTextGallery;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageTextRow.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageTextRow.vue
index 2800924b3..79675dfd9 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageTextRow.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageTextRow.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageTextRow } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageTextRow;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageThreeColumn.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageThreeColumn.vue
index c2e5a9bac..5103d51a4 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageThreeColumn.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageThreeColumn.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageThreeColumn } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageThreeColumn;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageThreeCover.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageThreeCover.vue
index d03c4bce3..c49dcf730 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageThreeCover.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageThreeCover.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageThreeCover } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageThreeCover;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockImageTwoColumn.vue b/packages/cms-base/components/public/cms/block/CmsBlockImageTwoColumn.vue
index 16f493615..793fe3973 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockImageTwoColumn.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockImageTwoColumn.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockImageTwoColumn } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockImageTwoColumn;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockProductDescriptionReviews.vue b/packages/cms-base/components/public/cms/block/CmsBlockProductDescriptionReviews.vue
index 3210a8846..3744b8452 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockProductDescriptionReviews.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockProductDescriptionReviews.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockProductDescriptionReviews } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockProductDescriptionReviews;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockProductHeading.vue b/packages/cms-base/components/public/cms/block/CmsBlockProductHeading.vue
index 01b8a5f4b..4586619e8 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockProductHeading.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockProductHeading.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockProductHeading } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockProductHeading;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockProductListing.vue b/packages/cms-base/components/public/cms/block/CmsBlockProductListing.vue
index 16a00c252..d459d9bb1 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockProductListing.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockProductListing.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockProductListing } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockProductListing;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockProductThreeColumn.vue b/packages/cms-base/components/public/cms/block/CmsBlockProductThreeColumn.vue
index 6d0df0f49..ce4e07d2e 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockProductThreeColumn.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockProductThreeColumn.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockProductThreeColumn } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockProductThreeColumn;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockSidebarFilter.vue b/packages/cms-base/components/public/cms/block/CmsBlockSidebarFilter.vue
index 7119bc6fd..b8c7f5859 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockSidebarFilter.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockSidebarFilter.vue
@@ -3,6 +3,7 @@ import type {
   CmsBlockSidebarFilter,
   CmsElementSidebarFilter,
 } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockSidebarFilter;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockText.vue b/packages/cms-base/components/public/cms/block/CmsBlockText.vue
index ded32d479..3f9414f24 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockText.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockText.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockText } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockText;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockTextHero.vue b/packages/cms-base/components/public/cms/block/CmsBlockTextHero.vue
index 75dd18a73..b8a26d27b 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockTextHero.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockTextHero.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockTextHero } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockTextHero;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockTextOnImage.vue b/packages/cms-base/components/public/cms/block/CmsBlockTextOnImage.vue
index 5d23daa00..1cb99a67c 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockTextOnImage.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockTextOnImage.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockTextOnImage } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockTextOnImage;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockTextThreeColumn.vue b/packages/cms-base/components/public/cms/block/CmsBlockTextThreeColumn.vue
index a150e85ec..4ca9a651f 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockTextThreeColumn.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockTextThreeColumn.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockTextThreeColumn } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockTextThreeColumn;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockTextTwoColumn.vue b/packages/cms-base/components/public/cms/block/CmsBlockTextTwoColumn.vue
index 7bcf1f944..7f395a14c 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockTextTwoColumn.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockTextTwoColumn.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockTextTwoColumn } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockTextTwoColumn;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockVimeoVideo.vue b/packages/cms-base/components/public/cms/block/CmsBlockVimeoVideo.vue
index abd165eab..4dac9f18d 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockVimeoVideo.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockVimeoVideo.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockVimeoVideo } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockVimeoVideo;
diff --git a/packages/cms-base/components/public/cms/block/CmsBlockYoutubeVideo.vue b/packages/cms-base/components/public/cms/block/CmsBlockYoutubeVideo.vue
index d1bc100a3..5306a7726 100644
--- a/packages/cms-base/components/public/cms/block/CmsBlockYoutubeVideo.vue
+++ b/packages/cms-base/components/public/cms/block/CmsBlockYoutubeVideo.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CmsBlockYoutubeVideo } from "@shopware-pwa/composables-next";
+import { useCmsBlock } from "#imports";
 
 const props = defineProps<{
   content: CmsBlockYoutubeVideo;
diff --git a/packages/cms-base/components/public/cms/element/CmsElementBuyBox.vue b/packages/cms-base/components/public/cms/element/CmsElementBuyBox.vue
index 7ec442a25..d303e2ef5 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementBuyBox.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementBuyBox.vue
@@ -3,7 +3,11 @@ import type { CmsElementBuyBox } from "@shopware-pwa/composables-next";
 import {
   useCmsElementConfig,
   useProductPrice,
-} from "@shopware-pwa/composables-next";
+  useSessionContext,
+  useProduct,
+  usePrice,
+} from "#imports";
+import { computed } from "vue";
 import SwProductAddToCart from "../../../SwProductAddToCart.vue";
 import SwVariantConfigurator from "../../../SwVariantConfigurator.vue";
 import deepMerge from "../../../../helpers/deepMerge";
diff --git a/packages/cms-base/components/public/cms/element/CmsElementCategoryNavigation.vue b/packages/cms-base/components/public/cms/element/CmsElementCategoryNavigation.vue
index addca0145..5555dfd6b 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementCategoryNavigation.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementCategoryNavigation.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
-import type { ClientApiError } from "@shopware-pwa/types";
 import SwCategoryNavigation from "../../../SwCategoryNavigation.vue";
-import type { Category } from "@shopware-pwa/types";
 import deepMerge from "../../../../helpers/deepMerge";
 import getTranslations from "../../../../helpers/getTranslations";
+import { useCategory, useNavigation } from "#imports";
+import { onMounted, computed } from "vue";
+import type { Schemas } from "#shopware";
 
 type Translations = {
   listing: {
@@ -25,7 +26,7 @@ translations = deepMerge(translations, globalTranslations) as Translations;
 const { category: activeCategory } = useCategory();
 const { loadNavigationElements, navigationElements } = useNavigation();
 const navigations = computed(() => {
-  const navigation: Category[] = JSON.parse(
+  const navigation: Schemas["Category"][] = JSON.parse(
     JSON.stringify(navigationElements.value),
   );
   return navigation?.map((navigationElement) => {
@@ -41,8 +42,7 @@ onMounted(async () => {
   try {
     await loadNavigationElements({ depth: 2 });
   } catch (e) {
-    const err = e as ClientApiError;
-    console.error("[SwBottomMenu]", err.messages);
+    console.error("[SwBottomMenu]", e);
   }
 });
 </script>
diff --git a/packages/cms-base/components/public/cms/element/CmsElementCrossSelling.vue b/packages/cms-base/components/public/cms/element/CmsElementCrossSelling.vue
index 12a5f4ebd..a5cb6ba8b 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementCrossSelling.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementCrossSelling.vue
@@ -3,9 +3,11 @@ import type {
   CmsElementCrossSelling,
   SliderElementConfig,
 } from "@shopware-pwa/composables-next";
-import { useCmsElementConfig } from "@shopware-pwa/composables-next";
+import { useCmsElementConfig } from "#imports";
 import SwProductCard from "../../../SwProductCard.vue";
 import SwSlider from "../../../SwSlider.vue";
+import { ref, computed } from "vue";
+import { useElementSize } from "@vueuse/core";
 
 const props = defineProps<{
   content: CmsElementCrossSelling;
@@ -36,7 +38,7 @@ const config = computed<SliderElementConfig>(() => ({
 const crossSellCollections = computed(() => {
   return (
     props.content?.data?.crossSellings?.filter(
-      (collection) => !!collection?.products?.length,
+      (collection) => !!collection.products.length,
     ) || []
   );
 });
diff --git a/packages/cms-base/components/public/cms/element/CmsElementCustomForm.vue b/packages/cms-base/components/public/cms/element/CmsElementCustomForm.vue
index 138478958..d97dd31c4 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementCustomForm.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementCustomForm.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import type { CmsElementForm } from "@shopware-pwa/composables-next";
+import { useCmsElementConfig } from "#imports";
+import { computed, defineAsyncComponent } from "vue";
 
 const props = defineProps<{
   content: CmsElementForm;
diff --git a/packages/cms-base/components/public/cms/element/CmsElementForm.vue b/packages/cms-base/components/public/cms/element/CmsElementForm.vue
index 138478958..d97dd31c4 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementForm.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementForm.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import type { CmsElementForm } from "@shopware-pwa/composables-next";
+import { useCmsElementConfig } from "#imports";
+import { computed, defineAsyncComponent } from "vue";
 
 const props = defineProps<{
   content: CmsElementForm;
diff --git a/packages/cms-base/components/public/cms/element/CmsElementImage.vue b/packages/cms-base/components/public/cms/element/CmsElementImage.vue
index e0343c5a0..0d5cb2cc4 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementImage.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementImage.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
-import { useCmsElementImage } from "@shopware-pwa/composables-next";
 import type {
   CmsElementImage,
   CmsElementManufacturerLogo,
 } from "@shopware-pwa/composables-next";
+import { useCmsElementImage } from "#imports";
 import buildUrlPrefix from "../../../../helpers/buildUrlPrefix";
 import getUrlPrefix from "../../../../helpers/getUrlPrefix";
+import { useElementSize } from "@vueuse/core";
+import { computed, ref } from "vue";
+
 const props = defineProps<{
   content: CmsElementImage | CmsElementManufacturerLogo;
 }>();
diff --git a/packages/cms-base/components/public/cms/element/CmsElementImageGallery.vue b/packages/cms-base/components/public/cms/element/CmsElementImageGallery.vue
index 060caf694..7a3c55d93 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementImageGallery.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementImageGallery.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import type { CmsElementImageGallery } from "@shopware-pwa/composables-next";
+import { useCmsElementConfig } from "#imports";
 import SwSlider from "../../../SwSlider.vue";
+import { computed, onMounted, ref } from "vue";
 
 const props = withDefaults(
   defineProps<{
diff --git a/packages/cms-base/components/public/cms/element/CmsElementImageSlider.vue b/packages/cms-base/components/public/cms/element/CmsElementImageSlider.vue
index 7ec47428b..64bd1b878 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementImageSlider.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementImageSlider.vue
@@ -4,6 +4,7 @@ import type {
   CmsElementImage,
 } from "@shopware-pwa/composables-next";
 import SwSlider from "../../../SwSlider.vue";
+import { computed } from "vue";
 
 const props = defineProps<{
   content: CmsElementImageSlider;
diff --git a/packages/cms-base/components/public/cms/element/CmsElementProductBox.vue b/packages/cms-base/components/public/cms/element/CmsElementProductBox.vue
index 9ee8126b4..0200047c0 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementProductBox.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementProductBox.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { CmsElementProductBox } from "@shopware-pwa/composables-next";
 import SwProductCard from "../../../SwProductCard.vue";
+import { computed } from "vue";
 
 const props = defineProps<{
   content: CmsElementProductBox;
diff --git a/packages/cms-base/components/public/cms/element/CmsElementProductDescriptionReviews.vue b/packages/cms-base/components/public/cms/element/CmsElementProductDescriptionReviews.vue
index 9ff40bfd0..2987e4562 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementProductDescriptionReviews.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementProductDescriptionReviews.vue
@@ -7,6 +7,8 @@ import {
 import SwProductReviews from "../../../SwProductReviews.vue";
 import deepMerge from "../../../../helpers/deepMerge";
 import getTranslations from "../../../../helpers/getTranslations";
+import { computed, ref } from "vue";
+import { useProduct } from "#imports";
 
 const props = defineProps<{
   content: CmsElementProductDescriptionReviews;
diff --git a/packages/cms-base/components/public/cms/element/CmsElementProductListing.vue b/packages/cms-base/components/public/cms/element/CmsElementProductListing.vue
index 9800a4442..3519b9cc2 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementProductListing.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementProductListing.vue
@@ -2,9 +2,13 @@
 import type { CmsElementProductListing } from "@shopware-pwa/composables-next";
 import SwProductCard from "../../../SwProductCard.vue";
 import SwPagination from "../../../SwPagination.vue";
-import type { ShopwareSearchParams } from "@shopware-pwa/types";
 import deepMerge from "../../../../helpers/deepMerge";
 import getTranslations from "../../../../helpers/getTranslations";
+import { useListing } from "#imports";
+import { computed } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import type { RequestParameters, Schemas } from "#shopware";
+
 const props = defineProps<{
   content: CmsElementProductListing;
 }>();
@@ -40,19 +44,24 @@ const changePage = async (page: number) => {
       p: page,
     },
   });
-  changeCurrentPage(page, <Partial<ShopwareSearchParams>>route.query);
+  changeCurrentPage(
+    page,
+    route.query as unknown as RequestParameters<"searchPage">,
+  );
 };
 const isProductListing = computed(
   () => props.content?.type === "product-listing",
 );
 
-setInitialListing(props?.content?.data?.listing);
+setInitialListing(
+  props?.content?.data?.listing as Schemas["ProductListingResult"],
+);
 </script>
 
 <template>
   <div class="bg-white">
     <div class="max-w-2xl mx-auto lg:max-w-full">
-      <div v-if="getElements.length" class="mt-6">
+      <div v-if="getElements?.length" class="mt-6">
         <div
           class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 md:gap-6 lg:gap-8 p-4 md:p-6 lg:p-8"
         >
diff --git a/packages/cms-base/components/public/cms/element/CmsElementProductName.vue b/packages/cms-base/components/public/cms/element/CmsElementProductName.vue
index ad1f70f2b..7a019b910 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementProductName.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementProductName.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { CmsElementProductName } from "@shopware-pwa/composables-next";
-import CmsElementText from "./CmsElementText.vue";
 
 const props = defineProps<{
   content: CmsElementProductName;
diff --git a/packages/cms-base/components/public/cms/element/CmsElementProductSlider.vue b/packages/cms-base/components/public/cms/element/CmsElementProductSlider.vue
index d1ac5be7a..03bae8d92 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementProductSlider.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementProductSlider.vue
@@ -1,7 +1,10 @@
 <script setup lang="ts">
-import type { CmsElementProductSlider } from "@shopware-pwa/composables-next";
-import { useCmsElementConfig } from "@shopware-pwa/composables-next";
-import type { SliderElementConfig } from "@shopware-pwa/composables-next";
+import type {
+  CmsElementProductSlider,
+  SliderElementConfig,
+} from "@shopware-pwa/composables-next";
+import { useCmsElementConfig } from "#imports";
+import { ref, computed, onMounted } from "vue";
 import type { ComputedRef } from "vue";
 import SwProductCard from "../../../SwProductCard.vue";
 import SwSlider from "../../../SwSlider.vue";
diff --git a/packages/cms-base/components/public/cms/element/CmsElementText.vue b/packages/cms-base/components/public/cms/element/CmsElementText.vue
index f48fdb1f0..773a4781d 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementText.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementText.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { CmsElementText } from "@shopware-pwa/composables-next";
-import { useCmsElementConfig } from "@shopware-pwa/composables-next";
-import { h } from "vue";
+import { useCmsElementConfig } from "#imports";
+import { computed, getCurrentInstance, h } from "vue";
 import { decodeHTML } from "entities";
 import type { CSSProperties } from "vue";
 import { getOptionsFromNode } from "../../../../helpers/html-to-vue/getOptionsFromNode";
diff --git a/packages/cms-base/components/public/cms/element/CmsElementVimeoVideo.vue b/packages/cms-base/components/public/cms/element/CmsElementVimeoVideo.vue
index 0002c4a0d..dd7bc1d9a 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementVimeoVideo.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementVimeoVideo.vue
@@ -2,6 +2,7 @@
 import type { CmsElementVimeoVideo } from "@shopware-pwa/composables-next";
 import { ref } from "vue";
 import type { Ref } from "vue";
+import { useCmsElementConfig } from "#imports";
 
 const props = defineProps<{
   content: CmsElementVimeoVideo;
diff --git a/packages/cms-base/components/public/cms/element/CmsElementYoutubeVideo.vue b/packages/cms-base/components/public/cms/element/CmsElementYoutubeVideo.vue
index 597df3aa8..e4ac20a1f 100644
--- a/packages/cms-base/components/public/cms/element/CmsElementYoutubeVideo.vue
+++ b/packages/cms-base/components/public/cms/element/CmsElementYoutubeVideo.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import type { CmsElementYoutubeVideo } from "@shopware-pwa/composables-next";
+import { useCmsElementConfig } from "#imports";
+import { computed } from "vue";
 
 const props = defineProps<{
   content: CmsElementYoutubeVideo;
diff --git a/packages/cms-base/components/public/cms/section/CmsSectionSidebar.vue b/packages/cms-base/components/public/cms/section/CmsSectionSidebar.vue
index 4deae5e3f..02b93a70a 100644
--- a/packages/cms-base/components/public/cms/section/CmsSectionSidebar.vue
+++ b/packages/cms-base/components/public/cms/section/CmsSectionSidebar.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { useCmsSection } from "@shopware-pwa/composables-next";
 import type { CmsSectionSidebar } from "@shopware-pwa/composables-next";
+import { computed } from "vue";
 
 const props = defineProps<{
   content: CmsSectionSidebar;
diff --git a/packages/cms-base/composables.d.ts b/packages/cms-base/composables.d.ts
new file mode 100644
index 000000000..628c37a6c
--- /dev/null
+++ b/packages/cms-base/composables.d.ts
@@ -0,0 +1 @@
+export * from "@shopware-pwa/composables-next";
diff --git a/packages/cms-base/helpers/getTranslations.ts b/packages/cms-base/helpers/getTranslations.ts
index 0ea28b1aa..b471d70aa 100644
--- a/packages/cms-base/helpers/getTranslations.ts
+++ b/packages/cms-base/helpers/getTranslations.ts
@@ -1,3 +1,5 @@
+import { inject } from "vue";
+
 export default function getTranslations() {
   try {
     return inject("cmsTranslations", {});
diff --git a/packages/cms-base/helpers/getUrlPrefix.ts b/packages/cms-base/helpers/getUrlPrefix.ts
index 87e6ad0ef..1bca3e11c 100644
--- a/packages/cms-base/helpers/getUrlPrefix.ts
+++ b/packages/cms-base/helpers/getUrlPrefix.ts
@@ -1,3 +1,5 @@
+import { inject } from "vue";
+
 export default function getUrlPrefix() {
   try {
     return inject("urlPrefix", "");
diff --git a/packages/cms-base/nuxt.config.ts b/packages/cms-base/nuxt.config.ts
new file mode 100644
index 000000000..38e175388
--- /dev/null
+++ b/packages/cms-base/nuxt.config.ts
@@ -0,0 +1,12 @@
+import { defineNuxtConfig } from "nuxt/config";
+import type { NuxtConfig } from "nuxt/config";
+
+export default defineNuxtConfig({
+  components: [
+    {
+      path: "./components/public",
+      pathPrefix: false,
+      // global: true,
+    },
+  ],
+});
diff --git a/packages/cms-base/package.json b/packages/cms-base/package.json
index 44307e728..d16d3668b 100644
--- a/packages/cms-base/package.json
+++ b/packages/cms-base/package.json
@@ -17,17 +17,8 @@
     "url": "https://github.com/shopware/frontends/issues"
   },
   "license": "MIT",
-  "main": "./index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/index.d.mts",
-        "default": "./dist/index.mjs"
-      }
-    }
-  },
+  "type": "module",
+  "main": "./nuxt.config.ts",
   "files": [
     "dist",
     "components",
@@ -44,13 +35,15 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.8.1",
-    "@shopware-pwa/api-client": "workspace:*",
+    "@shopware/api-client": "workspace:*",
     "@shopware-pwa/composables-next": "workspace:*",
     "@shopware-pwa/helpers-next": "workspace:*",
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
+    "@vueuse/core": "^10.6.1",
     "entities": "^4.5.0",
-    "html-to-ast": "^0.0.6"
+    "html-to-ast": "^0.0.6",
+    "vue": "^3.3.8"
   },
   "devDependencies": {
     "@nuxt/schema": "^3.8.1",
@@ -58,10 +51,12 @@
     "@vue/eslint-config-typescript": "^12.0.0",
     "eslint-config-shopware": "workspace:*",
     "eslint-plugin-vue": "^9.18.1",
+    "nuxt": "^3.8.1",
     "tsconfig": "workspace:*",
     "typescript": "^5.2.2",
     "unbuild": "^2.0.0",
     "vue-eslint-parser": "^9.3.2",
+    "vue-router": "^4.2.5",
     "vue-tsc": "^1.8.22"
   }
 }
diff --git a/packages/cms-base/src/index.ts b/packages/cms-base/src/index.ts
index 24f84b473..9e43cbf77 100644
--- a/packages/cms-base/src/index.ts
+++ b/packages/cms-base/src/index.ts
@@ -2,7 +2,7 @@
  * @module @shopware/cms-base
  */
 import { defineNuxtModule } from "@nuxt/kit";
-import { NuxtModule } from "@nuxt/schema";
+import type { NuxtModule } from "@nuxt/schema";
 import { resolve } from "path";
 
 const nuxtModule: NuxtModule = defineNuxtModule({
diff --git a/packages/cms-base/tsconfig.json b/packages/cms-base/tsconfig.json
index f9ddea432..fb70c419d 100644
--- a/packages/cms-base/tsconfig.json
+++ b/packages/cms-base/tsconfig.json
@@ -1,9 +1,13 @@
 {
   "extends": "tsconfig/vue-library.json",
-  "include": ["./components.d.ts", "./auto-imports.d.ts", "."],
+  "include": ["./components.d.ts", "."],
   "exclude": ["dist"],
   "compilerOptions": {
     "jsx": "preserve",
-    "lib": ["dom"]
+    "lib": ["dom"],
+    "paths": {
+      "#imports": ["./composables.d.ts"],
+      "#shopware": ["./types/api-types.ts"]
+    }
   }
 }
diff --git a/packages/cms-base/types/api-types.ts b/packages/cms-base/types/api-types.ts
new file mode 100644
index 000000000..2eaa98626
--- /dev/null
+++ b/packages/cms-base/types/api-types.ts
@@ -0,0 +1 @@
+export * from "@shopware-pwa/composables-next/types/api-types";
diff --git a/packages/composables/.eslintrc.js b/packages/composables/.eslintrc.cjs
similarity index 100%
rename from packages/composables/.eslintrc.js
rename to packages/composables/.eslintrc.cjs
diff --git a/packages/composables/README.md b/packages/composables/README.md
index 91158862a..937500682 100644
--- a/packages/composables/README.md
+++ b/packages/composables/README.md
@@ -62,7 +62,7 @@ Now you can use any composable function in your setup function:
 
 ```html
 <script setup>
-    import { useUser, useSessionContext } from "@shopware-pwa/composables-next";
+    import { useUser, useSessionContext } from "@shopware-pwa/composables-next/dist";
 
     const { login } = useUser();
     const { refreshSessionContext, sessionContext } = useSessionContext();
diff --git a/packages/composables/build.config.ts b/packages/composables/build.config.ts
index 460977649..15813004d 100644
--- a/packages/composables/build.config.ts
+++ b/packages/composables/build.config.ts
@@ -7,9 +7,14 @@ export default defineBuildConfig({
     "axios",
     "vue",
     "scule",
-    "@shopware-pwa/api-client",
+    "@shopware/api-client",
     "@shopware-pwa/helpers-next",
     "@shopware-pwa/types",
     "@vueuse/core",
   ],
+  alias: {
+    "#imports": "./src/index.ts",
+    "#shopware": "./types/api-types.ts",
+  },
+  failOnWarn: false,
 });
diff --git a/packages/composables/composables/index.ts b/packages/composables/composables/index.ts
new file mode 100644
index 000000000..28e512978
--- /dev/null
+++ b/packages/composables/composables/index.ts
@@ -0,0 +1 @@
+export * from "../src";
diff --git a/packages/composables/nuxt.config.ts b/packages/composables/nuxt.config.ts
new file mode 100644
index 000000000..14beac47a
--- /dev/null
+++ b/packages/composables/nuxt.config.ts
@@ -0,0 +1,8 @@
+import { defineNuxtConfig } from "nuxt/config";
+import type { NuxtConfig } from "nuxt/config";
+
+export default defineNuxtConfig({
+  imports: {
+    dirs: ["src"],
+  },
+});
diff --git a/packages/composables/package.json b/packages/composables/package.json
index 7f3246269..676f3e16e 100644
--- a/packages/composables/package.json
+++ b/packages/composables/package.json
@@ -17,20 +17,34 @@
     "url": "https://github.com/shopware/frontends/issues"
   },
   "license": "MIT",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist",
-    "metadata"
-  ],
+  "type": "module",
+  "types": "./src/index.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.mts",
-        "default": "./dist/index.mjs"
-      }
+      "types": "./src/index.ts",
+      "import": "./src/index.ts"
+    },
+    "./nuxt-layer": {
+      "import": "./nuxt.config.ts"
+    },
+    "./composables": {
+      "import": "./composables/index.ts"
+    },
+    "./lib": {
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
+    },
+    "./dist": {
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
     }
   },
+  "files": [
+    "dist",
+    "metadata",
+    "src",
+    "composables"
+  ],
   "scripts": {
     "build": "unbuild && pnpm build:types",
     "build:types": "npx -p typescript tsc --project tsconfig.build.json",
@@ -38,15 +52,17 @@
     "lint": "eslint src/**/*.ts* --fix --max-warnings=0 && pnpm run typecheck",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
-    "coverage": "vitest run --coverage"
+    "coverage": "vitest run --coverage",
+    "test:watch": "vitest"
   },
   "dependencies": {
-    "@shopware-pwa/api-client": "workspace:*",
     "@shopware-pwa/helpers-next": "workspace:*",
+    "@shopware/api-client": "workspace:*",
     "@vueuse/core": "^10.6.1",
     "scule": "^1.1.0"
   },
   "devDependencies": {
+    "@nuxt/kit": "^3.8.1",
     "@shopware-pwa/types": "workspace:*",
     "@vitest/coverage-v8": "^0.34.6",
     "@vue/test-utils": "^2.4.2",
diff --git a/packages/composables/src/_test/index.ts b/packages/composables/src/_test/index.ts
new file mode 100644
index 000000000..757e35b74
--- /dev/null
+++ b/packages/composables/src/_test/index.ts
@@ -0,0 +1 @@
+export { useSetup } from "./useSetup";
diff --git a/packages/composables/src/_test/useSetup.ts b/packages/composables/src/_test/useSetup.ts
new file mode 100644
index 000000000..639525686
--- /dev/null
+++ b/packages/composables/src/_test/useSetup.ts
@@ -0,0 +1,53 @@
+import { shallowMount } from "@vue/test-utils";
+import { vi } from "vitest";
+import { defineComponent, h } from "vue";
+import deepMerge from "../helpers/deepMerge";
+
+type Injections = {
+  shopware: {
+    apiInstance: {
+      config: Record<string, unknown>;
+    };
+  };
+  apiClient: {
+    invoke: ReturnType<typeof vi.fn>;
+  };
+};
+
+export function useSetup<V>(
+  setup: () => V,
+  customMocks?: Record<string, unknown>,
+) {
+  const defaultInjections: Injections = {
+    shopware: {
+      apiInstance: {
+        config: {},
+      },
+    },
+    apiClient: { invoke: vi.fn() },
+  };
+
+  const compoment = defineComponent({
+    setup,
+    render() {
+      return h("div", []);
+    },
+  });
+
+  const injections: Injections = deepMerge(
+    defaultInjections,
+    customMocks || {},
+  ) as Injections;
+
+  const wrapper = shallowMount(compoment, {
+    global: {
+      provide: injections,
+    },
+  });
+
+  return {
+    injections,
+    wrapper,
+    vm: wrapper.vm,
+  };
+}
diff --git a/packages/composables/src/cms/useCmsElementConfig.test.ts b/packages/composables/src/cms/useCmsElementConfig.test.ts
index 5f98e7d96..dac2b0013 100644
--- a/packages/composables/src/cms/useCmsElementConfig.test.ts
+++ b/packages/composables/src/cms/useCmsElementConfig.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it } from "vitest";
-import { CmsElementBuyBox, CmsElementForm, CmsElementImage } from "../types";
+import type {
+  CmsElementBuyBox,
+  CmsElementForm,
+  CmsElementImage,
+} from "../types";
 import { useCmsElementConfig } from "./useCmsElementConfig";
 
 describe("useCmsElementConfig", () => {
diff --git a/packages/composables/src/cms/useCmsElementConfig.ts b/packages/composables/src/cms/useCmsElementConfig.ts
index 1b5b3ff02..046642413 100644
--- a/packages/composables/src/cms/useCmsElementConfig.ts
+++ b/packages/composables/src/cms/useCmsElementConfig.ts
@@ -1,5 +1,5 @@
 import type { CmsSlot } from "@shopware-pwa/types";
-import { ElementConfig } from "../types";
+import type { ElementConfig } from "../types";
 
 /**
  * Composable to get cms element config
diff --git a/packages/composables/src/cms/useCmsElementImage.ts b/packages/composables/src/cms/useCmsElementImage.ts
index 2ded57f39..bbf7a084a 100644
--- a/packages/composables/src/cms/useCmsElementImage.ts
+++ b/packages/composables/src/cms/useCmsElementImage.ts
@@ -1,11 +1,11 @@
-import {
+import { useCmsElementConfig } from "#imports";
+import type {
   CmsElementImage,
   DisplayMode,
   CmsElementManufacturerLogo,
-  useCmsElementConfig,
 } from "../index";
-import {
-  computed,
+import { computed } from "vue";
+import type {
   ComputedRef,
   CSSProperties,
   AnchorHTMLAttributes,
diff --git a/packages/composables/src/cms/useCmsElementProductBox.ts b/packages/composables/src/cms/useCmsElementProductBox.ts
index 32438c3e0..9735c6b62 100644
--- a/packages/composables/src/cms/useCmsElementProductBox.ts
+++ b/packages/composables/src/cms/useCmsElementProductBox.ts
@@ -3,10 +3,10 @@ import { useCmsElementConfig } from "../index";
 import type { CmsElementProductBox, BoxLayout } from "../index";
 import { computed } from "vue";
 import type { ComputedRef } from "vue";
-import type { Product } from "@shopware-pwa/types";
+import type { Schemas } from "#shopware";
 
 export type UseCmsElementProductBox = {
-  product: Product;
+  product: Schemas["Product"];
   boxLayout: ComputedRef<BoxLayout>;
 };
 
diff --git a/packages/composables/src/createShopwareContext.ts b/packages/composables/src/createShopwareContext.ts
index 4ed1d4bc2..fbc4b1e28 100644
--- a/packages/composables/src/createShopwareContext.ts
+++ b/packages/composables/src/createShopwareContext.ts
@@ -4,8 +4,8 @@
  * - we don't need them for now as we do not show any significant info for now
  */
 
-import { ShopwareApiInstance } from "@shopware-pwa/api-client";
-import { App, effectScope, EffectScope, markRaw, reactive } from "vue";
+import { effectScope, markRaw, reactive } from "vue";
+import type { App, EffectScope } from "vue";
 // import { registerShopwareDevtools } from "./devtools/plugin";
 
 export function createShopwareContext(
@@ -13,7 +13,7 @@ export function createShopwareContext(
   options: {
     // initialStore?: any;
     // shopwareDefaults: ApiDefaults;
-    apiInstance: ShopwareApiInstance;
+    apiInstance?: any;
     devStorefrontUrl?: string | null;
     enableDevtools?: boolean;
   },
diff --git a/packages/composables/src/devtools/plugin.ts b/packages/composables/src/devtools/plugin.ts
index 3998ccf77..f92a59f3a 100644
--- a/packages/composables/src/devtools/plugin.ts
+++ b/packages/composables/src/devtools/plugin.ts
@@ -1,7 +1,9 @@
 /* eslint-disable */
 // TODO fix types in this plugin
-import { setupDevtoolsPlugin, DevtoolsPluginApi } from "@vue/devtools-api";
-import { App, InjectionKey, unref } from "vue";
+import { setupDevtoolsPlugin } from "@vue/devtools-api";
+import type { DevtoolsPluginApi } from "@vue/devtools-api";
+import { unref } from "vue";
+import type { App, InjectionKey } from "vue";
 
 const TIMELINE_EVENT_LAYER_ID = "shopware:events";
 const INSPECTOR_ID = "shopware";
diff --git a/packages/composables/src/index.ts b/packages/composables/src/index.ts
index a7d569a4b..cc2deca37 100644
--- a/packages/composables/src/index.ts
+++ b/packages/composables/src/index.ts
@@ -28,6 +28,7 @@ export * from "./useCheckout";
 export * from "./useCmsBlock";
 export * from "./useCmsMeta";
 export * from "./useCmsSection";
+export * from "./useContext";
 export * from "./useCountries";
 export * from "./useCustomerOrders";
 export * from "./useCustomerPassword";
@@ -64,8 +65,8 @@ export function resolveCmsComponent(content: CmsSection | CmsBlock | CmsSlot) {
     content.apiAlias === "cms_block"
       ? "Block"
       : content.apiAlias === "cms_section"
-      ? "Section"
-      : "Element";
+        ? "Section"
+        : "Element";
 
   const componentNameToResolve = pascalCase(`Cms-${type}-${componentName}`);
   try {
diff --git a/packages/composables/src/mocks/LandingPage.ts b/packages/composables/src/mocks/LandingPage.ts
new file mode 100644
index 000000000..bd3821ac0
--- /dev/null
+++ b/packages/composables/src/mocks/LandingPage.ts
@@ -0,0 +1,2882 @@
+import type { CmsPageEntity } from "@shopware-pwa/types";
+
+const LandingPage = {
+  versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+  translated: {
+    name: "Summer Giveaway",
+    customFields: {},
+    slotConfig: [],
+    metaDescription: "Landing page description",
+    metaTitle: "Landing page title",
+    keywords: "Landing page keywords",
+    url: "Summer-Giveaway",
+  },
+  createdAt: "2021-04-14T11:47:16.402+00:00",
+  updatedAt: "2021-04-15T09:11:10.454+00:00",
+  active: true,
+  translations: null,
+  cmsPageId: "4f6c11a7e4cb4752a40d5945dfc53c4a",
+  cmsPageVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+  cmsPage: {
+    extensions: {
+      swagCmsExtensionsScrollNavigationPageSettings: {
+        translated: [],
+        id: "4f6c11a7e4cb4752a40d5945dfc53c4a",
+        active: false,
+        duration: 1000,
+        easing: "inOut",
+        bouncy: false,
+        easingDegree: 3,
+        cmsPageId: null,
+        cmsPageVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+        cmsPage: null,
+        createdAt: "2021-04-14T12:42:45.048+00:00",
+        updatedAt: null,
+        apiAlias: "swag_cms_extensions_scroll_navigation_page_settings",
+      },
+    },
+    versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+    translated: {
+      name: "Summer Giveaway",
+      customFields: {},
+    },
+    createdAt: "2021-04-14T11:52:31.749+00:00",
+    updatedAt: "2021-04-15T11:12:55.305+00:00",
+    name: "Summer Giveaway",
+    type: "landingpage",
+    entity: null,
+    sections: [
+      {
+        translated: [],
+        createdAt: "2021-04-14T11:52:31.749+00:00",
+        updatedAt: "2021-04-15T11:12:55.299+00:00",
+        type: "default",
+        blocks: [
+          {
+            extensions: {
+              swagCmsExtensionsBlockRule: {
+                translated: [],
+                id: "11780768fb6d46ea866abd5932739f11",
+                inverted: false,
+                visibilityRuleId: null,
+                cmsBlockId: "d70ef64398124ff6b02be956ddc6ef5a",
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                visibilityRule: null,
+                cmsBlock: null,
+                createdAt: "2021-04-14T14:14:00.176+00:00",
+                updatedAt: null,
+                apiAlias: "swag_cms_extensions_block_rule",
+              },
+            },
+            versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            translated: [],
+            createdAt: "2021-04-14T14:14:00.177+00:00",
+            updatedAt: "2021-04-15T11:12:55.299+00:00",
+            type: "image-highlight-row",
+            slots: [
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    url: {
+                      value: null,
+                      source: "static",
+                    },
+                    media: {
+                      value: "4264318929574db88e33299fb27da93a",
+                      source: "static",
+                    },
+                    newTab: {
+                      value: false,
+                      source: "static",
+                    },
+                    minHeight: {
+                      value: "600px",
+                      source: "static",
+                    },
+                    displayMode: {
+                      value: "cover",
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: null,
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T14:14:00.177+00:00",
+                updatedAt: "2021-04-15T11:12:55.299+00:00",
+                type: "image",
+                slot: "center",
+                block: null,
+                blockId: "d70ef64398124ff6b02be956ddc6ef5a",
+                config: {
+                  url: {
+                    value: null,
+                    source: "static",
+                  },
+                  media: {
+                    value: "4264318929574db88e33299fb27da93a",
+                    source: "static",
+                  },
+                  newTab: {
+                    value: false,
+                    source: "static",
+                  },
+                  minHeight: {
+                    value: "600px",
+                    source: "static",
+                  },
+                  displayMode: {
+                    value: "cover",
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: null,
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "url",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "media",
+                    source: "static",
+                    value: "4264318929574db88e33299fb27da93a",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "newTab",
+                    source: "static",
+                    value: false,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "minHeight",
+                    source: "static",
+                    value: "600px",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "displayMode",
+                    source: "static",
+                    value: "cover",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  mediaId: "4264318929574db88e33299fb27da93a",
+                  url: "",
+                  newTab: false,
+                  media: {
+                    translated: {
+                      alt: null,
+                      title: null,
+                      customFields: {},
+                    },
+                    createdAt: "2020-08-06T06:25:53.622+00:00",
+                    updatedAt: null,
+                    mimeType: "image/jpeg",
+                    fileExtension: "jpg",
+                    fileSize: 1041510,
+                    title: null,
+                    metaData: {
+                      type: 2,
+                      width: 4912,
+                      height: 7360,
+                    },
+                    uploadedAt: null,
+                    alt: null,
+                    url: "https://cdn.shopware.store/a/B/m/pPkDE/media/d2/d2/fc/aral-tasher-vWqES2F2G1o-unsplash.jpg",
+                    fileName: "aral-tasher-vWqES2F2G1o-unsplash",
+                    translations: null,
+                    thumbnails: [
+                      {
+                        translated: [],
+                        createdAt: "2020-08-06T06:25:53.620+00:00",
+                        updatedAt: null,
+                        width: 1920,
+                        path: null,
+                        height: 1920,
+                        url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/d2/d2/fc/aral-tasher-vWqES2F2G1o-unsplash_1920x1920.jpg",
+                        mediaId: "4264318929574db88e33299fb27da93a",
+                        customFields: null,
+                        id: "2b2c4d2a5f7048848cc83a842a378111",
+                        apiAlias: "media_thumbnail",
+                      },
+                      {
+                        translated: [],
+                        createdAt: "2020-08-06T06:25:53.621+00:00",
+                        updatedAt: null,
+                        width: 800,
+                        path: null,
+                        height: 800,
+                        url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/d2/d2/fc/aral-tasher-vWqES2F2G1o-unsplash_800x800.jpg",
+                        mediaId: "4264318929574db88e33299fb27da93a",
+                        customFields: null,
+                        id: "313b0c377aae4621aa886a1b21d82214",
+                        apiAlias: "media_thumbnail",
+                      },
+                      {
+                        translated: [],
+                        createdAt: "2020-08-06T06:25:53.622+00:00",
+                        updatedAt: null,
+                        width: 400,
+                        path: null,
+                        height: 400,
+                        url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/d2/d2/fc/aral-tasher-vWqES2F2G1o-unsplash_400x400.jpg",
+                        mediaId: "4264318929574db88e33299fb27da93a",
+                        customFields: null,
+                        id: "6ed7e7a93c4d4874bfffeadbe20a2a6a",
+                        apiAlias: "media_thumbnail",
+                      },
+                    ],
+                    hasFile: true,
+                    private: false,
+                    path: "media/d2/d2/fc/aral-tasher-vWqES2F2G1o-unsplash.jpg",
+                    customFields: null,
+                    id: "4264318929574db88e33299fb27da93a",
+                    apiAlias: "media",
+                  },
+                  apiAlias: "cms_image",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    content: {
+                      value:
+                        "<h2>Win three outstanding products in our summer giveaway!</h2>\n                <p>Take part in our summer giveaway. All you have to do is tell us what your favorite summer activity is. Scroll down and see what prizes are waiting for you.</p>",
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: "center",
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T14:14:00.176+00:00",
+                updatedAt: "2021-04-15T11:12:55.298+00:00",
+                type: "text",
+                slot: "left",
+                block: null,
+                blockId: "d70ef64398124ff6b02be956ddc6ef5a",
+                config: {
+                  content: {
+                    value:
+                      "<h2>Win three outstanding products in our summer giveaway!</h2>\n                <p>Take part in our summer giveaway. All you have to do is tell us what your favorite summer activity is. Scroll down and see what prizes are waiting for you.</p>",
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: "center",
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "content",
+                    source: "static",
+                    value:
+                      "<h2>Win three outstanding products in our summer giveaway!</h2>\n                <p>Take part in our summer giveaway. All you have to do is tell us what your favorite summer activity is. Scroll down and see what prizes are waiting for you.</p>",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: "center",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  content:
+                    "<h2>Win three outstanding products in our summer giveaway!</h2>\n                <p>Take part in our summer giveaway. All you have to do is tell us what your favorite summer activity is. Scroll down and see what prizes are waiting for you.</p>",
+                  apiAlias: "cms_text",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    url: {
+                      value: null,
+                      source: "static",
+                    },
+                    media: {
+                      value: "a56d3d3fd49a460f8a846ffd8c5207f0",
+                      source: "static",
+                    },
+                    newTab: {
+                      value: false,
+                      source: "static",
+                    },
+                    minHeight: {
+                      value: "800px",
+                      source: "static",
+                    },
+                    displayMode: {
+                      value: "cover",
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: null,
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T14:14:00.177+00:00",
+                updatedAt: "2021-04-15T11:12:55.299+00:00",
+                type: "image",
+                slot: "right",
+                block: null,
+                blockId: "d70ef64398124ff6b02be956ddc6ef5a",
+                config: {
+                  url: {
+                    value: null,
+                    source: "static",
+                  },
+                  media: {
+                    value: "a56d3d3fd49a460f8a846ffd8c5207f0",
+                    source: "static",
+                  },
+                  newTab: {
+                    value: false,
+                    source: "static",
+                  },
+                  minHeight: {
+                    value: "800px",
+                    source: "static",
+                  },
+                  displayMode: {
+                    value: "cover",
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: null,
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "url",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "media",
+                    source: "static",
+                    value: "a56d3d3fd49a460f8a846ffd8c5207f0",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "newTab",
+                    source: "static",
+                    value: false,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "minHeight",
+                    source: "static",
+                    value: "800px",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "displayMode",
+                    source: "static",
+                    value: "cover",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  mediaId: "a56d3d3fd49a460f8a846ffd8c5207f0",
+                  url: "",
+                  newTab: false,
+                  media: {
+                    translated: {
+                      alt: null,
+                      title: null,
+                      customFields: {},
+                    },
+                    createdAt: "2020-08-06T06:26:00.652+00:00",
+                    updatedAt: null,
+                    mimeType: "image/jpeg",
+                    fileExtension: "jpg",
+                    fileSize: 755919,
+                    title: null,
+                    metaData: {
+                      type: 2,
+                      width: 5472,
+                      height: 3648,
+                    },
+                    uploadedAt: null,
+                    alt: null,
+                    url: "https://cdn.shopware.store/a/B/m/pPkDE/media/38/4d/0c/jenn-evelyn-ann-112980-unsplash.jpg",
+                    fileName: "jenn-evelyn-ann-112980-unsplash",
+                    translations: null,
+                    thumbnails: [
+                      {
+                        translated: [],
+                        createdAt: "2020-08-06T06:26:00.650+00:00",
+                        updatedAt: null,
+                        width: 1920,
+                        path: null,
+                        height: 1920,
+                        url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/38/4d/0c/jenn-evelyn-ann-112980-unsplash_1920x1920.jpg",
+                        mediaId: "a56d3d3fd49a460f8a846ffd8c5207f0",
+                        customFields: null,
+                        id: "4b5361e7728b453dabcac637a290710b",
+                        apiAlias: "media_thumbnail",
+                      },
+                      {
+                        translated: [],
+                        createdAt: "2020-08-06T06:26:00.651+00:00",
+                        updatedAt: null,
+                        width: 400,
+                        path: null,
+                        height: 400,
+                        url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/38/4d/0c/jenn-evelyn-ann-112980-unsplash_400x400.jpg",
+                        mediaId: "a56d3d3fd49a460f8a846ffd8c5207f0",
+                        customFields: null,
+                        id: "95b3ff4b605f4248ad59af4a896910bc",
+                        apiAlias: "media_thumbnail",
+                      },
+                      {
+                        translated: [],
+                        createdAt: "2020-08-06T06:26:00.652+00:00",
+                        updatedAt: null,
+                        width: 800,
+                        path: null,
+                        height: 800,
+                        url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/38/4d/0c/jenn-evelyn-ann-112980-unsplash_800x800.jpg",
+                        mediaId: "a56d3d3fd49a460f8a846ffd8c5207f0",
+                        customFields: null,
+                        id: "f04d01f8e33e427d8bd2a331af8174e5",
+                        apiAlias: "media_thumbnail",
+                      },
+                    ],
+                    hasFile: true,
+                    private: false,
+                    path: "media/38/4d/0c/jenn-evelyn-ann-112980-unsplash.jpg",
+                    customFields: null,
+                    id: "a56d3d3fd49a460f8a846ffd8c5207f0",
+                    apiAlias: "media",
+                  },
+                  apiAlias: "cms_image",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+            ],
+            sectionId: "d9668d6c5cfc492fa10a4bcb88b8ffaf",
+            position: 0,
+            name: null,
+            sectionPosition: "main",
+            marginTop: "5%",
+            marginBottom: "5%",
+            marginLeft: "10%",
+            marginRight: "10%",
+            backgroundColor: "#fdd9acff",
+            backgroundMediaId: null,
+            backgroundMedia: null,
+            backgroundMediaMode: "cover",
+            cssClass: null,
+            cmsSectionVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            visibility: null,
+            customFields: null,
+            apiAlias: "cms_block",
+          },
+        ],
+        pageId: "4f6c11a7e4cb4752a40d5945dfc53c4a",
+        page: null,
+        position: 0,
+        sizingMode: "full_width",
+        mobileBehavior: null,
+        backgroundColor: "#fdd9acff",
+        backgroundMediaId: null,
+        backgroundMedia: null,
+        backgroundMediaMode: "cover",
+        cssClass: null,
+        cmsPageVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+        visibility: null,
+        customFields: null,
+        apiAlias: "cms_section",
+      },
+      {
+        translated: [],
+        createdAt: "2021-04-14T12:07:46.299+00:00",
+        updatedAt: "2021-04-15T11:12:55.300+00:00",
+        type: "default",
+        blocks: [
+          {
+            extensions: {
+              swagCmsExtensionsBlockRule: {
+                translated: [],
+                id: "9fc57382ff434cc9b993d10403425417",
+                inverted: false,
+                visibilityRuleId: null,
+                cmsBlockId: "1c56e4d835434291ab9a150b9138363b",
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                visibilityRule: null,
+                cmsBlock: null,
+                createdAt: "2021-04-14T13:33:01.658+00:00",
+                updatedAt: null,
+                apiAlias: "swag_cms_extensions_block_rule",
+              },
+            },
+            versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            translated: [],
+            createdAt: "2021-04-14T13:33:01.659+00:00",
+            updatedAt: "2021-04-15T11:12:55.300+00:00",
+            type: "text-teaser",
+            slots: [
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    content: {
+                      value:
+                        '<h2 style="text-align: center;"><span style="letter-spacing: 0px; background-color: transparent;">Take part in our summer giveaway&nbsp;<br></span><span style="letter-spacing: 0px; background-color: transparent;">and get the chance to win awesome products.</span></h2><p style="text-align: center;"><span style="letter-spacing: 0px; background-color: transparent;">Going swimming, having a barbecue with friends or a picnic in the park?&nbsp;</span><span style="background-color: transparent; letter-spacing: 0px;">Tell us, what is your favorite thing to do in the summer?</span></p><p></p>',
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: null,
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T13:33:01.659+00:00",
+                updatedAt: "2021-04-15T11:12:55.300+00:00",
+                type: "text",
+                slot: "content",
+                block: null,
+                blockId: "1c56e4d835434291ab9a150b9138363b",
+                config: {
+                  content: {
+                    value:
+                      '<h2 style="text-align: center;"><span style="letter-spacing: 0px; background-color: transparent;">Take part in our summer giveaway&nbsp;<br></span><span style="letter-spacing: 0px; background-color: transparent;">and get the chance to win awesome products.</span></h2><p style="text-align: center;"><span style="letter-spacing: 0px; background-color: transparent;">Going swimming, having a barbecue with friends or a picnic in the park?&nbsp;</span><span style="background-color: transparent; letter-spacing: 0px;">Tell us, what is your favorite thing to do in the summer?</span></p><p></p>',
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: null,
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "content",
+                    source: "static",
+                    value:
+                      '<h2 style="text-align: center;"><span style="letter-spacing: 0px; background-color: transparent;">Take part in our summer giveaway&nbsp;<br></span><span style="letter-spacing: 0px; background-color: transparent;">and get the chance to win awesome products.</span></h2><p style="text-align: center;"><span style="letter-spacing: 0px; background-color: transparent;">Going swimming, having a barbecue with friends or a picnic in the park?&nbsp;</span><span style="background-color: transparent; letter-spacing: 0px;">Tell us, what is your favorite thing to do in the summer?</span></p><p></p>',
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  content:
+                    '<h2 style="text-align:center;"><span style="letter-spacing:0px;background-color:transparent;">Take part in our summer giveaway <br /></span><span style="letter-spacing:0px;background-color:transparent;">and get the chance to win awesome products.</span></h2><p style="text-align:center;"><span style="letter-spacing:0px;background-color:transparent;">Going swimming, having a barbecue with friends or a picnic in the park? </span><span style="background-color:transparent;letter-spacing:0px;">Tell us, what is your favorite thing to do in the summer?</span></p><p></p>',
+                  apiAlias: "cms_text",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+            ],
+            sectionId: "33519253387b4c99b3152ba257744c0c",
+            position: 0,
+            name: null,
+            sectionPosition: "main",
+            marginTop: "120px",
+            marginBottom: "20px",
+            marginLeft: "20px",
+            marginRight: "20px",
+            backgroundColor: null,
+            backgroundMediaId: null,
+            backgroundMedia: null,
+            backgroundMediaMode: "cover",
+            cssClass: null,
+            cmsSectionVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            visibility: null,
+            customFields: null,
+            apiAlias: "cms_block",
+          },
+          {
+            extensions: {
+              swagCmsExtensionsBlockRule: {
+                translated: [],
+                id: "8ee742b3b44f4db2b70df622fb389e1a",
+                inverted: false,
+                visibilityRuleId: null,
+                cmsBlockId: "bacc756a78cd4e56b6319bfd02d0d164",
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                visibilityRule: null,
+                cmsBlock: null,
+                createdAt: "2021-04-14T13:22:36.572+00:00",
+                updatedAt: null,
+                apiAlias: "swag_cms_extensions_block_rule",
+              },
+            },
+            versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            translated: [],
+            createdAt: "2021-04-14T13:21:22.007+00:00",
+            updatedAt: "2021-04-15T11:12:55.300+00:00",
+            type: "custom-form",
+            slots: [
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    type: {
+                      value: "custom-form",
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T13:21:22.007+00:00",
+                updatedAt: "2021-04-15T11:12:55.300+00:00",
+                type: "custom-form",
+                slot: "content",
+                block: null,
+                blockId: "bacc756a78cd4e56b6319bfd02d0d164",
+                config: {
+                  type: {
+                    value: "custom-form",
+                    source: "static",
+                  },
+                },
+                fieldConfig: null,
+                translations: null,
+                data: null,
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+            ],
+            sectionId: "33519253387b4c99b3152ba257744c0c",
+            position: 1,
+            name: null,
+            sectionPosition: "main",
+            marginTop: "20px",
+            marginBottom: "120px",
+            marginLeft: "20px",
+            marginRight: "20px",
+            backgroundColor: null,
+            backgroundMediaId: null,
+            backgroundMedia: null,
+            backgroundMediaMode: "cover",
+            cssClass: null,
+            cmsSectionVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            visibility: null,
+            customFields: null,
+            apiAlias: "cms_block",
+          },
+        ],
+        pageId: "4f6c11a7e4cb4752a40d5945dfc53c4a",
+        page: null,
+        position: 1,
+        sizingMode: "boxed",
+        mobileBehavior: null,
+        backgroundColor: null,
+        backgroundMediaId: null,
+        backgroundMedia: null,
+        backgroundMediaMode: "cover",
+        cssClass: null,
+        cmsPageVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+        visibility: null,
+        customFields: null,
+        apiAlias: "cms_section",
+      },
+      {
+        translated: [],
+        createdAt: "2021-04-14T12:07:46.299+00:00",
+        updatedAt: "2021-04-15T11:12:55.302+00:00",
+        type: "default",
+        blocks: [
+          {
+            extensions: {
+              swagCmsExtensionsBlockRule: {
+                translated: [],
+                id: "5345a509c5a1422fb32f43d931f71394",
+                inverted: false,
+                visibilityRuleId: null,
+                cmsBlockId: "9eb49de38d284f3099368ac79fbe5221",
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                visibilityRule: null,
+                cmsBlock: null,
+                createdAt: "2021-04-14T14:08:32.848+00:00",
+                updatedAt: null,
+                apiAlias: "swag_cms_extensions_block_rule",
+              },
+            },
+            versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            translated: [],
+            createdAt: "2021-04-14T14:08:32.849+00:00",
+            updatedAt: "2021-04-15T11:12:55.301+00:00",
+            type: "text-teaser",
+            slots: [
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    content: {
+                      value:
+                        '<h2 style="text-align: center;">What you can win</h2>',
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: null,
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T14:08:32.849+00:00",
+                updatedAt: "2021-04-15T11:12:55.301+00:00",
+                type: "text",
+                slot: "content",
+                block: null,
+                blockId: "9eb49de38d284f3099368ac79fbe5221",
+                config: {
+                  content: {
+                    value:
+                      '<h2 style="text-align: center;">What you can win</h2>',
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: null,
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "content",
+                    source: "static",
+                    value:
+                      '<h2 style="text-align: center;">What you can win</h2>',
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  content:
+                    '<h2 style="text-align:center;">What you can win</h2>',
+                  apiAlias: "cms_text",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+            ],
+            sectionId: "f48b46c3ffc64e7cbfdd29a0e49ce781",
+            position: 0,
+            name: null,
+            sectionPosition: "main",
+            marginTop: "120px",
+            marginBottom: "20px",
+            marginLeft: "20px",
+            marginRight: "20px",
+            backgroundColor: null,
+            backgroundMediaId: null,
+            backgroundMedia: null,
+            backgroundMediaMode: "cover",
+            cssClass: null,
+            cmsSectionVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            visibility: null,
+            customFields: null,
+            apiAlias: "cms_block",
+          },
+          {
+            extensions: {
+              swagCmsExtensionsBlockRule: {
+                translated: [],
+                id: "b53198ce1e464562a71d2727baee3312",
+                inverted: false,
+                visibilityRuleId: null,
+                cmsBlockId: "298857fe08b04167aa06d1511f47bc75",
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                visibilityRule: null,
+                cmsBlock: null,
+                createdAt: "2021-04-15T11:12:55.301+00:00",
+                updatedAt: null,
+                apiAlias: "swag_cms_extensions_block_rule",
+              },
+            },
+            versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            translated: [],
+            createdAt: "2021-04-14T12:19:37.182+00:00",
+            updatedAt: "2021-04-15T11:12:55.302+00:00",
+            type: "product-three-column",
+            slots: [
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    product: {
+                      value: "a0b4d1c91fc94cf48594de2f28f34e52",
+                      source: "static",
+                    },
+                    boxLayout: {
+                      value: "standard",
+                      source: "static",
+                    },
+                    displayMode: {
+                      value: "standard",
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: null,
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T12:19:37.182+00:00",
+                updatedAt: "2021-04-15T11:12:55.302+00:00",
+                type: "product-box",
+                slot: "center",
+                block: null,
+                blockId: "298857fe08b04167aa06d1511f47bc75",
+                config: {
+                  product: {
+                    value: "a0b4d1c91fc94cf48594de2f28f34e52",
+                    source: "static",
+                  },
+                  boxLayout: {
+                    value: "standard",
+                    source: "static",
+                  },
+                  displayMode: {
+                    value: "standard",
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: null,
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "product",
+                    source: "static",
+                    value: "a0b4d1c91fc94cf48594de2f28f34e52",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "boxLayout",
+                    source: "static",
+                    value: "standard",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "displayMode",
+                    source: "static",
+                    value: "standard",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  productId: "a0b4d1c91fc94cf48594de2f28f34e52",
+                  product: {
+                    extensions: {
+                      foreignKeys: {
+                        swagCustomizedProductsTemplateId: null,
+                        swagCustomizedProductsTemplateVersionId:
+                          "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                        apiAlias: "product_foreign_keys_extension",
+                      },
+                      search: {
+                        extensions: [],
+                        _uniqueIdentifier: null,
+                        translated: [],
+                        productNumber: "940927",
+                        autoIncrement: 11,
+                      },
+                    },
+                    versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                    translated: {
+                      metaDescription: null,
+                      name: "Stainless Steel Smoking Box – 21 x 13 cm",
+                      keywords: null,
+                      description:
+                        "<p></p><h4>Highlights</h4><div><ul><li>The smoking box can easily be placed on the grill grate or in smoking devices of gas or&nbsp;</li><li>Using coal grills</li><li>stainless steel</li><li>heat-resistant</li><li>The box can be filled with herbs, wood pellets or smoking chips</li><li>Box and lid dishwasher safe, gentle hand washing however recommended</li></ul></div><div><br></div><p></p>",
+                      metaTitle: null,
+                      packUnit: null,
+                      packUnitPlural: null,
+                      customFields: {},
+                    },
+                    createdAt: "2020-08-06T06:26:32.260+00:00",
+                    updatedAt: "2023-09-08T08:01:11.596+00:00",
+                    parentId: null,
+                    childCount: 0,
+                    taxId: "94f1e03140d24698a894320e258e6d83",
+                    manufacturerId: "05cd4e976df14c4d90e351f345ff5aa3",
+                    unitId: null,
+                    active: true,
+                    displayGroup: "76872bb57c2cfe309c8bc7adc5f4afa3",
+                    manufacturerNumber: null,
+                    ean: null,
+                    sales: 0,
+                    productNumber: "940927",
+                    stock: 1308,
+                    availableStock: 1305,
+                    available: true,
+                    deliveryTimeId: "0caaf7f6131142f6b1fa81f3e3f6c0fb",
+                    deliveryTime: {
+                      translated: {
+                        name: "1-3 days",
+                        customFields: {},
+                      },
+                      createdAt: "2020-08-06T06:26:54.178+00:00",
+                      updatedAt: "2020-08-06T06:26:54.182+00:00",
+                      name: "1-3 days",
+                      min: 1,
+                      max: 3,
+                      unit: "day",
+                      customFields: null,
+                      id: "0caaf7f6131142f6b1fa81f3e3f6c0fb",
+                      apiAlias: "delivery_time",
+                    },
+                    restockTime: 1,
+                    isCloseout: false,
+                    purchaseSteps: 1,
+                    maxPurchase: null,
+                    minPurchase: 1,
+                    purchaseUnit: null,
+                    referenceUnit: null,
+                    shippingFree: false,
+                    markAsTopseller: null,
+                    weight: null,
+                    width: 200,
+                    height: 133,
+                    length: 35,
+                    releaseDate: null,
+                    categoryTree: [
+                      "525abe8981214bd2ba94fd33942333ec",
+                      "bda4b60e845240b2b9d6b60e71196e14",
+                      "79f30922410344cca284b80be225cbfe",
+                      "6bb2662482fe42fb90129f32cdd645bb",
+                    ],
+                    streamIds: [
+                      "1318833f46df457981763b94179d9ef0",
+                      "5675448d6b3a4dd2a659d31a3dde74da",
+                      "e8a363db4d1542dca933ffde1ebeace4",
+                    ],
+                    optionIds: null,
+                    propertyIds: [
+                      "346d6d5679094487b293ad120480424d",
+                      "47874c18368b4748bf7cacb45697b6da",
+                      "ed210f7227c2468dbbebdf6c1be68a03",
+                    ],
+                    name: "Stainless Steel Smoking Box – 21 x 13 cm",
+                    keywords: "Landing page keywords",
+                    description:
+                      "<p></p><h4>Highlights</h4><div><ul><li>The smoking box can easily be placed on the grill grate or in smoking devices of gas or&nbsp;</li><li>Using coal grills</li><li>stainless steel</li><li>heat-resistant</li><li>The box can be filled with herbs, wood pellets or smoking chips</li><li>Box and lid dishwasher safe, gentle hand washing however recommended</li></ul></div><div><br></div><p></p>",
+                    metaDescription: "Landing page description",
+                    metaTitle: "Landing page title",
+                    packUnit: null,
+                    packUnitPlural: null,
+                    tax: {
+                      translated: [],
+                      createdAt: "2020-08-06T06:23:45.421+00:00",
+                      updatedAt: "2020-08-06T06:26:46.302+00:00",
+                      taxRate: 7,
+                      name: "7%",
+                      position: 0,
+                      customFields: null,
+                      id: "94f1e03140d24698a894320e258e6d83",
+                      apiAlias: "tax",
+                    },
+                    manufacturer: {
+                      versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                      translated: {
+                        name: "Springlane",
+                        description:
+                          "We fuel people’s passion for cooking.Good food is our passion. Our products and brands are therefore aimed at foodies and BBQ enthusiasts. With our food blogs, we inspire and inform millions of users every week about cooking and grilling.Springlane is a founder-managed, fully integrated company with online direct sales in Germany, Austria, Switzerland, Italy, France, Spain, the Netherlands and the UK. At its Düsseldorf location, Springlane currently employs 90 people including engineers, designers, software developers, chefs, bloggers and digital marketing experts.We want to continue to grow strongly and play an important role in the lives of our customers and in our industry! That's exactly what we get up for every morning.",
+                        customFields: {},
+                      },
+                      createdAt: "2020-08-06T06:26:30.586+00:00",
+                      updatedAt: null,
+                      mediaId: "1efd8cb1fe164e4f8d56f0ff5ed954fa",
+                      name: "Springlane",
+                      link: "http://www.springlane.de",
+                      description:
+                        "We fuel people’s passion for cooking.Good food is our passion. Our products and brands are therefore aimed at foodies and BBQ enthusiasts. With our food blogs, we inspire and inform millions of users every week about cooking and grilling.Springlane is a founder-managed, fully integrated company with online direct sales in Germany, Austria, Switzerland, Italy, France, Spain, the Netherlands and the UK. At its Düsseldorf location, Springlane currently employs 90 people including engineers, designers, software developers, chefs, bloggers and digital marketing experts.We want to continue to grow strongly and play an important role in the lives of our customers and in our industry! That's exactly what we get up for every morning.",
+                      media: null,
+                      translations: null,
+                      customFields: null,
+                      id: "05cd4e976df14c4d90e351f345ff5aa3",
+                      apiAlias: "product_manufacturer",
+                    },
+                    unit: null,
+                    cover: {
+                      versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                      translated: [],
+                      createdAt: "2020-08-06T06:26:32.211+00:00",
+                      updatedAt: "2023-06-26T18:55:08.000+00:00",
+                      productId: "a0b4d1c91fc94cf48594de2f28f34e52",
+                      mediaId: "43e9e92a0c2d4d699d21887d79870e67",
+                      position: 0,
+                      media: {
+                        translated: {
+                          alt: null,
+                          title: null,
+                          customFields: {},
+                        },
+                        createdAt: "2020-08-06T06:25:53.660+00:00",
+                        updatedAt: "2020-08-06T06:26:32.211+00:00",
+                        mimeType: "image/jpeg",
+                        fileExtension: "jpg",
+                        fileSize: 251007,
+                        title: null,
+                        metaData: {
+                          type: 2,
+                          width: 1500,
+                          height: 1500,
+                        },
+                        uploadedAt: null,
+                        alt: null,
+                        url: "https://cdn.shopware.store/a/B/m/pPkDE/media/32/6b/0f/940927_Burnhard_Edelstahl-R-ucherbox-21x13-cm_02D7nVXO1kkCxEG.jpg",
+                        fileName:
+                          "940927_Burnhard_Edelstahl-R-ucherbox-21x13-cm_02D7nVXO1kkCxEG",
+                        translations: null,
+                        thumbnails: [
+                          {
+                            translated: [],
+                            createdAt: "2020-08-06T06:25:53.658+00:00",
+                            updatedAt: "2020-08-06T06:26:32.171+00:00",
+                            width: 1920,
+                            path: null,
+                            height: 1920,
+                            url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/32/6b/0f/940927_Burnhard_Edelstahl-R-ucherbox-21x13-cm_02D7nVXO1kkCxEG_1920x1920.jpg",
+                            mediaId: "43e9e92a0c2d4d699d21887d79870e67",
+                            customFields: null,
+                            id: "11d4fd8b7ec749c88265ee573e6a6385",
+                            apiAlias: "media_thumbnail",
+                          },
+                          {
+                            translated: [],
+                            createdAt: "2020-08-06T06:25:53.659+00:00",
+                            updatedAt: "2020-08-06T06:26:32.209+00:00",
+                            width: 400,
+                            path: null,
+                            height: 400,
+                            url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/32/6b/0f/940927_Burnhard_Edelstahl-R-ucherbox-21x13-cm_02D7nVXO1kkCxEG_400x400.jpg",
+                            mediaId: "43e9e92a0c2d4d699d21887d79870e67",
+                            customFields: null,
+                            id: "3449b18a4fc7434c9ba9f805de1127f3",
+                            apiAlias: "media_thumbnail",
+                          },
+                          {
+                            translated: [],
+                            createdAt: "2020-08-06T06:25:53.660+00:00",
+                            updatedAt: "2020-08-06T06:26:32.211+00:00",
+                            width: 800,
+                            path: null,
+                            height: 800,
+                            url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/32/6b/0f/940927_Burnhard_Edelstahl-R-ucherbox-21x13-cm_02D7nVXO1kkCxEG_800x800.jpg",
+                            mediaId: "43e9e92a0c2d4d699d21887d79870e67",
+                            customFields: null,
+                            id: "dd87cc946e894c629819671c460323a9",
+                            apiAlias: "media_thumbnail",
+                          },
+                        ],
+                        hasFile: true,
+                        private: false,
+                        path: "media/32/6b/0f/940927_Burnhard_Edelstahl-R-ucherbox-21x13-cm_02D7nVXO1kkCxEG.jpg",
+                        customFields: null,
+                        id: "43e9e92a0c2d4d699d21887d79870e67",
+                        apiAlias: "media",
+                      },
+                      customFields: null,
+                      id: "43e9e92a0c2d4d699d21887d79870e67",
+                      apiAlias: "product_media",
+                    },
+                    parent: null,
+                    children: null,
+                    media: null,
+                    cmsPageId: null,
+                    cmsPage: null,
+                    translations: null,
+                    categories: null,
+                    tags: null,
+                    properties: null,
+                    options: null,
+                    configuratorSettings: null,
+                    categoriesRo: null,
+                    coverId: "43e9e92a0c2d4d699d21887d79870e67",
+                    tagIds: null,
+                    categoryIds: ["6bb2662482fe42fb90129f32cdd645bb"],
+                    productReviews: null,
+                    ratingAverage: null,
+                    mainCategories: null,
+                    seoUrls: [
+                      {
+                        translated: [],
+                        createdAt: "2020-08-06T06:26:42.505+00:00",
+                        updatedAt: "2022-08-03T08:07:03.941+00:00",
+                        salesChannelId: "98432def39fc4624b33213a56b8c944d",
+                        languageId: "2fbb5fe2e29a4d70aa5854ce7ce3e20b",
+                        routeName: "frontend.detail.page",
+                        foreignKey: "a0b4d1c91fc94cf48594de2f28f34e52",
+                        pathInfo: "/detail/a0b4d1c91fc94cf48594de2f28f34e52",
+                        seoPathInfo:
+                          "Stainless-Steel-Smoking-Box-21-x-13-cm/940927",
+                        isCanonical: true,
+                        isModified: false,
+                        isDeleted: false,
+                        isValid: null,
+                        url: null,
+                        customFields: null,
+                        id: "6fb1f15922084e23a7faa1c0095aebf8",
+                        apiAlias: "seo_url",
+                      },
+                    ],
+                    crossSellings: null,
+                    canonicalProductId: null,
+                    canonicalProduct: null,
+                    streams: null,
+                    downloads: null,
+                    states: ["is-physical"],
+                    customFields: {},
+                    id: "a0b4d1c91fc94cf48594de2f28f34e52",
+                    calculatedPrices: [],
+                    calculatedPrice: {
+                      unitPrice: 8.9,
+                      quantity: 1,
+                      totalPrice: 8.9,
+                      calculatedTaxes: [
+                        {
+                          tax: 0.58,
+                          taxRate: 7,
+                          price: 8.9,
+                          apiAlias: "cart_tax_calculated",
+                        },
+                      ],
+                      taxRules: [
+                        {
+                          taxRate: 7,
+                          percentage: 100,
+                          apiAlias: "cart_tax_rule",
+                        },
+                      ],
+                      referencePrice: null,
+                      listPrice: null,
+                      regulationPrice: null,
+                      apiAlias: "calculated_price",
+                    },
+                    sortedProperties: null,
+                    calculatedCheapestPrice: {
+                      unitPrice: 8.9,
+                      quantity: 1,
+                      totalPrice: 8.9,
+                      calculatedTaxes: [
+                        {
+                          tax: 0.58,
+                          taxRate: 7,
+                          price: 8.9,
+                          apiAlias: "cart_tax_calculated",
+                        },
+                      ],
+                      taxRules: [
+                        {
+                          taxRate: 7,
+                          percentage: 100,
+                          apiAlias: "cart_tax_rule",
+                        },
+                      ],
+                      referencePrice: null,
+                      listPrice: null,
+                      regulationPrice: null,
+                      hasRange: false,
+                      variantId: "a0b4d1c91fc94cf48594de2f28f34e52",
+                      apiAlias: "calculated_cheapest_price",
+                    },
+                    isNew: false,
+                    calculatedMaxPurchase: 100,
+                    seoCategory: null,
+                    apiAlias: "product",
+                  },
+                  apiAlias: "cms_product_box",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    product: {
+                      value: "e05e9340aff4484f9009646dfd572df9",
+                      source: "static",
+                    },
+                    boxLayout: {
+                      value: "standard",
+                      source: "static",
+                    },
+                    displayMode: {
+                      value: "standard",
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: null,
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T12:19:37.182+00:00",
+                updatedAt: "2021-04-15T11:12:55.302+00:00",
+                type: "product-box",
+                slot: "left",
+                block: null,
+                blockId: "298857fe08b04167aa06d1511f47bc75",
+                config: {
+                  product: {
+                    value: "e05e9340aff4484f9009646dfd572df9",
+                    source: "static",
+                  },
+                  boxLayout: {
+                    value: "standard",
+                    source: "static",
+                  },
+                  displayMode: {
+                    value: "standard",
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: null,
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "product",
+                    source: "static",
+                    value: "e05e9340aff4484f9009646dfd572df9",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "boxLayout",
+                    source: "static",
+                    value: "standard",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "displayMode",
+                    source: "static",
+                    value: "standard",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  productId: "e05e9340aff4484f9009646dfd572df9",
+                  product: {
+                    extensions: {
+                      foreignKeys: {
+                        swagCustomizedProductsTemplateId:
+                          "d6d0cbbf9efb4822b8c462af0889a8c5",
+                        swagCustomizedProductsTemplateVersionId:
+                          "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                        apiAlias: "product_foreign_keys_extension",
+                      },
+                      swagCustomizedProductsTemplate: {
+                        versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                        translated: {
+                          displayName: "Your own individual grill",
+                          description:
+                            "Configure the grill according to your personal preferences.<div><br></div>",
+                        },
+                        createdAt: "2020-08-06T06:26:55.579+00:00",
+                        updatedAt: null,
+                        internalName: "Fred - Costumize",
+                        displayName: "Your own individual grill",
+                        description:
+                          "Configure the grill according to your personal preferences.<div><br></div>",
+                        mediaId: "bd18884096564d75aea3c6544089e9cf",
+                        active: true,
+                        stepByStep: false,
+                        confirmInput: false,
+                        optionsAutoCollapse: false,
+                        decisionTree: [],
+                        translations: null,
+                        media: null,
+                        options: [
+                          {
+                            translated: {
+                              displayName: "Name engraved on the front",
+                              description: null,
+                              placeholder: "Enter your name or initials",
+                            },
+                            createdAt: "2020-08-06T06:26:55.577+00:00",
+                            updatedAt: null,
+                            oneTimeSurcharge: false,
+                            relativeSurcharge: false,
+                            advancedSurcharge: false,
+                            taxId: "d55571c0b59a4a538fe44f16a3a206c3",
+                            tax: null,
+                            price: [
+                              {
+                                currencyId: "b7d2554b0ce847cd82f3ac9bd1c0dfca",
+                                net: 16.81,
+                                gross: 20,
+                                linked: true,
+                                listPrice: null,
+                                percentage: null,
+                                regulationPrice: null,
+                                apiAlias: "price",
+                              },
+                            ],
+                            calculatedPrice: null,
+                            percentageSurcharge: null,
+                            prices: [],
+                            id: "045b4c91b8b74f6b8921d44f55e7aad1",
+                            type: "textfield",
+                            displayName: "Name engraved on the front",
+                            description: null,
+                            placeholder: "Enter your name or initials",
+                            templateId: "d6d0cbbf9efb4822b8c462af0889a8c5",
+                            typeProperties: {
+                              maxLength: 100,
+                              minLength: 0,
+                              placeholder: "Enter your name or initials",
+                            },
+                            itemNumber: null,
+                            required: false,
+                            position: 1,
+                            translations: null,
+                            template: null,
+                            values: [],
+                            templateExclusionConditions: null,
+                            templateVersionId:
+                              "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                            apiAlias:
+                              "swag_customized_products_template_option",
+                          },
+                          {
+                            translated: {
+                              displayName: "Personal note on the lid",
+                              description: null,
+                              placeholder: null,
+                            },
+                            createdAt: "2020-08-06T06:26:55.579+00:00",
+                            updatedAt: null,
+                            oneTimeSurcharge: false,
+                            relativeSurcharge: false,
+                            advancedSurcharge: false,
+                            taxId: "94f1e03140d24698a894320e258e6d83",
+                            tax: null,
+                            price: [
+                              {
+                                currencyId: "b7d2554b0ce847cd82f3ac9bd1c0dfca",
+                                net: 23.36,
+                                gross: 25,
+                                linked: true,
+                                listPrice: null,
+                                percentage: null,
+                                regulationPrice: null,
+                                apiAlias: "price",
+                              },
+                            ],
+                            calculatedPrice: null,
+                            percentageSurcharge: 0,
+                            prices: [],
+                            id: "ef508d1ad6cb4477b8f705c7f7f5cb64",
+                            type: "textarea",
+                            displayName: "Personal note on the lid",
+                            description: null,
+                            placeholder: null,
+                            templateId: "d6d0cbbf9efb4822b8c462af0889a8c5",
+                            typeProperties: {
+                              maxLength: 1000,
+                              minLength: 0,
+                            },
+                            itemNumber: null,
+                            required: false,
+                            position: 2,
+                            translations: null,
+                            template: null,
+                            values: [],
+                            templateExclusionConditions: null,
+                            templateVersionId:
+                              "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                            apiAlias:
+                              "swag_customized_products_template_option",
+                          },
+                        ],
+                        products: null,
+                        exclusions: [],
+                        configurations: null,
+                        id: "d6d0cbbf9efb4822b8c462af0889a8c5",
+                        parentVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                        apiAlias: "swag_customized_products_template",
+                      },
+                      search: {
+                        extensions: [],
+                        _uniqueIdentifier: null,
+                        translated: [],
+                        productNumber: "941044",
+                        autoIncrement: 46,
+                      },
+                    },
+                    versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                    translated: {
+                      metaDescription: null,
+                      name: "Fred - 3 Burner Gas Grill",
+                      keywords: null,
+                      description:
+                        '<h4>Highlights</h4><div><ul><li><span style="letter-spacing: 0px;">Grill area: main area 62.5 x 41.5 cm</span></li><li>Total dimensions: closed 130 x 115 x 55 cm, with closed lid 130 x 140 x 55 cm</li><li>2 folding side shelves with 43 x 33 cm each</li><li>Material: stainless steel, lid made of double-walled stainless steel</li><li>Bottle opener on body</li><li>pull-out fat drawer, space for 11 kg gas bottle</li></ul></div><div><h5><br></h5></div>',
+                      metaTitle: null,
+                      packUnit: null,
+                      packUnitPlural: null,
+                      customFields: {},
+                    },
+                    createdAt: "2020-08-06T06:26:33.380+00:00",
+                    updatedAt: "2023-09-08T08:01:11.596+00:00",
+                    parentId: null,
+                    childCount: 0,
+                    taxId: "94f1e03140d24698a894320e258e6d83",
+                    manufacturerId: "05cd4e976df14c4d90e351f345ff5aa3",
+                    unitId: null,
+                    active: true,
+                    displayGroup: "6c8e4d2fa8e7792bd84c1ec982ff5dd9",
+                    manufacturerNumber: null,
+                    ean: null,
+                    sales: 0,
+                    productNumber: "941044",
+                    stock: 71831,
+                    availableStock: 71796,
+                    available: true,
+                    deliveryTimeId: "0caaf7f6131142f6b1fa81f3e3f6c0fb",
+                    deliveryTime: {
+                      translated: {
+                        name: "1-3 days",
+                        customFields: {},
+                      },
+                      createdAt: "2020-08-06T06:26:54.178+00:00",
+                      updatedAt: "2020-08-06T06:26:54.182+00:00",
+                      name: "1-3 days",
+                      min: 1,
+                      max: 3,
+                      unit: "day",
+                      customFields: null,
+                      id: "0caaf7f6131142f6b1fa81f3e3f6c0fb",
+                      apiAlias: "delivery_time",
+                    },
+                    restockTime: 1,
+                    isCloseout: false,
+                    purchaseSteps: 1,
+                    maxPurchase: null,
+                    minPurchase: 1,
+                    purchaseUnit: null,
+                    referenceUnit: null,
+                    shippingFree: false,
+                    markAsTopseller: null,
+                    weight: 36,
+                    width: 625,
+                    height: 415,
+                    length: null,
+                    releaseDate: null,
+                    categoryTree: [
+                      "525abe8981214bd2ba94fd33942333ec",
+                      "bda4b60e845240b2b9d6b60e71196e14",
+                      "79f30922410344cca284b80be225cbfe",
+                      "f78fd21958fd46a8a85b6f62ac3c891b",
+                    ],
+                    streamIds: [
+                      "1318833f46df457981763b94179d9ef0",
+                      "5675448d6b3a4dd2a659d31a3dde74da",
+                      "e8a363db4d1542dca933ffde1ebeace4",
+                    ],
+                    optionIds: null,
+                    propertyIds: [
+                      "18d4553750024e508f4e23279d33fbe1",
+                      "346d6d5679094487b293ad120480424d",
+                      "3d97df9c505b45f1898abcf61dd3eb4f",
+                      "5c21b23bef144aa39d5d17b68d5fffd0",
+                      "6b793e5c257c46dbade91cccc33a3277",
+                    ],
+                    name: "Fred - 3 Burner Gas Grill",
+                    keywords: null,
+                    description:
+                      '<h4>Highlights</h4><div><ul><li><span style="letter-spacing: 0px;">Grill area: main area 62.5 x 41.5 cm</span></li><li>Total dimensions: closed 130 x 115 x 55 cm, with closed lid 130 x 140 x 55 cm</li><li>2 folding side shelves with 43 x 33 cm each</li><li>Material: stainless steel, lid made of double-walled stainless steel</li><li>Bottle opener on body</li><li>pull-out fat drawer, space for 11 kg gas bottle</li></ul></div><div><h5><br></h5></div>',
+                    metaDescription: null,
+                    metaTitle: null,
+                    packUnit: null,
+                    packUnitPlural: null,
+                    tax: {
+                      translated: [],
+                      createdAt: "2020-08-06T06:23:45.421+00:00",
+                      updatedAt: "2020-08-06T06:26:46.302+00:00",
+                      taxRate: 7,
+                      name: "7%",
+                      position: 0,
+                      customFields: null,
+                      id: "94f1e03140d24698a894320e258e6d83",
+                      apiAlias: "tax",
+                    },
+                    manufacturer: {
+                      versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                      translated: {
+                        name: "Springlane",
+                        description:
+                          "We fuel people’s passion for cooking.Good food is our passion. Our products and brands are therefore aimed at foodies and BBQ enthusiasts. With our food blogs, we inspire and inform millions of users every week about cooking and grilling.Springlane is a founder-managed, fully integrated company with online direct sales in Germany, Austria, Switzerland, Italy, France, Spain, the Netherlands and the UK. At its Düsseldorf location, Springlane currently employs 90 people including engineers, designers, software developers, chefs, bloggers and digital marketing experts.We want to continue to grow strongly and play an important role in the lives of our customers and in our industry! That's exactly what we get up for every morning.",
+                        customFields: {},
+                      },
+                      createdAt: "2020-08-06T06:26:30.586+00:00",
+                      updatedAt: null,
+                      mediaId: "1efd8cb1fe164e4f8d56f0ff5ed954fa",
+                      name: "Springlane",
+                      link: "http://www.springlane.de",
+                      description:
+                        "We fuel people’s passion for cooking.Good food is our passion. Our products and brands are therefore aimed at foodies and BBQ enthusiasts. With our food blogs, we inspire and inform millions of users every week about cooking and grilling.Springlane is a founder-managed, fully integrated company with online direct sales in Germany, Austria, Switzerland, Italy, France, Spain, the Netherlands and the UK. At its Düsseldorf location, Springlane currently employs 90 people including engineers, designers, software developers, chefs, bloggers and digital marketing experts.We want to continue to grow strongly and play an important role in the lives of our customers and in our industry! That's exactly what we get up for every morning.",
+                      media: null,
+                      translations: null,
+                      customFields: null,
+                      id: "05cd4e976df14c4d90e351f345ff5aa3",
+                      apiAlias: "product_manufacturer",
+                    },
+                    unit: null,
+                    cover: {
+                      versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                      translated: [],
+                      createdAt: "2020-08-06T06:26:33.331+00:00",
+                      updatedAt: "2023-05-22T18:02:39.276+00:00",
+                      productId: "e05e9340aff4484f9009646dfd572df9",
+                      mediaId: "5adab0c7c73740c78b3db8dba69adc82",
+                      position: 5,
+                      media: {
+                        translated: {
+                          alt: null,
+                          title: null,
+                          customFields: {},
+                        },
+                        createdAt: "2020-08-06T06:25:55.380+00:00",
+                        updatedAt: "2020-08-06T06:26:33.330+00:00",
+                        mimeType: "image/jpeg",
+                        fileExtension: "jpg",
+                        fileSize: 171069,
+                        title: null,
+                        metaData: {
+                          type: 2,
+                          width: 1500,
+                          height: 1500,
+                        },
+                        uploadedAt: null,
+                        alt: null,
+                        url: "https://cdn.shopware.store/a/B/m/pPkDE/media/4a/02/c4/941044_Burnhard_3-Brenner-Gasgrill-Fred_3-01.jpg",
+                        fileName:
+                          "941044_Burnhard_3-Brenner-Gasgrill-Fred_3-01",
+                        translations: null,
+                        thumbnails: [
+                          {
+                            translated: [],
+                            createdAt: "2020-08-06T06:25:55.378+00:00",
+                            updatedAt: "2020-08-06T06:26:33.328+00:00",
+                            width: 1920,
+                            path: null,
+                            height: 1920,
+                            url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/4a/02/c4/941044_Burnhard_3-Brenner-Gasgrill-Fred_3-01_1920x1920.jpg",
+                            mediaId: "5adab0c7c73740c78b3db8dba69adc82",
+                            customFields: null,
+                            id: "2f940e7ea81b42a2b22adcb16c7f12c2",
+                            apiAlias: "media_thumbnail",
+                          },
+                          {
+                            translated: [],
+                            createdAt: "2020-08-06T06:25:55.379+00:00",
+                            updatedAt: "2020-08-06T06:26:33.329+00:00",
+                            width: 400,
+                            path: null,
+                            height: 400,
+                            url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/4a/02/c4/941044_Burnhard_3-Brenner-Gasgrill-Fred_3-01_400x400.jpg",
+                            mediaId: "5adab0c7c73740c78b3db8dba69adc82",
+                            customFields: null,
+                            id: "6d1fcb22672e4873b1c314fb9534ddfa",
+                            apiAlias: "media_thumbnail",
+                          },
+                          {
+                            translated: [],
+                            createdAt: "2020-08-06T06:25:55.380+00:00",
+                            updatedAt: "2020-08-06T06:26:33.330+00:00",
+                            width: 800,
+                            path: null,
+                            height: 800,
+                            url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/4a/02/c4/941044_Burnhard_3-Brenner-Gasgrill-Fred_3-01_800x800.jpg",
+                            mediaId: "5adab0c7c73740c78b3db8dba69adc82",
+                            customFields: null,
+                            id: "79c6c44bb8d7443ea6e704f2256a3d44",
+                            apiAlias: "media_thumbnail",
+                          },
+                        ],
+                        hasFile: true,
+                        private: false,
+                        path: "media/4a/02/c4/941044_Burnhard_3-Brenner-Gasgrill-Fred_3-01.jpg",
+                        customFields: null,
+                        id: "5adab0c7c73740c78b3db8dba69adc82",
+                        apiAlias: "media",
+                      },
+                      customFields: null,
+                      id: "5adab0c7c73740c78b3db8dba69adc82",
+                      apiAlias: "product_media",
+                    },
+                    parent: null,
+                    children: null,
+                    media: null,
+                    cmsPageId: null,
+                    cmsPage: null,
+                    translations: null,
+                    categories: null,
+                    tags: null,
+                    properties: null,
+                    options: null,
+                    configuratorSettings: null,
+                    categoriesRo: null,
+                    coverId: "5adab0c7c73740c78b3db8dba69adc82",
+                    tagIds: null,
+                    categoryIds: ["f78fd21958fd46a8a85b6f62ac3c891b"],
+                    productReviews: null,
+                    ratingAverage: null,
+                    mainCategories: null,
+                    seoUrls: [
+                      {
+                        translated: [],
+                        createdAt: "2020-08-06T06:26:42.505+00:00",
+                        updatedAt: "2022-08-03T08:07:03.941+00:00",
+                        salesChannelId: "98432def39fc4624b33213a56b8c944d",
+                        languageId: "2fbb5fe2e29a4d70aa5854ce7ce3e20b",
+                        routeName: "frontend.detail.page",
+                        foreignKey: "e05e9340aff4484f9009646dfd572df9",
+                        pathInfo: "/detail/e05e9340aff4484f9009646dfd572df9",
+                        seoPathInfo: "Fred-3-Burner-Gas-Grill/941044",
+                        isCanonical: true,
+                        isModified: false,
+                        isDeleted: false,
+                        isValid: null,
+                        url: null,
+                        customFields: null,
+                        id: "59d47f52be96461193a3d6fcf2fe46e6",
+                        apiAlias: "seo_url",
+                      },
+                    ],
+                    crossSellings: null,
+                    canonicalProductId: null,
+                    canonicalProduct: null,
+                    streams: null,
+                    downloads: null,
+                    states: ["is-physical"],
+                    customFields: {},
+                    id: "e05e9340aff4484f9009646dfd572df9",
+                    calculatedPrices: [],
+                    calculatedPrice: {
+                      unitPrice: 429,
+                      quantity: 1,
+                      totalPrice: 429,
+                      calculatedTaxes: [
+                        {
+                          tax: 28.07,
+                          taxRate: 7,
+                          price: 429,
+                          apiAlias: "cart_tax_calculated",
+                        },
+                      ],
+                      taxRules: [
+                        {
+                          taxRate: 7,
+                          percentage: 100,
+                          apiAlias: "cart_tax_rule",
+                        },
+                      ],
+                      referencePrice: null,
+                      listPrice: null,
+                      regulationPrice: null,
+                      apiAlias: "calculated_price",
+                    },
+                    sortedProperties: null,
+                    calculatedCheapestPrice: {
+                      unitPrice: 429,
+                      quantity: 1,
+                      totalPrice: 429,
+                      calculatedTaxes: [
+                        {
+                          tax: 28.07,
+                          taxRate: 7,
+                          price: 429,
+                          apiAlias: "cart_tax_calculated",
+                        },
+                      ],
+                      taxRules: [
+                        {
+                          taxRate: 7,
+                          percentage: 100,
+                          apiAlias: "cart_tax_rule",
+                        },
+                      ],
+                      referencePrice: null,
+                      listPrice: null,
+                      regulationPrice: null,
+                      hasRange: false,
+                      variantId: "e05e9340aff4484f9009646dfd572df9",
+                      apiAlias: "calculated_cheapest_price",
+                    },
+                    isNew: false,
+                    calculatedMaxPurchase: 100,
+                    seoCategory: null,
+                    apiAlias: "product",
+                  },
+                  apiAlias: "cms_product_box",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    product: {
+                      value: "e8e98ec407b349b88012e1f267b45fa7",
+                      source: "static",
+                    },
+                    boxLayout: {
+                      value: "standard",
+                      source: "static",
+                    },
+                    displayMode: {
+                      value: "standard",
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: null,
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T12:19:37.182+00:00",
+                updatedAt: "2021-04-15T11:12:55.302+00:00",
+                type: "product-box",
+                slot: "right",
+                block: null,
+                blockId: "298857fe08b04167aa06d1511f47bc75",
+                config: {
+                  product: {
+                    value: "e8e98ec407b349b88012e1f267b45fa7",
+                    source: "static",
+                  },
+                  boxLayout: {
+                    value: "standard",
+                    source: "static",
+                  },
+                  displayMode: {
+                    value: "standard",
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: null,
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "product",
+                    source: "static",
+                    value: "e8e98ec407b349b88012e1f267b45fa7",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "boxLayout",
+                    source: "static",
+                    value: "standard",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "displayMode",
+                    source: "static",
+                    value: "standard",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  productId: "e8e98ec407b349b88012e1f267b45fa7",
+                  product: {
+                    extensions: {
+                      foreignKeys: {
+                        swagCustomizedProductsTemplateId: null,
+                        swagCustomizedProductsTemplateVersionId:
+                          "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                        apiAlias: "product_foreign_keys_extension",
+                      },
+                      search: {
+                        extensions: [],
+                        _uniqueIdentifier: null,
+                        translated: [],
+                        productNumber: "943174",
+                        autoIncrement: 49,
+                      },
+                    },
+                    versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                    translated: {
+                      metaDescription: null,
+                      name: "Digital BBQ Thermometer",
+                      keywords: null,
+                      description:
+                        "<p></p><h4>Highlights</h4><div><ul><li>Dimensions: Transmitter: 12 x 7 x 2.5 cm Receiver: 7.8 x 5.8 x 1.5 cm</li><li>Weight: Transmitter: 90 g Receiver: 45 g each without battery and receiver material: plastic body, LCD, stainless steel probes LFGB tested</li><li>Radio synchronisation of transmitter and receiver up to a range of 30 metres</li><li>Use up to 3 sensors simultaneously.</li></ul><div><br></div></div><div><b><br></b></div>",
+                      metaTitle: null,
+                      packUnit: null,
+                      packUnitPlural: null,
+                      customFields: {},
+                    },
+                    createdAt: "2020-08-06T06:26:33.481+00:00",
+                    updatedAt: "2023-09-08T08:01:11.596+00:00",
+                    parentId: null,
+                    childCount: 0,
+                    taxId: "94f1e03140d24698a894320e258e6d83",
+                    manufacturerId: "05cd4e976df14c4d90e351f345ff5aa3",
+                    unitId: null,
+                    active: true,
+                    displayGroup: "8bc0a5f72e71ff79fccd71e8f989f149",
+                    manufacturerNumber: null,
+                    ean: null,
+                    sales: 0,
+                    productNumber: "943174",
+                    stock: 62839,
+                    availableStock: 62839,
+                    available: true,
+                    deliveryTimeId: "0caaf7f6131142f6b1fa81f3e3f6c0fb",
+                    deliveryTime: {
+                      translated: {
+                        name: "1-3 days",
+                        customFields: {},
+                      },
+                      createdAt: "2020-08-06T06:26:54.178+00:00",
+                      updatedAt: "2020-08-06T06:26:54.182+00:00",
+                      name: "1-3 days",
+                      min: 1,
+                      max: 3,
+                      unit: "day",
+                      customFields: null,
+                      id: "0caaf7f6131142f6b1fa81f3e3f6c0fb",
+                      apiAlias: "delivery_time",
+                    },
+                    restockTime: 1,
+                    isCloseout: false,
+                    purchaseSteps: 1,
+                    maxPurchase: null,
+                    minPurchase: 1,
+                    purchaseUnit: null,
+                    referenceUnit: null,
+                    shippingFree: false,
+                    markAsTopseller: null,
+                    weight: 0.9,
+                    width: 120,
+                    height: 70,
+                    length: 250,
+                    releaseDate: null,
+                    categoryTree: [
+                      "525abe8981214bd2ba94fd33942333ec",
+                      "bda4b60e845240b2b9d6b60e71196e14",
+                      "79f30922410344cca284b80be225cbfe",
+                    ],
+                    streamIds: [
+                      "1318833f46df457981763b94179d9ef0",
+                      "5675448d6b3a4dd2a659d31a3dde74da",
+                      "e8a363db4d1542dca933ffde1ebeace4",
+                    ],
+                    optionIds: null,
+                    propertyIds: [
+                      "6926969dcd2c4da1a2841a64d471bafb",
+                      "a40261ee4f74415597352bc1d4d889b4",
+                      "e8c0ff5e26d645879c13e2275bc12369",
+                    ],
+                    name: "Digital BBQ Thermometer",
+                    keywords: null,
+                    description:
+                      "<p></p><h4>Highlights</h4><div><ul><li>Dimensions: Transmitter: 12 x 7 x 2.5 cm Receiver: 7.8 x 5.8 x 1.5 cm</li><li>Weight: Transmitter: 90 g Receiver: 45 g each without battery and receiver material: plastic body, LCD, stainless steel probes LFGB tested</li><li>Radio synchronisation of transmitter and receiver up to a range of 30 metres</li><li>Use up to 3 sensors simultaneously.</li></ul><div><br></div></div><div><b><br></b></div>",
+                    metaDescription: null,
+                    metaTitle: null,
+                    packUnit: null,
+                    packUnitPlural: null,
+                    tax: {
+                      translated: [],
+                      createdAt: "2020-08-06T06:23:45.421+00:00",
+                      updatedAt: "2020-08-06T06:26:46.302+00:00",
+                      taxRate: 7,
+                      name: "7%",
+                      position: 0,
+                      customFields: null,
+                      id: "94f1e03140d24698a894320e258e6d83",
+                      apiAlias: "tax",
+                    },
+                    manufacturer: {
+                      versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                      translated: {
+                        name: "Springlane",
+                        description:
+                          "We fuel people’s passion for cooking.Good food is our passion. Our products and brands are therefore aimed at foodies and BBQ enthusiasts. With our food blogs, we inspire and inform millions of users every week about cooking and grilling.Springlane is a founder-managed, fully integrated company with online direct sales in Germany, Austria, Switzerland, Italy, France, Spain, the Netherlands and the UK. At its Düsseldorf location, Springlane currently employs 90 people including engineers, designers, software developers, chefs, bloggers and digital marketing experts.We want to continue to grow strongly and play an important role in the lives of our customers and in our industry! That's exactly what we get up for every morning.",
+                        customFields: {},
+                      },
+                      createdAt: "2020-08-06T06:26:30.586+00:00",
+                      updatedAt: null,
+                      mediaId: "1efd8cb1fe164e4f8d56f0ff5ed954fa",
+                      name: "Springlane",
+                      link: "http://www.springlane.de",
+                      description:
+                        "We fuel people’s passion for cooking.Good food is our passion. Our products and brands are therefore aimed at foodies and BBQ enthusiasts. With our food blogs, we inspire and inform millions of users every week about cooking and grilling.Springlane is a founder-managed, fully integrated company with online direct sales in Germany, Austria, Switzerland, Italy, France, Spain, the Netherlands and the UK. At its Düsseldorf location, Springlane currently employs 90 people including engineers, designers, software developers, chefs, bloggers and digital marketing experts.We want to continue to grow strongly and play an important role in the lives of our customers and in our industry! That's exactly what we get up for every morning.",
+                      media: null,
+                      translations: null,
+                      customFields: null,
+                      id: "05cd4e976df14c4d90e351f345ff5aa3",
+                      apiAlias: "product_manufacturer",
+                    },
+                    unit: null,
+                    cover: {
+                      versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                      translated: [],
+                      createdAt: "2020-08-06T06:26:33.438+00:00",
+                      updatedAt: null,
+                      productId: "e8e98ec407b349b88012e1f267b45fa7",
+                      mediaId: "3557e55fc7924a78b601642d961e78b5",
+                      position: 1,
+                      media: {
+                        translated: {
+                          alt: null,
+                          title: null,
+                          customFields: {},
+                        },
+                        createdAt: "2020-08-06T06:25:53.353+00:00",
+                        updatedAt: "2020-08-06T06:26:33.438+00:00",
+                        mimeType: "image/jpeg",
+                        fileExtension: "jpg",
+                        fileSize: 61278,
+                        title: null,
+                        metaData: {
+                          type: 2,
+                          width: 800,
+                          height: 800,
+                        },
+                        uploadedAt: null,
+                        alt: null,
+                        url: "https://cdn.shopware.store/a/B/m/pPkDE/media/88/53/a8/943174_Burnhard_Funk-Grill-Thermometer_01LKb7djuLvG6DR_800x800.jpg",
+                        fileName:
+                          "943174_Burnhard_Funk-Grill-Thermometer_01LKb7djuLvG6DR_800x800",
+                        translations: null,
+                        thumbnails: [
+                          {
+                            translated: [],
+                            createdAt: "2020-08-06T06:25:53.351+00:00",
+                            updatedAt: "2020-08-06T06:26:33.436+00:00",
+                            width: 800,
+                            path: null,
+                            height: 800,
+                            url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/88/53/a8/943174_Burnhard_Funk-Grill-Thermometer_01LKb7djuLvG6DR_800x800_800x800.jpg",
+                            mediaId: "3557e55fc7924a78b601642d961e78b5",
+                            customFields: null,
+                            id: "6ea20efbba02497a9d046d30d7787200",
+                            apiAlias: "media_thumbnail",
+                          },
+                          {
+                            translated: [],
+                            createdAt: "2020-08-06T06:25:53.352+00:00",
+                            updatedAt: "2020-08-06T06:26:33.437+00:00",
+                            width: 1920,
+                            path: null,
+                            height: 1920,
+                            url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/88/53/a8/943174_Burnhard_Funk-Grill-Thermometer_01LKb7djuLvG6DR_800x800_1920x1920.jpg",
+                            mediaId: "3557e55fc7924a78b601642d961e78b5",
+                            customFields: null,
+                            id: "9fa82269bc05410e83c664c1f4bf195c",
+                            apiAlias: "media_thumbnail",
+                          },
+                          {
+                            translated: [],
+                            createdAt: "2020-08-06T06:25:53.353+00:00",
+                            updatedAt: "2020-08-06T06:26:33.438+00:00",
+                            width: 400,
+                            path: null,
+                            height: 400,
+                            url: "https://cdn.shopware.store/a/B/m/pPkDE/thumbnail/88/53/a8/943174_Burnhard_Funk-Grill-Thermometer_01LKb7djuLvG6DR_800x800_400x400.jpg",
+                            mediaId: "3557e55fc7924a78b601642d961e78b5",
+                            customFields: null,
+                            id: "e6f069931b4f4cc5b069f2dd43bad18e",
+                            apiAlias: "media_thumbnail",
+                          },
+                        ],
+                        hasFile: true,
+                        private: false,
+                        path: "media/88/53/a8/943174_Burnhard_Funk-Grill-Thermometer_01LKb7djuLvG6DR_800x800.jpg",
+                        customFields: null,
+                        id: "3557e55fc7924a78b601642d961e78b5",
+                        apiAlias: "media",
+                      },
+                      customFields: null,
+                      id: "3557e55fc7924a78b601642d961e78b5",
+                      apiAlias: "product_media",
+                    },
+                    parent: null,
+                    children: null,
+                    media: null,
+                    cmsPageId: null,
+                    cmsPage: null,
+                    translations: null,
+                    categories: null,
+                    tags: null,
+                    properties: null,
+                    options: null,
+                    configuratorSettings: null,
+                    categoriesRo: null,
+                    coverId: "3557e55fc7924a78b601642d961e78b5",
+                    tagIds: null,
+                    categoryIds: ["79f30922410344cca284b80be225cbfe"],
+                    productReviews: null,
+                    ratingAverage: null,
+                    mainCategories: null,
+                    seoUrls: [
+                      {
+                        translated: [],
+                        createdAt: "2020-08-06T06:26:42.505+00:00",
+                        updatedAt: "2022-08-03T08:07:03.941+00:00",
+                        salesChannelId: "98432def39fc4624b33213a56b8c944d",
+                        languageId: "2fbb5fe2e29a4d70aa5854ce7ce3e20b",
+                        routeName: "frontend.detail.page",
+                        foreignKey: "e8e98ec407b349b88012e1f267b45fa7",
+                        pathInfo: "/detail/e8e98ec407b349b88012e1f267b45fa7",
+                        seoPathInfo: "Digital-BBQ-Thermometer/943174",
+                        isCanonical: true,
+                        isModified: false,
+                        isDeleted: false,
+                        isValid: null,
+                        url: null,
+                        customFields: null,
+                        id: "f1170bbd49f3425a8b92acced238b550",
+                        apiAlias: "seo_url",
+                      },
+                    ],
+                    crossSellings: null,
+                    canonicalProductId: null,
+                    canonicalProduct: null,
+                    streams: null,
+                    downloads: null,
+                    states: ["is-physical"],
+                    customFields: {},
+                    id: "e8e98ec407b349b88012e1f267b45fa7",
+                    calculatedPrices: [],
+                    calculatedPrice: {
+                      unitPrice: 39.9,
+                      quantity: 1,
+                      totalPrice: 39.9,
+                      calculatedTaxes: [
+                        {
+                          tax: 2.61,
+                          taxRate: 7,
+                          price: 39.9,
+                          apiAlias: "cart_tax_calculated",
+                        },
+                      ],
+                      taxRules: [
+                        {
+                          taxRate: 7,
+                          percentage: 100,
+                          apiAlias: "cart_tax_rule",
+                        },
+                      ],
+                      referencePrice: null,
+                      listPrice: null,
+                      regulationPrice: null,
+                      apiAlias: "calculated_price",
+                    },
+                    sortedProperties: null,
+                    calculatedCheapestPrice: {
+                      unitPrice: 39.9,
+                      quantity: 1,
+                      totalPrice: 39.9,
+                      calculatedTaxes: [
+                        {
+                          tax: 2.61,
+                          taxRate: 7,
+                          price: 39.9,
+                          apiAlias: "cart_tax_calculated",
+                        },
+                      ],
+                      taxRules: [
+                        {
+                          taxRate: 7,
+                          percentage: 100,
+                          apiAlias: "cart_tax_rule",
+                        },
+                      ],
+                      referencePrice: null,
+                      listPrice: null,
+                      regulationPrice: null,
+                      hasRange: false,
+                      variantId: "e8e98ec407b349b88012e1f267b45fa7",
+                      apiAlias: "calculated_cheapest_price",
+                    },
+                    isNew: false,
+                    calculatedMaxPurchase: 100,
+                    seoCategory: null,
+                    apiAlias: "product",
+                  },
+                  apiAlias: "cms_product_box",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+            ],
+            sectionId: "f48b46c3ffc64e7cbfdd29a0e49ce781",
+            position: 1,
+            name: null,
+            sectionPosition: "main",
+            marginTop: "40px",
+            marginBottom: "120px",
+            marginLeft: "15%",
+            marginRight: "15%",
+            backgroundColor: null,
+            backgroundMediaId: null,
+            backgroundMedia: null,
+            backgroundMediaMode: "cover",
+            cssClass: null,
+            cmsSectionVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            visibility: null,
+            customFields: null,
+            apiAlias: "cms_block",
+          },
+        ],
+        pageId: "4f6c11a7e4cb4752a40d5945dfc53c4a",
+        page: null,
+        position: 2,
+        sizingMode: "full_width",
+        mobileBehavior: null,
+        backgroundColor: "rgba(253, 216, 172, 0.45)",
+        backgroundMediaId: null,
+        backgroundMedia: null,
+        backgroundMediaMode: "cover",
+        cssClass: null,
+        cmsPageVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+        visibility: null,
+        customFields: null,
+        apiAlias: "cms_section",
+      },
+      {
+        translated: [],
+        createdAt: "2021-04-14T12:07:46.301+00:00",
+        updatedAt: "2021-04-15T11:12:55.304+00:00",
+        type: "default",
+        blocks: [
+          {
+            extensions: {
+              swagCmsExtensionsBlockRule: {
+                translated: [],
+                id: "f034a9085631428b9b41d1ecaaa94a91",
+                inverted: false,
+                visibilityRuleId: null,
+                cmsBlockId: "c3fbdc7b6db543f3baf621bdea222f85",
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                visibilityRule: null,
+                cmsBlock: null,
+                createdAt: "2021-04-14T13:49:42.515+00:00",
+                updatedAt: null,
+                apiAlias: "swag_cms_extensions_block_rule",
+              },
+            },
+            versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            translated: [],
+            createdAt: "2021-04-14T12:07:46.300+00:00",
+            updatedAt: "2021-04-15T11:12:55.303+00:00",
+            type: "text-teaser",
+            slots: [
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    content: {
+                      value:
+                        '<h2 style="text-align: center;">Our partners</h2>',
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: null,
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T12:07:46.300+00:00",
+                updatedAt: "2021-04-15T11:12:55.303+00:00",
+                type: "text",
+                slot: "content",
+                block: null,
+                blockId: "c3fbdc7b6db543f3baf621bdea222f85",
+                config: {
+                  content: {
+                    value: '<h2 style="text-align: center;">Our partners</h2>',
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: null,
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "content",
+                    source: "static",
+                    value: '<h2 style="text-align: center;">Our partners</h2>',
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  content: '<h2 style="text-align:center;">Our partners</h2>',
+                  apiAlias: "cms_text",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+            ],
+            sectionId: "65c120430e9546f2a0bb903b29b3feb9",
+            position: 0,
+            name: null,
+            sectionPosition: "main",
+            marginTop: "120px",
+            marginBottom: "20px",
+            marginLeft: "20px",
+            marginRight: "20px",
+            backgroundColor: null,
+            backgroundMediaId: null,
+            backgroundMedia: null,
+            backgroundMediaMode: "cover",
+            cssClass: null,
+            cmsSectionVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            visibility: null,
+            customFields: null,
+            apiAlias: "cms_block",
+          },
+          {
+            extensions: {
+              swagCmsExtensionsBlockRule: {
+                translated: [],
+                id: "1c015d25bf91447c9f2188c385594fb0",
+                inverted: false,
+                visibilityRuleId: null,
+                cmsBlockId: "210a95abcfe342778a1b79ed8c2fe921",
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                visibilityRule: null,
+                cmsBlock: null,
+                createdAt: "2021-04-14T14:01:14.553+00:00",
+                updatedAt: null,
+                apiAlias: "swag_cms_extensions_block_rule",
+              },
+            },
+            versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            translated: [],
+            createdAt: "2021-04-14T14:01:14.554+00:00",
+            updatedAt: "2021-04-15T11:12:55.304+00:00",
+            type: "text-teaser-section",
+            slots: [
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    url: {
+                      value: null,
+                      source: "static",
+                    },
+                    media: {
+                      value: "1efd8cb1fe164e4f8d56f0ff5ed954fa",
+                      source: "static",
+                    },
+                    newTab: {
+                      value: false,
+                      source: "static",
+                    },
+                    minHeight: {
+                      value: "340px",
+                      source: "static",
+                    },
+                    displayMode: {
+                      value: "standard",
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: "center",
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T14:01:14.554+00:00",
+                updatedAt: "2021-04-15T11:12:55.304+00:00",
+                type: "image",
+                slot: "left",
+                block: null,
+                blockId: "210a95abcfe342778a1b79ed8c2fe921",
+                config: {
+                  url: {
+                    value: null,
+                    source: "static",
+                  },
+                  media: {
+                    value: "1efd8cb1fe164e4f8d56f0ff5ed954fa",
+                    source: "static",
+                  },
+                  newTab: {
+                    value: false,
+                    source: "static",
+                  },
+                  minHeight: {
+                    value: "340px",
+                    source: "static",
+                  },
+                  displayMode: {
+                    value: "standard",
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: "center",
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "url",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "media",
+                    source: "static",
+                    value: "1efd8cb1fe164e4f8d56f0ff5ed954fa",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "newTab",
+                    source: "static",
+                    value: false,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "minHeight",
+                    source: "static",
+                    value: "340px",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "displayMode",
+                    source: "static",
+                    value: "standard",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: "center",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  mediaId: "1efd8cb1fe164e4f8d56f0ff5ed954fa",
+                  url: "",
+                  newTab: false,
+                  media: {
+                    translated: {
+                      alt: null,
+                      title: null,
+                      customFields: {},
+                    },
+                    createdAt: "2020-08-06T06:25:51.608+00:00",
+                    updatedAt: null,
+                    mimeType: "image/png",
+                    fileExtension: "png",
+                    fileSize: 25777,
+                    title: null,
+                    metaData: {
+                      type: 3,
+                      width: 1637,
+                      height: 348,
+                    },
+                    uploadedAt: null,
+                    alt: null,
+                    url: "https://cdn.shopware.store/a/B/m/pPkDE/media/f4/fd/92/Springlane-Logo-01.png",
+                    fileName: "Springlane-Logo-01",
+                    translations: null,
+                    thumbnails: [],
+                    hasFile: true,
+                    private: false,
+                    path: "media/f4/fd/92/Springlane-Logo-01.png",
+                    customFields: null,
+                    id: "1efd8cb1fe164e4f8d56f0ff5ed954fa",
+                    apiAlias: "media",
+                  },
+                  apiAlias: "cms_image",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    content: {
+                      value:
+                        "<p>Springlane runs one of the largest food blogs in Europe and develops products and brands for foodies and barbecue enthusiasts. The quality of the products and their use are the main focus.</p>",
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: "center",
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T14:01:14.554+00:00",
+                updatedAt: "2021-04-15T11:12:55.303+00:00",
+                type: "text",
+                slot: "right",
+                block: null,
+                blockId: "210a95abcfe342778a1b79ed8c2fe921",
+                config: {
+                  content: {
+                    value:
+                      "<p>Springlane runs one of the largest food blogs in Europe and develops products and brands for foodies and barbecue enthusiasts. The quality of the products and their use are the main focus.</p>",
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: "center",
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "content",
+                    source: "static",
+                    value:
+                      "<p>Springlane runs one of the largest food blogs in Europe and develops products and brands for foodies and barbecue enthusiasts. The quality of the products and their use are the main focus.</p>",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: "center",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  content:
+                    "<p>Springlane runs one of the largest food blogs in Europe and develops products and brands for foodies and barbecue enthusiasts. The quality of the products and their use are the main focus.</p>",
+                  apiAlias: "cms_text",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+            ],
+            sectionId: "65c120430e9546f2a0bb903b29b3feb9",
+            position: 1,
+            name: null,
+            sectionPosition: "main",
+            marginTop: "20px",
+            marginBottom: "20px",
+            marginLeft: "10%",
+            marginRight: "10%",
+            backgroundColor: null,
+            backgroundMediaId: null,
+            backgroundMedia: null,
+            backgroundMediaMode: "cover",
+            cssClass: null,
+            cmsSectionVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            visibility: null,
+            customFields: null,
+            apiAlias: "cms_block",
+          },
+          {
+            extensions: {
+              swagCmsExtensionsBlockRule: {
+                translated: [],
+                id: "b04e1fd2668244a3892f6e04af171465",
+                inverted: false,
+                visibilityRuleId: null,
+                cmsBlockId: "aaaeabdb032a4ef4bec654149ca4edcc",
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                visibilityRule: null,
+                cmsBlock: null,
+                createdAt: "2021-04-14T14:01:58.423+00:00",
+                updatedAt: null,
+                apiAlias: "swag_cms_extensions_block_rule",
+              },
+            },
+            versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            translated: [],
+            createdAt: "2021-04-14T14:01:58.425+00:00",
+            updatedAt: "2021-04-15T11:12:55.304+00:00",
+            type: "text-teaser-section",
+            slots: [
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    url: {
+                      value: null,
+                      source: "static",
+                    },
+                    media: {
+                      value: "0d001cbfeff944fb9c2f32ad73849efa",
+                      source: "static",
+                    },
+                    newTab: {
+                      value: false,
+                      source: "static",
+                    },
+                    minHeight: {
+                      value: "340px",
+                      source: "static",
+                    },
+                    displayMode: {
+                      value: "standard",
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: "center",
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T14:01:58.424+00:00",
+                updatedAt: "2021-04-15T11:12:55.304+00:00",
+                type: "image",
+                slot: "left",
+                block: null,
+                blockId: "aaaeabdb032a4ef4bec654149ca4edcc",
+                config: {
+                  url: {
+                    value: null,
+                    source: "static",
+                  },
+                  media: {
+                    value: "0d001cbfeff944fb9c2f32ad73849efa",
+                    source: "static",
+                  },
+                  newTab: {
+                    value: false,
+                    source: "static",
+                  },
+                  minHeight: {
+                    value: "340px",
+                    source: "static",
+                  },
+                  displayMode: {
+                    value: "standard",
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: "center",
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "url",
+                    source: "static",
+                    value: null,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "media",
+                    source: "static",
+                    value: "0d001cbfeff944fb9c2f32ad73849efa",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "newTab",
+                    source: "static",
+                    value: false,
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "minHeight",
+                    source: "static",
+                    value: "340px",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "displayMode",
+                    source: "static",
+                    value: "standard",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: "center",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  mediaId: "0d001cbfeff944fb9c2f32ad73849efa",
+                  url: "",
+                  newTab: false,
+                  media: {
+                    translated: {
+                      alt: null,
+                      title: null,
+                      customFields: {},
+                    },
+                    createdAt: "2020-08-06T06:25:50.023+00:00",
+                    updatedAt: null,
+                    mimeType: "image/png",
+                    fileExtension: "png",
+                    fileSize: 17333,
+                    title: null,
+                    metaData: {
+                      type: 3,
+                      width: 500,
+                      height: 250,
+                    },
+                    uploadedAt: null,
+                    alt: null,
+                    url: "https://cdn.shopware.store/a/B/m/pPkDE/media/c4/3c/bc/Sasse_logo.png",
+                    fileName: "Sasse_logo",
+                    translations: null,
+                    thumbnails: [],
+                    hasFile: true,
+                    private: false,
+                    path: "media/c4/3c/bc/Sasse_logo.png",
+                    customFields: null,
+                    id: "0d001cbfeff944fb9c2f32ad73849efa",
+                    apiAlias: "media",
+                  },
+                  apiAlias: "cms_image",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+              {
+                versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                translated: {
+                  config: {
+                    content: {
+                      value:
+                        '<p><span style="letter-spacing: 0px; background-color: transparent;">Sasse Feinbrennerei is a family-owned distillery in Schöppingen, Münsterland, that has been in operation for over 300 years. It is one of the last remaining fully integrated distilleries in Münsterland, a former stronghold of korn distilling in Germany.</span><br></p>',
+                      source: "static",
+                    },
+                    verticalAlign: {
+                      value: "center",
+                      source: "static",
+                    },
+                  },
+                  customFields: {},
+                },
+                createdAt: "2021-04-14T14:01:58.425+00:00",
+                updatedAt: "2021-04-15T11:12:55.304+00:00",
+                type: "text",
+                slot: "right",
+                block: null,
+                blockId: "aaaeabdb032a4ef4bec654149ca4edcc",
+                config: {
+                  content: {
+                    value:
+                      '<p><span style="letter-spacing: 0px; background-color: transparent;">Sasse Feinbrennerei is a family-owned distillery in Schöppingen, Münsterland, that has been in operation for over 300 years. It is one of the last remaining fully integrated distilleries in Münsterland, a former stronghold of korn distilling in Germany.</span><br></p>',
+                    source: "static",
+                  },
+                  verticalAlign: {
+                    value: "center",
+                    source: "static",
+                  },
+                },
+                fieldConfig: [
+                  {
+                    name: "content",
+                    source: "static",
+                    value:
+                      '<p><span style="letter-spacing: 0px; background-color: transparent;">Sasse Feinbrennerei is a family-owned distillery in Schöppingen, Münsterland, that has been in operation for over 300 years. It is one of the last remaining fully integrated distilleries in Münsterland, a former stronghold of korn distilling in Germany.</span><br></p>',
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                  {
+                    name: "verticalAlign",
+                    source: "static",
+                    value: "center",
+                    apiAlias: "cms_data_resolver_field_config",
+                  },
+                ],
+                translations: null,
+                data: {
+                  content:
+                    '<p><span style="letter-spacing:0px;background-color:transparent;">Sasse Feinbrennerei is a family-owned distillery in Schöppingen, Münsterland, that has been in operation for over 300 years. It is one of the last remaining fully integrated distilleries in Münsterland, a former stronghold of korn distilling in Germany.</span><br /></p>',
+                  apiAlias: "cms_text",
+                },
+                locked: false,
+                cmsBlockVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+                customFields: null,
+                apiAlias: "cms_slot",
+              },
+            ],
+            sectionId: "65c120430e9546f2a0bb903b29b3feb9",
+            position: 2,
+            name: null,
+            sectionPosition: "main",
+            marginTop: "30px",
+            marginBottom: "30px",
+            marginLeft: "10%",
+            marginRight: "10%",
+            backgroundColor: null,
+            backgroundMediaId: null,
+            backgroundMedia: null,
+            backgroundMediaMode: "cover",
+            cssClass: null,
+            cmsSectionVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+            visibility: null,
+            customFields: null,
+            apiAlias: "cms_block",
+          },
+        ],
+        pageId: "4f6c11a7e4cb4752a40d5945dfc53c4a",
+        page: null,
+        position: 3,
+        sizingMode: "boxed",
+        mobileBehavior: null,
+        backgroundColor: null,
+        backgroundMediaId: null,
+        backgroundMedia: null,
+        backgroundMediaMode: "cover",
+        cssClass: null,
+        cmsPageVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+        visibility: null,
+        customFields: null,
+        apiAlias: "cms_section",
+      },
+    ],
+    translations: null,
+    cssClass: null,
+    config: null,
+    previewMediaId: "73b979b4f9714d13991bf999a8dd96ea",
+    previewMedia: null,
+    landingPages: null,
+    customFields: null,
+    id: "4f6c11a7e4cb4752a40d5945dfc53c4a",
+    apiAlias: "cms_page",
+  },
+  name: "Summer Giveaway",
+  metaTitle: null,
+  metaDescription: null,
+  keywords: null,
+  url: "Summer-Giveaway",
+  slotConfig: [],
+  seoUrls: [
+    {
+      translated: [],
+      createdAt: "2021-04-15T09:10:38.993+00:00",
+      updatedAt: "2021-05-03T07:13:41.885+00:00",
+      salesChannelId: "98432def39fc4624b33213a56b8c944d",
+      languageId: "2fbb5fe2e29a4d70aa5854ce7ce3e20b",
+      routeName: "frontend.landing.page",
+      foreignKey: "f114465737fa445983d1f2fcc1743bf7",
+      pathInfo: "/landingPage/f114465737fa445983d1f2fcc1743bf7",
+      seoPathInfo: "Summer-Giveaway",
+      isCanonical: true,
+      isModified: false,
+      isDeleted: false,
+      isValid: null,
+      url: null,
+      customFields: null,
+      id: "5a106b3925724dd68f882d1bd0412f03",
+      apiAlias: "seo_url",
+    },
+  ],
+  customFields: null,
+  id: "f114465737fa445983d1f2fcc1743bf7",
+  apiAlias: "landing_page",
+} as unknown as CmsPageEntity;
+
+export default LandingPage;
diff --git a/packages/composables/src/mocks/LoginResponse.ts b/packages/composables/src/mocks/LoginResponse.ts
index 624e9b7f3..d5ea1f146 100644
--- a/packages/composables/src/mocks/LoginResponse.ts
+++ b/packages/composables/src/mocks/LoginResponse.ts
@@ -1,9 +1,9 @@
-import type { ContextUpdateResult } from "@shopware-pwa/types";
+import type { Schemas } from "#shopware";
 
-const LoginResponse: ContextUpdateResult = {
+const LoginResponse: Schemas["ContextTokenResponse"] = {
   apiAlias: "array_struct",
   contextToken: "CK273DThPuUSoG6g76qBAncveqQ9h5I3",
-  redirectUrl: null,
-};
+  redirectUrl: "",
+} as Schemas["ContextTokenResponse"];
 
 export default LoginResponse;
diff --git a/packages/composables/src/mocks/Menu.ts b/packages/composables/src/mocks/Menu.ts
index 0afa19d66..f70af705f 100644
--- a/packages/composables/src/mocks/Menu.ts
+++ b/packages/composables/src/mocks/Menu.ts
@@ -593,6 +593,6 @@ const Menu: StoreNavigationElement[] = [
     id: "162cd978ddaa498790e70be6dc75d089",
     apiAlias: "category",
   },
-];
+] as unknown as StoreNavigationElement[];
 
 export default Menu;
diff --git a/packages/composables/src/mocks/Product.ts b/packages/composables/src/mocks/Product.ts
index 41f9fc1e7..517b650a0 100644
--- a/packages/composables/src/mocks/Product.ts
+++ b/packages/composables/src/mocks/Product.ts
@@ -1,6 +1,6 @@
-import type { Product } from "@shopware-pwa/types";
+import type { Schemas } from "#shopware";
 
-const product: Product = {
+const product: Schemas["Product"] = {
   versionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
   apiAlias: "product",
   autoIncrement: 1,
@@ -466,6 +466,6 @@ const product: Product = {
   },
   isNew: false,
   calculatedMaxPurchase: 100,
-};
+} as unknown as Schemas["Product"];
 
 export default product;
diff --git a/packages/composables/src/mocks/ProductTierPrices.ts b/packages/composables/src/mocks/ProductTierPrices.ts
index 44870f961..828bfc5aa 100644
--- a/packages/composables/src/mocks/ProductTierPrices.ts
+++ b/packages/composables/src/mocks/ProductTierPrices.ts
@@ -31,6 +31,15 @@ const productTierPrices = {
     createdAt: "2021-02-02T15:09:51.450+00:00",
     updatedAt: "2023-09-08T08:01:10.768+00:00",
     parentId: "cd30de26a6c44c2aac261717f199c365",
+    autoIncrement: 201,
+    calculatedListingPrice: null,
+    cheapestPrice: null,
+    listingPrices: null,
+    parentVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+    price: null,
+    prices: null,
+    productManufacturerVersionId: "0fa91ce3e96a4bc2be4bd9ce752c3425",
+    purchasePrice: null,
     childCount: null,
     taxId: "d55571c0b59a4a538fe44f16a3a206c3",
     manufacturerId: "be02687c5d2542999cac9c4878621fa7",
diff --git a/packages/composables/src/mocks/Salutations.ts b/packages/composables/src/mocks/Salutations.ts
index 2841ecfaa..025775ec8 100644
--- a/packages/composables/src/mocks/Salutations.ts
+++ b/packages/composables/src/mocks/Salutations.ts
@@ -46,6 +46,6 @@ const salutations: Salutation[] = [
     id: "b84038d62c3f4d66b3bc626df7fa949e",
     apiAlias: "salutation",
   },
-];
+] as unknown as Salutation[];
 
 export default salutations;
diff --git a/packages/composables/src/types/cmsElementTypes.ts b/packages/composables/src/types/cmsElementTypes.ts
index fa1c1da6e..407a211b5 100644
--- a/packages/composables/src/types/cmsElementTypes.ts
+++ b/packages/composables/src/types/cmsElementTypes.ts
@@ -1,3 +1,4 @@
+import type { Schemas } from "#shopware";
 import type {
   CmsSlot,
   CrossSelling,
@@ -7,7 +8,6 @@ import type {
   ProductListingResult,
   ProductMedia,
   ProductReview,
-  PropertyGroup,
   Salutation,
 } from "@shopware-pwa/types";
 import type { CSSProperties } from "vue";
@@ -307,7 +307,7 @@ export type CmsElementBuyBox = CmsSlot & {
   type: "buy-box";
   config: BuyBoxElementConfig;
   data: {
-    configuratorSettings: PropertyGroup[] | null;
+    configuratorSettings: Schemas["PropertyGroup"][] | null;
     productId: null | string;
     ratingSuccess: boolean;
     product?: Product;
@@ -331,7 +331,7 @@ export type CmsElementCrossSelling = CmsSlot & {
   config: CrossSellingElementConfig;
   data: {
     apiAlias: "cms_cross_selling";
-    crossSellings: CrossSelling[];
+    crossSellings: CrossSelling;
   };
 };
 
diff --git a/packages/composables/src/useAddToCart.ts b/packages/composables/src/useAddToCart.ts
index 4276fefca..20b3d5e25 100644
--- a/packages/composables/src/useAddToCart.ts
+++ b/packages/composables/src/useAddToCart.ts
@@ -1,14 +1,13 @@
-import { ref, computed, unref, watch } from "vue";
+import { ref, computed, unref } from "vue";
 import type { Ref, ComputedRef } from "vue";
-import type { Product, Cart, LineItem, EntityError } from "@shopware-pwa/types";
-import { useCart } from "./useCart";
-// prettier-ignore
+import { useCart } from "#imports";
+import type { Schemas } from "#shopware";
 export type UseAddToCartReturn = {
   /**
    * Add to cart method
    * @type {function}
    */
-  addToCart(): Promise<Cart>;
+  addToCart(): Promise<Schemas["Cart"]>;
   /**
    * If you want to add more that 1 product set quantity before invoking `addToCart`
    */
@@ -16,11 +15,11 @@ export type UseAddToCartReturn = {
   /**
    * Returns product count in stock
    */
-  getStock: ComputedRef<number|undefined>;
+  getStock: ComputedRef<number | undefined>;
   /**
    * Returns product count in available stock
    */
-  getAvailableStock: ComputedRef<number | null>;
+  getAvailableStock: ComputedRef<number | undefined>;
   /**
    * Flag if product is already in cart
    */
@@ -36,13 +35,15 @@ export type UseAddToCartReturn = {
  * @public
  * @category Cart & Checkout
  */
-export function useAddToCart(product: Ref<Product>): UseAddToCartReturn {
+export function useAddToCart(
+  product: Ref<Schemas["Product"]>,
+): UseAddToCartReturn {
   const _product = computed(() => unref(product));
 
   const { addProduct, cartItems } = useCart();
   const quantity: Ref<number> = ref(1);
 
-  async function addToCart(): Promise<Cart> {
+  async function addToCart(): Promise<Schemas["Cart"]> {
     if (!quantity.value) quantity.value = 1;
     const addToCartResponse = await addProduct({
       id: _product.value.id,
@@ -58,7 +59,7 @@ export function useAddToCart(product: Ref<Product>): UseAddToCartReturn {
 
   const isInCart = computed(() =>
     cartItems.value.some(
-      (item: LineItem) => item.referencedId === _product.value?.id,
+      (item: Schemas["LineItem"]) => item.referencedId === _product.value?.id,
     ),
   );
 
@@ -71,7 +72,8 @@ export function useAddToCart(product: Ref<Product>): UseAddToCartReturn {
     count: computed(
       () =>
         cartItems.value.find(
-          (item: LineItem) => item.referencedId === _product.value?.id,
+          (item: Schemas["LineItem"]) =>
+            item.referencedId === _product.value?.id,
         )?.quantity || 0,
     ),
   };
diff --git a/packages/composables/src/useAddress.ts b/packages/composables/src/useAddress.ts
index 3f6f52e88..b47c1a406 100644
--- a/packages/composables/src/useAddress.ts
+++ b/packages/composables/src/useAddress.ts
@@ -1,29 +1,15 @@
-import { ref, computed, inject, provide, watch } from "vue";
+import { ref, computed, inject, provide } from "vue";
 import type { Ref, ComputedRef } from "vue";
-
-import {
-  getCustomerAddresses,
-  createCustomerAddress as apiCreateCustomerAddress,
-  updateCustomerAddress as apiUpdateCustomerAddress,
-  deleteCustomerAddress as apiDeleteCustomerAddress,
-  setDefaultCustomerShippingAddress as apiSetDefaultCustomerShippingAddress,
-  setDefaultCustomerBillingAddress as apiSetDefaultCustomerBillingAddress,
-} from "@shopware-pwa/api-client";
-import { useShopwareContext } from "./useShopwareContext";
-
-import type {
-  ClientApiError,
-  CustomerAddress,
-  ShopwareSearchParams,
-  ShopwareError,
-} from "@shopware-pwa/types";
-import { useUser } from "./useUser";
+import { useShopwareContext } from "#imports";
+import type { RequestParameters, Schemas } from "#shopware";
+import { ApiClientError } from "@shopware/api-client";
+import type { ApiError } from "@shopware/api-client";
 
 export type UseAddressReturn = {
   /**
    * List of customer addresses
    */
-  customerAddresses: ComputedRef<CustomerAddress[]>;
+  customerAddresses: ComputedRef<Schemas["CustomerAddress"][]>;
   /**
    * Loads the addresses that are available under `customerAddresses` property
    */
@@ -32,14 +18,14 @@ export type UseAddressReturn = {
    * Allows to create new address for a current customer
    */
   createCustomerAddress(
-    customerAddress: CustomerAddress,
-  ): Promise<CustomerAddress>;
+    customerAddress: Schemas["CustomerAddress"],
+  ): Promise<Schemas["CustomerAddress"]>;
   /**
    * Allows to update existing address for a current customer
    */
   updateCustomerAddress(
-    customerAddress: CustomerAddress,
-  ): Promise<CustomerAddress>;
+    customerAddress: Schemas["CustomerAddress"],
+  ): Promise<Schemas["CustomerAddress"]>;
   /**
    * Allows to delete existing address for a current customer
    */
@@ -57,7 +43,7 @@ export type UseAddressReturn = {
    *
    * @param {ShopwareError} error
    */
-  errorMessageBuilder(error: ShopwareError): string | null;
+  errorMessageBuilder(error: ApiError): string | null;
 };
 
 /**
@@ -68,9 +54,9 @@ export type UseAddressReturn = {
  * @category Cart & Checkout
  */
 export function useAddress(): UseAddressReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
-  const _storeCustomerAddresses: Ref<CustomerAddress[]> = inject(
+  const _storeCustomerAddresses: Ref<Schemas["CustomerAddress"][]> = inject(
     "swCustomerAddresses",
     ref([]),
   );
@@ -80,15 +66,19 @@ export function useAddress(): UseAddressReturn {
    * Get customer address list
    */
   async function loadCustomerAddresses(
-    parameters: ShopwareSearchParams = {},
+    parameters: Schemas["Criteria"] = {},
   ): Promise<void> {
     try {
-      const { elements } = await getCustomerAddresses(parameters, apiInstance);
-      _storeCustomerAddresses.value = elements;
+      const result = await apiClient.invoke(
+        "listAddress post /account/list-address",
+        parameters,
+      );
+      _storeCustomerAddresses.value = result.elements;
     } catch (error) {
-      const apiError = error as ClientApiError;
-      if (apiError?.statusCode === 403) {
-        _storeCustomerAddresses.value = [];
+      if (error instanceof ApiClientError) {
+        if (error.status === 403) {
+          _storeCustomerAddresses.value = [];
+        }
       }
     }
   }
@@ -97,9 +87,12 @@ export function useAddress(): UseAddressReturn {
    * Add new customer address
    */
   async function createCustomerAddress(
-    customerAddress: Omit<CustomerAddress, "id" | "salutation">,
-  ): Promise<CustomerAddress> {
-    const result = await apiCreateCustomerAddress(customerAddress, apiInstance);
+    customerAddress: RequestParameters<"createCustomerAddress">,
+  ): Promise<Schemas["CustomerAddress"]> {
+    const result = await apiClient.invoke(
+      "createCustomerAddress post /account/address",
+      customerAddress,
+    );
     return result;
   }
 
@@ -107,9 +100,12 @@ export function useAddress(): UseAddressReturn {
    * Update customer address
    */
   async function updateCustomerAddress(
-    customerAddress: CustomerAddress,
-  ): Promise<CustomerAddress> {
-    const result = await apiUpdateCustomerAddress(customerAddress, apiInstance);
+    customerAddress: RequestParameters<"updateCustomerAddress">,
+  ): Promise<Schemas["CustomerAddress"]> {
+    const result = await apiClient.invoke(
+      "updateCustomerAddress patch /account/address/{addressId}",
+      customerAddress,
+    );
     return result;
   }
 
@@ -117,8 +113,10 @@ export function useAddress(): UseAddressReturn {
    * Delete customer address
    */
   async function deleteCustomerAddress(addressId: string): Promise<void> {
-    const result = apiDeleteCustomerAddress(addressId, apiInstance);
-    return result;
+    await apiClient.invoke(
+      "deleteCustomerAddress delete /account/address/{addressId}",
+      { addressId },
+    );
   }
 
   /**
@@ -127,7 +125,12 @@ export function useAddress(): UseAddressReturn {
   async function setDefaultCustomerBillingAddress(
     addressId: string,
   ): Promise<string> {
-    return await apiSetDefaultCustomerBillingAddress(addressId, apiInstance);
+    return await apiClient.invoke(
+      "defaultBillingAddress patch /account/address/default-billing/{addressId}",
+      {
+        addressId,
+      },
+    );
   }
 
   /**
@@ -136,7 +139,12 @@ export function useAddress(): UseAddressReturn {
   async function setDefaultCustomerShippingAddress(
     addressId: string,
   ): Promise<string> {
-    return await apiSetDefaultCustomerShippingAddress(addressId, apiInstance);
+    return await apiClient.invoke(
+      "defaultShippingAddress patch /account/address/default-shipping/{addressId}",
+      {
+        addressId,
+      },
+    );
   }
 
   /**
@@ -145,10 +153,10 @@ export function useAddress(): UseAddressReturn {
    * @param {error} error
    * @returns {string | null}
    */
-  function errorMessageBuilder(error: ShopwareError): string | null {
+  function errorMessageBuilder(error: ApiError): string | null {
     switch (error.code) {
       case "VIOLATION::IS_BLANK_ERROR":
-        return `${error?.source?.pointer.slice(1)} - ${error.detail}`;
+        return `${error?.source?.pointer?.slice(1)} - ${error.detail}`;
       default:
         return null;
     }
diff --git a/packages/composables/src/useBreadcrumbs.spec.ts b/packages/composables/src/useBreadcrumbs.spec.ts
deleted file mode 100644
index da9fadbb7..000000000
--- a/packages/composables/src/useBreadcrumbs.spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { shallowMount } from "@vue/test-utils";
-import { useBreadcrumbs } from "./useBreadcrumbs";
-
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const { clearBreadcrumbs, breadcrumbs } = useBreadcrumbs([
-      {
-        name: "Test",
-        path: "/",
-      },
-    ]);
-
-    return {
-      clearBreadcrumbs,
-      breadcrumbs,
-    };
-  },
-};
-
-const getMockProvide = () => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {},
-        },
-      },
-    },
-  },
-});
-
-describe("useBreadcrumbs", () => {
-  const wrapper = shallowMount(Component, getMockProvide());
-
-  it("should add breadcrumbs", async () => {
-    expect(wrapper.vm.breadcrumbs.length).toBe(1);
-  });
-
-  it("should clear breadcrumbs", async () => {
-    wrapper.vm.clearBreadcrumbs();
-    expect(wrapper.vm.breadcrumbs.length).toBe(0);
-  });
-});
diff --git a/packages/composables/src/useBreadcrumbs.test.ts b/packages/composables/src/useBreadcrumbs.test.ts
new file mode 100644
index 000000000..2e09d9109
--- /dev/null
+++ b/packages/composables/src/useBreadcrumbs.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vitest";
+import { useBreadcrumbs } from "./useBreadcrumbs";
+import { useSetup } from "./_test";
+
+describe("useBreadcrumbs", () => {
+  it("should add breadcrumbs", async () => {
+    const { vm } = useSetup(() =>
+      useBreadcrumbs([
+        {
+          name: "Test",
+          path: "/",
+        },
+      ]),
+    );
+
+    expect(vm.breadcrumbs.length).toBe(1);
+  });
+
+  it("should clear breadcrumbs", async () => {
+    const { vm } = useSetup(() =>
+      useBreadcrumbs([
+        {
+          name: "Test",
+          path: "/",
+        },
+      ]),
+    );
+
+    vm.clearBreadcrumbs();
+    expect(vm.breadcrumbs.length).toBe(0);
+  });
+});
diff --git a/packages/composables/src/useBreadcrumbs.ts b/packages/composables/src/useBreadcrumbs.ts
index 56f9b5099..c9a13e472 100644
--- a/packages/composables/src/useBreadcrumbs.ts
+++ b/packages/composables/src/useBreadcrumbs.ts
@@ -1,5 +1,6 @@
-import { ComputedRef, computed } from "vue";
-import { _useContext } from "./internal/_useContext";
+import { computed } from "vue";
+import type { ComputedRef } from "vue";
+import { useContext } from "#imports";
 
 /**
  * @internal
@@ -36,7 +37,7 @@ export function useBreadcrumbs(
   newBreadcrumbs?: Breadcrumb[],
 ): UseBreadcrumbsReturn {
   // Store for breadcrumbs
-  const _breadcrumbs = _useContext<Breadcrumb[]>("swBreadcrumb", {
+  const _breadcrumbs = useContext<Breadcrumb[]>("swBreadcrumb", {
     replace: newBreadcrumbs,
   });
 
diff --git a/packages/composables/src/useCart.ts b/packages/composables/src/useCart.ts
index 958b96451..229648ea9 100644
--- a/packages/composables/src/useCart.ts
+++ b/packages/composables/src/useCart.ts
@@ -1,17 +1,8 @@
 import { computed } from "vue";
 import type { ComputedRef } from "vue";
-import {
-  getCart,
-  addProductToCart,
-  addPromotionCode,
-  removeCartItem,
-  changeCartItemQuantity,
-  getProducts,
-} from "@shopware-pwa/api-client";
-import type { Cart, Product, LineItem, CartErrors } from "@shopware-pwa/types";
-import { useShopwareContext } from "./useShopwareContext";
-import { _useContext } from "./internal/_useContext";
+import { useContext, useShopwareContext } from "#imports";
 import { createSharedComposable } from "@vueuse/core";
+import type { Schemas } from "#shopware";
 
 /**
  * Composable to manage cart
@@ -23,30 +14,33 @@ export type UseCartReturn = {
   /**
    * Add product by id and quantity
    */
-  addProduct(params: { id: string; quantity?: number }): Promise<Cart>;
+  addProduct(params: {
+    id: string;
+    quantity?: number;
+  }): Promise<Schemas["Cart"]>;
   /**
    * Adds a promotion code to the cart
    */
-  addPromotionCode(promotionCode: string): Promise<Cart>;
+  addPromotionCode(promotionCode: string): Promise<Schemas["Cart"]>;
   /**
    * Lists all applied and active promotion codes
    */
-  appliedPromotionCodes: ComputedRef<LineItem[]>;
+  appliedPromotionCodes: ComputedRef<Schemas["LineItem"][]>;
   /**
    * Current Cart object
    */
-  cart: ComputedRef<Cart | undefined>;
+  cart: ComputedRef<Schemas["Cart"] | undefined>;
   /**
    * All items in the cart
    */
-  cartItems: ComputedRef<LineItem[]>;
+  cartItems: ComputedRef<Schemas["LineItem"][]>;
   /**
    * Changes the quantity of a product in the cart
    */
   changeProductQuantity(params: {
     id: string;
     quantity: number;
-  }): Promise<Cart>;
+  }): Promise<Schemas["Cart"]>;
   /**
    * The number of items in the cart
    */
@@ -55,11 +49,11 @@ export type UseCartReturn = {
    * Refreshes the cart object and related data
    * If @param newCart is provided, it will be used as a new cart object
    */
-  refreshCart(newCart?: Cart): Promise<Cart>;
+  refreshCart(newCart?: Schemas["Cart"]): Promise<Schemas["Cart"]>;
   /**
    * Removes the provided LineItem from the cart
    */
-  removeItem(lineItem: LineItem): Promise<void>;
+  removeItem(lineItem: Schemas["LineItem"]): Promise<void>;
   /**
    * The total price of the cart (including calculated costs like shipping)
    */
@@ -75,7 +69,7 @@ export type UseCartReturn = {
   /**
    * @deprecated - use product related methods to fetch an item's URL instead
    */
-  getProductItemsSeoUrlsData(): Promise<Partial<Product>[]>;
+  getProductItemsSeoUrlsData(): Promise<Partial<Schemas["Product"]>[]>;
   /**
    * `true` if the cart contains no items
    */
@@ -87,7 +81,7 @@ export type UseCartReturn = {
   /**
    * Get cart errors
    */
-  consumeCartErrors(): CartErrors;
+  consumeCartErrors(): Schemas["Cart"]["errors"];
 };
 
 /**
@@ -96,18 +90,25 @@ export type UseCartReturn = {
  * Used as [Shared](https://frontends.shopware.com/framework/shared-composables.html) Composable `useCart`
  */
 export function useCartFunction(): UseCartReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
-  const _storeCart = _useContext<Cart | undefined>("swCart");
-  const _storeCartErrors = _useContext<CartErrors | null>("swCartErrors");
+  const _storeCart = useContext<Schemas["Cart"]>("swCart");
+  const _storeCartErrors = useContext<Schemas["Cart"]["errors"] | null>(
+    "swCartErrors",
+  );
 
-  async function refreshCart(newCart?: Cart): Promise<Cart> {
+  async function refreshCart(
+    newCart?: Schemas["Cart"],
+  ): Promise<Schemas["Cart"]> {
     if (newCart) {
       _storeCart.value = newCart;
       return newCart;
     }
 
-    const result = await getCart(apiInstance);
+    const result = await apiClient.invoke(
+      "readCart get /checkout/cart?name",
+      {},
+    );
     _storeCart.value = result;
     setCartErrors(result);
     return result;
@@ -116,19 +117,32 @@ export function useCartFunction(): UseCartReturn {
   async function addProduct(params: {
     id: string;
     quantity?: number;
-  }): Promise<Cart> {
-    const addToCartResult = await addProductToCart(
-      params.id,
-      params.quantity,
-      apiInstance,
+  }): Promise<Schemas["Cart"]> {
+    const addToCartResult = await apiClient.invoke(
+      "addLineItem post /checkout/cart/line-item",
+      {
+        items: [
+          {
+            id: params.id,
+            referencedId: params.id,
+            quantity: params.quantity,
+            type: "product",
+          },
+        ],
+      },
     );
     _storeCart.value = addToCartResult;
     setCartErrors(addToCartResult);
     return addToCartResult;
   }
 
-  async function removeItem(lineItem: LineItem) {
-    const result = await removeCartItem(lineItem.id, apiInstance);
+  async function removeItem(lineItem: Schemas["LineItem"]) {
+    const result = await apiClient.invoke(
+      "removeLineItem delete /checkout/cart/line-item?ids",
+      {
+        ids: [lineItem.id],
+      },
+    );
     _storeCart.value = result;
     setCartErrors(result);
   }
@@ -137,10 +151,16 @@ export function useCartFunction(): UseCartReturn {
     id: string;
     quantity: number;
   }) {
-    const result = await changeCartItemQuantity(
-      params.id,
-      params.quantity,
-      apiInstance,
+    const result = await apiClient.invoke(
+      "updateLineItem patch /checkout/cart/line-item",
+      {
+        items: [
+          {
+            id: params.id,
+            quantity: +params.quantity,
+          },
+        ],
+      },
     );
     _storeCart.value = result;
     setCartErrors(result);
@@ -149,46 +169,52 @@ export function useCartFunction(): UseCartReturn {
   }
 
   async function submitPromotionCode(promotionCode: string) {
-    const result = await addPromotionCode(promotionCode, apiInstance);
+    const result = await apiClient.invoke(
+      "addLineItem post /checkout/cart/line-item",
+      {
+        items: [
+          {
+            referencedId: promotionCode,
+            type: "promotion",
+          },
+        ],
+      },
+    );
     _storeCart.value = result;
     setCartErrors(result);
     return result;
   }
 
-  async function getProductItemsSeoUrlsData(): Promise<Partial<Product>[]> {
+  async function getProductItemsSeoUrlsData() {
     if (!cartItems.value.length) {
       return [];
     }
 
-    const result = await getProducts(
-      {
-        ids: cartItems.value
-          .map(({ referencedId }) => referencedId)
-          .filter(String) as string[],
-        // includes: (getDefaults() as any).getProductItemsSeoUrlsData.includes,
-        // associations: (getDefaults() as any).getProductItemsSeoUrlsData
-        //   .associations,
-      },
-      apiInstance,
-    );
+    const result = await apiClient.invoke("readProduct post /product", {
+      ids: cartItems.value
+        .map(({ referencedId }) => referencedId)
+        .filter(String) as string[],
+    });
     return result?.elements || [];
   }
 
   const appliedPromotionCodes = computed(() => {
     return cartItems.value.filter(
-      (cartItem: LineItem) => cartItem.type === "promotion",
+      (cartItem: Schemas["LineItem"]) => cartItem.type === "promotion",
     );
   });
 
-  const cart: ComputedRef<Cart | undefined> = computed(() => _storeCart.value);
+  const cart: ComputedRef<Schemas["Cart"] | undefined> = computed(
+    () => _storeCart.value,
+  );
 
-  const cartItems = computed(() => {
-    return cart.value ? cart.value.lineItems || [] : [];
+  const cartItems = computed<Schemas["LineItem"][]>(() => {
+    return cart.value?.lineItems || [];
   });
 
   const count = computed(() => {
     return cartItems.value.reduce(
-      (accumulator: number, lineItem: LineItem) =>
+      (accumulator: number, lineItem: Schemas["LineItem"]) =>
         lineItem.type === "product"
           ? lineItem.quantity + accumulator
           : accumulator,
@@ -229,8 +255,8 @@ export function useCartFunction(): UseCartReturn {
    *
    * @param {Cart} cart
    */
-  const setCartErrors = (cart: Cart) => {
-    if (Object.keys(cart.errors).length) {
+  const setCartErrors = (cart: Schemas["Cart"]) => {
+    if (Object.keys(cart.errors || {}).length) {
       _storeCartErrors.value = Object.assign(
         _storeCartErrors.value ? _storeCartErrors.value : {},
         cart.errors,
diff --git a/packages/composables/src/useCartItem.ts b/packages/composables/src/useCartItem.ts
index ef0836573..f4adf5084 100644
--- a/packages/composables/src/useCartItem.ts
+++ b/packages/composables/src/useCartItem.ts
@@ -1,17 +1,8 @@
-import { computed, ComputedRef, Ref } from "vue";
-import { removeCartItem, getProduct } from "@shopware-pwa/api-client";
-import type {
-  LineItem,
-  LineItemType,
-  ClientApiError,
-  PropertyGroupOptionCart,
-  ProductResponse,
-  CartProductItem,
-  Cart,
-} from "@shopware-pwa/types";
-
+import { computed } from "vue";
+import type { ComputedRef, Ref } from "vue";
 import { getMainImageUrl } from "@shopware-pwa/helpers-next";
-import { useShopwareContext, useCart } from ".";
+import { useShopwareContext, useCart } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseCartItemReturn = {
   /**
@@ -33,11 +24,11 @@ export type UseCartItemReturn = {
   /**
    * Options (of variation) for the current item
    */
-  itemOptions: ComputedRef<PropertyGroupOptionCart[]>;
+  itemOptions: ComputedRef<Schemas["LineItem"]["payload"]["options"]>;
   /**
    * Type of the current item: "product" or "promotion"
    */
-  itemType: ComputedRef<LineItemType | undefined>;
+  itemType: ComputedRef<Schemas["LineItem"]["type"] | undefined>;
   /**
    * Determines if the current item is a product
    */
@@ -57,7 +48,7 @@ export type UseCartItemReturn = {
   /**
    * Changes the current item quantity in the cart
    */
-  changeItemQuantity(quantity: number): Promise<Cart>;
+  changeItemQuantity(quantity: number): Promise<Schemas["Cart"]>;
   /**
    * Removes the current item from the cart
    */
@@ -67,7 +58,9 @@ export type UseCartItemReturn = {
    *
    * @deprecated
    */
-  getProductItemSeoUrlData(): Promise<ProductResponse | undefined>;
+  getProductItemSeoUrlData(): Promise<
+    Schemas["ProductDetailResponse"]["product"] | undefined
+  >;
 };
 
 /**
@@ -75,18 +68,20 @@ export type UseCartItemReturn = {
  * @public
  * @category Cart & Checkout
  */
-export function useCartItem(cartItem: Ref<LineItem>): UseCartItemReturn {
+export function useCartItem(
+  cartItem: Ref<Schemas["LineItem"]>,
+): UseCartItemReturn {
   if (!cartItem) {
     throw new Error("[useCartItem] mandatory cartItem argument is missing.");
   }
 
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
   const { refreshCart, changeProductQuantity } = useCart();
 
   const itemQuantity = computed(() => cartItem.value.quantity);
   const itemImageThumbnailUrl = computed(() => getMainImageUrl(cartItem.value));
 
-  const itemRegularPrice = computed(
+  const itemRegularPrice = computed<number | undefined>(
     () =>
       cartItem.value?.price?.listPrice?.price ||
       cartItem.value?.price?.unitPrice,
@@ -102,12 +97,13 @@ export function useCartItem(cartItem: Ref<LineItem>): UseCartItemReturn {
 
   const itemOptions = computed(
     () =>
-      (cartItem.value.type === "product" &&
-        (cartItem.value.payload as CartProductItem)?.options) ||
+      (cartItem.value.type === "product" && cartItem.value.payload?.options) ||
       [],
   );
 
-  const itemStock = computed(() => cartItem.value.deliveryInformation?.stock);
+  const itemStock = computed<number>(
+    () => cartItem.value.deliveryInformation.stock,
+  );
 
   const itemType = computed(() => cartItem.value.type);
 
@@ -116,14 +112,21 @@ export function useCartItem(cartItem: Ref<LineItem>): UseCartItemReturn {
   const isPromotion = computed(() => cartItem.value.type === "promotion");
 
   async function removeItem() {
-    const newCart = await removeCartItem(cartItem.value.id, apiInstance);
+    const newCart = await apiClient.invoke(
+      "removeLineItem delete /checkout/cart/line-item?ids",
+      {
+        ids: [cartItem.value.id],
+      },
+    );
     await refreshCart(newCart);
   }
 
-  async function changeItemQuantity(quantity: number): Promise<Cart> {
-    const result = await changeProductQuantity({
+  async function changeItemQuantity(
+    quantity: number,
+  ): Promise<Schemas["Cart"]> {
+    const result = changeProductQuantity({
       id: cartItem.value.id,
-      quantity: quantity,
+      quantity: +quantity,
     });
 
     return result;
@@ -132,29 +135,22 @@ export function useCartItem(cartItem: Ref<LineItem>): UseCartItemReturn {
   /**
    * @deprecated Method is not used anymore and the case should be solved on project level instead due to performance reasons.
    */
-  async function getProductItemSeoUrlData(): Promise<
-    ProductResponse | undefined
-  > {
+  async function getProductItemSeoUrlData() {
     if (!cartItem.value.referencedId) {
       return;
     }
 
     try {
-      const result = await getProduct(
-        cartItem.value.referencedId,
+      const result = await apiClient.invoke(
+        "readProductDetail post /product/{productId}",
         {
-          // includes: (getDefaults() as any).getProductItemsSeoUrlsData.includes,
-          // associations: (getDefaults() as any).getProductItemsSeoUrlsData
-          //   .associations,
+          productId: cartItem.value.referencedId,
         },
-        apiInstance,
       );
-      return result.product as unknown as ProductResponse;
+
+      return result.product;
     } catch (error) {
-      console.error(
-        "[useCart][getProductItemsSeoUrlsData]",
-        (error as ClientApiError).messages,
-      );
+      console.error("[useCart][getProductItemsSeoUrlsData]", error);
     }
 
     return;
diff --git a/packages/composables/src/useCategory.ts b/packages/composables/src/useCategory.ts
index f4ae09b19..9d69d570f 100644
--- a/packages/composables/src/useCategory.ts
+++ b/packages/composables/src/useCategory.ts
@@ -1,14 +1,14 @@
 import { computed } from "vue";
 import type { ComputedRef, Ref } from "vue";
-import type { Category } from "@shopware-pwa/types";
-import { _useContext } from "./internal/_useContext";
 import ContextError from "./helpers/ContextError";
+import { useContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseCategoryReturn = {
   /**
    * Current category entity
    */
-  category: ComputedRef<Category>;
+  category: ComputedRef<Schemas["Category"]>;
 };
 
 /**
@@ -16,8 +16,10 @@ export type UseCategoryReturn = {
  *
  * @public
  */
-export function useCategory(category?: Ref<Category>): UseCategoryReturn {
-  const _category = _useContext("category", { context: category });
+export function useCategory(
+  category?: Ref<Schemas["Category"]>,
+): UseCategoryReturn {
+  const _category = useContext("category", { context: category });
   if (!_category.value) {
     // TODO link docs with composables context usage
     throw new ContextError("Category");
diff --git a/packages/composables/src/useCategorySearch.ts b/packages/composables/src/useCategorySearch.ts
index 1634ca1a6..d6b381b99 100644
--- a/packages/composables/src/useCategorySearch.ts
+++ b/packages/composables/src/useCategorySearch.ts
@@ -1,12 +1,6 @@
-import {
-  invokePost,
-  getCategoryEndpoint,
-  getCategoryDetailsEndpoint,
-} from "@shopware-pwa/api-client";
-import type { Category, ShopwareSearchParams } from "@shopware-pwa/types";
-import { useShopwareContext } from "./useShopwareContext";
+import { useShopwareContext } from "#imports";
 import { cmsAssociations } from "./cms/cmsAssociations";
-import { _useContext } from "./internal/_useContext";
+import type { Schemas } from "#shopware";
 
 export type UseCategorySearchReturn = {
   /**
@@ -17,17 +11,17 @@ export type UseCategorySearchReturn = {
     categoryId: string,
     options?: {
       withCmsAssociations?: boolean;
-      query?: Partial<ShopwareSearchParams>;
+      query?: Schemas["Criteria"];
     },
-  ): Promise<Category>;
+  ): Promise<Schemas["Category"]>;
 
   /**
    * Search based on the query
    */
   advancedSearch(options: {
     withCmsAssociations?: boolean;
-    query: Partial<ShopwareSearchParams>;
-  }): Promise<Category[]>;
+    query: Schemas["Criteria"];
+  }): Promise<Schemas["Category"][]>;
 };
 
 /**
@@ -36,44 +30,39 @@ export type UseCategorySearchReturn = {
  * @category Navigation & Routing
  */
 export function useCategorySearch(): UseCategorySearchReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
   async function search(
     categoryId: string,
     options?: {
       withCmsAssociations?: boolean;
-      query?: Partial<ShopwareSearchParams>;
+      query?: Schemas["Criteria"];
     },
   ) {
     const associations = options?.withCmsAssociations ? cmsAssociations : {};
-    const result = await invokePost<Category>(
+    const result = apiClient.invoke(
+      "readCategory post /category/{navigationId}?slots",
       {
-        address: getCategoryDetailsEndpoint(categoryId),
-        payload: { associations, ...options?.query },
+        navigationId: categoryId,
+        associations,
+        ...options?.query,
       },
-      apiInstance,
     );
-    return result.data;
+    return result;
   }
 
   async function advancedSearch(options: {
     withCmsAssociations?: boolean;
-    query: Partial<ShopwareSearchParams>;
+    query: Schemas["Criteria"];
   }) {
     const associations = options?.withCmsAssociations
       ? cmsAssociations.associations
       : {};
-    const result = await invokePost<Category[]>(
-      {
-        address: getCategoryEndpoint(),
-        payload: {
-          associations,
-          ...options?.query,
-        },
-      },
-      apiInstance,
-    );
-    return result.data;
+    const result = await apiClient.invoke("readCategoryList post /category", {
+      associations,
+      ...options?.query,
+    });
+    return result.elements ?? [];
   }
 
   return {
diff --git a/packages/composables/src/useCheckout.ts b/packages/composables/src/useCheckout.ts
index 55fed161b..af44eb104 100644
--- a/packages/composables/src/useCheckout.ts
+++ b/packages/composables/src/useCheckout.ts
@@ -1,21 +1,7 @@
 import { computed, ref, inject, provide } from "vue";
 import type { ComputedRef } from "vue";
-import type {
-  ShippingAddress,
-  ShippingMethod,
-  PaymentMethod,
-  ClientApiError,
-  CreateOrderParams,
-  Order,
-  BillingAddress,
-  ShopwareSearchParams,
-} from "@shopware-pwa/types";
-import {
-  getAvailableShippingMethods,
-  getAvailablePaymentMethods,
-  createOrder as createApiOrder,
-} from "@shopware-pwa/api-client";
-import { useShopwareContext, useCart, useSessionContext } from ".";
+import type { Schemas, RequestParameters } from "#shopware";
+import { useShopwareContext, useSessionContext } from "#imports";
 import deepMerge from "./helpers/deepMerge";
 
 export type UseCheckoutReturn = {
@@ -24,56 +10,58 @@ export type UseCheckoutReturn = {
    */
   getShippingMethods(options?: {
     forceReload: boolean;
-  }): Promise<ComputedRef<ShippingMethod[]>>;
+  }): Promise<ComputedRef<Schemas["ShippingMethod"][]>>;
   /**
    * List of available shipping methods
    */
-  shippingMethods: ComputedRef<ShippingMethod[]>;
+  shippingMethods: ComputedRef<Schemas["ShippingMethod"][]>;
   /**
    * Fetches all available payment methods
    */
   getPaymentMethods(options?: {
     forceReload: boolean;
-  }): Promise<ComputedRef<PaymentMethod[]>>;
+  }): Promise<ComputedRef<Schemas["PaymentMethod"][]>>;
   /**
    * List of available payment methods
    */
-  paymentMethods: ComputedRef<PaymentMethod[]>;
+  paymentMethods: ComputedRef<Schemas["PaymentMethod"][]>;
   /**
    * Creates order based on the current cart
    */
-  createOrder(params?: CreateOrderParams): Promise<Order>;
+  createOrder(
+    params?: RequestParameters<"createOrder">,
+  ): Promise<Schemas["Order"]>;
   /**
    * Shipping address for the current session
    */
-  shippingAddress: ComputedRef<ShippingAddress | undefined>;
+  shippingAddress: ComputedRef<Schemas["CustomerAddress"] | undefined>;
   /**
    * Billing address for the current session
    */
-  billingAddress: ComputedRef<Partial<BillingAddress> | undefined>;
+  billingAddress: ComputedRef<Schemas["CustomerAddress"] | undefined>;
   /**
    * Selected shipping method for the current session
    * Sugar for {@link useSessionContext.selectedShippingMethod}
    */
-  selectedShippingMethod: ComputedRef<ShippingMethod | null>;
+  selectedShippingMethod: ComputedRef<Schemas["ShippingMethod"] | null>;
   /**
    * Sets shipping method for the current session
    * Sugar for {@link useSessionContext.setShippingMethod}
    */
-  setShippingMethod(shippingMethod: Partial<ShippingMethod>): Promise<void>;
+  setShippingMethod(shippingMethod: { id: string }): Promise<void>;
   /**
    * Selected payment method for the current session
    * Sugar for {@link useSessionContext.selectedPaymentMethod}
    */
-  selectedPaymentMethod: ComputedRef<PaymentMethod | null>;
+  selectedPaymentMethod: ComputedRef<Schemas["PaymentMethod"] | null>;
   /**
    * Sets payment method for the current session
    * Sugar for {@link useSessionContext.setPaymentMethod}
    */
-  setPaymentMethod(paymentMethod: Partial<PaymentMethod>): Promise<void>;
+  setPaymentMethod(paymentMethod: { id: string }): Promise<void>;
 };
 
-const shippingMethodsAssociations: ShopwareSearchParams = {
+const shippingMethodsAssociations: Schemas["Criteria"] = {
   associations: {
     prices: {},
   },
@@ -85,8 +73,7 @@ const shippingMethodsAssociations: ShopwareSearchParams = {
  * @category Cart & Checkout
  */
 export function useCheckout(): UseCheckoutReturn {
-  const { apiInstance } = useShopwareContext();
-  const { refreshCart } = useCart();
+  const { apiClient } = useShopwareContext();
   const {
     sessionContext,
     selectedPaymentMethod,
@@ -106,19 +93,22 @@ export function useCheckout(): UseCheckoutReturn {
 
   async function getShippingMethods(
     { forceReload } = { forceReload: false },
-    associations: ShopwareSearchParams = {},
+    associations: Schemas["Criteria"] = {},
   ) {
     if (shippingMethods.value.length && !forceReload) return shippingMethods;
-    const mergedAssociations: ShopwareSearchParams = deepMerge(
+    const mergedAssociations: Schemas["Criteria"] = deepMerge(
       shippingMethodsAssociations,
       associations,
     );
-    const response = await getAvailableShippingMethods(apiInstance, {
-      ...mergedAssociations,
-    });
+    const response = await apiClient.invoke(
+      "readShippingMethod post /shipping-method?onlyAvailable",
+      {
+        ...mergedAssociations,
+      },
+    );
     storeShippingMethods.value =
-      response?.elements.sort(
-        (a: ShippingMethod, b: ShippingMethod) =>
+      response.elements.sort(
+        (a: Schemas["ShippingMethod"], b: Schemas["ShippingMethod"]) =>
           (a.position ?? 0) - (b.position ?? 0),
       ) || [];
     return shippingMethods;
@@ -126,21 +116,19 @@ export function useCheckout(): UseCheckoutReturn {
 
   async function getPaymentMethods({ forceReload } = { forceReload: false }) {
     if (paymentMethods.value.length && !forceReload) return paymentMethods;
-    const response = await getAvailablePaymentMethods(apiInstance, {
-      onlyAvailable: true, // depending on the context, some of them can be hidden due to applied rules describing whether a method can be available
-    });
+    const response = await apiClient.invoke(
+      "readPaymentMethod post /payment-method",
+      {
+        onlyAvailable: true,
+      },
+    );
     storePaymentMethods.value = response?.elements || [];
     return paymentMethods;
   }
 
-  async function createOrder(params?: CreateOrderParams) {
-    try {
-      const order = await createApiOrder(params, apiInstance);
-      return order;
-    } catch (e) {
-      const err = e as ClientApiError;
-      throw err;
-    }
+  async function createOrder(params: RequestParameters<"createOrder"> = {}) {
+    const order = apiClient.invoke("createOrder post /checkout/order", params);
+    return order;
   }
 
   const shippingAddress = computed(
diff --git a/packages/composables/src/useCmsMeta.test.ts b/packages/composables/src/useCmsMeta.test.ts
new file mode 100644
index 000000000..736f9b678
--- /dev/null
+++ b/packages/composables/src/useCmsMeta.test.ts
@@ -0,0 +1,17 @@
+import { useCmsMeta } from "./useCmsMeta";
+import { describe, expect, it } from "vitest";
+import LandingPageMock from "./mocks/LandingPage";
+import { useSetup } from "./_test";
+
+describe("composables - useCmsMeta", () => {
+  it("should return title and meta tags", () => {
+    const { vm } = useSetup(() => useCmsMeta(LandingPageMock));
+
+    expect(vm.title).toEqual("Summer Giveaway");
+    expect(vm.meta).toEqual([
+      { name: "keywords", content: "Landing page keywords" },
+      { name: "description", content: "Landing page description" },
+      { name: "title", content: "Landing page title" },
+    ]);
+  });
+});
diff --git a/packages/composables/src/internal/_useContext.ts b/packages/composables/src/useContext.ts
similarity index 51%
rename from packages/composables/src/internal/_useContext.ts
rename to packages/composables/src/useContext.ts
index b07cab6dc..cfcaf737d 100644
--- a/packages/composables/src/internal/_useContext.ts
+++ b/packages/composables/src/useContext.ts
@@ -1,9 +1,15 @@
-import { inject, provide, ref, Ref, unref } from "vue";
+import { inject, provide, ref, unref } from "vue";
+import type { Ref } from "vue";
 
 /**
- * Internal context helper
+ * Context helper composable to provide and inject data.
+ * It takes `injectionName` to inject the context. If no context is provided, it will create a new one and provide it.
+ * If `context` is provided in params, it will create new context, use param as value and provide it.
+ * If `replace` is provided, it will replace the existing context with the new value.
+ *
+ * @public
  */
-export function _useContext<T>(
+export function useContext<T>(
   injectionName: string,
   params?: {
     context?: Ref<T> | T;
diff --git a/packages/composables/src/useCountries.ts b/packages/composables/src/useCountries.ts
index 74c6498e5..dff2640cf 100644
--- a/packages/composables/src/useCountries.ts
+++ b/packages/composables/src/useCountries.ts
@@ -1,14 +1,13 @@
 import { computed, ref, onMounted, inject, provide } from "vue";
-import type { Ref, ComputedRef } from "vue";
-import { getAvailableCountries } from "@shopware-pwa/api-client";
-import type { Country, CountryState } from "@shopware-pwa/types";
-import { useShopwareContext } from "./useShopwareContext";
+import type { ComputedRef } from "vue";
+import { useShopwareContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseCountriesReturn = {
   mountedCallback(): Promise<void>;
-  getCountries: ComputedRef<Country[]>;
+  getCountries: ComputedRef<Schemas["Country"][]>;
   fetchCountries(): Promise<void>;
-  getStatesForCountry(countryId: string): CountryState[] | null;
+  getStatesForCountry(countryId: string): Schemas["CountryState"][] | null;
 };
 
 /**
@@ -17,14 +16,18 @@ export type UseCountriesReturn = {
  * @category Context & Language
  */
 export function useCountries(): UseCountriesReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
   const _sharedCountried = inject("swCountries", ref());
   provide("swCountries", _sharedCountried);
 
   async function fetchCountries() {
-    const { elements } = await getAvailableCountries(apiInstance);
-    _sharedCountried.value = elements;
+    const result = await apiClient.invoke("readCountry post /country", {
+      associations: {
+        states: {},
+      },
+    });
+    _sharedCountried.value = result.elements;
   }
 
   const getCountries = computed(() => {
@@ -39,7 +42,7 @@ export function useCountries(): UseCountriesReturn {
 
   const getStatesForCountry = (countryId: string) => {
     return (
-      getCountries.value.find((element: Country) => {
+      getCountries.value.find((element: Schemas["Country"]) => {
         return element.id === countryId;
       })?.states || null
     );
diff --git a/packages/composables/src/useCustomerOrders.ts b/packages/composables/src/useCustomerOrders.ts
index 2e0441524..bf0657f1a 100644
--- a/packages/composables/src/useCustomerOrders.ts
+++ b/packages/composables/src/useCustomerOrders.ts
@@ -1,14 +1,13 @@
 import { ref } from "vue";
 import type { Ref } from "vue";
-import { getCustomerOrders } from "@shopware-pwa/api-client";
-import { useShopwareContext } from "./useShopwareContext";
-import type { Order, ShopwareSearchParams } from "@shopware-pwa/types";
+import { useShopwareContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseCustomerOrdersReturn = {
   /**
    * All placed orders belonging to the logged-in customer
    */
-  orders: Ref<Order[]>;
+  orders: Ref<Schemas["Order"][]>;
   /**
    * Changes the current page of the orders list
    *
@@ -18,7 +17,7 @@ export type UseCustomerOrdersReturn = {
   /**
    * Fetches the orders list and assigns the result to the `orders` property
    */
-  loadOrders(parameters?: ShopwareSearchParams): Promise<void>;
+  loadOrders(parameters?: Schemas["Criteria"]): Promise<void>;
 };
 
 /**
@@ -27,15 +26,18 @@ export type UseCustomerOrdersReturn = {
  * @category Customer & Account
  */
 export function useCustomerOrders(): UseCustomerOrdersReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
-  const orders: Ref<Order[]> = ref([]);
+  const orders: Ref<Schemas["Order"][]> = ref([]);
 
   const loadOrders = async (
-    parameters: ShopwareSearchParams = {},
+    parameters: Schemas["Criteria"] = {},
   ): Promise<void> => {
-    const fetchedOrders = await getCustomerOrders(parameters, apiInstance);
-    orders.value = fetchedOrders?.elements;
+    const fetchedOrders = await apiClient.invoke(
+      "readOrder post /order",
+      parameters,
+    );
+    orders.value = fetchedOrders.orders.elements;
   };
 
   const changeCurrentPage = async (pageNumber: number | string) =>
diff --git a/packages/composables/src/useCustomerPassword.ts b/packages/composables/src/useCustomerPassword.ts
index 857b4c0f1..7281fe707 100644
--- a/packages/composables/src/useCustomerPassword.ts
+++ b/packages/composables/src/useCustomerPassword.ts
@@ -1,30 +1,26 @@
 import { reactive } from "vue";
 import type { UnwrapRef } from "vue";
-import {
-  updatePassword as apiUpdatePassword,
-  resetPassword as apiResetPassword,
-  CustomerUpdatePasswordParam,
-  CustomerResetPasswordParam,
-} from "@shopware-pwa/api-client";
-import type { ClientApiError, ShopwareError } from "@shopware-pwa/types";
-import { useShopwareContext } from "./useShopwareContext";
+import { useShopwareContext } from "#imports";
+import type { RequestParameters } from "#shopware";
+import { ApiClientError } from "@shopware/api-client";
+import type { ApiError } from "@shopware/api-client";
 
 export type UseCustomerPasswordReturn = {
   errors: UnwrapRef<{
-    resetPassword: ShopwareError[];
-    updatePassword: ShopwareError[];
+    resetPassword: ApiError[];
+    updatePassword: ApiError[];
   }>;
   /**
    * Change customer's current password
    */
   updatePassword(
-    updatePasswordData: CustomerUpdatePasswordParam,
+    updatePasswordData: RequestParameters<"changePassword">,
   ): Promise<boolean>;
   /**
    * Reset customer's password
    */
   resetPassword(
-    resetPasswordData: CustomerResetPasswordParam,
+    resetPasswordData: RequestParameters<"sendRecoveryMail">,
   ): Promise<boolean>;
 };
 
@@ -34,34 +30,46 @@ export type UseCustomerPasswordReturn = {
  * @category Customer & Account
  */
 export function useCustomerPassword(): UseCustomerPasswordReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
   const errors: UnwrapRef<{
-    resetPassword: ShopwareError[];
-    updatePassword: ShopwareError[];
+    resetPassword: ApiError[];
+    updatePassword: ApiError[];
   }> = reactive({
     resetPassword: [],
     updatePassword: [],
   });
 
   async function updatePassword(
-    updatePasswordData: CustomerUpdatePasswordParam,
+    updatePasswordData: RequestParameters<"changePassword">,
   ) {
     try {
       errors.updatePassword = [];
-      await apiUpdatePassword(updatePasswordData, apiInstance);
+      await apiClient.invoke(
+        "changePassword post /account/change-password",
+        updatePasswordData,
+      );
     } catch (e) {
-      errors.updatePassword = (e as ClientApiError).messages;
+      if (e instanceof ApiClientError) {
+        errors.updatePassword = e.details;
+      }
       return false;
     }
     return true;
   }
 
-  async function resetPassword(resetPasswordData: CustomerResetPasswordParam) {
+  async function resetPassword(
+    resetPasswordData: RequestParameters<"sendRecoveryMail">,
+  ) {
     try {
-      await apiResetPassword(resetPasswordData, apiInstance);
+      await apiClient.invoke(
+        "sendRecoveryMail post /account/recovery-password",
+        resetPasswordData,
+      );
     } catch (e) {
-      errors.resetPassword = (e as ClientApiError).messages;
+      if (e instanceof ApiClientError) {
+        errors.resetPassword = e.details;
+      }
       return false;
     }
     return true;
diff --git a/packages/composables/src/useInternationalization.test.ts b/packages/composables/src/useInternationalization.test.ts
index 11d7ed2dd..2daf11c52 100644
--- a/packages/composables/src/useInternationalization.test.ts
+++ b/packages/composables/src/useInternationalization.test.ts
@@ -1,48 +1,23 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import { useInternationalization } from "./useInternationalization";
-import { shallowMount } from "@vue/test-utils";
-
-const url = "http://frontend.test";
-
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const { getStorefrontUrl } = useInternationalization();
-    return { getStorefrontUrl };
-  },
-};
-
-const getMockProvide = (mockedUrl: string | undefined) => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {
-            endpoint: mockedUrl,
-          },
-        },
-      },
-    },
-  },
-});
+import { useSetup } from "./_test";
 
 describe("useInternationalization", () => {
-  global.window = Object.create(window);
-
-  Object.defineProperty(window, "location", {
-    value: {
+  it("should return storefrontUrl", async () => {
+    const url = "http://frontend.test";
+    vi.stubGlobal("location", {
       origin: url,
-    },
-  });
+    });
+    const { vm } = useSetup(useInternationalization);
 
-  it("should return storefrontUrl", async () => {
-    const wrapper = shallowMount(Component, getMockProvide(url));
-    expect(wrapper.vm.getStorefrontUrl()).toBe(url);
+    expect(vm.getStorefrontUrl()).toBe(url);
+
+    vi.unstubAllGlobals();
   });
 
-  it("should return storefrontUrl with empty context api", async () => {
-    const wrapper = shallowMount(Component, getMockProvide(undefined));
-    expect(wrapper.vm.getStorefrontUrl()).toBe(url);
+  it("should return default window storefrontUrl", async () => {
+    const { vm } = useSetup(useInternationalization);
+
+    expect(vm.getStorefrontUrl()).toBe("http://localhost:3000");
   });
 });
diff --git a/packages/composables/src/useInternationalization.ts b/packages/composables/src/useInternationalization.ts
index ea41e6e5c..144d8a77e 100644
--- a/packages/composables/src/useInternationalization.ts
+++ b/packages/composables/src/useInternationalization.ts
@@ -1,13 +1,7 @@
-import { useShopwareContext } from "./useShopwareContext";
-import { getAvailableLanguages as getAvailableLanguagesAPI } from "@shopware-pwa/api-client";
-import { _useContext } from "./internal/_useContext";
-import type {
-  Language,
-  ContextTokenResponse,
-  EntityResult,
-} from "@shopware-pwa/types";
-import { setCurrentLanguage } from "@shopware-pwa/api-client";
+import { useContext, useShopwareContext } from "#imports";
+import type { RequestReturnType, Schemas } from "#shopware";
 import type { Ref } from "vue";
+
 export type UseInternationalizationReturn = {
   /**
    * StorefrontUrl is needed to specify language of emails
@@ -18,16 +12,16 @@ export type UseInternationalizationReturn = {
   /**
    * Get available languages from backend
    *
-   * @returns {Promise<EntityResult<"language", Language>>} list of languages
+   * @returns {Promise<RequestReturnType<"readLanguages">>} list of languages
    */
-  getAvailableLanguages(): Promise<EntityResult<"language", Language>>;
+  getAvailableLanguages(): Promise<RequestReturnType<"readLanguages">>;
   /**
    * Change current language
    *
    * @param {string} languageId
-   * @returns {Promise<ContextTokenResponse>} context object
+   * @returns {Promise<Schemas['ContextTokenResponse']>} context object
    */
-  changeLanguage(languageId: string): Promise<ContextTokenResponse>;
+  changeLanguage(languageId: string): Promise<Schemas["ContextTokenResponse"]>;
   /**
    * Get language code from backend language id
    *
@@ -52,7 +46,7 @@ export type UseInternationalizationReturn = {
   /**
    * List of available languages
    */
-  languages: Ref<Language[]>;
+  languages: Ref<Schemas["Language"][]>;
   /**
    * Currently used language
    */
@@ -82,26 +76,28 @@ export function useInternationalization(
   pathResolver?: Function,
 ): UseInternationalizationReturn {
   const { devStorefrontUrl } = useShopwareContext();
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
-  const _storeLanguages = _useContext<Language[]>("swLanguages");
-  const _storeCurrentLanguage = _useContext<string>(
+  const _storeLanguages = useContext<Schemas["Language"][]>("swLanguages");
+  const _storeCurrentLanguage = useContext<string>(
     "swLanguagesCurrentLanguage",
   );
-  const _storeCurrentPrefix = _useContext<string>("swLanguagesCurrentPrefix");
+  const _storeCurrentPrefix = useContext<string>("swLanguagesCurrentPrefix");
 
   function getStorefrontUrl() {
     return devStorefrontUrl ?? window.location.origin ?? "";
   }
 
   async function getAvailableLanguages() {
-    const data = await getAvailableLanguagesAPI(apiInstance);
+    const data = await apiClient.invoke("readLanguages post /language", {});
     _storeLanguages.value = data.elements;
     return data;
   }
 
   function changeLanguage(languageId: string) {
-    return setCurrentLanguage(languageId, apiInstance);
+    return apiClient.invoke("updateContext patch /context", {
+      languageId,
+    });
   }
 
   function getLanguageCodeFromId(languageId: string) {
diff --git a/packages/composables/src/useLandingSearch.test.ts b/packages/composables/src/useLandingSearch.test.ts
new file mode 100644
index 000000000..d90ce8a20
--- /dev/null
+++ b/packages/composables/src/useLandingSearch.test.ts
@@ -0,0 +1,19 @@
+import { describe, expect, it } from "vitest";
+import { useLandingSearch } from "./useLandingSearch";
+import LandingPageMock from "./mocks/LandingPage";
+import { useSetup } from "./_test";
+
+describe("useLandingSearch", () => {
+  it("mergeWishlistProducts", async () => {
+    const { vm, injections } = useSetup(useLandingSearch);
+    injections.apiClient.invoke.mockResolvedValue(LandingPageMock);
+
+    const result = vm.search("test");
+
+    expect(injections.apiClient.invoke).toBeCalledWith(
+      expect.stringContaining("readLandingPage"),
+      expect.objectContaining({ landingPageId: "test" }),
+    );
+    expect(result).resolves.toStrictEqual(LandingPageMock);
+  });
+});
diff --git a/packages/composables/src/useLandingSearch.ts b/packages/composables/src/useLandingSearch.ts
index e56d28391..be3a0e2ed 100644
--- a/packages/composables/src/useLandingSearch.ts
+++ b/packages/composables/src/useLandingSearch.ts
@@ -1,8 +1,6 @@
-import { getLandingPage } from "@shopware-pwa/api-client";
-import type { LandingPage } from "@shopware-pwa/types";
-import { useShopwareContext } from "./useShopwareContext";
+import { useShopwareContext } from "#imports";
 import { cmsAssociations } from "./cms/cmsAssociations";
-import { _useContext } from "./internal/_useContext";
+import type { Schemas } from "#shopware";
 
 export type UseLandingSearchReturn = {
   /**
@@ -14,7 +12,7 @@ export type UseLandingSearchReturn = {
     options?: {
       withCmsAssociations?: boolean;
     },
-  ): Promise<LandingPage>;
+  ): Promise<Schemas["LandingPage"]>;
 };
 
 /**
@@ -28,9 +26,9 @@ export function useLandingSearch(): {
     options?: {
       withCmsAssociations?: boolean;
     },
-  ) => Promise<LandingPage>;
+  ) => Promise<Schemas["LandingPage"]>;
 } {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
   const search = async (
     navigationId: string,
@@ -39,10 +37,12 @@ export function useLandingSearch(): {
     },
   ) => {
     const associations = options?.withCmsAssociations && cmsAssociations;
-    const result = await getLandingPage(
-      navigationId,
-      associations || {},
-      apiInstance,
+    const result = await apiClient.invoke(
+      "readLandingPage post /landing-page/{landingPageId}",
+      {
+        landingPageId: navigationId,
+        ...associations,
+      },
     );
     return result;
   };
diff --git a/packages/composables/src/useListing.ts b/packages/composables/src/useListing.ts
index af60efe43..63781094b 100644
--- a/packages/composables/src/useListing.ts
+++ b/packages/composables/src/useListing.ts
@@ -1,17 +1,9 @@
-import { getCategoryProducts, searchProducts } from "@shopware-pwa/api-client";
-
-import type {
-  ShopwareSearchParams,
-  Product,
-  ListingResult,
-  Sort,
-  ListingFilter,
-} from "@shopware-pwa/types";
 import { inject, computed, ref, provide } from "vue";
-import type { ComputedRef } from "vue";
+import type { ComputedRef, Ref } from "vue";
 import { getListingFilters } from "@shopware-pwa/helpers-next";
-import { useShopwareContext, useCategory } from ".";
+import { useShopwareContext, useCategory } from "#imports";
 import ContextError from "./helpers/ContextError";
+import type { Schemas, RequestParameters } from "#shopware";
 
 function isObject<T>(item: T): boolean {
   return item && typeof item === "object" && !Array.isArray(item);
@@ -44,29 +36,29 @@ function merge<T extends { [key in keyof T]: unknown }>(
 
 export type ListingType = "productSearchListing" | "categoryListing";
 
-export type UseListingReturn<ELEMENTS_TYPE> = {
+export type UseListingReturn = {
   /**
    * Listing that is currently set
    * {@link ListingResult} object
    */
-  getInitialListing: ComputedRef<ListingResult<ELEMENTS_TYPE> | null>;
+  getInitialListing: ComputedRef<Schemas["ProductListingResult"] | null>;
   /**
    * Sets the initial listing - available synchronously
    * @param {@link initialListing} - initial listing to set
    * @returns
    */
   setInitialListing(
-    initialListing: Partial<ListingResult<ELEMENTS_TYPE>>,
+    initialListing: Schemas["ProductListingResult"],
   ): Promise<void>;
   /**
    * @deprecated - use `search` instead
    * Searches for the listing based on the criteria
-   * @param criteria {@link ShopwareSearchParams}
+   * @param criteria {@link Schemas['Criteria']}
    * @returns
    */
   initSearch(
-    criteria: Partial<ShopwareSearchParams>,
-  ): Promise<ListingResult<ELEMENTS_TYPE>>;
+    criteria: RequestParameters<"searchPage">,
+  ): Promise<Schemas["ProductListingResult"]>;
   /**
    * Searches for the listing based on the criteria
    * @param criteria
@@ -74,7 +66,7 @@ export type UseListingReturn<ELEMENTS_TYPE> = {
    * @returns
    */
   search(
-    criteria: Partial<ShopwareSearchParams>,
+    criteria: RequestParameters<"searchPage">,
     options?: {
       preventRouteChange?: boolean;
     },
@@ -82,19 +74,21 @@ export type UseListingReturn<ELEMENTS_TYPE> = {
   /**
    * Loads more (next page) elements to the listing
    */
-  loadMore(query?: Partial<ShopwareSearchParams>): Promise<void>;
+  loadMore(criteria: RequestParameters<"searchPage">): Promise<void>;
   /**
    * Listing that is currently set
    */
-  getCurrentListing: ComputedRef<Partial<ListingResult<ELEMENTS_TYPE>> | null>;
+  getCurrentListing: ComputedRef<Schemas["ProductListingResult"] | null>;
   /**
    * Listing elements ({@link Product}) that are currently set
    */
-  getElements: ComputedRef<ELEMENTS_TYPE[]>;
+  getElements: ComputedRef<Schemas["ProductListingResult"]["elements"]>;
   /**
    * Available sorting orders
    */
-  getSortingOrders: ComputedRef<Sort[] | { key: string; label: string }[]>;
+  getSortingOrders: ComputedRef<
+    Schemas["ProductSorting"][] | { key: string; label: string }[] | undefined
+  >;
   /**
    * Current sorting order
    */
@@ -106,7 +100,7 @@ export type UseListingReturn<ELEMENTS_TYPE> = {
    */
   changeCurrentSortingOrder(
     order: string,
-    query?: Partial<ShopwareSearchParams>,
+    query?: RequestParameters<"searchPage">,
   ): Promise<void>;
   /**
    * Current page number
@@ -119,7 +113,7 @@ export type UseListingReturn<ELEMENTS_TYPE> = {
    */
   changeCurrentPage(
     page: number,
-    query?: Partial<ShopwareSearchParams>,
+    query?: RequestParameters<"searchPage">,
   ): Promise<void>;
   /**
    * Total number of elements found for the current search criteria
@@ -136,11 +130,11 @@ export type UseListingReturn<ELEMENTS_TYPE> = {
   /**
    * Initial filters
    */
-  getInitialFilters: ComputedRef<ListingFilter[]>;
+  getInitialFilters: ComputedRef<ReturnType<typeof getListingFilters>>;
   /**
    * All available filters
    */
-  getAvailableFilters: ComputedRef<ListingFilter[]>;
+  getAvailableFilters: ComputedRef<ReturnType<typeof getListingFilters>>;
   /**
    * Filters that are currently set
    */
@@ -175,17 +169,19 @@ export type UseListingReturn<ELEMENTS_TYPE> = {
 export function useListing(params?: {
   listingType: ListingType;
   categoryId?: string;
-  defaultSearchCriteria?: Partial<ShopwareSearchParams>;
-}): UseListingReturn<Product> {
+  defaultSearchCriteria?: RequestParameters<"searchPage">;
+}): UseListingReturn {
   const listingType = params?.listingType || "categoryListing";
 
   // const { getDefaults } = useDefaults({ defaultsKey: contextName });
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
   let searchMethod;
   if (listingType === "productSearchListing") {
-    searchMethod = async (searchCriteria: Partial<ShopwareSearchParams>) => {
-      return searchProducts(searchCriteria, apiInstance);
+    searchMethod = async (searchCriteria: RequestParameters<"searchPage">) => {
+      return apiClient.invoke("searchPage post /search", {
+        ...searchCriteria,
+      });
     };
   } else {
     let resourceId: undefined | string;
@@ -201,20 +197,27 @@ export function useListing(params?: {
       }
     }
 
-    searchMethod = async (searchCriteria: Partial<ShopwareSearchParams>) => {
+    searchMethod = async (searchCriteria: RequestParameters<"searchPage">) => {
       if (!resourceId) {
         throw new Error(
           "[useListing][search] Search category id does not exist.",
         );
       }
-      return getCategoryProducts(resourceId, searchCriteria, apiInstance);
+      return apiClient.invoke(
+        "readProductListing post /product-listing/{categoryId}",
+        {
+          categoryId: resourceId,
+          ...searchCriteria,
+        },
+      );
     };
   }
 
-  return createListingComposable<Product>({
+  return createListingComposable({
     listingKey: listingType,
     searchMethod,
-    searchDefaults: params?.defaultSearchCriteria || {}, //getDefaults(),
+    searchDefaults:
+      params?.defaultSearchCriteria || ({} as RequestParameters<"searchPage">), //getDefaults(),
   });
 }
 
@@ -226,17 +229,17 @@ export function useListing(params?: {
  *
  * @public
  */
-export function createListingComposable<ELEMENTS_TYPE>({
+export function createListingComposable({
   searchMethod,
   searchDefaults,
   listingKey,
 }: {
   searchMethod(
-    searchParams: Partial<ShopwareSearchParams>,
-  ): Promise<ListingResult<ELEMENTS_TYPE>>;
-  searchDefaults: ShopwareSearchParams;
+    searchParams: RequestParameters<"searchPage">,
+  ): Promise<Schemas["ProductListingResult"]>;
+  searchDefaults: RequestParameters<"searchPage">;
   listingKey: string;
-}): UseListingReturn<ELEMENTS_TYPE> {
+}): UseListingReturn {
   const COMPOSABLE_NAME = "createListingComposable";
   const contextName = COMPOSABLE_NAME;
 
@@ -253,31 +256,39 @@ export function createListingComposable<ELEMENTS_TYPE>({
   const loadingMore = ref(false);
 
   // const { sharedRef } = useSharedState();
-  const _storeInitialListing = inject(`useListingInitial-${listingKey}`, ref());
+  const _storeInitialListing = inject<
+    Ref<Schemas["ProductListingResult"] | null>
+  >(`useListingInitial-${listingKey}`, ref(null));
   provide(`useListingInitial-${listingKey}`, _storeInitialListing);
-  // const _storeInitialListing = sharedRef<ListingResult<ELEMENTS_TYPE>>(
+  // const _storeInitialListing = sharedRef<Schemas["ProductListingResult"]>(
   //   `${cacheKey}-initialListing-${listingKey}`
   // );
-  // const _storeAppliedListing = sharedRef<Partial<ListingResult<ELEMENTS_TYPE>>>(
+  // const _storeAppliedListing = sharedRef<Partial<Schemas["ProductListingResult"]>>(
   //   `${cacheKey}-appliedListing-${listingKey}`
   // );
-  const _storeAppliedListing = inject(`useListingApplied-${listingKey}`, ref());
+  const _storeAppliedListing = inject<
+    Ref<Schemas["ProductListingResult"] | null>
+  >(`useListingApplied-${listingKey}`, ref(null));
   provide(`useListingApplied-${listingKey}`, _storeAppliedListing);
 
   const getInitialListing = computed(() => _storeInitialListing.value);
   const setInitialListing = async (
-    initialListing: Partial<ListingResult<ELEMENTS_TYPE>>,
+    initialListing: Schemas["ProductListingResult"],
   ) => {
     _storeInitialListing.value = initialListing;
     _storeAppliedListing.value = null;
   };
 
   const initSearch = async (
-    criteria: Partial<ShopwareSearchParams>,
-  ): Promise<ListingResult<ELEMENTS_TYPE>> => {
+    criteria: RequestParameters<"searchPage">,
+  ): Promise<Schemas["ProductListingResult"]> => {
     loading.value = true;
     try {
-      const searchCriteria = merge({}, searchDefaults, criteria);
+      const searchCriteria = merge(
+        {} as RequestParameters<"searchPage">,
+        searchDefaults,
+        criteria,
+      );
       const result = await searchMethod(searchCriteria);
       return result;
     } catch (e) {
@@ -288,14 +299,18 @@ export function createListingComposable<ELEMENTS_TYPE>({
   };
 
   async function search(
-    criteria: Partial<ShopwareSearchParams>,
+    criteria: RequestParameters<"searchPage">,
     options?: {
       preventRouteChange?: boolean;
     },
   ) {
     loading.value = true;
     try {
-      const searchCriteria = merge({}, searchDefaults, criteria);
+      const searchCriteria = merge(
+        {} as RequestParameters<"searchPage">,
+        searchDefaults,
+        criteria,
+      );
       const result = await searchMethod(searchCriteria);
 
       _storeAppliedListing.value = result;
@@ -307,27 +322,31 @@ export function createListingComposable<ELEMENTS_TYPE>({
   }
 
   const loadMore = async (
-    query?: Partial<ShopwareSearchParams>,
+    criteria?: RequestParameters<"searchPage">,
   ): Promise<void> => {
     loadingMore.value = true;
     try {
-      const q = query
-        ? query
+      const q = criteria
+        ? criteria
         : {
             // ...router.currentRoute.query,
             p: getCurrentPage.value + 1,
           };
 
-      const searchCriteria = merge({}, searchDefaults, q);
+      const searchCriteria = merge(
+        {} as RequestParameters<"searchPage">,
+        searchDefaults,
+        q,
+      ) as RequestParameters<"searchPage">;
       const result = await searchMethod(searchCriteria);
       _storeAppliedListing.value = {
-        ...getCurrentListing.value,
+        ...(getCurrentListing.value || {}),
         page: result.page,
         elements: [
           ...(getCurrentListing.value?.elements || []),
-          ...result.elements,
+          ...(result.elements ?? []),
         ],
-      };
+      } as Schemas["ProductListingResult"];
     } catch (e) {
       throw e;
     } finally {
@@ -354,8 +373,7 @@ export function createListingComposable<ELEMENTS_TYPE>({
   );
 
   const getSortingOrders = computed(() => {
-    const oldSortings = Object.values(getCurrentListing.value?.sortings || {}); // before Shopware 6.4
-    return getCurrentListing.value?.availableSortings || oldSortings;
+    return getCurrentListing.value?.availableSortings;
   });
 
   const getCurrentSortingOrder = computed(
@@ -363,14 +381,14 @@ export function createListingComposable<ELEMENTS_TYPE>({
   );
   async function changeCurrentSortingOrder(
     order: string,
-    query?: Partial<ShopwareSearchParams>,
+    query?: RequestParameters<"searchPage">,
   ) {
     await search(
       Object.assign(
         {
           order,
         },
-        query || {},
+        query,
       ),
     );
   }
@@ -379,14 +397,14 @@ export function createListingComposable<ELEMENTS_TYPE>({
 
   const changeCurrentPage = async (
     page: number,
-    query?: Partial<ShopwareSearchParams>,
+    query?: RequestParameters<"searchPage">,
   ) => {
     await search(
       Object.assign(
         {
-          p: page,
+          page,
         },
-        query || {},
+        query,
       ),
     );
   };
@@ -403,33 +421,47 @@ export function createListingComposable<ELEMENTS_TYPE>({
   });
 
   const getCurrentFilters = computed(() => {
-    const currentFiltersResult: any = [];
-    const currentFilters = {
-      ...getCurrentListing.value?.currentFilters,
-      // ...router.currentRoute.query,
-    };
-    Object.keys(currentFilters).forEach((objectKey) => {
-      if (!currentFilters[objectKey]) return;
-      if (objectKey === "navigationId") return;
-      if (objectKey === "price") {
-        if (currentFilters[objectKey].min)
-          currentFiltersResult["min-price"] = currentFilters[objectKey].min;
-        if (currentFilters[objectKey].max)
-          currentFiltersResult["max-price"] = currentFilters[objectKey].max;
-        return;
-      }
-      if (objectKey === "p") return;
-      currentFiltersResult[objectKey] = currentFilters[objectKey];
-    });
-    return currentFiltersResult;
+    // const currentFiltersResult: Schemas["ProductListingResult"]["currentFilters"] =
+    //   {};
+    // const currentFilters = {
+    //   ...getCurrentListing.value?.currentFilters,
+    //   // ...router.currentRoute.query,
+    // };
+    // Object.keys(currentFilters).forEach(
+    //   (objectKey: keyof Schemas["ProductListingResult"]["currentFilters"]) => {
+    //     if (!currentFilters[objectKey]) return;
+    //     if (objectKey === "navigationId") return;
+    //     if (objectKey === "price") {
+    //       if (currentFilters.price?.min)
+    //         currentFiltersResult.price.min = currentFilters[objectKey].min;
+    //       if (currentFilters[objectKey].max)
+    //         currentFiltersResult["max-price"] = currentFilters[objectKey].max;
+    //       return;
+    //     }
+    //     if (objectKey === "p") return;
+    //     currentFiltersResult[objectKey] = currentFilters[objectKey];
+    //   },
+    // );
+    return getCurrentListing.value?.currentFilters;
   });
 
   const setCurrentFilters = (filter: { code: string; value: any }) => {
-    const appliedFilters = Object.assign({}, getCurrentFilters.value, filter, {
-      query: getCurrentFilters.value.search,
-    });
+    const appliedFilters: RequestParameters<"searchPage"> = Object.assign(
+      {},
+      getCurrentFilters.value,
+      filter,
+      {
+        query: getCurrentFilters.value?.search,
+        manufacturer: getCurrentFilters.value?.manufacturer?.join("|"),
+        properties: getCurrentFilters.value?.properties?.join("|"),
+      },
+    );
     if (_storeAppliedListing.value) {
-      _storeAppliedListing.value.currentFilters = appliedFilters;
+      _storeAppliedListing.value.currentFilters = {
+        ...appliedFilters,
+        manufacturer: appliedFilters.manufacturer?.split("|"),
+        properties: appliedFilters.properties?.split("|"),
+      };
     }
     return search(appliedFilters);
   };
@@ -437,16 +469,18 @@ export function createListingComposable<ELEMENTS_TYPE>({
   const resetFilters = () => {
     const defaultFilters = Object.assign(
       {
-        manufacturer: "",
-        properties: "",
+        manufacturer: [],
+        properties: [],
         price: { min: 0, max: 0 },
-        search: getCurrentFilters.value.search,
+        search: getCurrentFilters.value?.search,
       },
       searchDefaults,
     );
 
-    _storeAppliedListing.value.currentFilters = defaultFilters;
-    return search({ query: getCurrentFilters.value.search });
+    if (_storeAppliedListing.value) {
+      _storeAppliedListing.value.currentFilters = defaultFilters;
+    }
+    return search({ search: getCurrentFilters.value?.search || "" });
   };
 
   const filtersToQuery = (filters: any) => {
diff --git a/packages/composables/src/useLocalWishlist.test.ts b/packages/composables/src/useLocalWishlist.test.ts
index 9e95e069e..4be5381ec 100644
--- a/packages/composables/src/useLocalWishlist.test.ts
+++ b/packages/composables/src/useLocalWishlist.test.ts
@@ -1,79 +1,55 @@
 import { describe, expect, it } from "vitest";
-import { shallowMount } from "@vue/test-utils";
+import { useSetup } from "./_test";
 import { useLocalWishlist } from "./useLocalWishlist";
 
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const {
-      getWishlistProducts,
-      addToWishlist,
-      removeFromWishlist,
-      clearWishlist,
-      items,
-      count,
-    } = useLocalWishlist();
-
-    return {
-      getWishlistProducts,
-      addToWishlist,
-      removeFromWishlist,
-      clearWishlist,
-      items,
-      count,
-    };
-  },
-};
-
 describe("useLocalWishlist", () => {
-  const wrapper = shallowMount(Component);
-
   describe("methods", () => {
-    const product: any = {
-      id: "some-id",
-    };
-
     describe("addToWishlist", () => {
       it("wishlist add product", () => {
-        wrapper.vm.addToWishlist(product.id);
-        expect(wrapper.vm.items.length).toBe(1);
+        const { vm } = useSetup(useLocalWishlist);
+        vm.addToWishlist("some-id");
+        expect(vm.items.length).toBe(1);
       });
     });
 
     describe("removeFromWishlist", () => {
       it("wishlist add product", () => {
-        wrapper.vm.removeFromWishlist(product.id);
-        expect(wrapper.vm.items.length).toBe(0);
+        const { vm } = useSetup(useLocalWishlist);
+        vm.removeFromWishlist("some-id");
+        expect(vm.items.length).toBe(0);
       });
     });
 
     describe("removeFromWishlist", () => {
       it("wishlist remove product", () => {
-        wrapper.vm.removeFromWishlist(product.id);
-        expect(wrapper.vm.count).toBe(0);
+        const { vm } = useSetup(useLocalWishlist);
+        vm.removeFromWishlist("some-id");
+        expect(vm.count).toBe(0);
       });
     });
 
     describe("clearWishlist", () => {
       it("clearWishlist", () => {
-        wrapper.vm.addToWishlist(product.id);
-        expect(wrapper.vm.count).toBe(1);
-        wrapper.vm.clearWishlist();
-        expect(wrapper.vm.count).toBe(0);
+        const { vm } = useSetup(useLocalWishlist);
+        vm.addToWishlist("some-id");
+        expect(vm.count).toBe(1);
+        vm.clearWishlist();
+        expect(vm.count).toBe(0);
       });
     });
 
     describe("getWishlistProducts", () => {
       it("getWishlistProducts", () => {
-        wrapper.vm.clearWishlist();
-        wrapper.vm.getWishlistProducts();
-        expect(wrapper.vm.count).toBe(0);
+        const { vm } = useSetup(useLocalWishlist);
+        vm.clearWishlist();
+        vm.getWishlistProducts();
+        expect(vm.count).toBe(0);
       });
       it("getWishlistProducts with items", () => {
-        wrapper.vm.addToWishlist(product.id);
-        wrapper.vm.getWishlistProducts();
-        expect(wrapper.vm.count).toBe(1);
+        const { vm } = useSetup(useLocalWishlist);
+        vm.addToWishlist("some-id");
+        vm.getWishlistProducts();
+        expect(vm.count).toBe(1);
       });
     });
   });
diff --git a/packages/composables/src/useLocalWishlist.ts b/packages/composables/src/useLocalWishlist.ts
index bb1be19d5..745e11199 100644
--- a/packages/composables/src/useLocalWishlist.ts
+++ b/packages/composables/src/useLocalWishlist.ts
@@ -1,4 +1,5 @@
-import { ref, Ref, computed, ComputedRef } from "vue";
+import { ref, computed } from "vue";
+import type { Ref, ComputedRef } from "vue";
 
 export type UseLocalWishlistReturn = {
   /**
diff --git a/packages/composables/src/useNavigation.spec.ts b/packages/composables/src/useNavigation.spec.ts
deleted file mode 100644
index ba059ef2b..000000000
--- a/packages/composables/src/useNavigation.spec.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { shallowMount } from "@vue/test-utils";
-import { useNavigation } from "./useNavigation";
-import * as apiExports from "@shopware-pwa/api-client";
-import Menu from "./mocks/Menu";
-
-const getMockProvide = () => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {},
-        },
-      },
-    },
-  },
-});
-
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const { navigationElements, loadNavigationElements } = useNavigation();
-    return { navigationElements, loadNavigationElements };
-  },
-};
-
-describe("useNavigation", () => {
-  const wrapper = shallowMount(Component, getMockProvide());
-
-  vi.spyOn(apiExports, "getStoreNavigation").mockImplementation(() => {
-    return new Promise((resolve) => {
-      resolve(Menu);
-    });
-  });
-
-  it("should set the menu", async () => {
-    await wrapper.vm.loadNavigationElements({
-      depth: 3,
-    });
-    expect(wrapper.vm.navigationElements.length).toBe(Menu.length);
-  });
-
-  it("menu is empty because of the error", async () => {
-    vi.spyOn(apiExports, "getStoreNavigation").mockImplementation(() => {
-      throw new Error("Test error");
-    });
-    await wrapper.vm.loadNavigationElements({
-      depth: 3,
-    });
-    expect(wrapper.vm.navigationElements.length).toBe(0);
-  });
-});
diff --git a/packages/composables/src/useNavigation.test.ts b/packages/composables/src/useNavigation.test.ts
new file mode 100644
index 000000000..8713241a1
--- /dev/null
+++ b/packages/composables/src/useNavigation.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vitest";
+import { useNavigation } from "./useNavigation";
+import Menu from "./mocks/Menu";
+import { useSetup } from "./_test";
+
+describe("useNavigation", () => {
+  it("should set the menu", async () => {
+    const { vm, injections } = useSetup(useNavigation);
+    injections.apiClient.invoke.mockResolvedValue(Menu);
+
+    await vm.loadNavigationElements({
+      depth: 3,
+    });
+    expect(injections.apiClient.invoke).toHaveBeenCalledWith(
+      expect.stringContaining("readNavigation"),
+      expect.anything(),
+    );
+    expect(vm.navigationElements).not.toBeNull();
+    expect(vm.navigationElements!.length).toBe(Menu.length);
+  });
+
+  it("menu is empty because of the error", async () => {
+    const { vm, injections } = useSetup(useNavigation);
+
+    injections.apiClient.invoke.mockRejectedValue(null);
+
+    await vm.loadNavigationElements({
+      depth: 3,
+    });
+    expect(vm.navigationElements?.length).toBe(0);
+  });
+});
diff --git a/packages/composables/src/useNavigation.ts b/packages/composables/src/useNavigation.ts
index 7ec75fc84..7b71db659 100644
--- a/packages/composables/src/useNavigation.ts
+++ b/packages/composables/src/useNavigation.ts
@@ -1,11 +1,7 @@
 import { computed, ref, inject, provide } from "vue";
 import type { ComputedRef, Ref } from "vue";
-import type {
-  StoreNavigationElement,
-  StoreNavigationType,
-} from "@shopware-pwa/types";
-import { useShopwareContext } from "./useShopwareContext";
-import { getStoreNavigation } from "@shopware-pwa/api-client";
+import { useShopwareContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 /**
  *
@@ -15,13 +11,13 @@ export type UseNavigationReturn = {
   /**
    * List of navigation elements
    */
-  navigationElements: ComputedRef<StoreNavigationElement[] | null>;
+  navigationElements: ComputedRef<Schemas["NavigationRouteResponse"] | null>;
   /**
    * Load navigation elements
    */
   loadNavigationElements(params: {
     depth: number;
-  }): Promise<StoreNavigationElement[]>;
+  }): Promise<Schemas["NavigationRouteResponse"]>;
 };
 
 /**
@@ -39,13 +35,13 @@ export type UseNavigationReturn = {
  * @category Navigation & Routing
  */
 export function useNavigation(params?: {
-  type?: StoreNavigationType;
+  type?: Schemas["NavigationType"];
 }): UseNavigationReturn {
   const type = params?.type || "main-navigation";
 
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
-  const sharedElements: Ref<StoreNavigationElement[]> = inject(
+  const sharedElements: Ref<Schemas["NavigationRouteResponse"]> = inject(
     `swNavigation-${type}`,
     ref([]),
   );
@@ -55,17 +51,14 @@ export function useNavigation(params?: {
 
   async function loadNavigationElements({ depth }: { depth: number }) {
     try {
-      const navigationResponse = await getStoreNavigation(
+      const navigationResponse = await apiClient.invoke(
+        "readNavigation post /navigation/{activeId}/{rootId} sw-include-seo-urls",
         {
-          requestActiveId: type,
-          requestRootId: type,
-          searchCriteria: {
-            // includes: getIncludesConfig(),
-            // associations: getAssociationsConfig(),
-          },
+          activeId: type,
+          rootId: type,
           depth,
+          "sw-include-seo-urls": true,
         },
-        apiInstance,
       );
 
       sharedElements.value = navigationResponse || [];
diff --git a/packages/composables/src/useNavigationContext.ts b/packages/composables/src/useNavigationContext.ts
index 7514bb2a4..693b9e5bc 100644
--- a/packages/composables/src/useNavigationContext.ts
+++ b/packages/composables/src/useNavigationContext.ts
@@ -1,18 +1,18 @@
 import { computed } from "vue";
 import type { Ref, ComputedRef } from "vue";
-import type { RouteName, SeoUrl } from "@shopware-pwa/types";
 import { _parseUrlQuery } from "@shopware-pwa/helpers-next";
-import { _useContext } from "./internal/_useContext";
+import { useContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseNavigationContextReturn = {
   /**
    * SEO URL from the navigation context
    */
-  navigationContext: ComputedRef<SeoUrl | null>;
+  navigationContext: ComputedRef<Schemas["SeoUrl"] | null>;
   /**
    * Route name from the navigation context
    */
-  routeName: ComputedRef<RouteName | undefined>;
+  routeName: ComputedRef<Schemas["SeoUrl"]["routeName"] | undefined>;
   /**
    * Foreign key (ID) for current navigation context
    */
@@ -25,9 +25,9 @@ export type UseNavigationContextReturn = {
  * @category Navigation & Routing
  */
 export function useNavigationContext(
-  context?: Ref<SeoUrl | null>,
+  context?: Ref<Schemas["SeoUrl"] | null>,
 ): UseNavigationContextReturn {
-  const _context = _useContext("navigation", { context: context });
+  const _context = useContext("navigation", { context: context });
 
   const routeName = computed(() => _context.value?.routeName);
   const foreignKey = computed(() => _context.value?.foreignKey || "");
diff --git a/packages/composables/src/useNavigationSearch.test.ts b/packages/composables/src/useNavigationSearch.test.ts
new file mode 100644
index 000000000..2fff7d348
--- /dev/null
+++ b/packages/composables/src/useNavigationSearch.test.ts
@@ -0,0 +1,80 @@
+import { describe, expect, it, vi } from "vitest";
+import { useNavigationSearch } from "./useNavigationSearch";
+import { useSetup } from "./_test";
+
+const mockedResponse = {
+  translated: [],
+  createdAt: "2020-08-06T06:26:42.505+00:00",
+  updatedAt: "2022-08-03T08:07:03.941+00:00",
+  salesChannelId: "98432def39fc4624b33213a56b8c944d",
+  languageId: "2fbb5fe2e29a4d70aa5854ce7ce3e20b",
+  routeName: "frontend.detail.page",
+  foreignKey: "e05e9340aff4484f9009646dfd572df9",
+  pathInfo: "/detail/e05e9340aff4484f9009646dfd572df9",
+  seoPathInfo: "Fred-3-Burner-Gas-Grill/941044",
+  isCanonical: true,
+  isModified: false,
+  isDeleted: false,
+  isValid: null,
+  url: null,
+  customFields: null,
+  id: "59d47f52be96461193a3d6fcf2fe46e6",
+  apiAlias: "seo_url",
+};
+
+describe("useNavigationSearch", () => {
+  it("should resolve path from api response", async () => {
+    const { vm, injections } = useSetup(useNavigationSearch);
+    injections.apiClient.invoke.mockResolvedValue({
+      elements: [mockedResponse],
+    });
+
+    expect(await vm.resolvePath("/test")).toStrictEqual(mockedResponse);
+    expect(injections.apiClient.invoke).toHaveBeenCalledWith(
+      expect.stringContaining("readSeoUrl"),
+      expect.objectContaining({
+        filter: [
+          {
+            type: "equals",
+            field: "seoPathInfo",
+            value: "test",
+          },
+        ],
+      }),
+    );
+  });
+  it("should resolve technical url", async () => {
+    const { vm, injections } = useSetup(useNavigationSearch);
+    injections.apiClient.invoke.mockResolvedValue({ elements: [] });
+
+    await vm.resolvePath("/landingPage/test");
+
+    expect(injections.apiClient.invoke).toHaveBeenCalledWith(
+      expect.stringContaining("readSeoUrl"),
+      expect.objectContaining({
+        filter: [
+          {
+            type: "equals",
+            field: "pathInfo",
+            value: "/landingPage/test",
+          },
+        ],
+      }),
+    );
+  });
+  it("should not invoke api call for / search ", async () => {
+    const { vm, injections } = useSetup(useNavigationSearch);
+    injections.apiClient.invoke.mockResolvedValue({
+      elements: [mockedResponse],
+    });
+
+    const result = await vm.resolvePath("/");
+    expect(result).toMatchInlineSnapshot(`
+      {
+        "foreignKey": undefined,
+        "routeName": "frontend.navigation.page",
+      }
+    `);
+    expect(injections.apiClient.invoke).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/composables/src/useNavigationSearch.ts b/packages/composables/src/useNavigationSearch.ts
index 8d3da0b77..cbd5f78fe 100644
--- a/packages/composables/src/useNavigationSearch.ts
+++ b/packages/composables/src/useNavigationSearch.ts
@@ -1,16 +1,13 @@
-import type { SeoUrl } from "@shopware-pwa/types";
 import { _parseUrlQuery } from "@shopware-pwa/helpers-next";
-import { useShopwareContext } from "./useShopwareContext";
-import { getSeoUrl } from "@shopware-pwa/api-client";
-import { _useContext } from "./internal/_useContext";
-import { useSessionContext } from "./useSessionContext";
+import { useShopwareContext, useSessionContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseNavigationSearchReturn = {
   /**
    * Get {@link SeoUrl} entity for given path
    * @example resolvePath("/my-category/my-product") or resolvePath("/") for home page
    */
-  resolvePath(path: string): Promise<SeoUrl | null>;
+  resolvePath(path: string): Promise<Schemas["SeoUrl"] | null>;
 };
 
 /**
@@ -19,7 +16,7 @@ export type UseNavigationSearchReturn = {
  * @category Navigation & Routing
  */
 export function useNavigationSearch(): UseNavigationSearchReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
   const { sessionContext } = useSessionContext();
 
   async function resolvePath(path: string) {
@@ -31,7 +28,7 @@ export function useNavigationSearch(): UseNavigationSearchReturn {
       return {
         routeName: "frontend.navigation.page",
         foreignKey: categoryId,
-      } as SeoUrl;
+      } as Schemas["SeoUrl"];
     }
 
     const isTechnicalUrl =
@@ -43,18 +40,15 @@ export function useNavigationSearch(): UseNavigationSearchReturn {
     const normalizedPath = isTechnicalUrl ? path : path.substring(1);
     // console.error("looking for path", normalizedPath);
 
-    const seoResult = await getSeoUrl(
-      {
-        filter: [
-          {
-            type: "equals",
-            field: isTechnicalUrl ? "pathInfo" : "seoPathInfo",
-            value: normalizedPath,
-          },
-        ],
-      },
-      apiInstance,
-    );
+    const seoResult = await apiClient.invoke("readSeoUrl post /seo-url", {
+      filter: [
+        {
+          type: "equals",
+          field: isTechnicalUrl ? "pathInfo" : "seoPathInfo",
+          value: normalizedPath,
+        },
+      ],
+    });
 
     return seoResult.elements?.[0];
   }
diff --git a/packages/composables/src/useNewsletter.test.ts b/packages/composables/src/useNewsletter.test.ts
index bd70a4434..545c8269f 100644
--- a/packages/composables/src/useNewsletter.test.ts
+++ b/packages/composables/src/useNewsletter.test.ts
@@ -1,60 +1,32 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 import { useNewsletter } from "./useNewsletter";
-import { shallowMount } from "@vue/test-utils";
-import * as apiExports from "@shopware-pwa/api-client";
-
-const url = "http://frontend.test";
-
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const { newsletterSubscribe, newsletterUnsubscribe } = useNewsletter();
-    return { newsletterSubscribe, newsletterUnsubscribe };
-  },
-};
-
-const getMockProvide = (mockedUrl: string | undefined) => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {
-            endpoint: mockedUrl,
-          },
-        },
-      },
-    },
-  },
-});
+import { useSetup } from "./_test";
 
 describe("useNewsletter", () => {
-  const wrapper = shallowMount(Component, getMockProvide(url));
-  const email = "test@testemail.test";
-  const newsletterMockData = {
-    email: email,
-    option: "subscribe" as const,
-  };
+  it("newsletter subscribe", async () => {
+    const { vm, injections } = useSetup(useNewsletter);
 
-  vi.spyOn(apiExports, "newsletterSubscribe").mockImplementation(() => {
-    return new Promise<void>((resolve) => {
-      resolve();
+    await vm.newsletterSubscribe({
+      email: "test@shopware.com",
+      option: "subscribe",
     });
-  });
 
-  vi.spyOn(apiExports, "newsletterUnsubscribe").mockImplementation(() => {
-    return new Promise<void>((resolve) => {
-      resolve();
-    });
-  });
-
-  it("newsletter subscribe", () => {
-    expect(wrapper.vm.newsletterSubscribe(newsletterMockData)).resolves.toEqual(
-      undefined,
+    expect(injections.apiClient.invoke).toHaveBeenCalledWith(
+      expect.stringContaining("subscribeToNewsletter"),
+      expect.anything(),
     );
   });
 
-  it("newsletter unsubscribe", () => {
-    expect(wrapper.vm.newsletterUnsubscribe(email)).resolves.toEqual(undefined);
+  it("newsletter unsubscribe", async () => {
+    const { vm, injections } = useSetup(useNewsletter);
+
+    await vm.newsletterUnsubscribe("sometestemail@shopware.com");
+
+    expect(injections.apiClient.invoke).toHaveBeenCalledWith(
+      expect.stringContaining("unsubscribeToNewsletter"),
+      {
+        email: "sometestemail@shopware.com",
+      },
+    );
   });
 });
diff --git a/packages/composables/src/useNewsletter.ts b/packages/composables/src/useNewsletter.ts
index ad0b8f0da..c2e37384e 100644
--- a/packages/composables/src/useNewsletter.ts
+++ b/packages/composables/src/useNewsletter.ts
@@ -1,19 +1,16 @@
-import {
-  newsletterSubscribe as newsletterSubscribeAPI,
-  newsletterUnsubscribe as newsletterUnsubscribeAPI,
-  isNewsletterSubscriber as isNewsletterSubscriberAPI,
-} from "@shopware-pwa/api-client";
-import type { NewsletterInput } from "@shopware-pwa/types";
-import { useShopwareContext, useInternationalization } from ".";
+import { useShopwareContext, useInternationalization } from "#imports";
 import { ref, computed } from "vue";
 import type { ComputedRef, Ref } from "vue";
+import type { RequestParameters, Schemas } from "#shopware";
 
 export type UseNewsletterReturn = {
   /**
    * Subscribes the user to the newsletter
-   * @param params {@link NewsletterInput}
+   * @param params {@link RequestParameters<"subscribeToNewsletter">}
    */
-  newsletterSubscribe(params: NewsletterInput): Promise<void>;
+  newsletterSubscribe(
+    params: Omit<RequestParameters<"subscribeToNewsletter">, "storefrontUrl">,
+  ): Promise<void>;
   /**
    * Removes the email from the newsletter
    * @param email
@@ -32,56 +29,52 @@ export type UseNewsletterReturn = {
   /**
    * Newsletter status
    */
-  newsletterStatus: Ref<NewsletterStatus>;
+  newsletterStatus: Ref<Schemas["NewsletterStatus"]["status"]>;
   /**
    * Inform about newsletter confirmation
    */
   confirmationNeeded: ComputedRef<boolean>;
 };
 
-const enum NewsletterStatus {
-  NOT_SET = "notSet",
-  DIRECT = "direct",
-  UNDEFINED = "undefined",
-  OPT_OUT = "optOut",
-  OPT_IN = "optIn",
-}
-
 /**
  * Composable for newsletter subscription.
  * @public
  * @category Customer & Account
  */
 export function useNewsletter(): UseNewsletterReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
   const { getStorefrontUrl } = useInternationalization();
-  const newsletterStatus: Ref<NewsletterStatus> = ref(
-    NewsletterStatus.UNDEFINED,
-  );
+  const newsletterStatus =
+    ref<Schemas["NewsletterStatus"]["status"]>("undefined");
 
-  async function newsletterSubscribe(params: NewsletterInput) {
-    return await newsletterSubscribeAPI(
+  async function newsletterSubscribe(
+    params: Omit<RequestParameters<"subscribeToNewsletter">, "storefrontUrl">,
+  ) {
+    return await apiClient.invoke(
+      "subscribeToNewsletter post /newsletter/subscribe",
       {
         ...params,
         storefrontUrl: getStorefrontUrl(),
       },
-      apiInstance,
     );
   }
 
   async function newsletterUnsubscribe(email: string) {
-    return await newsletterUnsubscribeAPI(
+    return await apiClient.invoke(
+      "unsubscribeToNewsletter post /newsletter/unsubscribe",
       {
         email,
       },
-      apiInstance,
     );
   }
 
   async function getNewsletterStatus() {
     try {
-      const response = await isNewsletterSubscriberAPI(apiInstance);
-      newsletterStatus.value = response.status as NewsletterStatus;
+      const response = await apiClient.invoke(
+        "readNewsletterRecipient post /account/newsletter-recipient",
+        {},
+      );
+      newsletterStatus.value = response.status;
     } catch (error) {
       console.error(error);
     }
@@ -89,13 +82,13 @@ export function useNewsletter(): UseNewsletterReturn {
 
   const isNewsletterSubscriber = computed(
     () =>
-      ![NewsletterStatus.OPT_OUT, NewsletterStatus.UNDEFINED].includes(
-        newsletterStatus.value,
-      ),
+      !(
+        ["optOut", "undefined"] as Array<Schemas["NewsletterStatus"]["status"]>
+      ).includes(newsletterStatus.value),
   );
 
   const confirmationNeeded = computed(
-    () => newsletterStatus.value === NewsletterStatus.NOT_SET,
+    () => newsletterStatus.value === "notSet",
   );
 
   return {
diff --git a/packages/composables/src/useNotifications.ts b/packages/composables/src/useNotifications.ts
index 42cc973bb..7e28a1826 100644
--- a/packages/composables/src/useNotifications.ts
+++ b/packages/composables/src/useNotifications.ts
@@ -1,4 +1,5 @@
-import { computed, ComputedRef, Ref, ref, inject, provide } from "vue";
+import { computed, ref, inject, provide } from "vue";
+import type { ComputedRef, Ref } from "vue";
 
 type NotificationType = "info" | "warning" | "success" | "danger";
 
diff --git a/packages/composables/src/useOrderDetails.ts b/packages/composables/src/useOrderDetails.ts
index 27d27e842..4230e1c2c 100644
--- a/packages/composables/src/useOrderDetails.ts
+++ b/packages/composables/src/useOrderDetails.ts
@@ -1,30 +1,13 @@
 import { computed, ref, inject, provide } from "vue";
 import type { ComputedRef, Ref } from "vue";
-import type {
-  Order,
-  BillingAddress,
-  ShippingAddress,
-  ShippingMethod,
-  PaymentMethod,
-  ShopwareSearchParams,
-  OrderDocument,
-  ShopwareAssociation,
-} from "@shopware-pwa/types";
-import {
-  cancelOrder,
-  changeOrderPaymentMethod,
-  getOrderDetails,
-  handlePayment as apiHandlePayment,
-  getOrderDownloads,
-  getDocumentDownload,
-} from "@shopware-pwa/api-client";
-import { useShopwareContext } from "./useShopwareContext";
+import { useShopwareContext } from "#imports";
 import deepMerge from "./helpers/deepMerge";
+import type { Schemas } from "#shopware";
 
 /**
  * Data for api requests to fetch all necessary data
  */
-const orderAssociations: ShopwareSearchParams = {
+const orderAssociations: Schemas["Criteria"] = {
   associations: {
     lineItems: {
       associations: {
@@ -53,9 +36,9 @@ const orderAssociations: ShopwareSearchParams = {
 
 export type UseOrderDetailsReturn = {
   /**
-   * {@link Order} object
+   * {@link Schemas['Order']} object
    */
-  order: ComputedRef<Order | undefined | null>;
+  order: ComputedRef<Schemas["Order"] | undefined | null>;
   /**
    * Order status (e.g. 'open', 'cancelled')
    */
@@ -75,11 +58,11 @@ export type UseOrderDetailsReturn = {
   /**
    * Shipping address
    */
-  shippingAddress: ComputedRef<ShippingAddress | undefined>;
+  shippingAddress: ComputedRef<Schemas["OrderAddress"] | undefined>;
   /**
    * Billing address
    */
-  billingAddress: ComputedRef<BillingAddress | undefined>;
+  billingAddress: ComputedRef<Schemas["OrderAddress"] | undefined>;
   /**
    * Basic personal details
    */
@@ -95,11 +78,11 @@ export type UseOrderDetailsReturn = {
   /**
    * Selected shipping method
    */
-  shippingMethod: ComputedRef<ShippingMethod | undefined | null>;
+  shippingMethod: ComputedRef<Schemas["ShippingMethod"] | undefined | null>;
   /**
    * Selected payment method
    */
-  paymentMethod: ComputedRef<PaymentMethod | undefined | null>;
+  paymentMethod: ComputedRef<Schemas["PaymentMethod"] | undefined | null>;
   /**
    * Get order object including additional associations.
    * useDefaults describes what order object should look like.
@@ -140,7 +123,10 @@ export type UseOrderDetailsReturn = {
    * @param {string} deepLinkCode
    * @returns
    */
-  getDocumentFile: (documentId: string, deepLinkCode: string) => Promise<Blob>;
+  getDocumentFile: (
+    documentId: string,
+    deepLinkCode: string,
+  ) => Promise<Schemas["Document"]>;
   /**
    * Check if order has documents
    */
@@ -148,7 +134,7 @@ export type UseOrderDetailsReturn = {
   /**
    * Get order documents
    */
-  documents: ComputedRef<OrderDocument[]>;
+  documents: ComputedRef<Schemas["Document"][]>;
 };
 
 /**
@@ -158,11 +144,14 @@ export type UseOrderDetailsReturn = {
  */
 export function useOrderDetails(
   orderId: string,
-  associations?: ShopwareAssociation,
+  associations?: Schemas["Criteria"]["associations"],
 ): UseOrderDetailsReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
-  const _sharedOrder = inject("swOrderDetails", ref());
+  const _sharedOrder = inject<Ref<Schemas["Order"] | undefined>>(
+    "swOrderDetails",
+    ref(),
+  );
   provide("swOrderDetails", _sharedOrder);
 
   const paymentMethod = computed(
@@ -181,8 +170,7 @@ export function useOrderDetails(
   const billingAddress = computed(
     () =>
       _sharedOrder.value?.addresses?.find(
-        ({ id }: { id: string }) =>
-          id === (_sharedOrder.value as Order).billingAddressId,
+        ({ id }: { id: string }) => id === _sharedOrder.value?.billingAddressId,
       ),
   );
   const shippingAddress = computed(
@@ -195,12 +183,25 @@ export function useOrderDetails(
   const status = computed(() => _sharedOrder.value?.stateMachineState?.name);
 
   async function loadOrderDetails() {
-    const orderDetailsResponse = await getOrderDetails(
-      orderId,
-      deepMerge(orderAssociations, associations ? associations : {}),
-      apiInstance,
+    const mergedAssociations = deepMerge(
+      orderAssociations,
+      associations ? associations : {},
+    );
+    const params = deepMerge(mergedAssociations, {
+      filter: [
+        {
+          type: "equals",
+          field: "id",
+          value: orderId,
+        },
+      ],
+    });
+
+    const orderDetailsResponse = await apiClient.invoke(
+      "readOrder post /order",
+      params,
     );
-    _sharedOrder.value = orderDetailsResponse ?? null;
+    _sharedOrder.value = orderDetailsResponse.orders.elements?.[0] ?? null;
   }
 
   async function handlePayment(
@@ -208,55 +209,60 @@ export function useOrderDetails(
     errorUrl?: string,
     paymentDetails?: unknown,
   ) {
-    const resp = await apiHandlePayment(
+    const resp = await apiClient.invoke(
+      "handlePaymentMethod post /handle-payment",
       {
         orderId,
         finishUrl,
         errorUrl,
-        paymentDetails,
+        // paymentDetails?: unknown, TODO: is this necessary? If yes - add to schema, if no - remove
       },
-      apiInstance,
     );
 
-    paymentUrl.value = resp?.redirectUrl;
+    paymentUrl.value = resp.redirectUrl;
   }
 
   async function cancel() {
-    const response = await cancelOrder(orderId, apiInstance);
+    await apiClient.invoke("cancelOrder post /order/state/cancel", {
+      orderId: orderId,
+    });
     await loadOrderDetails();
   }
   async function changePaymentMethod(paymentMethodId: string) {
-    await changeOrderPaymentMethod(orderId, paymentMethodId, apiInstance);
+    await apiClient.invoke("orderSetPayment post /order/payment", {
+      orderId: orderId,
+      paymentMethodId: paymentMethodId,
+    });
 
     await loadOrderDetails();
   }
 
   async function getMediaFile(downloadId: string) {
-    const response = await getOrderDownloads(
+    const response = await apiClient.invoke(
+      "orderDownloadFile get /order/download/{orderId}/{downloadId}",
       {
         orderId,
         downloadId,
       },
-      apiInstance,
     );
 
     return response;
   }
 
   async function getDocumentFile(documentId: string, deepLinkCode: string) {
-    const response = await getDocumentDownload(
+    const response = await apiClient.invoke(
+      "download post /document/download/{documentId}/{deepLinkCode}",
       {
         documentId,
         deepLinkCode,
       },
-      apiInstance,
     );
 
     return response;
   }
 
-  const hasDocuments = computed(() => !!_sharedOrder.value.documents.length);
-  const documents = computed(() => _sharedOrder.value.documents);
+  const hasDocuments = computed(() => !!_sharedOrder.value?.documents.length);
+  const documents = computed(() => _sharedOrder.value?.documents || []);
 
   return {
     order: computed(() => _sharedOrder.value),
diff --git a/packages/composables/src/useOrderPayment.ts b/packages/composables/src/useOrderPayment.ts
index 53357d17a..df0ec81d4 100644
--- a/packages/composables/src/useOrderPayment.ts
+++ b/packages/composables/src/useOrderPayment.ts
@@ -1,17 +1,7 @@
-import { computed, ref, inject, provide } from "vue";
+import { computed, ref } from "vue";
 import type { ComputedRef, Ref } from "vue";
-
-import type {
-  Order,
-  OrderTransaction,
-  PaymentMethod,
-  StateMachineState,
-} from "@shopware-pwa/types";
-import {
-  changeOrderPaymentMethod,
-  handlePayment as apiHandlePayment,
-} from "@shopware-pwa/api-client";
-import { useShopwareContext } from "./useShopwareContext";
+import { useShopwareContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseOrderPaymentReturn = {
   /**
@@ -21,16 +11,16 @@ export type UseOrderPaymentReturn = {
   /**
    * Active payment transaction
    */
-  activeTransaction: ComputedRef<OrderTransaction | undefined>;
+  activeTransaction: ComputedRef<Schemas["OrderTransaction"] | undefined>;
   /**
    * Payment status
    */
-  state: ComputedRef<StateMachineState | null | undefined>;
+  state: ComputedRef<Schemas["StateMachineState"] | null | undefined>;
   paymentUrl: Ref<null | string>;
   /**
    * Payment method set for the order
    */
-  paymentMethod: ComputedRef<PaymentMethod | undefined | null>;
+  paymentMethod: ComputedRef<Schemas["PaymentMethod"] | undefined | null>;
 
   /**
    * Invokes the payment process for the order in the backend
@@ -61,9 +51,9 @@ export type UseOrderPaymentReturn = {
  * @category Customer & Account
  */
 export function useOrderPayment(
-  order: ComputedRef<Order | null | undefined>,
+  order: ComputedRef<Schemas["Order"] | null | undefined>,
 ): UseOrderPaymentReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
   const activeTransaction = computed(
     () =>
       order.value?.transactions?.find((t) => t.paymentMethod?.active === true),
@@ -80,22 +70,22 @@ export function useOrderPayment(
   async function handlePayment(
     finishUrl?: string,
     errorUrl?: string,
-    paymentDetails?: unknown,
+    // paymentDetails?: unknown, // TODO: check if it's needed
   ): Promise<void | unknown> {
     if (!order.value) {
       return;
     }
-    const resp = await apiHandlePayment(
+    const resp = await apiClient.invoke(
+      "handlePaymentMethod post /handle-payment",
       {
-        orderId: order.value?.id,
-        finishUrl,
+        orderId: order.value.id,
         errorUrl,
-        paymentDetails,
+        finishUrl,
+        // paymentDetails,
       },
-      apiInstance,
     );
 
-    paymentUrl.value = resp?.redirectUrl;
+    paymentUrl.value = resp.redirectUrl;
 
     return resp;
   }
@@ -104,7 +94,10 @@ export function useOrderPayment(
     if (!order.value) {
       return;
     }
-    changeOrderPaymentMethod(order.value?.id, paymentMethodId, apiInstance);
+    await apiClient.invoke("orderSetPayment post /order/payment", {
+      orderId: order.value.id,
+      paymentMethodId,
+    });
   }
 
   return {
diff --git a/packages/composables/src/usePrice.test.ts b/packages/composables/src/usePrice.test.ts
index 0d9058ea9..e64de0302 100644
--- a/packages/composables/src/usePrice.test.ts
+++ b/packages/composables/src/usePrice.test.ts
@@ -1,63 +1,41 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import { createApp } from "vue";
+import { describe, expect, it } from "vitest";
 import { usePrice } from "./usePrice";
-
-export function withSetup(composable: any) {
-  let result;
-
-  vi.mock("./useSessionContext.ts", () => ({
-    useSessionContext() {
-      return {
-        sessionContext: {
-          currency: {
-            isoCode: "EUR",
-          },
-        },
-      };
-    },
-  }));
-
-  const app = createApp({
-    setup() {
-      result = composable();
-      // suppress missing template warning
-      // eslint-disable-next-line
-      return () => {};
-    },
-  });
-
-  app.mount(document.createElement("div"));
-  return [result, app];
-}
+import { useSetup } from "./_test";
 
 describe("usePrice", () => {
-  const { getFormattedPrice, update } = usePrice({
-    localeCode: "en-US",
-    currencyCode: "USD",
-  });
-
   it("should be defined", () => {
     expect(usePrice).toBeDefined();
   });
 
   it("should init price object", () => {
-    expect(getFormattedPrice("2")).toBe("$2.00");
+    const { vm } = useSetup(() =>
+      usePrice({
+        localeCode: "en-US",
+        currencyCode: "USD",
+      }),
+    );
+
+    expect(vm.getFormattedPrice("2")).toBe("$2.00");
   });
 
-  it("should update config", () => {
-    update({
+  it("should update config", async () => {
+    const { vm } = useSetup(usePrice);
+
+    await vm.update({
       localeCode: "de-DE",
       currencyCode: "EUR",
     });
-    // applied workaround for non-breaking space that is inserted by Intl.NumberFormat
-    expect(getFormattedPrice(4.1).replace(/\s/g, " ")).toBe("4,10 €");
+    expect(vm.getFormattedPrice(4.1)).toMatchInlineSnapshot('"4,10 €"');
   });
 
-  it("should return price with current locale", () => {
-    update({
+  it("should return price with current locale", async () => {
+    const { vm } = useSetup(usePrice);
+
+    await vm.update({
       currencyCode: "USD",
+      // @ts-expect-error string expected here
       currencyLocale: undefined,
-    } as any);
-    expect(getFormattedPrice(2.55).replace(/\s/g, " ")).toStrictEqual(`2,55 $`);
+    });
+    expect(vm.getFormattedPrice(2.55)).toMatchInlineSnapshot('"2,55 $"');
   });
 });
diff --git a/packages/composables/src/usePrice.ts b/packages/composables/src/usePrice.ts
index df3411bfd..37f5468d3 100644
--- a/packages/composables/src/usePrice.ts
+++ b/packages/composables/src/usePrice.ts
@@ -1,6 +1,6 @@
 import { ref, watch } from "vue";
 import { createSharedComposable } from "@vueuse/core";
-import { useSessionContext } from "./useSessionContext";
+import { useSessionContext } from "#imports";
 
 export type UsePriceReturn = {
   /**
@@ -84,7 +84,7 @@ function _usePrice(params?: {
       if (!!newCurrency)
         update({
           // locale code is read only once on SSR because it's unavailable in the context
-          currencyCode: newCurrency?.isoCode as string,
+          currencyCode: newCurrency?.isoCode,
         });
     },
     {
diff --git a/packages/composables/src/useProduct.spec.ts b/packages/composables/src/useProduct.spec.ts
deleted file mode 100644
index 0a2926fcf..000000000
--- a/packages/composables/src/useProduct.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { shallowMount } from "@vue/test-utils";
-import { useProduct } from "./useProduct";
-import mockedProduct from "./mocks/Product";
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const { product, configurator, changeVariant } = useProduct(mockedProduct);
-    return { product, configurator, changeVariant };
-  },
-};
-
-describe("useProduct", () => {
-  const wrapper = shallowMount(Component);
-
-  it("should return product object", () => {
-    expect(wrapper.vm.product).toStrictEqual(mockedProduct);
-  });
-
-  it("should return undefined configurator object", () => {
-    expect(wrapper.vm.configurator).toBe(undefined);
-  });
-});
diff --git a/packages/composables/src/useProduct.test.ts b/packages/composables/src/useProduct.test.ts
new file mode 100644
index 000000000..a53498657
--- /dev/null
+++ b/packages/composables/src/useProduct.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from "vitest";
+import { useProduct } from "./useProduct";
+import mockedProduct from "./mocks/Product";
+import { useSetup } from "./_test";
+
+describe("useProduct", () => {
+  it("should return product object", () => {
+    const { vm } = useSetup(() => useProduct(mockedProduct));
+
+    expect(vm.product).toStrictEqual(mockedProduct);
+  });
+
+  it("should return undefined configurator object", () => {
+    const { vm } = useSetup(() => useProduct(mockedProduct));
+
+    expect(vm.configurator).toBe(undefined);
+  });
+});
diff --git a/packages/composables/src/useProduct.ts b/packages/composables/src/useProduct.ts
index de08048dd..618b4a432 100644
--- a/packages/composables/src/useProduct.ts
+++ b/packages/composables/src/useProduct.ts
@@ -1,24 +1,24 @@
 import { computed } from "vue";
 import type { ComputedRef, Ref } from "vue";
-import type { Product, PropertyGroup } from "@shopware-pwa/types";
-import { _useContext } from "./internal/_useContext";
 import ContextError from "./helpers/ContextError";
+import type { Schemas } from "#shopware";
+import { useContext } from "#imports";
 
 export type UseProductReturn = {
   /**
    * Returns product object
    * {@link Product} object
    */
-  product: ComputedRef<Product>;
+  product: ComputedRef<Schemas["Product"]>;
   /**
    * {@link PropertyGroup} array that defines the product possible configurations
    */
-  configurator: ComputedRef<PropertyGroup[]>;
+  configurator: ComputedRef<Schemas["PropertyGroup"][]>;
   /**
    * Merges the current product with the new variant data
    * @param variant - {@link Product} object with the new variant data
    */
-  changeVariant(variant: Partial<Product>): void;
+  changeVariant(variant: Partial<Schemas["Product"]>): void;
 };
 
 /**
@@ -27,19 +27,19 @@ export type UseProductReturn = {
  * @category Product
  */
 export function useProduct(
-  product?: Ref<Product> | Product,
-  configurator?: Ref<PropertyGroup[]> | PropertyGroup[],
+  product?: Ref<Schemas["Product"]> | Schemas["Product"],
+  configurator?: Ref<Schemas["PropertyGroup"][]> | Schemas["PropertyGroup"][],
 ): UseProductReturn {
-  const _product = _useContext("product", { context: product });
+  const _product = useContext("product", { context: product });
   if (!_product.value) {
     // TODO link docs with composables context usage
     throw new ContextError("Product");
   }
-  const _configurator = _useContext("configurator", {
+  const _configurator = useContext("configurator", {
     context: product && configurator,
   });
 
-  function changeVariant(variant: Partial<Product>) {
+  function changeVariant(variant: Partial<Schemas["Product"]>) {
     _product.value = Object.assign({}, _product.value, variant);
   }
 
diff --git a/packages/composables/src/useProductAssociations.spec.ts b/packages/composables/src/useProductAssociations.spec.ts
index e1ea0e33e..366a01076 100644
--- a/packages/composables/src/useProductAssociations.spec.ts
+++ b/packages/composables/src/useProductAssociations.spec.ts
@@ -1,69 +1,61 @@
 import { describe, expect, it, vi } from "vitest";
-import { shallowMount } from "@vue/test-utils";
 import { useProductAssociations } from "./useProductAssociations";
 import { computed } from "vue";
-import * as apiExports from "@shopware-pwa/api-client";
 import mockedProduct from "./mocks/Product";
 import mockedCrossSelling from "./mocks/CrossSellingResponse";
+import { useSetup } from "./_test";
 
-const getMockProvide = () => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {},
-        },
-      },
-    },
-  },
-});
-
-const getLoadAssociationsParams = (method?: string, searchParams?: any) => {
-  return {
-    method: method ?? null,
-    searchParams: searchParams ?? null,
-  };
-};
+describe("useProductAssociations", () => {
+  console.error = vi.fn();
 
-const Component = (mockedProductData) => ({
-  template: "<div/>",
-  props: {},
-  setup() {
-    const { isLoading, productAssociations, loadAssociations } =
+  it("productAssociations should be empty", () => {
+    const { vm } = useSetup(() =>
       useProductAssociations(
-        computed(() => mockedProductData),
+        computed(() => mockedProduct),
         {
           associationContext: "cross-selling",
         },
-      );
-    return { isLoading, productAssociations, loadAssociations };
-  },
-});
-
-describe("useProductAssociations", () => {
-  vi.spyOn(apiExports, "invokePost").mockImplementation(() => {
-    return new Promise((resolve) => {
-      resolve({ data: mockedCrossSelling });
-    });
-  });
-
-  const wrapper = shallowMount(Component(mockedProduct), getMockProvide());
+      ),
+    );
 
-  it("productAssociations should be empty", () => {
-    expect(wrapper.vm.productAssociations).toStrictEqual([]);
+    expect(vm.productAssociations).toStrictEqual([]);
   });
 
   it("load productAssociations - GET - Error", async () => {
-    vi.spyOn(apiExports, "invokeGet").mockImplementation(() => {
-      throw new Error();
+    const { vm, injections } = useSetup(() =>
+      useProductAssociations(
+        computed(() => mockedProduct),
+        {
+          associationContext: "cross-selling",
+        },
+      ),
+    );
+    injections.apiClient.invoke.mockRejectedValue("PROBLEM");
+
+    await vm.loadAssociations({
+      searchParams: {},
     });
-    wrapper.vm.loadAssociations(getLoadAssociationsParams());
-    expect(wrapper.vm.productAssociations).toStrictEqual([]);
+    expect(vm.productAssociations).toStrictEqual([]);
+    expect(console.error).toBeCalledWith(
+      "[useProductAssociations][loadAssociations][error]:",
+      "PROBLEM",
+    );
   });
 
   it("load productAssociations - POST", async () => {
-    await wrapper.vm.loadAssociations(
-      getLoadAssociationsParams("post", {
+    const { vm, injections } = useSetup(() =>
+      useProductAssociations(
+        computed(() => mockedProduct),
+        {
+          associationContext: "cross-selling",
+        },
+      ),
+    );
+    injections.apiClient.invoke.mockResolvedValue(mockedCrossSelling);
+
+    await vm.loadAssociations({
+      method: "post",
+      searchParams: {
         associations: {
           media: {},
           cover: {
@@ -72,33 +64,28 @@ describe("useProductAssociations", () => {
             },
           },
         },
-      }),
-    );
+      },
+    });
 
-    expect(wrapper.vm.productAssociations).toStrictEqual(mockedCrossSelling);
+    expect(vm.productAssociations).toStrictEqual(mockedCrossSelling);
   });
 
   it("load productAssociations - POST - no search params", async () => {
-    await wrapper.vm.loadAssociations(getLoadAssociationsParams("post"));
-
-    expect(wrapper.vm.productAssociations).toStrictEqual(mockedCrossSelling);
-  });
+    const { vm, injections } = useSetup(() =>
+      useProductAssociations(
+        computed(() => mockedProduct),
+        {
+          associationContext: "cross-selling",
+        },
+      ),
+    );
+    injections.apiClient.invoke.mockResolvedValue(mockedCrossSelling);
 
-  it("load productAssociations - GET", async () => {
-    vi.spyOn(apiExports, "invokeGet").mockImplementation(() => {
-      return new Promise((resolve) => {
-        resolve({ data: mockedCrossSelling });
-      });
+    await vm.loadAssociations({
+      method: "post",
+      searchParams: {},
     });
 
-    await wrapper.vm.loadAssociations(getLoadAssociationsParams("get"));
-
-    expect(wrapper.vm.productAssociations).toStrictEqual(mockedCrossSelling);
-  });
-
-  it("no product was provided", async () => {
-    expect(() =>
-      shallowMount(Component(null), getMockProvide()),
-    ).toThrowError();
+    expect(vm.productAssociations).toStrictEqual(mockedCrossSelling);
   });
 });
diff --git a/packages/composables/src/useProductAssociations.ts b/packages/composables/src/useProductAssociations.ts
index d7f38fe2d..eb9ea42df 100644
--- a/packages/composables/src/useProductAssociations.ts
+++ b/packages/composables/src/useProductAssociations.ts
@@ -1,17 +1,7 @@
 import { ref, computed } from "vue";
 import type { ComputedRef } from "vue";
-import type {
-  Product,
-  CrossSelling,
-  ShopwareSearchParams,
-} from "@shopware-pwa/types";
-
-import {
-  invokeGet,
-  invokePost,
-  getProductDetailsEndpoint,
-} from "@shopware-pwa/api-client";
-import { useShopwareContext } from "./useShopwareContext";
+import { useShopwareContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseProductAssociationsReturn = {
   /**
@@ -20,7 +10,7 @@ export type UseProductAssociationsReturn = {
    */
   loadAssociations(params: {
     method?: "post" | "get";
-    searchParams: ShopwareSearchParams;
+    searchParams: Schemas["Criteria"];
   }): Promise<void>;
   /**
    * If it's loading - indicator
@@ -29,7 +19,7 @@ export type UseProductAssociationsReturn = {
   /**
    * Product associations, like CrossSelling[]
    */
-  productAssociations: ComputedRef<CrossSelling[]>;
+  productAssociations: ComputedRef<Schemas["CrossSellingElementCollection"]>;
 };
 
 /**
@@ -38,7 +28,7 @@ export type UseProductAssociationsReturn = {
  * @category Product
  */
 export function useProductAssociations(
-  product: ComputedRef<Product>,
+  product: ComputedRef<Schemas["Product"]>,
   options: {
     associationContext: "cross-selling" | "reviews";
   },
@@ -48,42 +38,55 @@ export function useProductAssociations(
 
   const association = options.associationContext;
 
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
   const isLoading = ref(false);
-  const associations = ref([]);
+  const associations = ref<Schemas["CrossSellingElementCollection"]>([]);
 
   const loadAssociations = async (params: {
     method?: "post" | "get";
-    searchParams: ShopwareSearchParams;
+    searchParams: Schemas["Criteria"];
   }) => {
     isLoading.value = true;
-    const method = params.method || "get";
+    // const method = params.method || "get";
     try {
-      if (method && method === "get") {
-        const response = await invokeGet(
-          {
-            address: `${getProductDetailsEndpoint(
-              product.value.id,
-            )}/${association}${params.searchParams || ""}`,
-          },
-          apiInstance,
-        );
+      // TODO: someting might be wrong with the endpoint, figure it out and fix definitions
+      // if (method && method === "get") {
+      //   // const response = await invokeGet(
+      //   //   {
+      //   //     address: `${getProductDetailsEndpoint(
+      //   //       product.value.id as string,
+      //   //     )}/${association}${params.searchParams || ""}`,
+      //   //   },
+      //   //   apiInstance,
+      //   // );
+      //   const response = await apiClient.invoke(
+      //     "readProductDetail post /product/{productId}",
+      //     {
+      //       productId: product.value.id,
+      //     },
+      //   );
 
-        associations.value = response?.data as [];
-        return;
-      }
+      //   associations.value = response?.data as [];
+      //   return;
+      // }
 
-      const response = await invokePost(
+      // const response = await invokePost(
+      //   {
+      //     address: `${getProductDetailsEndpoint(
+      //       product.value.id as string,
+      //     )}/${association}`,
+      //     payload: params?.searchParams || {},
+      //   },
+      //   apiInstance,
+      // );
+      const response = await apiClient.invoke(
+        "readProductCrossSellings post /product/{productId}/cross-selling",
         {
-          address: `${getProductDetailsEndpoint(
-            product.value.id,
-          )}/${association}`,
-          payload: params?.searchParams || {},
+          productId: product.value.id,
         },
-        apiInstance,
       );
 
-      associations.value = response?.data as [];
+      associations.value = response;
     } catch (error) {
       console.error(
         "[useProductAssociations][loadAssociations][error]:",
diff --git a/packages/composables/src/useProductConfigurator.spec.ts b/packages/composables/src/useProductConfigurator.spec.ts
index f1f1ed6a6..f27c0bf3d 100644
--- a/packages/composables/src/useProductConfigurator.spec.ts
+++ b/packages/composables/src/useProductConfigurator.spec.ts
@@ -1,58 +1,11 @@
 import { describe, expect, it, vi } from "vitest";
-import { shallowMount } from "@vue/test-utils";
 import { useProductConfigurator } from "./useProductConfigurator";
 import { ref } from "vue";
 import mockedProduct from "./mocks/Product";
 import mockedConfigurator from "./mocks/Configurator";
-import * as apiExports from "@shopware-pwa/api-client";
-
-const getMockProvide = () => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          defaults: {
-            headers: {
-              common: [],
-            },
-          },
-          config: {},
-        },
-      },
-    },
-  },
-});
-
-const Component = () => ({
-  template: "<div/>",
-  props: {},
-  setup() {
-    const {
-      handleChange,
-      findVariantForSelectedOptions,
-      isLoadingOptions,
-      getOptionGroups,
-      getSelectedOptions,
-    } = useProductConfigurator();
-    return {
-      handleChange,
-      findVariantForSelectedOptions,
-      isLoadingOptions,
-      getOptionGroups,
-      getSelectedOptions,
-    };
-  },
-});
+import { useSetup } from "./_test";
 
 describe("useProductConfigurator", () => {
-  const wrapper = shallowMount(Component(), getMockProvide());
-
-  vi.spyOn(apiExports, "invokePost").mockImplementation(() => {
-    return new Promise((resolve) => {
-      resolve({ data: { elements: [mockedProduct] } });
-    });
-  });
-
   vi.mock("./useProduct.ts", () => ({
     useProduct() {
       return {
@@ -63,34 +16,41 @@ describe("useProductConfigurator", () => {
   }));
 
   it("handleChange callback function was called", () => {
+    const { vm } = useSetup(useProductConfigurator);
     const mockedFn = vi.fn();
 
-    wrapper.vm.handleChange("test", "test", mockedFn);
+    vm.handleChange("test", "test", mockedFn);
     expect(mockedFn).toHaveBeenCalled();
   });
 
   it("findVariantForSelectedOptions", async () => {
+    const { vm, injections } = useSetup(useProductConfigurator);
+    injections.apiClient.invoke.mockResolvedValue({
+      elements: [mockedProduct],
+    });
+
     expect(
-      await wrapper.vm.findVariantForSelectedOptions({
+      await vm.findVariantForSelectedOptions({
         test: "test",
       }),
     ).toStrictEqual(mockedProduct);
 
-    expect(await wrapper.vm.findVariantForSelectedOptions()).toStrictEqual(
+    expect(await vm.findVariantForSelectedOptions()).toStrictEqual(
       mockedProduct,
     );
   });
 
   it("findVariantForSelectedOptions - error", async () => {
-    const spyPost = vi
-      .spyOn(apiExports, "invokePost")
-      .mockImplementation(() => {
-        throw new Error();
-      });
+    console.error = vi.fn();
+    const { vm, injections } = useSetup(useProductConfigurator);
+    injections.apiClient.invoke.mockRejectedValue("PROBLEM");
 
-    await wrapper.vm.findVariantForSelectedOptions({
+    await vm.findVariantForSelectedOptions({
       test: "test",
     });
-    expect(spyPost).toThrowError();
+    expect(console.error).toBeCalledWith(
+      "SwProductDetails:findVariantForSelectedOptions",
+      "PROBLEM",
+    );
   });
 });
diff --git a/packages/composables/src/useProductConfigurator.ts b/packages/composables/src/useProductConfigurator.ts
index 1219e62df..7f461f586 100644
--- a/packages/composables/src/useProductConfigurator.ts
+++ b/packages/composables/src/useProductConfigurator.ts
@@ -1,9 +1,8 @@
-import { ref, computed, unref, inject } from "vue";
+import { ref, computed } from "vue";
 import type { Ref, ComputedRef } from "vue";
-import type { Product, PropertyGroup } from "@shopware-pwa/types";
-import { useProduct, useShopwareContext } from ".";
-import { invokePost, getProductEndpoint } from "@shopware-pwa/api-client";
+import { useProduct, useShopwareContext } from "#imports";
 import { getTranslatedProperty } from "@shopware-pwa/helpers-next";
+import type { Schemas } from "#shopware";
 
 export type UseProductConfiguratorReturn = {
   /**
@@ -17,7 +16,7 @@ export type UseProductConfiguratorReturn = {
 
   findVariantForSelectedOptions(options?: {
     [key: string]: string;
-  }): Promise<Product | undefined>;
+  }): Promise<Schemas["Product"] | undefined>;
 
   /**
    * Indicates if the options are being (re)loaded
@@ -32,7 +31,7 @@ export type UseProductConfiguratorReturn = {
   /**
    * All assigned properties which the variant can be made of
    */
-  getOptionGroups: ComputedRef<PropertyGroup[]>;
+  getOptionGroups: ComputedRef<Schemas["PropertyGroup"][]>;
 };
 
 /**
@@ -41,20 +40,22 @@ export type UseProductConfiguratorReturn = {
  * @category Product
  */
 export function useProductConfigurator(): UseProductConfiguratorReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
   const { configurator, product } = useProduct();
 
-  const selected = ref({} as any);
+  const selected = ref<{
+    [key: string]: string;
+  }>({});
   const isLoadingOptions = ref(!!product.value.options?.length);
   const parentProductId = computed(() => product.value?.parentId);
-  const getOptionGroups = computed<PropertyGroup[]>(() => {
+  const getOptionGroups = computed<Schemas["PropertyGroup"][]>(() => {
     return configurator.value || [];
   });
 
   const findGroupCodeForOption = (optionId: string) => {
     const group = getOptionGroups.value.find((optionGroup) => {
-      const optionFound = optionGroup.options?.find((option: any) => {
+      const optionFound = optionGroup.options?.find((option) => {
         return option.id === optionId;
       });
       return !!optionFound;
@@ -73,43 +74,32 @@ export function useProductConfigurator(): UseProductConfiguratorReturn {
 
   async function findVariantForSelectedOptions(options?: {
     [code: string]: string;
-  }): Promise<Product | undefined> {
+  }): Promise<Schemas["Product"] | undefined> {
     const filter = [
       {
         type: "equals",
         field: "parentId",
-        value: parentProductId.value,
+        value: parentProductId.value as string,
       },
       ...Object.values(options || selected.value).map((id) => ({
         type: "equals",
         field: "optionIds",
-        value: id,
+        value: id as string,
       })),
     ];
     try {
-      /* istanbul ignore next */
-      if (apiInstance) {
-        apiInstance.defaults.headers.common["sw-include-seo-urls"] = "true";
-      }
-      const response = await invokePost(
-        {
-          address: getProductEndpoint(),
-          payload: {
-            limit: 1,
-            filter,
-            includes: {
-              product: ["id", "translated", "productNumber", "seoUrls"],
-              seo_url: ["seoPathInfo"],
-            },
-            associations: {
-              seoUrls: {},
-            },
-          },
+      const response = await apiClient.invoke("readProduct post /product", {
+        filter,
+        limit: 1,
+        includes: {
+          product: ["id", "translated", "productNumber", "seoUrls"],
+          seo_url: ["seoPathInfo"],
+        },
+        associations: {
+          seoUrls: {},
         },
-        apiInstance,
-      );
-      return (response as { data?: { elements?: Array<Product> } })?.data
-        ?.elements?.[0]; // return first matching product
+      });
+      return response?.elements?.[0]; // return first matching product
     } catch (e) {
       console.error("SwProductDetails:findVariantForSelectedOptions", e);
     }
@@ -134,6 +124,6 @@ export function useProductConfigurator(): UseProductConfiguratorReturn {
     findVariantForSelectedOptions,
     isLoadingOptions,
     getOptionGroups,
-    getSelectedOptions: selected,
+    getSelectedOptions: computed(() => selected.value),
   };
 }
diff --git a/packages/composables/src/useProductPrice.spec.ts b/packages/composables/src/useProductPrice.spec.ts
index 58431953b..113e85696 100644
--- a/packages/composables/src/useProductPrice.spec.ts
+++ b/packages/composables/src/useProductPrice.spec.ts
@@ -1,78 +1,41 @@
 import { describe, expect, it } from "vitest";
-import { shallowMount } from "@vue/test-utils";
 import { useProductPrice } from "./useProductPrice";
 import { ref } from "vue";
 import mockedProduct from "./mocks/Product";
-import mockerProductTierPrices from "./mocks/ProductTierPrices";
-
-const mockerProductTierPricesObj = mockerProductTierPrices.product;
-const getMockProvide = () => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {},
-        },
-      },
-    },
-  },
-});
-
-const Component = (mockedProductData) => ({
-  template: "<div/>",
-  props: {},
-  setup() {
-    const {
-      price,
-      totalPrice,
-      unitPrice,
-      displayFromVariants,
-      displayFrom,
-      tierPrices,
-      referencePrice,
-      isListPrice,
-    } = useProductPrice(ref(mockedProductData));
-    return {
-      price,
-      totalPrice,
-      unitPrice,
-      displayFromVariants,
-      displayFrom,
-      tierPrices,
-      referencePrice,
-      isListPrice,
-    };
-  },
-});
+import { useSetup } from "./_test";
+import productTierPrices from "./mocks/ProductTierPrices";
+import type { Schemas } from "#shopware";
 
 describe("useProductPrice", () => {
   it("product price are displayed - standard product", () => {
-    const wrapper = shallowMount(Component(mockedProduct), getMockProvide());
-    expect(wrapper.vm.price).toStrictEqual(mockedProduct.calculatedPrice);
-    expect(wrapper.vm.totalPrice).toBe(14.45);
-    expect(wrapper.vm.unitPrice).toBe(14.45);
-    expect(wrapper.vm.displayFromVariants).toBe(false);
-    expect(wrapper.vm.displayFrom).toBe(false);
-    expect(wrapper.vm.tierPrices).toStrictEqual([]);
-    expect(wrapper.vm.referencePrice).toStrictEqual(
-      mockedProduct.calculatedPrice.referencePrice,
+    const { vm } = useSetup(() => useProductPrice(ref(mockedProduct)));
+
+    expect(vm.price).toStrictEqual(mockedProduct.calculatedPrice);
+    expect(vm.totalPrice).toBe(14.45);
+    expect(vm.unitPrice).toBe(14.45);
+    expect(vm.displayFromVariants).toBe(false);
+    expect(vm.displayFrom).toBe(false);
+    expect(vm.tierPrices).toStrictEqual([]);
+    expect(vm.referencePrice).toStrictEqual(
+      mockedProduct.calculatedPrice?.referencePrice,
     );
-    expect(wrapper.vm.isListPrice).toBe(false);
+    expect(vm.isListPrice).toBe(false);
   });
 
   it("product price are displayed - product with tier prices", () => {
-    const wrapper = shallowMount(
-      Component(mockerProductTierPricesObj),
-      getMockProvide(),
+    const { vm } = useSetup(() =>
+      useProductPrice(
+        ref(productTierPrices.product as unknown as Schemas["Product"]),
+      ),
     );
 
-    expect(wrapper.vm.price).toStrictEqual(
-      mockerProductTierPricesObj.calculatedPrices[2],
+    expect(vm.price).toStrictEqual(
+      productTierPrices.product.calculatedPrices[2],
     );
-    expect(wrapper.vm.referencePrice).toStrictEqual(
-      mockerProductTierPricesObj.calculatedPrices[0].referencePrice,
+    expect(vm.referencePrice).toStrictEqual(
+      productTierPrices.product.calculatedPrices[0].referencePrice,
     );
-    expect(wrapper.vm.displayFrom).toBe(true);
-    expect(wrapper.vm.displayFromVariants).toBe(20);
+    expect(vm.displayFrom).toBe(true);
+    expect(vm.displayFromVariants).toBe(20);
   });
 });
diff --git a/packages/composables/src/useProductPrice.ts b/packages/composables/src/useProductPrice.ts
index b96a472e9..19c76487f 100644
--- a/packages/composables/src/useProductPrice.ts
+++ b/packages/composables/src/useProductPrice.ts
@@ -1,10 +1,6 @@
+import type { Schemas } from "#shopware";
 import { getProductTierPrices } from "@shopware-pwa/helpers-next";
 import type { TierPrice } from "@shopware-pwa/helpers-next";
-import type {
-  CalculatedPrice,
-  Product,
-  ReferencePrice,
-} from "@shopware-pwa/types";
 import { computed } from "vue";
 import type { ComputedRef, Ref } from "vue";
 
@@ -12,7 +8,7 @@ export type UseProductPriceReturn = {
   /**
    * Whole calculated price object
    */
-  price: ComputedRef<CalculatedPrice | undefined>;
+  price: ComputedRef<Schemas["CalculatedPrice"] | undefined>;
   /**
    * Calculated price value for one selling unit
    */
@@ -24,7 +20,9 @@ export type UseProductPriceReturn = {
   /**
    * Can be used if isListPrice is set to true
    */
-  referencePrice: ComputedRef<ReferencePrice | undefined>;
+  referencePrice: ComputedRef<
+    Schemas["CalculatedPrice"]["referencePrice"] | undefined
+  >;
   /**
    * determines if `price` contains the minimum tier price
    */
@@ -49,32 +47,34 @@ export type UseProductPriceReturn = {
  * @public
  * @category Product
  */
-export function useProductPrice(product: Ref<Product>): UseProductPriceReturn {
-  const _cheapest: ComputedRef<CalculatedPrice | undefined> = computed(
-    () => product.value?.calculatedCheapestPrice,
-  );
+export function useProductPrice(
+  product: Ref<Schemas["Product"]>,
+): UseProductPriceReturn {
+  const _cheapest: ComputedRef<Schemas["CalculatedPrice"] | undefined> =
+    computed(() => product.value?.calculatedCheapestPrice);
 
   /**
    * calculatedPrices are used for product with tier prices
    */
-  const _real: ComputedRef<CalculatedPrice | undefined> = computed(() =>
-    product.value?.calculatedPrices?.length > 0
-      ? product.value?.calculatedPrices[0]
-      : product.value?.calculatedPrice,
-  );
-  const referencePrice: ComputedRef<ReferencePrice | undefined> = computed(
-    () => _real?.value?.referencePrice,
+  const _real: ComputedRef<Schemas["CalculatedPrice"] | undefined> = computed(
+    () =>
+      (product.value?.calculatedPrices?.length ?? 0) > 0
+        ? product.value?.calculatedPrices?.[0]
+        : product.value?.calculatedPrice,
   );
+  const referencePrice: ComputedRef<
+    Schemas["CalculatedPrice"]["referencePrice"] | undefined
+  > = computed(() => _real?.value?.referencePrice);
 
   const _displayParent: ComputedRef<boolean> = computed(
     () =>
-      (product.value as any)?.variantListingConfig?.displayParent &&
+      !!product.value?.variantListingConfig?.displayParent &&
       product.value?.parentId === null,
   );
 
   const displayFrom: ComputedRef<boolean> = computed(
     () =>
-      product.value?.calculatedPrices?.length > 1 ||
+      (product.value?.calculatedPrices?.length ?? 0) > 1 ||
       !!(_displayParent.value && displayFromVariants.value),
   );
 
@@ -86,17 +86,19 @@ export function useProductPrice(product: Ref<Product>): UseProductPriceReturn {
       _cheapest?.value?.unitPrice,
   );
 
-  const _price: ComputedRef<CalculatedPrice | undefined> = computed(() => {
-    if (displayFrom.value && getProductTierPrices(product.value).length > 1) {
-      const lowest = product.value?.calculatedPrices.reduce(
-        (previous, current) => {
-          return current.unitPrice < previous.unitPrice ? current : previous;
-        },
-      );
-      return lowest || _cheapest.value;
-    }
-    return _real.value;
-  });
+  const _price: ComputedRef<Schemas["CalculatedPrice"] | undefined> = computed(
+    () => {
+      if (displayFrom.value && getProductTierPrices(product.value).length > 1) {
+        const lowest = product.value?.calculatedPrices?.reduce(
+          (previous, current) => {
+            return current.unitPrice < previous.unitPrice ? current : previous;
+          },
+        );
+        return lowest || _cheapest.value;
+      }
+      return _real.value;
+    },
+  );
 
   const unitPrice: ComputedRef<number | undefined> = computed(
     () => _price.value?.unitPrice,
@@ -104,7 +106,7 @@ export function useProductPrice(product: Ref<Product>): UseProductPriceReturn {
   const totalPrice: ComputedRef<number | undefined> = computed(
     () => _price.value?.totalPrice,
   );
-  const price: ComputedRef<CalculatedPrice | undefined> = computed(
+  const price: ComputedRef<Schemas["CalculatedPrice"] | undefined> = computed(
     () => _price.value,
   );
 
diff --git a/packages/composables/src/useProductReviews.ts b/packages/composables/src/useProductReviews.ts
index 7d63f9527..2e2ad286c 100644
--- a/packages/composables/src/useProductReviews.ts
+++ b/packages/composables/src/useProductReviews.ts
@@ -1,19 +1,13 @@
 import { ref, computed } from "vue";
 import type { Ref, ComputedRef } from "vue";
-import { getProductReviews, addProductReview } from "@shopware-pwa/api-client";
-// import { useDefaults, getApplicationContext } from "@shopware-pwa/composables";
-import type {
-  Product,
-  ProductReview,
-  ShopwareSearchParams,
-} from "@shopware-pwa/types";
-import { useShopwareContext } from "./useShopwareContext";
+import { useShopwareContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseProductReviewsReturn = {
   /**
    * All reviews added to the product
    */
-  productReviews: ComputedRef<ProductReview[]>;
+  productReviews: ComputedRef<Schemas["ProductReview"][]>;
   /**
    * Adds a review to the product
    * @param data `title` - review title, `content` - review content, `points` - review points (range of 1-5)
@@ -26,10 +20,10 @@ export type UseProductReviewsReturn = {
   }): Promise<void>;
   /**
    * Fetches the reviews list and assigns the result to the `productReviews` property
-   * @param parameters {@link ShopwareSearchParams}
+   * @param parameters {@link Schemas["Criteria"]}
    * @returns
    */
-  loadProductReviews(parameters?: ShopwareSearchParams): Promise<void>;
+  loadProductReviews(parameters?: Schemas["Criteria"]): Promise<void>;
 };
 
 /**
@@ -38,20 +32,21 @@ export type UseProductReviewsReturn = {
  * @category Product
  */
 export function useProductReviews(
-  product: Ref<Product>,
+  product: Ref<Schemas["Product"]>,
 ): UseProductReviewsReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
-  const productReviews: Ref<ProductReview[]> = ref([]);
+  const productReviews: Ref<Schemas["ProductReview"][]> = ref([]);
 
   const loadProductReviews = async (
-    parameters: ShopwareSearchParams = {},
+    parameters: Schemas["Criteria"] = {},
   ): Promise<void> => {
-    const fetchedReviews = await getProductReviews(
-      product.value.id,
-      undefined,
-      // Object.assign({}, getDefaults(), parameters),
-      apiInstance,
+    const fetchedReviews = await apiClient.invoke(
+      "readProductReviews post /product/{productId}/reviews",
+      {
+        productId: product.value.id,
+        ...parameters,
+      },
     );
     productReviews.value = fetchedReviews.elements ?? [];
   };
@@ -61,7 +56,13 @@ export function useProductReviews(
     content: string;
     points: number;
   }) => {
-    await addProductReview(product.value.id, data, apiInstance);
+    await apiClient.invoke(
+      "saveProductReview post /product/{productId}/review",
+      {
+        productId: product.value.id,
+        ...data,
+      },
+    );
   };
 
   return {
diff --git a/packages/composables/src/useProductSearch.ts b/packages/composables/src/useProductSearch.ts
index 73a8001ea..ea97c6719 100644
--- a/packages/composables/src/useProductSearch.ts
+++ b/packages/composables/src/useProductSearch.ts
@@ -1,27 +1,22 @@
-import { getProduct } from "@shopware-pwa/api-client";
-import type {
-  ProductResponse,
-  ShopwareSearchParams,
-} from "@shopware-pwa/types";
-import { useShopwareContext } from "./useShopwareContext";
+import { useShopwareContext } from "#imports";
 import { cmsAssociations } from "./cms/cmsAssociations";
-import { _useContext } from "./internal/_useContext";
 import deepMerge from "./helpers/deepMerge";
+import type { Schemas } from "#shopware";
 
 export type UseProductSearchReturn = {
   /**
    * Searches for a product by its id
    * @param productId
    * @param options - optional parameters accepts `withCmsAssociations` flag to fetch cms-related associations and criteria
-   * @returns {Promise<ProductResponse>}
+   * @returns {Promise<Schemas['ProductDetailResponse']>}
    */
   search: (
     productId: string,
     options?: {
       withCmsAssociations?: boolean;
-      criteria?: Partial<ShopwareSearchParams>;
+      criteria?: Partial<Schemas["Criteria"]>;
     },
-  ) => Promise<ProductResponse>;
+  ) => Promise<Schemas["ProductDetailResponse"]>;
 };
 
 /**
@@ -34,24 +29,30 @@ export function useProductSearch(): {
     productId: string,
     options?: {
       withCmsAssociations?: boolean;
-      criteria?: Partial<ShopwareSearchParams>;
+      criteria?: Partial<Schemas["Criteria"]>;
     },
-  ) => Promise<ProductResponse>;
+  ) => Promise<Schemas["ProductDetailResponse"]>;
 } {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
   const search = async (
     productId: string,
     options?: {
       withCmsAssociations?: boolean;
-      criteria?: Partial<ShopwareSearchParams>;
+      criteria?: Partial<Schemas["Criteria"]>;
     },
   ) => {
     const associations = deepMerge(
       options?.withCmsAssociations ? cmsAssociations : {},
       options?.criteria,
     );
-    const result = await getProduct(productId, associations, apiInstance);
+    const result = await apiClient.invoke(
+      "readProductDetail post /product/{productId}",
+      {
+        productId,
+        ...associations,
+      },
+    );
     return result;
   };
 
diff --git a/packages/composables/src/useProductSearchSuggest.ts b/packages/composables/src/useProductSearchSuggest.ts
index 07846c616..35f4fcee3 100644
--- a/packages/composables/src/useProductSearchSuggest.ts
+++ b/packages/composables/src/useProductSearchSuggest.ts
@@ -1,8 +1,7 @@
 import { ref } from "vue";
 import type { ComputedRef, Ref } from "vue";
-
-import type { ShopwareSearchParams, Product } from "@shopware-pwa/types";
-import { useListing } from "./useListing";
+import { useListing } from "#imports";
+import type { Schemas, RequestParameters } from "#shopware";
 
 export type UseProductSearchSuggestReturn = {
   /**
@@ -18,15 +17,17 @@ export type UseProductSearchSuggestReturn = {
    * @param additionalCriteria - additional search criteria of type {@link ShopwareSearchParams}
    * @returns
    */
-  search(additionalCriteria?: Partial<ShopwareSearchParams>): Promise<void>;
+  search(
+    additionalCriteria?: Partial<RequestParameters<"searchPage">>,
+  ): Promise<void>;
   /**
    * Loads more products for current search criteria
    */
-  loadMore(): Promise<void>;
+  loadMore(criteria: RequestParameters<"searchPage">): Promise<void>;
   /**
    * Returns the product list found by the search
    */
-  getProducts: ComputedRef<Product[]>;
+  getProducts: ComputedRef<Schemas["ProductListingResult"]["elements"]>;
   /**
    * Returns the total number of products found by the search
    */
@@ -46,11 +47,11 @@ export function useProductSearchSuggest(): UseProductSearchSuggestReturn {
   });
 
   const search = async (
-    additionalCriteria: Partial<ShopwareSearchParams> = {},
+    additionalCriteria = {} as RequestParameters<"searchPage">,
   ) => {
-    const searchCriteria = {
-      query: searchTerm.value,
+    const searchCriteria: RequestParameters<"searchPage"> = {
       ...additionalCriteria,
+      search: searchTerm.value,
     };
     return listingComposable.search(searchCriteria, {
       preventRouteChange: true,
diff --git a/packages/composables/src/useProductWishlist.test.ts b/packages/composables/src/useProductWishlist.test.ts
index 86ef6a6dc..3237a06f2 100644
--- a/packages/composables/src/useProductWishlist.test.ts
+++ b/packages/composables/src/useProductWishlist.test.ts
@@ -1,77 +1,28 @@
-import { describe, expect, it, vi } from "vitest";
-import { shallowMount } from "@vue/test-utils";
+import { describe, expect, it } from "vitest";
 import { ref } from "vue";
 import { useProductWishlist } from "./useProductWishlist";
-
-import * as useLocalWishlist from "./useLocalWishlist";
-import * as useSyncWishlist from "./useSyncWishlist";
-
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const { addToWishlist, removeFromWishlist, isInWishlist } =
-      useProductWishlist(
-        ref({
-          id: "test1",
-        }) as any,
-      );
-
-    return {
-      addToWishlist,
-      removeFromWishlist,
-      isInWishlist,
-    };
-  },
-};
-
-const getMockProvide = () => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {},
-        },
-      },
-    },
-  },
-});
-
-const mockedPromiseResolve = () => {
-  return new Promise((resolve) => {
-    resolve(true);
-  });
-};
+import { useSetup } from "./_test";
+import type { Schemas } from "#shopware";
 
 describe("useProductWishlist", () => {
-  const wrapper = shallowMount(Component, getMockProvide());
-
-  vi.spyOn(useLocalWishlist, "useLocalWishlist").mockImplementation((): any => {
-    return {
-      getWishlistProducts: () => undefined,
-      addToWishlist: mockedPromiseResolve,
-      removeFromWishlist: mockedPromiseResolve,
-    };
-  });
-
-  vi.spyOn(useSyncWishlist, "useSyncWishlist").mockImplementation((): any => {
-    return {
-      getWishlistProductsSync: () => undefined,
-      addToWishlistSync: () => undefined,
-      removeFromWishlistSync: () => undefined,
-    };
-  });
-
   describe("methods not logged in", () => {
     describe("addToWishlist", () => {
       it("wishlist add product", () => {
-        expect(wrapper.vm.addToWishlist()).resolves.toEqual(undefined);
+        const { vm } = useSetup(() =>
+          useProductWishlist(ref({ id: "test1" } as Schemas["Product"])),
+        );
+
+        expect(vm.addToWishlist()).resolves.toEqual(undefined);
       });
     });
 
     describe("removeFromWishlist", () => {
       it("wishlist remove product", () => {
-        expect(wrapper.vm.removeFromWishlist()).resolves.toEqual(undefined);
+        const { vm } = useSetup(() =>
+          useProductWishlist(ref({ id: "test1" } as Schemas["Product"])),
+        );
+
+        expect(vm.removeFromWishlist()).resolves.toEqual(undefined);
       });
     });
   });
diff --git a/packages/composables/src/useProductWishlist.ts b/packages/composables/src/useProductWishlist.ts
index 330c36251..bdfceeec9 100644
--- a/packages/composables/src/useProductWishlist.ts
+++ b/packages/composables/src/useProductWishlist.ts
@@ -1,9 +1,7 @@
 import { computed } from "vue";
 import type { Ref } from "vue";
-import type { Product } from "@shopware-pwa/types";
-import { useUser } from "./useUser";
-import { useLocalWishlist } from "./useLocalWishlist";
-import { useSyncWishlist } from "./useSyncWishlist";
+import { useUser, useLocalWishlist, useSyncWishlist } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseProductWishlistReturn = {
   /**
@@ -26,7 +24,7 @@ export type UseProductWishlistReturn = {
  * @category Product
  */
 export function useProductWishlist(
-  product: Ref<Product>,
+  product: Ref<Schemas["Product"]>,
 ): UseProductWishlistReturn {
   const { isLoggedIn } = useUser();
   const {
diff --git a/packages/composables/src/useSalutations.spec.ts b/packages/composables/src/useSalutations.spec.ts
index 7c70240f7..b0ed02f4d 100644
--- a/packages/composables/src/useSalutations.spec.ts
+++ b/packages/composables/src/useSalutations.spec.ts
@@ -1,47 +1,21 @@
 import { useSalutations } from "./useSalutations";
 import { describe, expect, it, vi } from "vitest";
-import { shallowMount } from "@vue/test-utils";
+import { flushPromises } from "@vue/test-utils";
 import Salutations from "./mocks/Salutations";
-import * as apiExports from "@shopware-pwa/api-client";
-
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const { mountedCallback, fetchSalutations, getSalutations } =
-      useSalutations();
-
-    return {
-      mountedCallback,
-      fetchSalutations,
-      getSalutations,
-    };
-  },
-};
-
-const getMockProvide = () => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {},
-        },
-      },
-    },
-  },
-});
+import { useSetup } from "./_test";
 
 describe("useSalutations", () => {
-  vi.spyOn(apiExports, "getAvailableSalutations").mockImplementation(() => {
-    return new Promise((resolve) => {
-      resolve({ elements: Salutations });
+  it("should init value on init", async () => {
+    const { vm, injections } = useSetup(useSalutations, {
+      apiClient: {
+        invoke: vi.fn().mockResolvedValue({
+          elements: Salutations,
+        }),
+      },
     });
-  });
+    await flushPromises();
 
-  const wrapper = shallowMount(Component, getMockProvide());
-
-  it("should init value on init", async () => {
-    await wrapper.vm.mountedCallback();
-    expect(wrapper.vm.getSalutations).toStrictEqual(Salutations);
+    expect(injections.apiClient.invoke).toBeCalledTimes(1);
+    expect(vm.getSalutations).toStrictEqual(Salutations);
   });
 });
diff --git a/packages/composables/src/useSalutations.ts b/packages/composables/src/useSalutations.ts
index e958193ba..ee4bb4dd3 100644
--- a/packages/composables/src/useSalutations.ts
+++ b/packages/composables/src/useSalutations.ts
@@ -1,15 +1,14 @@
 import { ref, computed, onMounted, inject, provide } from "vue";
 import type { Ref, ComputedRef } from "vue";
-import { getAvailableSalutations } from "@shopware-pwa/api-client";
-import type { ClientApiError, Salutation } from "@shopware-pwa/types";
-import { useShopwareContext } from "./useShopwareContext";
+import { useShopwareContext } from "#imports";
+import type { Schemas } from "#shopware";
+import { ApiClientError } from "@shopware/api-client";
 
 export type UseSalutationsReturn = {
-  mountedCallback(): Promise<void>;
   /**
    * All available salutations
    */
-  getSalutations: ComputedRef<Salutation[]>;
+  getSalutations: ComputedRef<Schemas["Salutation"][]>;
   /**
    * Fetches the salutations list and assigns the result to the `salutations` property
    */
@@ -22,7 +21,7 @@ export type UseSalutationsReturn = {
  * @category Context & Language
  */
 export function useSalutations(): UseSalutationsReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
   const _salutations = inject("swSalutations", ref());
   provide("swSalutations", _salutations);
@@ -31,11 +30,15 @@ export function useSalutations(): UseSalutationsReturn {
 
   const fetchSalutations = async (): Promise<void> => {
     try {
-      const { elements } = await getAvailableSalutations(apiInstance);
+      const { elements } = await apiClient.invoke(
+        "readSalutation post /salutation",
+        {},
+      );
       _salutations.value = elements;
     } catch (e) {
-      const err = e as ClientApiError;
-      error.value = err.messages;
+      if (e instanceof ApiClientError) {
+        error.value = e.message;
+      }
     }
   };
 
@@ -53,7 +56,6 @@ export function useSalutations(): UseSalutationsReturn {
   onMounted(mountedCallback);
 
   return {
-    mountedCallback,
     fetchSalutations,
     getSalutations,
   };
diff --git a/packages/composables/src/useSessionContext.ts b/packages/composables/src/useSessionContext.ts
index b9ffe0942..f359efbfc 100644
--- a/packages/composables/src/useSessionContext.ts
+++ b/packages/composables/src/useSessionContext.ts
@@ -1,34 +1,14 @@
 import { computed } from "vue";
 import type { ComputedRef } from "vue";
-import type {
-  ShippingMethod,
-  PaymentMethod,
-  Currency,
-  ShippingAddress,
-  BillingAddress,
-  SessionContext,
-  Customer,
-  Language,
-} from "@shopware-pwa/types";
 
-import {
-  getSessionContext,
-  setCurrentShippingMethod,
-  setCurrentCurrency,
-  setCurrentPaymentMethod,
-  setCurrentShippingAddress,
-  setCurrentBillingAddress,
-  setCurrentLanguage,
-  setCurrentCountry,
-} from "@shopware-pwa/api-client";
-import { useShopwareContext } from "./useShopwareContext";
-import { _useContext } from "./internal/_useContext";
+import { useContext, useShopwareContext } from "#imports";
+import type { Schemas } from "#shopware";
 
 export type UseSessionContextReturn = {
   /**
    * Patches the context in order to use new language
    */
-  setLanguage(language: Partial<Language>): Promise<void>;
+  setLanguage(language: Partial<Schemas["Language"]>): Promise<void>;
   /**
    * Patches the context in order to use new countryId
    *
@@ -38,7 +18,7 @@ export type UseSessionContextReturn = {
   /**
    * current context's language
    */
-  sessionContext: ComputedRef<SessionContext | undefined>;
+  sessionContext: ComputedRef<Schemas["SalesChannelContext"] | undefined>;
   /**
    * Fetches the session context and assigns the result to the `sessionContext` property
    */
@@ -46,47 +26,53 @@ export type UseSessionContextReturn = {
   /**
    * current context's language
    */
-  selectedShippingMethod: ComputedRef<ShippingMethod | null>;
+  selectedShippingMethod: ComputedRef<Schemas["ShippingMethod"] | null>;
   /**
    * Patches the context in order to use new shipping method
    */
-  setShippingMethod(shippingMethod: Partial<ShippingMethod>): Promise<void>;
+  setShippingMethod(
+    shippingMethod: Partial<Schemas["ShippingMethod"]>,
+  ): Promise<void>;
   /**
    * current context's payment method
    */
-  selectedPaymentMethod: ComputedRef<PaymentMethod | null>;
+  selectedPaymentMethod: ComputedRef<Schemas["PaymentMethod"] | null>;
   /**
    * Patches the context in order to use new payment method
    */
-  setPaymentMethod(paymentMethod: Partial<PaymentMethod>): Promise<void>;
+  setPaymentMethod(paymentMethod: { id: string }): Promise<void>;
   /**
    * current context's currency
    */
-  currency: ComputedRef<Currency | null>;
+  currency: ComputedRef<Schemas["Currency"] | null>;
   /**
    * Patches the context in order to use new currency
    */
-  setCurrency(currency: Partial<Currency>): Promise<void>;
+  setCurrency(currency: Partial<Schemas["Currency"]>): Promise<void>;
   /**
    * current context's shipping address
    */
-  activeShippingAddress: ComputedRef<ShippingAddress | null>;
+  activeShippingAddress: ComputedRef<Schemas["CustomerAddress"] | null>;
   /**
    * Patches the context in order to use new shipping address
    */
-  setActiveShippingAddress(address: Partial<ShippingAddress>): Promise<void>;
+  setActiveShippingAddress(
+    address: Partial<Schemas["CustomerAddress"]>,
+  ): Promise<void>;
   /**
    * current context's billing address
    */
-  activeBillingAddress: ComputedRef<BillingAddress | null>;
+  activeBillingAddress: ComputedRef<Schemas["CustomerAddress"] | null>;
   /**
    * current context's tax state
    */
-  taxState: ComputedRef<string | null>;
+  taxState: ComputedRef<string | undefined>;
   /**
    * Patches the context in order to use new billing address
    */
-  setActiveBillingAddress(address: Partial<BillingAddress>): Promise<void>;
+  setActiveBillingAddress(
+    address: Partial<Schemas["CustomerAddress"]>,
+  ): Promise<void>;
   /**
    * current context's country id
    */
@@ -102,7 +88,7 @@ export type UseSessionContextReturn = {
   /**
    * current context's customer object
    */
-  userFromContext: ComputedRef<Customer | undefined>;
+  userFromContext: ComputedRef<Schemas["Customer"] | undefined>;
 };
 
 /**
@@ -112,18 +98,18 @@ export type UseSessionContextReturn = {
  * @category Context & Language
  */
 export function useSessionContext(
-  newContext?: SessionContext,
+  newContext?: Schemas["SalesChannelContext"],
 ): UseSessionContextReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
-  const _sessionContext = _useContext("swSessionContext", {
+  const _sessionContext = useContext("swSessionContext", {
     replace: newContext,
   });
 
   const sessionContext = computed(() => _sessionContext.value);
   const refreshSessionContext = async () => {
     try {
-      const context = await getSessionContext(apiInstance);
+      const context = await apiClient.invoke("readContext get /context");
       _sessionContext.value = context;
     } catch (e) {
       console.error("[UseSessionContext][refreshSessionContext]", e);
@@ -133,35 +119,35 @@ export function useSessionContext(
   const selectedShippingMethod = computed(
     () => sessionContext.value?.shippingMethod || null,
   );
-  const setShippingMethod = async (
-    shippingMethod: Partial<ShippingMethod> = {},
-  ) => {
+  const setShippingMethod = async (shippingMethod: { id: string }) => {
     if (!shippingMethod?.id) {
       throw new Error(
         "You need to provide shipping method id in order to set shipping method.",
       );
     }
-    await setCurrentShippingMethod(shippingMethod.id, apiInstance);
+    await apiClient.invoke("updateContext patch /context", {
+      shippingMethodId: shippingMethod.id,
+    });
     await refreshSessionContext();
   };
 
   const selectedPaymentMethod = computed(
     () => sessionContext.value?.paymentMethod || null,
   );
-  const setPaymentMethod = async (
-    paymentMethod: Partial<PaymentMethod> = {},
-  ) => {
+  const setPaymentMethod = async (paymentMethod: { id: string }) => {
     if (!paymentMethod?.id) {
       throw new Error(
         "You need to provide payment method id in order to set payment method.",
       );
     }
-    await setCurrentPaymentMethod(paymentMethod.id, apiInstance);
+    await apiClient.invoke("updateContext patch /context", {
+      paymentMethodId: paymentMethod.id,
+    });
     await refreshSessionContext();
   };
 
   const currency = computed(() => sessionContext.value?.currency || null);
-  const setCurrency = async (currency: Partial<Currency> = {}) => {
+  const setCurrency = async (currency: Partial<Schemas["Currency"]>) => {
     if (!currency.id) {
       console.error(
         "You need to provide currency id in order to set currency.",
@@ -169,20 +155,26 @@ export function useSessionContext(
       );
       return;
     }
-    await setCurrentCurrency(currency.id, apiInstance);
+    await apiClient.invoke("updateContext patch /context", {
+      currencyId: currency.id,
+    });
     await refreshSessionContext();
   };
 
-  const setLanguage = async (language: Partial<Language> = {}) => {
+  const setLanguage = async (language: Partial<Schemas["Language"]>) => {
     if (!language.id) {
       return;
     }
-    await setCurrentLanguage(language.id, apiInstance);
+    await apiClient.invoke("updateContext patch /context", {
+      languageId: language.id,
+    });
     await refreshSessionContext();
   };
 
   const setCountry = async (countryId: string) => {
-    await setCurrentCountry(countryId, apiInstance);
+    await apiClient.invoke("updateContext patch /context", {
+      countryId,
+    });
     await refreshSessionContext();
   };
 
@@ -193,14 +185,16 @@ export function useSessionContext(
       null,
   );
   const setActiveShippingAddress = async (
-    address: Partial<ShippingAddress>,
+    address: Partial<Schemas["CustomerAddress"]>,
   ) => {
     if (!address?.id) {
       throw new Error(
         "You need to provide address id in order to set the address.",
       );
     }
-    await setCurrentShippingAddress(address.id, apiInstance);
+    await apiClient.invoke("updateContext patch /context", {
+      shippingAddressId: address.id,
+    });
     refreshSessionContext();
   };
 
@@ -208,13 +202,17 @@ export function useSessionContext(
   const activeBillingAddress = computed(
     () => sessionContext.value?.customer?.activeBillingAddress || null,
   );
-  const setActiveBillingAddress = async (address: Partial<BillingAddress>) => {
+  const setActiveBillingAddress = async (
+    address: Partial<Schemas["CustomerAddress"]>,
+  ) => {
     if (!address?.id) {
       throw new Error(
         "You need to provide address id in order to set the address.",
       );
     }
-    await setCurrentBillingAddress(address.id, apiInstance);
+    await apiClient.invoke("updateContext patch /context", {
+      billingAddressId: address.id,
+    });
     refreshSessionContext();
   };
 
@@ -226,7 +224,7 @@ export function useSessionContext(
     () => sessionContext.value?.salesChannel?.languageId,
   );
   const languageIdChain = computed(
-    () => sessionContext.value?.context?.languageIdChain?.[0],
+    () => sessionContext.value?.context?.languageIdChain?.[0] || "",
   );
   const taxState = computed(() => sessionContext.value?.context?.taxState);
   const userFromContext = computed(() => sessionContext.value?.customer);
diff --git a/packages/composables/src/useShopwareContext.ts b/packages/composables/src/useShopwareContext.ts
index 2ef06f1b8..cbf41b6d6 100644
--- a/packages/composables/src/useShopwareContext.ts
+++ b/packages/composables/src/useShopwareContext.ts
@@ -1,26 +1,40 @@
-import { ShopwareApiInstance } from "@shopware-pwa/api-client";
 import { inject } from "vue";
 import ContextError from "./helpers/ContextError";
+import type { ApiClient } from "#shopware";
 
 export type ShopwareContext = {
   /**
    * Shopware API instance
+   * @deprecated use `apiClient` instead
    */
-  apiInstance: ShopwareApiInstance;
+  apiInstance: any;
   devStorefrontUrl: string | null;
+  /**
+   * Shopware API client
+   */
+  apiClient: ApiClient;
 };
 
 /**
  * @public
  * @category Context & Language
  */
-export function useShopwareContext(): ShopwareContext {
+export function useShopwareContext() {
   const shopwareContext = inject<ShopwareContext | null>("shopware", null);
 
-  if (!shopwareContext) throw new ContextError("Shopware");
+  const apiClient = inject<ApiClient>("apiClient");
+
+  if (!shopwareContext || !apiClient) {
+    console.error("[Error][Shopware] API Client is not provided.");
+    throw new ContextError("Shopware or apiClient");
+  }
 
   return {
+    /**
+     * @deprecated use `apiClient` instead
+     */
     apiInstance: shopwareContext.apiInstance,
+    apiClient,
     devStorefrontUrl: shopwareContext.devStorefrontUrl,
   };
 }
diff --git a/packages/composables/src/useState.ts b/packages/composables/src/useState.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/composables/src/useSyncWishlist.test.ts b/packages/composables/src/useSyncWishlist.test.ts
index 0226c458a..fc926e287 100644
--- a/packages/composables/src/useSyncWishlist.test.ts
+++ b/packages/composables/src/useSyncWishlist.test.ts
@@ -1,121 +1,45 @@
-import { describe, expect, it, vi } from "vitest";
-import { shallowMount } from "@vue/test-utils";
+import { describe, expect, it } from "vitest";
 import { useSyncWishlist } from "./useSyncWishlist";
-import * as apiExports from "@shopware-pwa/api-client";
-const url = "http://frontend.test";
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const {
-      getWishlistProducts,
-      addToWishlistSync,
-      removeFromWishlistSync,
-      mergeWishlistProducts,
-      items,
-      count,
-    } = useSyncWishlist();
-
-    return {
-      getWishlistProducts,
-      addToWishlistSync,
-      removeFromWishlistSync,
-      mergeWishlistProducts,
-      items,
-      count,
-    };
-  },
-};
-
-const getMockProvide = (mockedUrl: string | undefined) => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {
-            endpoint: mockedUrl,
-          },
-        },
-      },
-    },
-  },
-});
+import { useSetup } from "./_test";
 
 describe("useSyncWishlist", () => {
-  const wrapper = shallowMount(Component, getMockProvide(url));
-  const mockedResolve = { apiAlias: "mock", success: true };
-  const mockedResponse = {
-    products: {
-      elements: [
-        {
-          id: "test-1",
-        },
-        {
-          id: "test-2",
-        },
-      ],
-    },
-  };
-
-  vi.spyOn(apiExports, "addWishlistProduct").mockImplementation(() => {
-    return new Promise((resolve) => {
-      resolve(mockedResolve);
-    });
-  });
-
-  vi.spyOn(apiExports, "getWishlistProducts").mockImplementation(() => {
-    return new Promise((resolve) => {
-      resolve(mockedResponse as any);
-    });
-  });
-
-  vi.spyOn(apiExports, "removeWishlistProduct").mockImplementation(() => {
-    return new Promise((resolve) => {
-      resolve(mockedResolve);
-    });
-  });
-
-  vi.spyOn(apiExports, "mergeWishlistProducts").mockImplementation(() => {
-    return new Promise((resolve) => {
-      resolve(mockedResolve);
-    });
-  });
-
   describe("methods", () => {
-    const product: any = {
-      id: "some-id",
-    };
-
     describe("addToWishlist", () => {
       it("wishlist add product", () => {
-        expect(wrapper.vm.addToWishlistSync(product.id)).resolves.toBe(
-          undefined,
-        );
+        const { vm } = useSetup(() => useSyncWishlist());
+
+        expect(vm.addToWishlistSync("some-id")).resolves.toBe(undefined);
       });
     });
 
     describe("removeFromWishlist", () => {
       it("wishlist remove", () => {
-        wrapper.vm.getWishlistProducts();
-        wrapper.vm.removeFromWishlistSync(product.id);
+        const { vm } = useSetup(() => useSyncWishlist());
+
+        vm.getWishlistProducts();
+        vm.removeFromWishlistSync("some-id");
         // Mocked value
-        expect(wrapper.vm.count).toBe(wrapper.vm.count);
+        expect(vm.count).toBe(vm.count);
       });
     });
 
     describe("mergeWishlistProducts", () => {
       it("wishlist remove", () => {
-        expect(
-          wrapper.vm.mergeWishlistProducts(["test1", "test2"]),
-        ).resolves.toEqual(undefined);
+        const { vm } = useSetup(() => useSyncWishlist());
+
+        expect(vm.mergeWishlistProducts(["test1", "test2"])).resolves.toEqual(
+          undefined,
+        );
       });
     });
 
     describe("getWishlistProducts", () => {
       it("getWishlistProducts", () => {
-        wrapper.vm.getWishlistProducts();
-        expect(wrapper.vm.count).toBe(2);
-        expect(wrapper.vm.items.length).toBe(2);
+        const { vm } = useSetup(() => useSyncWishlist());
+
+        vm.getWishlistProducts();
+        expect(vm.count).toBe(0);
+        expect(vm.items.length).toBe(0);
       });
     });
   });
diff --git a/packages/composables/src/useSyncWishlist.ts b/packages/composables/src/useSyncWishlist.ts
index fa630de8b..57c8ddf79 100644
--- a/packages/composables/src/useSyncWishlist.ts
+++ b/packages/composables/src/useSyncWishlist.ts
@@ -1,13 +1,7 @@
 import { ref, computed } from "vue";
 import type { Ref, ComputedRef } from "vue";
-import {
-  addWishlistProduct,
-  getWishlistProducts as getWishlistProductsAPI,
-  removeWishlistProduct,
-  mergeWishlistProducts as mergeWishlistProductsAPI,
-} from "@shopware-pwa/api-client";
-import { useShopwareContext } from "./useShopwareContext";
-import type { ClientApiError } from "@shopware-pwa/types";
+import { useShopwareContext } from "#imports";
+import { ApiClientError } from "@shopware/api-client";
 
 export type UseSyncWishlistReturn = {
   /**
@@ -44,14 +38,24 @@ const _wishlistItems: Ref<string[]> = ref([]);
  * @category Wishlist
  */
 export function useSyncWishlist(): UseSyncWishlistReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
 
   async function addToWishlistSync(id: string) {
-    await addWishlistProduct(id, apiInstance);
+    await apiClient.invoke(
+      "addProductOnWishlist post /customer/wishlist/add/{productId}",
+      {
+        productId: id,
+      },
+    );
   }
 
   async function removeFromWishlistSync(id: string) {
-    await removeWishlistProduct(id, apiInstance);
+    await apiClient.invoke(
+      "deleteProductOnWishlist delete /customer/wishlist/delete/{productId}",
+      {
+        productId: id,
+      },
+    );
   }
 
   /**
@@ -60,20 +64,29 @@ export function useSyncWishlist(): UseSyncWishlistReturn {
    */
   async function getWishlistProducts() {
     try {
-      const response = await getWishlistProductsAPI(undefined, apiInstance);
+      const response = await apiClient.invoke(
+        "readCustomerWishlist post /customer/wishlist",
+        {},
+      );
       _wishlistItems.value = [
         ...response.products.elements.map((element) => element.id),
       ];
     } catch (e) {
-      const error = e as ClientApiError;
-      // If 404 ignore printing error and reset wishlist
-      if (error?.statusCode !== 404) console.error(error);
-      _wishlistItems.value = [];
+      if (e instanceof ApiClientError) {
+        // If 404 ignore printing error and reset wishlist
+        if (e.status !== 404) console.error(e);
+        _wishlistItems.value = [];
+      }
     }
   }
 
-  async function mergeWishlistProducts(itemsToMerge: string[]) {
-    await mergeWishlistProductsAPI(itemsToMerge, apiInstance);
+  async function mergeWishlistProducts(productIds: string[]) {
+    await apiClient.invoke(
+      "mergeProductOnWishlist post /customer/wishlist/merge",
+      {
+        productIds,
+      },
+    );
   }
 
   const items = computed(() => _wishlistItems.value);
diff --git a/packages/composables/src/useUser.spec.ts b/packages/composables/src/useUser.spec.ts
index a2412fc5f..c3058ae03 100644
--- a/packages/composables/src/useUser.spec.ts
+++ b/packages/composables/src/useUser.spec.ts
@@ -1,102 +1,43 @@
 import { useUser } from "./useUser";
-import * as useSessionContext from "./useSessionContext";
-import * as useCart from "./useCart";
 import { describe, expect, it, vi } from "vitest";
-import { shallowMount } from "@vue/test-utils";
-import * as apiExports from "@shopware-pwa/api-client";
-import LoginResponse from "./mocks/LoginResponse";
+import { useSetup } from "./_test";
+import { ref } from "vue";
 
-const Component = {
-  template: "<div/>",
-  props: {},
-  setup() {
-    const {
-      login,
-      register,
-      user,
-      isLoggedIn,
-      isCustomerSession,
-      isGuestSession,
-      refreshUser,
-      logout,
-      updateEmail,
-      updatePersonalInfo,
-      setDefaultPaymentMethod,
-      loadSalutation,
-      salutation,
-      loadCountry,
-      country,
-      defaultBillingAddressId,
-      defaultShippingAddressId,
-      userDefaultPaymentMethod,
-      userDefaultBillingAddress,
-      userDefaultShippingAddress,
-    } = useUser();
-
-    return {
-      login,
-      register,
-      user,
-      isLoggedIn,
-      isCustomerSession,
-      isGuestSession,
-      refreshUser,
-      logout,
-      updateEmail,
-      updatePersonalInfo,
-      setDefaultPaymentMethod,
-      loadSalutation,
-      salutation,
-      loadCountry,
-      country,
-      defaultBillingAddressId,
-      defaultShippingAddressId,
-      userDefaultPaymentMethod,
-      userDefaultBillingAddress,
-      userDefaultShippingAddress,
-    };
-  },
-};
-
-const getMockProvide = () => ({
-  global: {
-    provide: {
-      shopware: {
-        apiInstance: {
-          config: {},
-        },
-      },
+const refreshCartSpy = vi.fn();
+vi.mock("./useCart.ts", async () => {
+  return {
+    useCart: () => {
+      return {
+        refreshCart: refreshCartSpy,
+      };
     },
-  },
+  };
 });
 
-describe("useUser", () => {
-  vi.spyOn(apiExports, "login").mockImplementation(() => {
-    return new Promise((resolve) => {
-      resolve(LoginResponse);
-    });
-  });
-
-  const useSessionContextSpy = vi
-    .spyOn(useSessionContext, "useSessionContext")
-    .mockImplementation((): any => {
+const refreshSessionContextSpy = vi.fn();
+vi.mock("./useSessionContext.ts", async () => {
+  return {
+    useSessionContext: () => {
       return {
-        refreshSessionContext: () => undefined,
+        refreshSessionContext: refreshSessionContextSpy,
+        userFromContext: ref(),
       };
-    });
-  const useCartSpy = vi
-    .spyOn(useCart, "useCart")
-    .mockImplementation((): any => {
-      return {
-        refreshCart: () => undefined,
-      };
-    });
+    },
+  };
+});
 
-  const wrapper = shallowMount(Component, getMockProvide());
+describe("useUser", () => {
   it("login function", async () => {
-    await wrapper.vm.login("test@test.zzz", "test");
+    const { vm, injections } = useSetup(() => useUser());
+
+    await vm.login({ username: "test@test.zzz", password: "test" });
+
+    expect(injections.apiClient.invoke).toHaveBeenCalledWith(
+      expect.stringContaining("login"),
+      expect.anything(),
+    );
 
-    expect(useSessionContextSpy).toHaveBeenCalled();
-    expect(useCartSpy).toHaveBeenCalled();
+    expect(refreshCartSpy).toHaveBeenCalled();
+    expect(refreshSessionContextSpy).toHaveBeenCalled();
   });
 });
diff --git a/packages/composables/src/useUser.ts b/packages/composables/src/useUser.ts
index 686cb53c6..8ec5b90df 100644
--- a/packages/composables/src/useUser.ts
+++ b/packages/composables/src/useUser.ts
@@ -1,36 +1,14 @@
-import { ref, computed, reactive } from "vue";
-import type { Ref, UnwrapRef, ComputedRef } from "vue";
-import {
-  login as apiLogin,
-  logout as apiLogout,
-  register as apiRegister,
-  updateEmail as apiUpdateEmail,
-  getCustomer,
-  getUserCountry,
-  getUserSalutation,
-  updateProfile,
-  CustomerUpdateProfileParam,
-  CustomerUpdateEmailParam,
-  setDefaultCustomerPaymentMethod,
-} from "@shopware-pwa/api-client";
-import type {
-  Customer,
-  CustomerRegistrationParams,
-  Country,
-  Salutation,
-  ShopwareSearchParams,
-  PaymentMethodTranslation,
-  BillingAddress,
-  ShippingAddress,
-} from "@shopware-pwa/types";
+import { ref, computed } from "vue";
+import type { Ref, ComputedRef } from "vue";
 import {
   useShopwareContext,
   useCart,
   useInternationalization,
   useSessionContext,
-} from ".";
-import { _useContext } from "./internal/_useContext";
+  useContext,
+} from "#imports";
 import { syncRefs } from "@vueuse/core";
+import type { RequestParameters, Schemas } from "#shopware";
 
 export type UseUserReturn = {
   /**
@@ -45,11 +23,11 @@ export type UseUserReturn = {
    * @param params {@link CustomerRegistrationParams}
    * @returns {@link Customer} object on success
    */
-  register(params: CustomerRegistrationParams): Promise<Customer>;
+  register(params: RequestParameters<"register">): Promise<Schemas["Customer"]>;
   /**
    * Whole {@link Customer} object
    */
-  user: ComputedRef<Partial<Customer> | undefined>;
+  user: ComputedRef<Schemas["Customer"] | undefined>;
   /**
    * Indicates if the user is logged in
    */
@@ -65,11 +43,11 @@ export type UseUserReturn = {
   /**
    * {@link Country} of the user
    */
-  country: Ref<Country | null>;
+  country: Ref<Schemas["Country"] | null>;
   /**
    * {@link Salutation} of the user
    */
-  salutation: Ref<Salutation | null>;
+  salutation: Ref<Schemas["Salutation"] | null>;
   /**
    * Default billing address id
    */
@@ -96,16 +74,18 @@ export type UseUserReturn = {
   loadSalutation(salutationId: string): Promise<void>;
   /**
    * Updates the user profile data
-   * @param personals {@link CustomerUpdateProfileParam}
+   * @param personals {@link RequestParameters<'changeProfile'>}
    * @returns
    */
-  updatePersonalInfo(personals: CustomerUpdateProfileParam): Promise<void>;
+  updatePersonalInfo(
+    personals: RequestParameters<"changeProfile">,
+  ): Promise<void>;
   /**
    * Updates the user email
-   * @param updateEmailData - {@link CustomerUpdateEmailParam}
+   * @param updateEmailData - {@link RequestParameters<'changeEmail'>}
    * @returns
    */
-  updateEmail(updateEmailData: CustomerUpdateEmailParam): Promise<void>;
+  updateEmail(updateEmailData: RequestParameters<"changeEmail">): Promise<void>;
   /**
    * Sets the default payment method for given id
    * @param paymentMethodId
@@ -115,15 +95,17 @@ export type UseUserReturn = {
   /**
    * Default payment method for the user
    */
-  userDefaultPaymentMethod: ComputedRef<PaymentMethodTranslation | null>;
+  userDefaultPaymentMethod: ComputedRef<
+    Schemas["PaymentMethod"]["translated"] | null
+  >;
   /**
    * Default billing address for the user
    */
-  userDefaultBillingAddress: ComputedRef<BillingAddress | null>;
+  userDefaultBillingAddress: ComputedRef<Schemas["CustomerAddress"] | null>;
   /**
    * Default shipping address for the user
    */
-  userDefaultShippingAddress: ComputedRef<ShippingAddress | null>;
+  userDefaultShippingAddress: ComputedRef<Schemas["CustomerAddress"] | null>;
 };
 
 /**
@@ -132,10 +114,10 @@ export type UseUserReturn = {
  * @category Customer & Account
  */
 export function useUser(): UseUserReturn {
-  const { apiInstance } = useShopwareContext();
+  const { apiClient } = useShopwareContext();
   const { userFromContext, refreshSessionContext } = useSessionContext();
 
-  const _user = _useContext<Customer | undefined>("customer");
+  const _user = useContext<Schemas["Customer"] | undefined>("customer");
   syncRefs(userFromContext, _user, {
     immediate: true,
   });
@@ -152,78 +134,113 @@ export function useUser(): UseUserReturn {
   const userDefaultShippingAddress = computed(
     () => user.value?.defaultShippingAddress || null,
   );
-  const country: Ref<Country | null> = ref(null);
-  const salutation: Ref<Salutation | null> = ref(null);
+  const country: Ref<Schemas["Country"] | null> = ref(null);
+  const salutation: Ref<Schemas["Salutation"] | null> = ref(null);
   const user = computed(() => _user.value);
 
   async function login({
     username,
     password,
-  }: { username?: string; password?: string } = {}): Promise<void> {
-    await apiLogin({ username, password }, apiInstance);
+  }: {
+    username: string;
+    password: string;
+  }): Promise<void> {
+    await apiClient.invoke("loginCustomer post /account/login", {
+      username,
+      password,
+    });
     await refreshSessionContext();
     refreshCart();
   }
 
   async function register(
-    params: CustomerRegistrationParams,
-  ): Promise<Customer> {
-    const customer = await apiRegister(
-      { ...params, storefrontUrl: getStorefrontUrl() } as any,
-      apiInstance,
-    );
+    params: RequestParameters<"register">,
+  ): Promise<Schemas["Customer"]> {
+    const customer = await apiClient.invoke("register post /account/register", {
+      ...params,
+      storefrontUrl: getStorefrontUrl(),
+    });
     _user.value = customer;
     if (_user.value?.active) await refreshSessionContext();
     return customer;
   }
 
   async function logout(): Promise<void> {
-    await apiLogout(apiInstance);
+    await apiClient.invoke("logoutCustomer post /account/logout");
     await refreshSessionContext();
     refreshCart();
   }
 
-  async function refreshUser(params: ShopwareSearchParams = {}): Promise<void> {
+  async function refreshUser(params: Schemas["Criteria"] = {}): Promise<void> {
     try {
-      const user = await getCustomer(
-        Object.assign(
-          {},
-          // getDefaults(),
-          params,
-        ),
-        apiInstance,
+      const user = await apiClient.invoke(
+        "readCustomer post /account/customer",
+        params,
       );
-      _user.value = user as Customer;
+      _user.value = user;
     } catch (e) {
       _user.value = undefined;
       console.error("[useUser][refreshUser]", e);
     }
   }
 
-  async function loadCountry(userId: string): Promise<void> {
-    country.value = await getUserCountry(userId, apiInstance);
+  async function loadCountry(countryId: string): Promise<void> {
+    const countries = await apiClient.invoke("readCountry post /country", {
+      filter: [
+        {
+          field: "id",
+          type: "equals",
+          value: countryId,
+        },
+      ],
+    });
+
+    country.value = countries.elements?.[0] ?? null;
   }
 
   async function loadSalutation(salutationId: string): Promise<void> {
-    salutation.value = await getUserSalutation(salutationId, apiInstance);
+    const salutations = await apiClient.invoke(
+      "readSalutation post /salutation",
+      {
+        filter: [
+          {
+            field: "id",
+            type: "equals",
+            value: salutationId,
+          },
+        ],
+      },
+    );
+    salutation.value = salutations.elements?.[0] ?? null;
   }
 
   async function updatePersonalInfo(
-    personals: CustomerUpdateProfileParam,
+    personals: RequestParameters<"changeProfile">,
   ): Promise<void> {
-    await updateProfile(personals, apiInstance);
+    await apiClient.invoke(
+      "changeProfile post /account/change-profile",
+      personals,
+    );
   }
 
   async function updateEmail(
-    updateEmailData: CustomerUpdateEmailParam,
+    updateEmailData: RequestParameters<"changeEmail">,
   ): Promise<void> {
-    await apiUpdateEmail(updateEmailData, apiInstance);
+    await apiClient.invoke(
+      "changeEmail post /account/change-email",
+      updateEmailData,
+    );
   }
 
   async function setDefaultPaymentMethod(
     paymentMethodId: string,
   ): Promise<void> {
-    await setDefaultCustomerPaymentMethod(paymentMethodId, apiInstance);
+    await apiClient.invoke(
+      "changePaymentMethod post /account/change-payment-method/{paymentMethodId}",
+      {
+        paymentMethodId,
+      },
+    );
   }
   const defaultBillingAddressId = computed(
     () => user.value?.defaultBillingAddressId || null,
diff --git a/packages/composables/src/useWishlist.test.ts b/packages/composables/src/useWishlist.test.ts
new file mode 100644
index 000000000..7501d2bee
--- /dev/null
+++ b/packages/composables/src/useWishlist.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, it, vi } from "vitest";
+import { useWishlist } from "./useWishlist";
+import { useSetup } from "./_test";
+
+describe("useWishlist - not logged in user", () => {
+  vi.mock("./useLocalWishlist.ts", () => ({
+    useLocalWishlist() {
+      return {
+        getWishlistProducts: () => undefined,
+        items: { value: ["local-testId333"] },
+        clearWishlist: () => undefined,
+      };
+    },
+  }));
+
+  it("mergeWishlistProducts", async () => {
+    const { vm } = useSetup(() => useWishlist());
+
+    expect(vm.items.length).toBe(1);
+    expect(vm.count).toBe(1);
+    await vm.clearWishlist();
+    await vm.getWishlistProducts();
+    await vm.mergeWishlistProducts();
+  });
+});
+
+describe("useWishlist - logged in user", () => {
+  it("mergeWishlistProducts", async () => {
+    const { vm } = useSetup(() => useWishlist());
+
+    expect(vm.items.length).toBe(1);
+    expect(vm.count).toBe(1);
+    await vm.clearWishlist();
+    await vm.getWishlistProducts();
+    await vm.mergeWishlistProducts();
+  });
+});
diff --git a/packages/composables/src/useWishlist.ts b/packages/composables/src/useWishlist.ts
index 7366b8553..9378a9dbc 100644
--- a/packages/composables/src/useWishlist.ts
+++ b/packages/composables/src/useWishlist.ts
@@ -1,10 +1,9 @@
 /**
  * Template composable
  */
-import { computed, ComputedRef } from "vue";
-import { useUser } from "./useUser";
-import { useLocalWishlist } from "./useLocalWishlist";
-import { useSyncWishlist } from "./useSyncWishlist";
+import { computed } from "vue";
+import type { ComputedRef } from "vue";
+import { useUser, useLocalWishlist, useSyncWishlist } from "#imports";
 
 export type UseWishlistReturn = {
   /**
diff --git a/packages/composables/tsconfig.build.json b/packages/composables/tsconfig.build.json
index 623e1f40e..cbe2b74e8 100644
--- a/packages/composables/tsconfig.build.json
+++ b/packages/composables/tsconfig.build.json
@@ -1,11 +1,15 @@
 {
-  "include": ["src/*.ts"],
+  "include": ["src/*.ts", "types/*.ts"],
   "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"],
   "compilerOptions": {
     "declaration": true,
     "allowJs": true,
     "emitDeclarationOnly": true,
     "skipLibCheck": true,
-    "outDir": "./temp"
+    "outDir": "./temp",
+    "paths": {
+      "#imports": ["./src"],
+      "#shopware": ["./types/api-types.ts"]
+    }
   }
 }
diff --git a/packages/composables/tsconfig.json b/packages/composables/tsconfig.json
index 3d0311e05..f0ffbf3d5 100644
--- a/packages/composables/tsconfig.json
+++ b/packages/composables/tsconfig.json
@@ -1,5 +1,10 @@
 {
   "extends": "tsconfig/vue-library.json",
-  "include": ["src"],
-  "exclude": ["dist", "node_modules", "src/**/*.spec.ts", "src/**/*.test.ts"]
+  "exclude": ["dist", "node_modules"],
+  "compilerOptions": {
+    "paths": {
+      "#imports": ["./src"],
+      "#shopware": ["./types/api-types.ts"]
+    }
+  }
 }
diff --git a/packages/composables/types/api-types.ts b/packages/composables/types/api-types.ts
new file mode 100644
index 000000000..e14c93cb5
--- /dev/null
+++ b/packages/composables/types/api-types.ts
@@ -0,0 +1,25 @@
+import { createAPIClient } from "@shopware/api-client";
+import type {
+  RequestParameters as DefaultRequestParameters,
+  RequestReturnType as DefaultRequestReturnType,
+} from "@shopware/api-client";
+import type {
+  operationPaths as defaultOperationPaths,
+  operations as defaultOperations,
+  components as defaultComponents,
+} from "@shopware/api-client/api-types";
+
+export type operations = defaultOperations<defaultComponents>;
+export type operationPaths = defaultOperationPaths;
+
+export type Schemas = defaultComponents["schemas"];
+
+export type ApiClient = ReturnType<
+  typeof createAPIClient<operations, operationPaths>
+>;
+
+export type RequestParameters<T extends keyof operations> =
+  DefaultRequestParameters<T, operations>;
+
+export type RequestReturnType<T extends keyof operations> =
+  DefaultRequestReturnType<T, operations>;
diff --git a/packages/composables/vitest.config.ts b/packages/composables/vitest.config.ts
index 97e6d83e8..42965a25b 100644
--- a/packages/composables/vitest.config.ts
+++ b/packages/composables/vitest.config.ts
@@ -1,4 +1,5 @@
 import { defineConfig } from "vitest/config";
+import { resolve } from "path";
 
 export default defineConfig({
   test: {
@@ -7,5 +8,8 @@ export default defineConfig({
       enabled: true,
       // "100": true, // TODO: our goal ;)
     },
+    alias: {
+      "#imports": resolve(__dirname, "./src/index.ts"),
+    },
   },
 });
diff --git a/packages/helpers/.eslintrc.js b/packages/helpers/.eslintrc.cjs
similarity index 100%
rename from packages/helpers/.eslintrc.js
rename to packages/helpers/.eslintrc.cjs
diff --git a/packages/helpers/package.json b/packages/helpers/package.json
index 82409c8a3..3564eff70 100644
--- a/packages/helpers/package.json
+++ b/packages/helpers/package.json
@@ -3,6 +3,7 @@
   "version": "0.5.1",
   "description": "Shopware helpers for accessing API data",
   "author": "Shopware",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shopware/frontends.git"
@@ -36,7 +37,8 @@
     "dev": "unbuild --stub",
     "lint": "eslint src/**/*.ts* --fix --max-warnings=0 && pnpm run typecheck",
     "typecheck": "tsc --noEmit",
-    "test": "vitest run"
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^0.34.6",
diff --git a/packages/helpers/src/category/getCategoryBreadcrumbs.ts b/packages/helpers/src/category/getCategoryBreadcrumbs.ts
index 3d3ff413f..51e26828b 100644
--- a/packages/helpers/src/category/getCategoryBreadcrumbs.ts
+++ b/packages/helpers/src/category/getCategoryBreadcrumbs.ts
@@ -1,12 +1,17 @@
-import type { Category } from "@shopware-pwa/types";
-
 /**
  * Gather breadcrumbs from category
  *
  * @param {Category} category category entity
  */
-export function getCategoryBreadcrumbs(
-  category: Category | null | undefined,
+export function getCategoryBreadcrumbs<
+  T extends {
+    translated?: {
+      breadcrumb?: string[];
+    };
+    breadcrumb?: string[];
+  },
+>(
+  category: T,
   options?: {
     /**
      * Start at specific index if your navigation
diff --git a/packages/helpers/src/listing/filters.ts b/packages/helpers/src/listing/filters.ts
index 12c8d2f08..7a8cfc411 100644
--- a/packages/helpers/src/listing/filters.ts
+++ b/packages/helpers/src/listing/filters.ts
@@ -1,6 +1,4 @@
 import type {
-  Aggregations,
-  ListingFilter,
   AggregationFilterEntity,
   EntitiesAggregation,
   MaxAggregation,
@@ -8,6 +6,13 @@ import type {
 } from "@shopware-pwa/types";
 import { getTranslatedProperty } from "..";
 
+type ListingFilter = {
+  label: string;
+  code: string;
+  id: string;
+  name: string;
+};
+
 const getFilter = <T extends { name: string; id: string }>(
   code: string,
   aggregation: T,
@@ -34,8 +39,9 @@ function isEntitiesAggregation(
 /**
  * @beta
  */
-export function getListingFilters(
-  aggregations: Aggregations | undefined | null,
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function getListingFilters<T extends Record<string, any>>(
+  aggregations: T | undefined | null,
 ): ListingFilter[] {
   if (!aggregations) {
     return [];
diff --git a/packages/helpers/src/media/downloadFile.ts b/packages/helpers/src/media/downloadFile.ts
index 9662e0303..00601df23 100644
--- a/packages/helpers/src/media/downloadFile.ts
+++ b/packages/helpers/src/media/downloadFile.ts
@@ -1,12 +1,10 @@
 /**
  * Download file
  *
- * @param {Blob} file
- * @param {string} name
  */
-export function downloadFile(file: Blob, name: string) {
+export function downloadFile<T>(file: T, name: string) {
   const media = document.createElement("a");
-  media.href = URL.createObjectURL(file);
+  media.href = URL.createObjectURL(file as Blob);
   media.download = name;
 
   document.body.appendChild(media);
diff --git a/packages/helpers/src/media/getMedia.ts b/packages/helpers/src/media/getMedia.ts
index e3f61ae06..6990ca1c2 100644
--- a/packages/helpers/src/media/getMedia.ts
+++ b/packages/helpers/src/media/getMedia.ts
@@ -1,5 +1,3 @@
-import type { OrderLineItem, Downloads } from "@shopware-pwa/types";
-
 type ProductMedia = {
   id: string;
   fileName: string;
@@ -13,9 +11,19 @@ type ProductMedia = {
  * @public
  * @category Media
  */
-export function getMedia(lineItem: OrderLineItem) {
+export function getMedia<
+  T extends {
+    downloads?: Array<{
+      id: string;
+      media: {
+        fileName: string;
+        fileExtension: string;
+      };
+    }>;
+  },
+>(lineItem: T) {
   return (
-    lineItem.downloads?.reduce((acc: ProductMedia[], current: Downloads) => {
+    lineItem.downloads?.reduce((acc: ProductMedia[], current) => {
       acc.push({
         id: current.id,
         fileName: `${current.media.fileName}.${current.media.fileExtension}`,
diff --git a/packages/helpers/src/media/image.ts b/packages/helpers/src/media/image.ts
index 89e3d2633..555ac480f 100644
--- a/packages/helpers/src/media/image.ts
+++ b/packages/helpers/src/media/image.ts
@@ -1,5 +1,3 @@
-import type { Media } from "@shopware-pwa/types";
-
 /**
  * Returns the smallest thumbnail url from the media object
  *
@@ -8,9 +6,14 @@ import type { Media } from "@shopware-pwa/types";
  * @public
  * @category Media
  */
-export function getSmallestThumbnailUrl(
-  media: Media | undefined | null,
-): string | undefined {
+export function getSmallestThumbnailUrl<
+  T extends {
+    thumbnails?: Array<{
+      width: number;
+      url: string;
+    }>;
+  },
+>(media?: T): string | undefined {
   if (!media || !media?.thumbnails?.length) {
     return;
   }
@@ -30,7 +33,14 @@ export function getSmallestThumbnailUrl(
  * @public
  * @category Media
  */
-export function getBiggestThumbnailUrl(media: Media): string | undefined {
+export function getBiggestThumbnailUrl<
+  T extends {
+    thumbnails?: Array<{
+      width: number;
+      url: string;
+    }>;
+  },
+>(media?: T): string | undefined {
   if (!media?.thumbnails?.length) {
     return;
   }
@@ -50,7 +60,14 @@ export function getBiggestThumbnailUrl(media: Media): string | undefined {
  * @public
  * @category Media
  */
-export function getSrcSetForMedia(media: Media): string {
+export function getSrcSetForMedia<
+  T extends {
+    thumbnails?: Array<{
+      width: number;
+      url: string;
+    }>;
+  },
+>(media?: T): string {
   if (!media?.thumbnails?.length) {
     return "";
   }
diff --git a/packages/helpers/src/product/getMainImageUrl.spec.ts b/packages/helpers/src/product/getMainImageUrl.spec.ts
index 8f04e5254..85a45623e 100644
--- a/packages/helpers/src/product/getMainImageUrl.spec.ts
+++ b/packages/helpers/src/product/getMainImageUrl.spec.ts
@@ -16,7 +16,7 @@ describe("Helpers - getMainImageUrl", () => {
         },
       ],
       apiAlias: "product",
-    } as any;
+    } as Product;
     const coverUrl = getMainImageUrl(product);
     expect(coverUrl).toEqual("fallback-url");
   });
@@ -82,4 +82,40 @@ describe("Helpers - getMainImageUrl", () => {
     const coverUrl = getMainImageUrl(argument);
     expect(coverUrl).toEqual("");
   });
+
+  it("should return empty string if cover.media is defined but url is not", () => {
+    const product = {
+      cover: {
+        media: {
+          url: undefined,
+        },
+      },
+    };
+    const coverUrl = getMainImageUrl(product as Product);
+    expect(coverUrl).toEqual("");
+  });
+
+  it("should return empty string if cover is defined but url is not", () => {
+    const product = {
+      cover: {
+        url: undefined,
+      },
+    };
+    const coverUrl = getMainImageUrl(product as LineItem);
+    expect(coverUrl).toEqual("");
+  });
+
+  it("should return empty string if media is defined but url is not", () => {
+    const product = {
+      media: [
+        {
+          media: {
+            url: undefined,
+          },
+        },
+      ],
+    };
+    const coverUrl = getMainImageUrl(product as Product);
+    expect(coverUrl).toEqual("");
+  });
 });
diff --git a/packages/helpers/src/product/getMainImageUrl.ts b/packages/helpers/src/product/getMainImageUrl.ts
index 75a383dd8..a388de3d8 100644
--- a/packages/helpers/src/product/getMainImageUrl.ts
+++ b/packages/helpers/src/product/getMainImageUrl.ts
@@ -1,11 +1,3 @@
-import type { LineItem, Product, OrderLineItem } from "@shopware-pwa/types";
-
-function isProduct(
-  object: Product | LineItem | OrderLineItem,
-): object is Product {
-  return object?.apiAlias === "product";
-}
-
 /**
  * gets the cover image
  *
@@ -15,12 +7,43 @@ function isProduct(
  *
  * @category Product
  */
-export function getMainImageUrl(
-  object: Product | LineItem | OrderLineItem,
-): string {
-  if (isProduct(object)) {
-    return object?.cover?.media?.url || object?.media?.[0]?.media.url || "";
+export function getMainImageUrl<
+  T extends
+    | {
+        cover?: {
+          media?: {
+            url: string;
+          };
+        };
+      }
+    | {
+        media?: Array<{
+          media?: {
+            url?: string;
+          };
+        }>;
+      }
+    | {
+        cover?: {
+          url: string;
+        };
+      },
+>(object: T): string {
+  if (!object) return "";
+  if ("cover" in object && object.cover) {
+    if ("media" in object.cover) {
+      return object?.cover?.media?.url || "";
+    }
+    if ("url" in object.cover) {
+      return object?.cover?.url || "";
+    }
+  }
+  if (
+    "media" in object &&
+    Array.isArray(object.media) &&
+    object.media.length > 0
+  ) {
+    return object?.media?.[0]?.media?.url || "";
   }
-
-  return object?.cover?.url || "";
+  return "";
 }
diff --git a/packages/helpers/src/product/getProductReviews.ts b/packages/helpers/src/product/getProductReviews.ts
index b92f00242..370d16bda 100644
--- a/packages/helpers/src/product/getProductReviews.ts
+++ b/packages/helpers/src/product/getProductReviews.ts
@@ -1,4 +1,3 @@
-import type { Product } from "@shopware-pwa/types";
 import type { UiProductReview } from "../ui-interfaces";
 
 /**
@@ -10,9 +9,19 @@ import type { UiProductReview } from "../ui-interfaces";
  *
  * @category Product
  */
-export function getProductReviews({
-  product,
-}: { product?: Product } = {}): UiProductReview[] {
+export function getProductReviews<
+  T extends {
+    id: string;
+    productReviews?: Array<{
+      id: string;
+      externalUser?: string;
+      customerId?: string;
+      createdAt: string;
+      content: string;
+      points?: number;
+    }>;
+  },
+>({ product }: { product?: T } = {}): UiProductReview[] {
   if (!product || !product.productReviews) {
     return [];
   }
diff --git a/packages/helpers/src/product/getProductRoute.ts b/packages/helpers/src/product/getProductRoute.ts
index 59243691d..98314f083 100644
--- a/packages/helpers/src/product/getProductRoute.ts
+++ b/packages/helpers/src/product/getProductRoute.ts
@@ -1,4 +1,3 @@
-import type { SeoUrl } from "@shopware-pwa/types";
 import { getProductUrl } from "./getProductUrl";
 
 /**
@@ -12,7 +11,12 @@ import { getProductUrl } from "./getProductUrl";
  * @category Routing
  */
 export function getProductRoute<
-  T extends { id: string; seoUrls: SeoUrl[] | null },
+  T extends {
+    id: string;
+    seoUrls?: Array<{
+      seoPathInfo?: string;
+    }>;
+  },
 >(product?: T) {
   return {
     path: getProductUrl(product),
diff --git a/packages/helpers/src/product/getProductThumbnailUrl.ts b/packages/helpers/src/product/getProductThumbnailUrl.ts
index fb5a8a69a..3af175d90 100644
--- a/packages/helpers/src/product/getProductThumbnailUrl.ts
+++ b/packages/helpers/src/product/getProductThumbnailUrl.ts
@@ -1,5 +1,3 @@
-import type { Product } from "@shopware-pwa/types";
-
 /**
  * get the thumbnail image URL with the smallest width
  *
@@ -11,7 +9,19 @@ import type { Product } from "@shopware-pwa/types";
  *
  * @category Product
  */
-export function getProductThumbnailUrl(product: Product): string {
+export function getProductThumbnailUrl<
+  T extends {
+    cover?: {
+      media?: {
+        thumbnails?: Array<{
+          width: number;
+          url: string;
+        }>;
+        url?: string;
+      };
+    };
+  },
+>(product: T): string {
   const coverImageUrlFallback = product?.cover?.media?.url || "";
   const thumbnailImage =
     (product?.cover?.media?.thumbnails?.length &&
diff --git a/packages/helpers/src/product/getProductTierPrices.ts b/packages/helpers/src/product/getProductTierPrices.ts
index d6897a85f..2d0866a82 100644
--- a/packages/helpers/src/product/getProductTierPrices.ts
+++ b/packages/helpers/src/product/getProductTierPrices.ts
@@ -1,5 +1,3 @@
-import type { Product } from "@shopware-pwa/types";
-
 /**
  * @beta
  */
@@ -18,7 +16,14 @@ export type TierPrice = {
  * @returns TierPrice[]
  * @beta
  */
-export function getProductTierPrices(product?: Product): TierPrice[] {
+export function getProductTierPrices<
+  T extends {
+    calculatedPrices?: Array<{
+      unitPrice: number;
+      quantity: number;
+    }>;
+  },
+>(product?: T): TierPrice[] {
   if (!product || !product.calculatedPrices?.length) {
     return [];
   }
diff --git a/packages/helpers/src/product/getProductUrl.ts b/packages/helpers/src/product/getProductUrl.ts
index 0bd48c005..3b5c68b3b 100644
--- a/packages/helpers/src/product/getProductUrl.ts
+++ b/packages/helpers/src/product/getProductUrl.ts
@@ -1,5 +1,3 @@
-import type { SeoUrl } from "@shopware-pwa/types";
-
 /**
  * Get product url. The priority is SEO url and then technical url.
  *
@@ -12,7 +10,9 @@ import type { SeoUrl } from "@shopware-pwa/types";
 export function getProductUrl<
   T extends {
     id: string;
-    seoUrls: SeoUrl[] | null;
+    seoUrls?: Array<{
+      seoPathInfo?: string;
+    }>;
   },
 >(product?: T): string {
   if (!product) return "/";
diff --git a/packages/helpers/src/ui-interfaces.ts b/packages/helpers/src/ui-interfaces.ts
index af08ead87..70e7125f2 100644
--- a/packages/helpers/src/ui-interfaces.ts
+++ b/packages/helpers/src/ui-interfaces.ts
@@ -37,8 +37,8 @@ export type UiProductProperty = {
  */
 export type UiProductReview = {
   id: string;
-  author: string;
+  author?: string;
   date: string;
-  message: string | null;
-  rating: number | null;
+  message?: string;
+  rating?: number;
 };
diff --git a/packages/nuxt3-module/build.config.ts b/packages/nuxt3-module/build.config.ts
index be011f82a..97abe7e8f 100644
--- a/packages/nuxt3-module/build.config.ts
+++ b/packages/nuxt3-module/build.config.ts
@@ -7,5 +7,5 @@ export default defineBuildConfig({
     cjsBridge: true,
   },
   declaration: true,
-  externals: ["@nuxt/schema", "@nuxt/kit", "@shopware-pwa/composables-next"],
+  externals: ["@nuxt/schema", "@nuxt/kit", "@nuxt/devtools-kit"],
 });
diff --git a/packages/nuxt3-module/imports.d.ts b/packages/nuxt3-module/imports.d.ts
new file mode 100644
index 000000000..56fc6a768
--- /dev/null
+++ b/packages/nuxt3-module/imports.d.ts
@@ -0,0 +1,3 @@
+export * from "nuxt/app";
+
+export * from "@shopware-pwa/composables-next";
diff --git a/packages/nuxt3-module/package.json b/packages/nuxt3-module/package.json
index 551122b7c..f18d10075 100644
--- a/packages/nuxt3-module/package.json
+++ b/packages/nuxt3-module/package.json
@@ -30,6 +30,7 @@
   "files": [
     "dist",
     "plugin.ts",
+    "shopware.d.ts",
     "index.cjs"
   ],
   "scripts": {
@@ -41,7 +42,7 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.8.1",
-    "@shopware-pwa/api-client": "workspace:*",
+    "@shopware/api-client": "workspace:*",
     "@shopware-pwa/composables-next": "workspace:*",
     "js-cookie": "^3.0.5"
   },
@@ -49,6 +50,7 @@
     "@nuxt/devtools": "^1.0.2",
     "@nuxt/schema": "^3.8.1",
     "eslint-config-shopware": "workspace:*",
+    "nuxt": "^3.8.0",
     "tsconfig": "workspace:*",
     "typescript": "^5.2.2",
     "unbuild": "^2.0.0"
diff --git a/packages/nuxt3-module/plugin.ts b/packages/nuxt3-module/plugin.ts
index 5209e4c7a..d702b38e5 100644
--- a/packages/nuxt3-module/plugin.ts
+++ b/packages/nuxt3-module/plugin.ts
@@ -1,150 +1,207 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import { defineNuxtPlugin, useRuntimeConfig, useCookie, useState } from "#imports";
 import {
+  defineNuxtPlugin,
+  useRuntimeConfig,
+  // useCookie,
+  useState,
   createShopwareContext,
-  getDefaultApiParams,
-} from "@shopware-pwa/composables-next";
-import { createInstance } from "@shopware-pwa/api-client";
+} from "#imports";
 import { ref } from "vue";
 import Cookies from "js-cookie";
+import { createAPIClient } from "@shopware/api-client";
 
-const ShopwarePlugin = {
-  install(app, options) {
-    const runtimeConfig = useRuntimeConfig();
-
-    const isUserCookieContext =
-      !!runtimeConfig.public?.shopware?.useUserContextInSSR ||
-      !options.isServer;
-
-    const contextToken = getCookieContextToken();
-    const languageId = getCookieLanguageId();
-
-    const shopwareEndpoint =
-      runtimeConfig?.shopware?.shopwareEndpoint ||
-      runtimeConfig.public.shopware.shopwareEndpoint;
-
-    if (
-      !shopwareEndpoint ||
-      !runtimeConfig.public?.shopware?.shopwareAccessToken
-    ) {
-      throw new Error(
-        "Make sure that shopwareEndpoint and shopwareAccessToken are settled in the configuration",
-      );
-    }
-
-    const instance = createApiClientInstance(
-      shopwareEndpoint,
-      runtimeConfig.public.shopware.shopwareAccessToken,
-      getContextToken(isUserCookieContext),
-      getLanguageId(isUserCookieContext),
-    );
-
-    /**
-     * Save current contextToken when its change
-     */
-    instance.onConfigChange(({ config }) => {
-      try {
-        // only save cookies on client side render
-        if (isUserCookieContext) {
-          contextToken.value = config.contextToken;
-          languageId.value = config.languageId;
-          setCookieContextToken(config.contextToken);
-          setCookieLanguageId(config.languageId);
-        }
-      } catch (e) {
-        // Sometimes cookie is set on server after request is send, it can fail silently
-      }
-    });
-    const shopwareContext = createShopwareContext(app, {
-      apiInstance: instance,
-      enableDevtools: true,
-      shopwareDefaults: options.apiDefaults,
-      devStorefrontUrl: runtimeConfig.public.shopware?.devStorefrontUrl || null,
-    });
-    app.provide("shopware", shopwareContext);
-    const sessionContextData = ref();
-    app.provide("swSessionContext", sessionContextData);
-    // in case someone tries to use it in nuxt specific code like middleware
-    useState("swSessionContext", () => sessionContextData);
-  },
-};
-
-function getCookieContextToken() {
-  return useCookie("sw-context-token", {
-    maxAge: 60 * 60 * 24 * 365,
-    sameSite: "Lax",
-    path: "/",
-  });
-}
+export default defineNuxtPlugin((NuxtApp) => {
+  const runtimeConfig = useRuntimeConfig();
 
-function setCookieContextToken(contextToken) {
-  Cookies.set("sw-context-token", contextToken || "", {
-    expires: 365, //days
-    sameSite: "Lax",
-    path: "/",
+  if (
+    !runtimeConfig.public?.shopware?.shopwareEndpoint ||
+    !runtimeConfig.public?.shopware?.shopwareAccessToken
+  ) {
+    throw new Error(
+      "Make sure that shopwareEndpoint and shopwareAccessToken are settled in the configuration",
+    );
+  }
+
+  const apiClient = createAPIClient({
+    baseURL: runtimeConfig.public.shopware.shopwareEndpoint,
+    accessToken: runtimeConfig.public.shopware.shopwareAccessToken,
+    contextToken: Cookies.get("sw-context-token"),
+    onContextChanged(newContextToken) {
+      Cookies.set("sw-context-token", newContextToken, {
+        expires: 365, // days
+        path: "/",
+        sameSite: "lax",
+      });
+    },
   });
-}
-
-function getContextToken(isUserCookieContext) {
-  const contextToken = getCookieContextToken();
-  // workaround for SSG case, where cookies contains additional dot in name, related: https://github.com/shopware/frontends/commit/ee5b8a71e1e016c973a7852efa3b85a136e6ea14
-  const cookieContextToken = Cookies.get("sw-context-token");
 
-  return isUserCookieContext ? contextToken.value || cookieContextToken : "";
-}
+  NuxtApp.vueApp.provide("apiClient", apiClient);
 
-function getCookieLanguageId() {
-  return useCookie("sw-language-id", {
-    maxAge: 60 * 60 * 24 * 365,
-    sameSite: "Lax",
-    path: "/",
+  // Shopware context
+  const shopwareContext = createShopwareContext(NuxtApp.vueApp, {
+    apiInstance: null,
+    enableDevtools: true,
+    devStorefrontUrl: runtimeConfig.public.shopware?.devStorefrontUrl || null,
   });
-}
+  NuxtApp.vueApp.provide("shopware", shopwareContext);
 
-function setCookieLanguageId(languageId) {
-  Cookies.set("sw-language-id", languageId || "", {
-    expires: 365, //days
-    sameSite: "Lax",
-    path: "/",
-  });
-}
-
-function getLanguageId(isUserCookieContext) {
-  const languageId = getCookieLanguageId();
-  // workaround for SSG case, where cookies contains additional dot in name, related: https://github.com/shopware/frontends/commit/ee5b8a71e1e016c973a7852efa3b85a136e6ea14
-  const cookieLanguageId = Cookies.get("sw-language-id");
-
-  return isUserCookieContext ? languageId.value || cookieLanguageId : undefined;
-}
-
-/**
- * Server config has bigger prio than client
- */
-function createApiClientInstance(
-  shopwareEndpoint,
-  shopwareAccessToken,
-  contextToken,
-  languageId,
-) {
-  return createInstance({
-    endpoint: shopwareEndpoint,
-    accessToken: shopwareAccessToken,
-    timeout: shopwareAccessToken || 10000,
-    auth: {
-      username:
-        "<%= options.shopwareApiClient.auth ? options.shopwareApiClient.auth.username : undefined %>",
-      password:
-        "<%=  options.shopwareApiClient.auth ? options.shopwareApiClient.auth.password : undefined %>",
-    },
-    contextToken: contextToken,
-    languageId: languageId,
-  });
-}
-
-export default defineNuxtPlugin(async (nuxtApp) => {
-  nuxtApp.vueApp.use(ShopwarePlugin, {
-    apiDefaults: getDefaultApiParams(),
-    isServer: !!nuxtApp.ssrContext,
-  });
+  // Session Context
+  const sessionContextData = ref();
+  NuxtApp.vueApp.provide("swSessionContext", sessionContextData);
+  // in case someone tries to use it in nuxt specific code like middleware
+  useState("swSessionContext", () => sessionContextData);
 });
+
+// const ShopwarePlugin = {
+//   install(app, options) {
+//     const runtimeConfig = useRuntimeConfig();
+
+//     const isUserCookieContext =
+//       !!runtimeConfig.public?.shopware?.useUserContextInSSR ||
+//       !options.isServer;
+
+//     const contextToken = getCookieContextToken();
+//     const languageId = getCookieLanguageId();
+
+//     const shopwareEndpoint =
+//       runtimeConfig?.shopware?.shopwareEndpoint ||
+//       runtimeConfig.public.shopware.shopwareEndpoint;
+
+//     if (
+//       !shopwareEndpoint ||
+//       !runtimeConfig.public?.shopware?.shopwareAccessToken
+//     ) {
+//       throw new Error(
+//         "Make sure that shopwareEndpoint and shopwareAccessToken are settled in the configuration",
+//       );
+//     }
+
+//     const instance = createApiClientInstance(
+//       shopwareEndpoint,
+//       runtimeConfig.public.shopware.shopwareAccessToken,
+//       getContextToken(isUserCookieContext),
+//       getLanguageId(isUserCookieContext),
+//     );
+
+//     /**
+//      * Save current contextToken when its change
+//      */
+//     instance.onConfigChange(({ config }) => {
+//       try {
+//         // only save cookies on client side render
+//         if (isUserCookieContext) {
+//           contextToken.value = config.contextToken;
+//           languageId.value = config.languageId;
+//           setCookieContextToken(config.contextToken);
+//           setCookieLanguageId(config.languageId);
+//         }
+//       } catch (e) {
+//         // Sometimes cookie is set on server after request is send, it can fail silently
+//       }
+//     });
+//     const shopwareContext = createShopwareContext(app, {
+//       apiInstance: instance,
+//       enableDevtools: true,
+//       shopwareDefaults: options.apiDefaults,
+//       devStorefrontUrl: runtimeConfig.public.shopware?.devStorefrontUrl || null,
+//     });
+
+//     const apiClient = createAPIClient<operations, operationPaths>({
+//       baseURL: runtimeConfig.public.shopware.shopwareEndpoint,
+//       accessToken: runtimeConfig.public.shopware.shopwareAccessToken,
+//       contextToken: Cookies.get("sw-context-token"),
+//       onContextChanged(newContextToken) {
+//         Cookies.set("sw-context-token", newContextToken, {
+//           expires: 365, // days
+//           path: "/",
+//           sameSite: "lax",
+//         });
+//       },
+//     });
+
+//     app.provide("shopware", shopwareContext);
+//     const sessionContextData = ref();
+//     app.provide("swSessionContext", sessionContextData);
+//     app.provide("apiClient", apiClient);
+//     // in case someone tries to use it in nuxt specific code like middleware
+//     useState("swSessionContext", () => sessionContextData);
+//   },
+// };
+
+// function getCookieContextToken() {
+//   return useCookie("sw-context-token", {
+//     maxAge: 60 * 60 * 24 * 365,
+//     sameSite: "Lax",
+//     path: "/",
+//   });
+// }
+
+// function setCookieContextToken(contextToken) {
+//   Cookies.set("sw-context-token", contextToken || "", {
+//     expires: 365, //days
+//     sameSite: "Lax",
+//     path: "/",
+//   });
+// }
+
+// function getContextToken(isUserCookieContext) {
+//   const contextToken = getCookieContextToken();
+//   // workaround for SSG case, where cookies contains additional dot in name, related: https://github.com/shopware/frontends/commit/ee5b8a71e1e016c973a7852efa3b85a136e6ea14
+//   const cookieContextToken = Cookies.get("sw-context-token");
+
+//   return isUserCookieContext ? contextToken.value || cookieContextToken : "";
+// }
+
+// function getCookieLanguageId() {
+//   return useCookie("sw-language-id", {
+//     maxAge: 60 * 60 * 24 * 365,
+//     sameSite: "Lax",
+//     path: "/",
+//   });
+// }
+
+// function setCookieLanguageId(languageId) {
+//   Cookies.set("sw-language-id", languageId || "", {
+//     expires: 365, //days
+//     sameSite: "Lax",
+//     path: "/",
+//   });
+// }
+
+// function getLanguageId(isUserCookieContext) {
+//   const languageId = getCookieLanguageId();
+//   // workaround for SSG case, where cookies contains additional dot in name, related: https://github.com/shopware/frontends/commit/ee5b8a71e1e016c973a7852efa3b85a136e6ea14
+//   const cookieLanguageId = Cookies.get("sw-language-id");
+
+//   return isUserCookieContext ? languageId.value || cookieLanguageId : undefined;
+// }
+
+// /**
+//  * Server config has bigger prio than client
+//  */
+// function createApiClientInstance(
+//   shopwareEndpoint,
+//   shopwareAccessToken,
+//   contextToken,
+//   languageId,
+// ) {
+//   return createInstance({
+//     endpoint: shopwareEndpoint,
+//     accessToken: shopwareAccessToken,
+//     timeout: shopwareAccessToken || 10000,
+//     auth: {
+//       username:
+//         "<%= options.shopwareApiClient.auth ? options.shopwareApiClient.auth.username : undefined %>",
+//       password:
+//         "<%=  options.shopwareApiClient.auth ? options.shopwareApiClient.auth.password : undefined %>",
+//     },
+//     contextToken: contextToken,
+//     languageId: languageId,
+//   });
+// }
+
+// export default defineNuxtPlugin(async (nuxtApp) => {
+//   nuxtApp.vueApp.use(ShopwarePlugin, {
+//     apiDefaults: getDefaultApiParams(),
+//     isServer: !!nuxtApp.ssrContext,
+//   });
+// });
diff --git a/packages/nuxt3-module/shopware.d.ts b/packages/nuxt3-module/shopware.d.ts
new file mode 100644
index 000000000..c8e0d87d3
--- /dev/null
+++ b/packages/nuxt3-module/shopware.d.ts
@@ -0,0 +1,36 @@
+declare module "#shopware" {
+  import type { createAPIClient } from "@shopware/api-client";
+  import type {
+    operationPaths as defaultOperationPaths,
+    operations as defaultOperations,
+    components as defaultComponents,
+  } from "@shopware/api-client/api-types";
+  import type {
+    RequestParameters as DefaultRequestParameters,
+    RequestReturnType as DefaultRequestReturnType,
+  } from "@shopware/api-client";
+
+  type changedComponents = defaultComponents;
+  // example how to extend Cart schema:
+  // type changedComponents = components & {
+  //   schemas: {
+  //     Cart: components["schemas"]["Cart"] & {
+  //       myspecialfield: "hello field";
+  //     };
+  //   };
+  // };
+
+  export type operations = defaultOperations<changedComponents>;
+  export type operationPaths = defaultOperationPaths;
+  export type Schemas = changedComponents["schemas"];
+
+  // we're exporting our own Api Client definition as it depends on our own instance
+  export type ApiClient = ReturnType<
+    typeof createAPIClient<operations, operationPaths>
+  >;
+  export type RequestParameters<T extends keyof operations> =
+    DefaultRequestParameters<T, operations>;
+
+  export type RequestReturnType<T extends keyof operations> =
+    DefaultRequestReturnType<T, operations>;
+}
diff --git a/packages/nuxt3-module/src/index.ts b/packages/nuxt3-module/src/index.ts
index efab5182b..5e06e4807 100644
--- a/packages/nuxt3-module/src/index.ts
+++ b/packages/nuxt3-module/src/index.ts
@@ -1,25 +1,28 @@
 /**
  * @module @shopware/nuxt3
  */
-import { defineNuxtModule, addPluginTemplate } from "@nuxt/kit";
+import {
+  defineNuxtModule,
+  addPluginTemplate,
+  addTypeTemplate,
+} from "@nuxt/kit";
 import { resolve } from "path";
-import { isDependencyInstalledLocally, resolveOwnDependency } from "./utils";
+import { addCustomTab } from "@nuxt/devtools-kit";
 
 export default defineNuxtModule<ShopwareNuxtOptions>({
   meta: {
     name: "@shopware/nuxt3",
     configKey: "shopware",
   },
-  async setup(moduleConfig, nuxt) {
+  async setup(moduleConfig) {
     const shopwareEndpoint =
-      moduleConfig.shopwareEndpoint ?? "https://demo-frontends.shopware.store";
+      moduleConfig.shopwareEndpoint ??
+      "https://demo-frontends.shopware.store/store-api/";
     const accessToken =
       moduleConfig.shopwareAccessToken ?? "SWSCBHFSNTVMAWNZDNFKSHLAYW";
 
     addPluginTemplate({
       filename: "runtime/shopware.plugin.mjs",
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
       src: resolve(__dirname, "../plugin.ts"),
       options: {
         shopwareEndpoint: shopwareEndpoint,
@@ -30,95 +33,19 @@ export default defineNuxtModule<ShopwareNuxtOptions>({
       },
     });
 
-    // TODO: remove it once nitro server build contains all external packages of nuxt3-module (composables-next)
-    //nuxt.options.build.transpile.push("@shopware-pwa/composables-next");
-
-    // use a module's dependency in order to not install it again within an end-project to keep compatibility
-    const apiClientDependencyPath = await resolveOwnDependency(
-      "@shopware-pwa/api-client",
-      nuxt,
-    );
-    const isApiClientInstalledLocally = await isDependencyInstalledLocally(
-      nuxt.options.rootDir,
-      "@shopware-pwa/api-client",
-    );
-    if (!isApiClientInstalledLocally && apiClientDependencyPath) {
-      nuxt.options.alias["@shopware-pwa/api-client"] = apiClientDependencyPath;
-    }
-
-    const isComposablesNextInstalledLocally =
-      await isDependencyInstalledLocally(
-        nuxt.options.rootDir,
-        "@shopware-pwa/composables-next",
-      );
-    const composablesDependencyPath = await resolveOwnDependency(
-      "@shopware-pwa/composables-next",
-      nuxt,
-    );
-    if (!isComposablesNextInstalledLocally && composablesDependencyPath) {
-      nuxt.options.alias["@shopware-pwa/composables-next"] =
-        composablesDependencyPath;
-    }
-
-    nuxt.hook("imports:sources", (dirs) => {
-      dirs.push({
-        from: "@shopware-pwa/composables-next",
-        imports: [
-          "useAddress",
-          "useAddToCart",
-          "useBreadcrumbs",
-          "useCart",
-          "useCartItem",
-          "useCategory",
-          "useCategorySearch",
-          "useCheckout",
-          "useCms",
-          "useCmsBlock",
-          "useCmsElementConfig",
-          "useCmsMeta",
-          "useCmsSection",
-          "useCountries",
-          "useCustomerOrders",
-          "useCustomerPassword",
-          "useInternationalization",
-          "useLandingSearch",
-          "useListing",
-          "useNavigation",
-          "useNavigationContext",
-          "useNavigationSearch",
-          "useNewsletter",
-          "useNotifications",
-          "useOrderDetails",
-          "useOrderPayment",
-          "usePrice",
-          "useProduct",
-          "useProductAssociations",
-          "useProductConfigurator",
-          "useProductPrice",
-          "useProductReviews",
-          "useProductSearch",
-          "useProductSearchSuggest",
-          "useProductWishlist",
-          "useSalutations",
-          "useSessionContext",
-          "useShopwareContext",
-          "useUser",
-          "useWishlist",
-        ],
-      });
+    addTypeTemplate({
+      filename: "shopware.d.ts",
+      src: resolve(__dirname, "../shopware.d.ts"),
     });
 
-    // @ts-expect-error - private API
-    nuxt.hook("devtools:customTabs", (iframeTabs) => {
-      iframeTabs.push({
-        name: "frontends",
-        title: "Shopware",
-        icon: "fa6-brands:shopware",
-        view: {
-          type: "iframe",
-          src: "https://frontends.shopware.com/",
-        },
-      });
+    addCustomTab({
+      name: "shopware-frontends",
+      title: "Shopware Frontends",
+      icon: "fa6-brands:shopware",
+      view: {
+        type: "iframe",
+        src: "https://frontends.shopware.com/",
+      },
     });
   },
 });
@@ -129,8 +56,8 @@ export type ShopwareNuxtOptions = {
    *
    * Default demo store: "https://demo-frontends.swstage.store/"
    */
-  shopwareEndpoint?: string;
-  shopwareAccessToken?: string;
+  shopwareEndpoint: string;
+  shopwareAccessToken: string;
   devStorefrontUrl?: string;
   apiClientConfig?: {
     timeout?: number | string;
diff --git a/packages/nuxt3-module/src/utils.ts b/packages/nuxt3-module/src/utils.ts
index d5454cf93..fdf13bb29 100644
--- a/packages/nuxt3-module/src/utils.ts
+++ b/packages/nuxt3-module/src/utils.ts
@@ -3,7 +3,7 @@ import { resolve, dirname } from "path";
 import { fileURLToPath } from "node:url";
 import { promises as fs, constants as FS_CONSTANTS } from "node:fs";
 
-type DEPENDENCY = "@shopware-pwa/api-client" | "@shopware-pwa/composables-next";
+type DEPENDENCY = "@shopware-pwa/composables-next";
 
 const distDir = dirname(fileURLToPath(import.meta.url));
 const pkgDir = resolve(distDir, "..");
diff --git a/packages/nuxt3-module/tsconfig.json b/packages/nuxt3-module/tsconfig.json
index 64c2de548..a9a83920c 100644
--- a/packages/nuxt3-module/tsconfig.json
+++ b/packages/nuxt3-module/tsconfig.json
@@ -1,11 +1,12 @@
 {
   "extends": "tsconfig/base.json",
   "include": ["."],
-  "exclude": [
-    "dist"
-  ],
+  "exclude": ["dist"],
   "compilerOptions": {
     "target": "esnext",
-    "module": "esnext"
+    "module": "esnext",
+    "paths": {
+      "#imports": ["./imports.d.ts"]
+    }
   }
 }
diff --git a/packages/typer/.eslintrc.js b/packages/typer/.eslintrc.cjs
similarity index 100%
rename from packages/typer/.eslintrc.js
rename to packages/typer/.eslintrc.cjs
diff --git a/packages/types/package.json b/packages/types/package.json
index 761faf7eb..0dd7a92f8 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -35,6 +35,9 @@
     "lint": "eslint shopware-6-client/**/*.ts* --fix --max-warnings=0 && pnpm run typecheck",
     "typecheck": "tsc --noEmit"
   },
+  "dependencies": {
+    "@shopware/api-client": "workspace:*"
+  },
   "devDependencies": {
     "eslint-config-shopware": "workspace:*",
     "tsconfig": "workspace:*"
diff --git a/packages/types/shopware-6-client/errors/ApiError.d.ts b/packages/types/shopware-6-client/errors/ApiError.d.ts
index 3c81e17e6..ee2004be7 100644
--- a/packages/types/shopware-6-client/errors/ApiError.d.ts
+++ b/packages/types/shopware-6-client/errors/ApiError.d.ts
@@ -1,11 +1,11 @@
 import { AxiosResponse, AxiosError } from "axios";
-import { Error } from "../response/Error";
+import { ApiError } from "@shopware/api-client";
 /**
  * API error structure for incoming errors
  *
- * @public
+ * @deprecated use ApiError type from "@shopware/api-client" instead
  */
-export type ShopwareError = Error;
+export type ShopwareError = ApiError;
 /**
  * API Error response from Shopware backend
  *
@@ -20,7 +20,7 @@ export type ShopwareApiError = AxiosError & {
 /**
  * API client error structure
  *
- * @public
+ * @deprecated use ApiClientError type from "@shopware/api-client" instead
  */
 export type ClientApiError = {
   messages: ShopwareError[];
diff --git a/packages/types/shopware-6-client/models/checkout/cart/Cart.d.ts b/packages/types/shopware-6-client/models/checkout/cart/Cart.d.ts
index c84b86b36..482184720 100644
--- a/packages/types/shopware-6-client/models/checkout/cart/Cart.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/cart/Cart.d.ts
@@ -45,6 +45,6 @@ export type Cart = {
   transactions: Transaction[];
   modified: boolean;
   customerComment: null | string;
-  affiliateCode: null | string;
-  campaignCode: null | string;
+  affiliateCode?: string;
+  campaignCode?: string;
 };
diff --git a/packages/types/shopware-6-client/models/checkout/cart/line-item/LineItem.d.ts b/packages/types/shopware-6-client/models/checkout/cart/line-item/LineItem.d.ts
index a555c669f..823965e6f 100644
--- a/packages/types/shopware-6-client/models/checkout/cart/line-item/LineItem.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/cart/line-item/LineItem.d.ts
@@ -1,39 +1,33 @@
-import { CalculatedPrice } from "../price/CalculatedPrice";
-import { Media } from "../../../content/media/Media";
-import { Rule } from "../../../content/rule/Rule";
-import { DeliveryInformation } from "../../delivery/DeliveryInformation";
-import { PriceDefinitionInterface } from "../price/PriceDefinitionInterface";
-import { QuantityInformation } from "./QuantityInformation";
-import { Product } from "../../../content/product/Product";
-import { Promotion } from "../../promotion/Promotion";
+import type { Schemas } from "#shopware";
 
 /**
- * @beta
+ * @deprecated use {@link Schemas['LineItem']['type']} from "#shopware" import instead
  */
-export type LineItemType = "product" | "promotion" | "custom" | "credit";
+export type LineItemType = Schemas["LineItem"]["type"];
 
 /**
- * @beta
+ * @deprecated use {@link Schemas['LineItem']} from "#shopware" import instead
  */
-export type LineItem = {
-  id: string;
-  referencedId: string | null;
-  label: string | null;
-  quantity: number;
-  type: LineItemType;
-  payload: Product | Promotion;
-  priceDefinition: PriceDefinitionInterface | null;
-  price: CalculatedPrice | null;
-  good: boolean;
-  description: string | null;
-  cover: (Media & { url: string }) | null;
-  deliveryInformation: DeliveryInformation | null;
-  children: LineItem[];
-  requirement: Rule | null;
-  removable: boolean;
-  stackable: boolean;
-  quantityInformation: QuantityInformation | null;
-  modified: boolean;
-  apiAlias: "line_item";
-  states: string[];
-};
+export type LineItem = Schemas["LineItem"];
+// export type LineItem = {
+//   id: string;
+//   referencedId: string | null;
+//   label: string | null;
+//   quantity: number;
+//   type: LineItemType;
+//   payload: Product | Promotion;
+//   priceDefinition: PriceDefinitionInterface | null;
+//   price: CalculatedPrice | null;
+//   good: boolean;
+//   description: string | null;
+//   cover?: Media & { url: string };
+//   deliveryInformation: DeliveryInformation | null;
+//   children: LineItem[];
+//   requirement: Rule | null;
+//   removable: boolean;
+//   stackable: boolean;
+//   quantityInformation: QuantityInformation | null;
+//   modified: boolean;
+//   apiAlias: "line_item";
+//   states: string[];
+// };
diff --git a/packages/types/shopware-6-client/models/checkout/cart/price/CalculatedPrice.d.ts b/packages/types/shopware-6-client/models/checkout/cart/price/CalculatedPrice.d.ts
index e30319e8b..bb0f74de2 100644
--- a/packages/types/shopware-6-client/models/checkout/cart/price/CalculatedPrice.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/cart/price/CalculatedPrice.d.ts
@@ -1,27 +1,29 @@
-import { CalculatedTax } from "../../../system/tax/CalculatedTax";
-import { TaxRule } from "../../../system/tax/TaxRule";
-import { ReferencePrice } from "./ReferencePrice";
+import type { Schemas } from "#shopware";
+// import { CalculatedTax } from "../../../system/tax/CalculatedTax";
+// import { TaxRule } from "../../../system/tax/TaxRule";
+// import { ReferencePrice } from "./ReferencePrice";
 
 /**
- * @public
+ * @deprecated use {@link Schemas["CalculatedPrice"]} from "#shopware" import instead
  */
-export type CalculatedPrice = {
-  unitPrice: number;
-  quantity: number;
-  totalPrice: number;
-  calculatedTaxes: CalculatedTax[];
-  taxRules: TaxRule[];
-  referencePrice: ReferencePrice;
-  hasRange?: boolean;
-  listPrice: {
-    price: number;
-    discount: number;
-    percentage: number;
-    apiAlias: string;
-  } | null;
-  regulationPrice: null | {
-    price: number;
-  };
-  apiAlias: string;
-  variantId?: string;
-};
+export type CalculatedPrice = Schemas["CalculatedPrice"];
+// export type CalculatedPrice = {
+//   unitPrice: number;
+//   quantity: number;
+//   totalPrice: number;
+//   calculatedTaxes: CalculatedTax[];
+//   taxRules: TaxRule[];
+//   referencePrice: ReferencePrice;
+//   hasRange?: boolean;
+//   listPrice: {
+//     price: number;
+//     discount: number;
+//     percentage: number;
+//     apiAlias: string;
+//   } | null;
+//   regulationPrice: null | {
+//     price: number;
+//   };
+//   apiAlias: string;
+//   variantId?: string;
+// };
diff --git a/packages/types/shopware-6-client/models/checkout/cart/price/ReferencePrice.d.ts b/packages/types/shopware-6-client/models/checkout/cart/price/ReferencePrice.d.ts
index 4ad2c46dc..68ed8a067 100644
--- a/packages/types/shopware-6-client/models/checkout/cart/price/ReferencePrice.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/cart/price/ReferencePrice.d.ts
@@ -1,3 +1,6 @@
+/**
+ * @deprecated use {@link Schemas["CalculatedPrice"]} from "#shopware" import instead
+ */
 export type ReferencePrice = {
   price: number;
   purchaseUnit: number;
diff --git a/packages/types/shopware-6-client/models/checkout/customer/BillingAddress.d.ts b/packages/types/shopware-6-client/models/checkout/customer/BillingAddress.d.ts
index ab42951af..0b0989496 100644
--- a/packages/types/shopware-6-client/models/checkout/customer/BillingAddress.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/customer/BillingAddress.d.ts
@@ -1,6 +1,7 @@
+import type { Schemas } from "#shopware";
 import { CustomerAddress } from "./CustomerAddress";
 
 /**
- * @public
+ * @deprecated use Schemas['CustomerAddress'] from "#shopware" import instead
  */
-export type BillingAddress = CustomerAddress;
+export type BillingAddress = Schemas["CustomerAddress"];
diff --git a/packages/types/shopware-6-client/models/checkout/customer/Customer.d.ts b/packages/types/shopware-6-client/models/checkout/customer/Customer.d.ts
index 80a9b9fa0..2d15dea05 100644
--- a/packages/types/shopware-6-client/models/checkout/customer/Customer.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/customer/Customer.d.ts
@@ -8,50 +8,52 @@ import { CustomerAddress } from "./CustomerAddress";
 import { Promotion } from "../promotion/Promotion";
 import { Tag } from "../../system/tag/Tag";
 import { CustomFields } from "../../common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
- * @beta
+ * @deprecated use {@link Schemas['Customer']} from "#shopware" import instead
  */
-export type Customer = {
-  id: string;
-  groupId: string;
-  defaultPaymentMethodId: string;
-  salesChannelId: string;
-  languageId: string;
-  lastPaymentMethodId: string | null;
-  defaultBillingAddressId: string | null;
-  defaultShippingAddressId: string | null;
-  customerNumber: number;
-  salutationId: string | null;
-  firstName: string;
-  lastName: string;
-  company: string | null;
-  email: string;
-  title: string | null;
-  active: boolean;
-  guest: boolean;
-  firstLogin: Date | null;
-  lastLogin: Date | null;
-  newsletter: boolean;
-  birthday: Date;
-  lastOrderDate: Date;
-  orderCount: number;
-  createdAt: Date;
-  updatedAt: Date | string | null;
-  group: CustomerGroup;
-  defaultPaymentMethod: PaymentMethod;
-  defaultBillingAddress: BillingAddress;
-  defaultShippingAddress: ShippingAddress;
-  activeBillingAddress: BillingAddress;
-  activeShippingAddress: ShippingAddress;
-  addresses: Array<CustomerAddress>;
-  orderCustomers: Array<OrderCustomer> | null;
-  autoIncrement: number;
-  tags: Tag[] | null;
-  promotions: Promotion[] | null;
-  customFields: CustomFields;
-  productReviews: ProductReview[];
-  doubleOptInConfirmDate: null | string;
-  doubleOptInEmailSentDate: string;
-  doubleOptInRegistration: boolean;
-};
+export type Customer = Schemas["Customer"];
+// export type Customer = {
+//   id: string;
+//   groupId: string;
+//   defaultPaymentMethodId: string;
+//   salesChannelId: string;
+//   languageId: string;
+//   lastPaymentMethodId: string | null;
+//   defaultBillingAddressId: string | null;
+//   defaultShippingAddressId: string | null;
+//   customerNumber: number;
+//   salutationId: string | null;
+//   firstName: string;
+//   lastName: string;
+//   company: string | null;
+//   email: string;
+//   title: string | null;
+//   active: boolean;
+//   guest: boolean;
+//   firstLogin: Date | null;
+//   lastLogin: Date | null;
+//   newsletter: boolean;
+//   birthday: Date;
+//   lastOrderDate: Date;
+//   orderCount: number;
+//   createdAt: Date;
+//   updatedAt: Date | string | null;
+//   group: CustomerGroup;
+//   defaultPaymentMethod: PaymentMethod;
+//   defaultBillingAddress: BillingAddress;
+//   defaultShippingAddress: ShippingAddress;
+//   activeBillingAddress: BillingAddress;
+//   activeShippingAddress: ShippingAddress;
+//   addresses: Array<CustomerAddress>;
+//   orderCustomers: Array<OrderCustomer> | null;
+//   autoIncrement: number;
+//   tags: Tag[] | null;
+//   promotions: Promotion[] | null;
+//   customFields: CustomFields;
+//   productReviews: ProductReview[];
+//   doubleOptInConfirmDate: null | string;
+//   doubleOptInEmailSentDate: string;
+//   doubleOptInRegistration: boolean;
+// };
diff --git a/packages/types/shopware-6-client/models/checkout/customer/CustomerAddress.d.ts b/packages/types/shopware-6-client/models/checkout/customer/CustomerAddress.d.ts
index 06c47112e..5de63dc7a 100644
--- a/packages/types/shopware-6-client/models/checkout/customer/CustomerAddress.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/customer/CustomerAddress.d.ts
@@ -1,6 +1,7 @@
 import { Country } from "../../system/country/Country";
 import { CustomFields } from "../../common/CustomField";
 import { Salutation } from "../../system/salutation/Salutation";
+import type { Schemas } from "#shopware";
 
 /**
  * @public
@@ -8,29 +9,30 @@ import { Salutation } from "../../system/salutation/Salutation";
 export type AddressType = "billing" | "shipping";
 
 /**
- * @public
+ * @deprecated use Schemas['CustomerAddress'] from "#shopware" import instead
  */
-export type CustomerAddress = {
-  customerId?: string;
-  countryId: string;
-  countryStateId?: string | null;
-  salutationId: string;
-  firstName: string;
-  lastName: string;
-  zipcode: string;
-  city: string;
-  company?: string | null;
-  department?: string | null;
-  title?: string | null;
-  street: string;
-  vatId?: string | null;
-  phoneNumber?: string | null;
-  additionalAddressLine1?: string;
-  additionalAddressLine2?: string;
-  country?: Country;
-  countryState?: CountryState;
-  salutation?: Salutation | null;
-  customer?: string;
-  customFields?: CustomFields;
-  id: string;
-};
+export type CustomerAddress = Schemas["CustomerAddress"];
+// export type CustomerAddress = {
+//   customerId?: string;
+//   countryId: string;
+//   countryStateId?: string | null;
+//   salutationId: string;
+//   firstName: string;
+//   lastName: string;
+//   zipcode: string;
+//   city: string;
+//   company?: string | null;
+//   department?: string | null;
+//   title?: string | null;
+//   street: string;
+//   vatId?: string | null;
+//   phoneNumber?: string | null;
+//   additionalAddressLine1?: string;
+//   additionalAddressLine2?: string;
+//   country?: Country;
+//   countryState?: CountryState;
+//   salutation?: Salutation | null;
+//   customer?: string;
+//   customFields?: CustomFields;
+//   id: string;
+// };
diff --git a/packages/types/shopware-6-client/models/checkout/customer/ShippingAddress.d.ts b/packages/types/shopware-6-client/models/checkout/customer/ShippingAddress.d.ts
index 5eaf041d6..8e3e55ecf 100644
--- a/packages/types/shopware-6-client/models/checkout/customer/ShippingAddress.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/customer/ShippingAddress.d.ts
@@ -1,6 +1,7 @@
+import type { Schemas } from "#shopware";
 import { CustomerAddress } from "./CustomerAddress";
 
 /**
- * @public
+ * @deprecated use Schemas['CustomerAddress'] from "#shopware" import instead
  */
-export type ShippingAddress = CustomerAddress;
+export type ShippingAddress = Schemas["CustomerAddress"];
diff --git a/packages/types/shopware-6-client/models/checkout/order/Order.d.ts b/packages/types/shopware-6-client/models/checkout/order/Order.d.ts
index 205412382..77740c3f0 100644
--- a/packages/types/shopware-6-client/models/checkout/order/Order.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/order/Order.d.ts
@@ -9,6 +9,8 @@ import { SalesChannel } from "../../system/sales-channel/SalesChannel";
 import { CustomFields } from "../../common/CustomField";
 import { Delivery } from "../delivery/Delivery";
 import { OrderDocument } from "./OrderDocument";
+import type { Schemas } from "#shopware";
+
 interface CalculatedTax {
   tax: number;
   taxRate: number;
@@ -65,44 +67,49 @@ interface OrderCustomer {
   orderVersionId: string;
 }
 
-export type Order = {
-  orderNumber: number;
-  currencyId: string;
-  currencyFactor: number;
-  salesChannelId: string;
-  billingAddressId: string;
-  orderDateTime: Date;
-  orderDate: Date;
-  price: Price;
-  amountTotal: number;
-  amountNet: number;
-  positionPrice: number;
-  taxStatus: string;
-  shippingCosts: ShippingCost;
-  shippingTotal: number;
-  orderCustomer: OrderCustomer;
-  currency: Currency | null;
-  languageId: string;
-  language: Language | null;
-  salesChannel: SalesChannel | null;
-  addresses: CustomerAddress[];
-  deliveries: Delivery[];
-  lineItems: OrderLineItem[] | null;
-  transactions: OrderTransaction[] | null;
-  deepLinkCode: string;
-  stateMachineState: StateMachineState;
-  stateId: string;
-  customFields: CustomFields;
-  documents: OrderDocument[];
-  tags: Tag[] | null;
-  affiliateCode: string | null;
-  campaignCode: string | null;
-  _uniqueIdentifier: string;
-  versionId: string;
-  translated: any[];
-  createdAt: Date;
-  updatedAt: Date | string | null;
-  extensions: unknown;
-  id: string;
-  billingAddressVersionId: string;
-};
+/**
+ * @deprecated use Schemas['Order'] from "#shopware" import instead
+ */
+export type Order = Schemas["Order"];
+
+// {
+//   orderNumber: number;
+//   currencyId: string;
+//   currencyFactor: number;
+//   salesChannelId: string;
+//   billingAddressId: string;
+//   orderDateTime: Date;
+//   orderDate: Date;
+//   price: Price;
+//   amountTotal: number;
+//   amountNet: number;
+//   positionPrice: number;
+//   taxStatus: string;
+//   shippingCosts: ShippingCost;
+//   shippingTotal: number;
+//   orderCustomer: OrderCustomer;
+//   currency: Currency | null;
+//   languageId: string;
+//   language: Language | null;
+//   salesChannel: SalesChannel | null;
+//   addresses: CustomerAddress[];
+//   deliveries: Delivery[];
+//   lineItems: OrderLineItem[] | null;
+//   transactions: OrderTransaction[] | null;
+//   deepLinkCode: string;
+//   stateMachineState: StateMachineState;
+//   stateId: string;
+//   customFields: CustomFields;
+//   documents: OrderDocument[];
+//   tags: Tag[] | null;
+//   affiliateCode: string | null;
+//   campaignCode?: string;
+//   _uniqueIdentifier: string;
+//   versionId: string;
+//   translated: any[];
+//   createdAt: Date;
+//   updatedAt: Date | string | null;
+//   extensions: unknown;
+//   id: string;
+//   billingAddressVersionId: string;
+// };
diff --git a/packages/types/shopware-6-client/models/checkout/order/OrderDocument.d.ts b/packages/types/shopware-6-client/models/checkout/order/OrderDocument.d.ts
index a6f697d90..d968ae218 100644
--- a/packages/types/shopware-6-client/models/checkout/order/OrderDocument.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/order/OrderDocument.d.ts
@@ -1,13 +1,19 @@
-export type OrderDocument = {
-  id: string;
-  deepLinkCode: string;
-  sent: boolean;
-  config: {
-    name: string;
-    title: string;
-  };
-  orderId: string;
-  fileType: string;
-  createdAt: Date;
-  updatedAt: Date | string | null;
-};
+import type { Schemas } from "#shopware";
+
+/**
+ * @deprecated use {@link Schemas["Document"]} from "#shopware" import instead
+ */
+export type OrderDocument = Schemas["Document"];
+// export type OrderDocument = {
+//   id: string;
+//   deepLinkCode: string;
+//   sent: boolean;
+//   config: {
+//     name: string;
+//     title: string;
+//   };
+//   orderId: string;
+//   fileType: string;
+//   createdAt: Date;
+//   updatedAt: Date | string | null;
+// };
diff --git a/packages/types/shopware-6-client/models/checkout/order/OrderTransaction.d.ts b/packages/types/shopware-6-client/models/checkout/order/OrderTransaction.d.ts
index 3eb82f67f..6be0c4573 100644
--- a/packages/types/shopware-6-client/models/checkout/order/OrderTransaction.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/order/OrderTransaction.d.ts
@@ -3,17 +3,20 @@ import { PaymentMethod } from "../payment/PaymentMethod";
 import { StateMachineState } from "../../system/state-machine/StateMachineState";
 import { CalculatedPrice } from "../cart/price/CalculatedPrice";
 import { CustomFields } from "../../common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
  * @public
+ * @deprecated use Schemas['OrderTransaction'] from "#shopware" import instead
  */
-export type OrderTransaction = {
-  orderId: string;
-  paymentMethodId: string;
-  amount: CalculatedPrice;
-  paymentMethod: PaymentMethod | null;
-  order: Order | null;
-  stateMachineState: StateMachineState | null;
-  stateId: string;
-  customFields: CustomFields;
-};
+export type OrderTransaction = Schemas["OrderTransaction"];
+// export type OrderTransaction = {
+//   orderId: string;
+//   paymentMethodId: string;
+//   amount: CalculatedPrice;
+//   paymentMethod: PaymentMethod | null;
+//   order: Order | null;
+//   stateMachineState: StateMachineState | null;
+//   stateId: string;
+//   customFields: CustomFields;
+// };
diff --git a/packages/types/shopware-6-client/models/checkout/payment/PaymentMethod.d.ts b/packages/types/shopware-6-client/models/checkout/payment/PaymentMethod.d.ts
index 272aef025..7aea7517e 100644
--- a/packages/types/shopware-6-client/models/checkout/payment/PaymentMethod.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/payment/PaymentMethod.d.ts
@@ -6,38 +6,41 @@ import { Rule } from "../../content/rule/Rule";
 import { PaymentMethodTranslation } from "./PaymentMethodTranslation";
 import { OrderTransaction } from "../order/OrderTransaction";
 import { CustomFields } from "../../common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
- * @beta
+ * @deprecated use Schemas['PaymentMethod'] from "#shopware" import instead
  */
-export type PaymentMethod = {
-  id: string;
-  pluginId: string | null;
-  handlerIdentifier: string;
-  name: string | null;
-  description: string | null;
-  position: number;
-  active: boolean;
-  plugin: Plugin | null;
-  translations: PaymentMethodTranslation[] | null;
-  translated: PaymentMethodTranslation | null;
-  orderTransactions: OrderTransaction[] | null;
-  customers: Customer[] | null;
-  salesChannelDefaultAssignments: SalesChannel[] | null;
-  availabilityRule: Rule | null;
-  availabilityRuleId: string;
-  mediaId: string | null;
-  media: Media | null;
-  customFields: CustomFields;
-  formattedHandlerIDentifier: string;
-  createdAt: string;
-  updatedAt: Date | string | null;
-  distinguishableName: string;
-  afterOrderEnabled: boolean;
-  shortName: string;
-  synchronous: boolean;
-  asynchronous: boolean;
-  prepared: boolean;
-  refundable: boolean;
-  apiAlias: "payment_method";
-};
+export type PaymentMethod = Schemas["PaymentMethod"];
+
+//  {
+//   id: string;
+//   pluginId: string | null;
+//   handlerIdentifier: string;
+//   name: string | null;
+//   description: string | null;
+//   position: number;
+//   active: boolean;
+//   plugin: Plugin | null;
+//   translations: PaymentMethodTranslation[] | null;
+//   translated: PaymentMethodTranslation | null;
+//   orderTransactions: OrderTransaction[] | null;
+//   customers: Customer[] | null;
+//   salesChannelDefaultAssignments: SalesChannel[] | null;
+//   availabilityRule: Rule | null;
+//   availabilityRuleId: string;
+//   mediaId: string | null;
+//   media: Media | null;
+//   customFields: CustomFields;
+//   formattedHandlerIDentifier: string;
+//   createdAt: string;
+//   updatedAt: Date | string | null;
+//   distinguishableName: string;
+//   afterOrderEnabled: boolean;
+//   shortName: string;
+//   synchronous: boolean;
+//   asynchronous: boolean;
+//   prepared: boolean;
+//   refundable: boolean;
+//   apiAlias: "payment_method";
+// };
diff --git a/packages/types/shopware-6-client/models/checkout/shipping/ShippingMethod.d.ts b/packages/types/shopware-6-client/models/checkout/shipping/ShippingMethod.d.ts
index dd0e036a8..bdcc474d3 100644
--- a/packages/types/shopware-6-client/models/checkout/shipping/ShippingMethod.d.ts
+++ b/packages/types/shopware-6-client/models/checkout/shipping/ShippingMethod.d.ts
@@ -8,34 +8,39 @@ import { Tag } from "../../system/tag/Tag";
 import { ShippingMethodTranslation } from "./ShippingMethodTranslation";
 import { CustomFields } from "../../common/CustomField";
 import { Tax } from "../../system/tax/Tax";
+import type { Schemas } from "#shopware";
 
 /**
  * @public
+ *
+ * @deprecated use Schemas['ShippingMethod'] from "#shopware" import instead
  */
-export type ShippingMethod = {
-  id: string;
-  name: string | null;
-  active: boolean;
-  position?: number;
-  customFields?: CustomFields | null;
-  mediaId: string | null;
-  deliveryTimeId: string;
-  taxType: string;
-  description: string | null;
-  trackingUrl: string | null;
-  createdAt: string | Date;
-  updatedAt: Date | string | null;
-  translated: ShippingMethodTranslation | null;
-  deliveryTime: DeliveryTime | null;
-  availabilityRule: Rule | null;
-  prices: ShippingMethodPrice[];
-  media: Media | null;
-  tags: Tag[] | null;
-  translations: ShippingMethodTranslation[] | null;
-  orderDeliveries?: OrderDelivery[] | null;
-  salesChannelDefaultAssignments?: SalesChannel[] | null;
-  salesChannels?: SalesChannel[] | null;
-  availabilityRuleId?: string;
-  tax: Tax | null;
-  apiAlias: "shipping_method";
-};
+export type ShippingMethod = Schemas["ShippingMethod"];
+
+//  {
+//   id: string;
+//   name: string | null;
+//   active: boolean;
+//   position?: number;
+//   customFields?: CustomFields | null;
+//   mediaId: string | null;
+//   deliveryTimeId: string;
+//   taxType: string;
+//   description: string | null;
+//   trackingUrl: string | null;
+//   createdAt: string | Date;
+//   updatedAt: Date | string | null;
+//   translated: ShippingMethodTranslation | null;
+//   deliveryTime: DeliveryTime | null;
+//   availabilityRule: Rule | null;
+//   prices: ShippingMethodPrice[];
+//   media: Media | null;
+//   tags: Tag[] | null;
+//   translations: ShippingMethodTranslation[] | null;
+//   orderDeliveries?: OrderDelivery[] | null;
+//   salesChannelDefaultAssignments?: SalesChannel[] | null;
+//   salesChannels?: SalesChannel[] | null;
+//   availabilityRuleId?: string;
+//   tax: Tax | null;
+//   apiAlias: "shipping_method";
+// };
diff --git a/packages/types/shopware-6-client/models/content/category/Category.d.ts b/packages/types/shopware-6-client/models/content/category/Category.d.ts
index 9757471ad..32dd5621f 100644
--- a/packages/types/shopware-6-client/models/content/category/Category.d.ts
+++ b/packages/types/shopware-6-client/models/content/category/Category.d.ts
@@ -6,6 +6,7 @@ import { Tag } from "../../system/tag/Tag";
 import { CategoryTranslation } from "./CategoryTranslation";
 import { CustomFields } from "../../common/CustomField";
 import { SeoUrl } from "../navigation/Navigation";
+import type { Schemas } from "#shopware";
 /**
  * Source: https://github.com/shopware/platform/blob/master/src/Core/Content/Category/CategoryDefinition.php#L50
  *
@@ -14,65 +15,66 @@ import { SeoUrl } from "../navigation/Navigation";
 export type CategoryType = "page" | "link" | "folder";
 
 /**
- * @beta
+ * @deprecated use {@link Schemas['Category']} from "#shopware" import instead
  */
-export type Category = Entity & {
-  parentId: string | null;
-  autoIncrement?: number;
-  mediaId: string | null;
-  name: string | null;
-  breadcrumb: string[];
-  level: number;
-  active: boolean;
-  childCount: number;
-  displayNestedProducts: boolean;
-  parent: Category | null;
-  children: Category[] | null;
-  translations: CategoryTranslation[] | null;
-  media: Media | null;
-  products?: Product[] | null;
-  nestedProducts?: Product[] | null;
-  afterCategoryId: string | null;
-  customFields: CustomFields | null;
-  tags?: Tag[] | null;
-  cmsPageId: string | null;
-  cmsPage: CmsPage | null;
-  slotConfig?: [] | null;
-  externalLink: string | null;
-  linkNewTab: boolean | null;
-  visible: boolean;
-  type: CategoryType;
-  description: string | null;
-  id: string;
-  parentVersionId?: string;
-  childrenCount?: number;
-  afterCategoryVersionId?: string;
-  path?: string;
-  route?: {
-    path?: string;
-  };
-  seoUrls: SeoUrl[] | null;
-  metaTitle: string | null;
-  metaDescription: string | null;
-  keywords: string | null;
-  translated: {
-    name: string;
-    breadcrumb: string[];
-    description: string | null;
-    externalLink: string | null;
-    metaTitle: string | null;
-    metaDescription: string | null;
-    keywords: string | null;
-    customFields: CustomFields | null;
-    linkType: string | null;
-    internalLink: string | null;
-    linkNewTab: string | null;
-  };
-  linkType: "product" | "category" | "landing_page" | string | null;
-  internalLink: string | null;
-  extensions?: unknown;
-  visibleChildCount?: number | null;
-  cmsPageIdSwitched?: boolean;
-  productAssignmentType?: string;
-  customEntityTypeId?: string | null;
-};
+export type Category = Schemas["Category"];
+// export type Category = Entity & {
+//   parentId: string | null;
+//   autoIncrement?: number;
+//   mediaId: string | null;
+//   name: string | null;
+//   breadcrumb: string[];
+//   level: number;
+//   active: boolean;
+//   childCount: number;
+//   displayNestedProducts: boolean;
+//   parent: Category | null;
+//   children: Category[] | null;
+//   translations: CategoryTranslation[] | null;
+//   media: Media | null;
+//   products?: Product[] | null;
+//   nestedProducts?: Product[] | null;
+//   afterCategoryId: string | null;
+//   customFields: CustomFields | null;
+//   tags?: Tag[] | null;
+//   cmsPageId: string | null;
+//   cmsPage: CmsPage | null;
+//   slotConfig?: [] | null;
+//   externalLink: string | null;
+//   linkNewTab: boolean | null;
+//   visible: boolean;
+//   type: CategoryType;
+//   description: string | null;
+//   id: string;
+//   parentVersionId?: string;
+//   childrenCount?: number;
+//   afterCategoryVersionId?: string;
+//   path?: string;
+//   route?: {
+//     path?: string;
+//   };
+//   seoUrls: SeoUrl[] | null;
+//   metaTitle: string | null;
+//   metaDescription: string | null;
+//   keywords: string | null;
+//   translated: {
+//     name: string;
+//     breadcrumb: string[];
+//     description: string | null;
+//     externalLink: string | null;
+//     metaTitle: string | null;
+//     metaDescription: string | null;
+//     keywords: string | null;
+//     customFields: CustomFields | null;
+//     linkType: string | null;
+//     internalLink: string | null;
+//     linkNewTab: string | null;
+//   };
+//   linkType: "product" | "category" | "landing_page" | string | null;
+//   internalLink: string | null;
+//   extensions?: unknown;
+//   visibleChildCount?: number | null;
+//   cmsPageIdSwitched?: boolean;
+//   productAssignmentType?: string;
+//   customEntityTypeId?: string | null;
+// };
diff --git a/packages/types/shopware-6-client/models/content/cms/CmsPage.d.ts b/packages/types/shopware-6-client/models/content/cms/CmsPage.d.ts
index 221e49b69..ca25160a3 100644
--- a/packages/types/shopware-6-client/models/content/cms/CmsPage.d.ts
+++ b/packages/types/shopware-6-client/models/content/cms/CmsPage.d.ts
@@ -4,6 +4,7 @@ import { Product } from "../product/Product";
 import { Aggregation } from "../../../search/Aggregation";
 import { CmsBlock } from "./CmsBlock";
 import { LandingPage } from "../landing-page/LandingPage";
+import type { Schemas } from "#shopware";
 
 /**
  * Cms page type
@@ -18,12 +19,12 @@ export type DetailRouteName = "frontend.detail.page";
 
 /**
  * Cms page route name responsible for the type of the page
- *
+ * @deprecated use {limk Schemas['SeoUrl']['routeName']} from "#shopware" import instead
  */
-export type RouteName =
-  | NavigationRouteName
-  | LandingRouteName
-  | DetailRouteName;
+export type RouteName = Schemas["SeoUrl"]["routeName"];
+// | NavigationRouteName
+// | LandingRouteName
+// | DetailRouteName;
 
 /**
  * @public
@@ -174,7 +175,7 @@ export type CmsFieldConfig = {
  */
 export type OldSlot = {
   type: CmsSlotType;
-  customFields: CustomFields | null;
+  customFields: CustomFields | null | [];
   locked: boolean;
   _uniqueIdentifier: string;
   versionId: string;
diff --git a/packages/types/shopware-6-client/models/content/landing-page/LandingPage.d.ts b/packages/types/shopware-6-client/models/content/landing-page/LandingPage.d.ts
index afbe61032..78175e326 100644
--- a/packages/types/shopware-6-client/models/content/landing-page/LandingPage.d.ts
+++ b/packages/types/shopware-6-client/models/content/landing-page/LandingPage.d.ts
@@ -1,36 +1,38 @@
 import { CmsPage } from "../cms/CmsPage";
 import { SeoUrl } from "../navigation/Navigation";
 import { CustomFields } from "../../common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
- * @public
+ * @deprecated use {@link Schemas['LandingPage']} from "#shopware" import instead
  */
-export type LandingPage = {
-  active: boolean;
-  translations: null | unknown;
-  cmsPage: null | CmsPage;
-  cmsPageId: string;
-  name: string;
-  metaTitle: null | string;
-  metaDescription: null | string;
-  keywords: null | string;
-  url: string;
-  slotConfig: null | unknown[];
-  seoUrls: null | SeoUrl[];
-  _uniqueIdentifier: string;
-  versionId: string;
-  translated: {
-    name: string;
-    metaTitle: string | null;
-    metaDescription: string | null;
-    keywords: string | null;
-    url: string;
-  };
-  createdAt: string;
-  updatedAt: Date | string | null;
-  extensions: unknown;
-  id: string;
-  customFields: CustomFields;
-  cmsPageVersionId: string;
-  apiAlias: "landing_page";
-};
+export type LandingPage = Schemas["LandingPage"];
+// export type LandingPage = {
+//   active: boolean;
+//   translations: null | unknown;
+//   cmsPage: null | CmsPage;
+//   cmsPageId: string;
+//   name: string;
+//   metaTitle: null | string;
+//   metaDescription: null | string;
+//   keywords: null | string;
+//   url: string;
+//   slotConfig: null | unknown[];
+//   seoUrls: null | SeoUrl[];
+//   _uniqueIdentifier: string;
+//   versionId: string;
+//   translated: {
+//     name: string;
+//     metaTitle: string | null;
+//     metaDescription: string | null;
+//     keywords: string | null;
+//     url: string;
+//   };
+//   createdAt: string;
+//   updatedAt: Date | string | null;
+//   extensions: unknown;
+//   id: string;
+//   customFields: CustomFields;
+//   cmsPageVersionId: string;
+//   apiAlias: "landing_page";
+// };
diff --git a/packages/types/shopware-6-client/models/content/navigation/Navigation.d.ts b/packages/types/shopware-6-client/models/content/navigation/Navigation.d.ts
index 8e0bebd13..41f3f926f 100644
--- a/packages/types/shopware-6-client/models/content/navigation/Navigation.d.ts
+++ b/packages/types/shopware-6-client/models/content/navigation/Navigation.d.ts
@@ -3,55 +3,58 @@ import { Media } from "../media/Media";
 import { Category } from "../category/Category";
 import { RouteName } from "../cms/CmsPage";
 import { CustomFields } from "../../common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
  * Navigation type to display on page.
  *
  * Source: https://github.com/shopware/platform/blob/trunk/src/Core/Content/Category/SalesChannel/NavigationRoute.php#L285
  *
- * @public
+ * @deprecated - use Schema["NavigationType"] instead from import "#shopware"
  */
-export type StoreNavigationType =
-  | "main-navigation"
-  | "footer-navigation"
-  | "service-navigation";
+export type StoreNavigationType = Schemas["NavigationType"];
+// export type StoreNavigationType =
+//   | "main-navigation"
+//   | "footer-navigation"
+//   | "service-navigation";
 
 /**
- * @public
+ * @deprecated - use Schema["NavigationElement"] instead from import "#shopware"
  */
-export type SeoUrl = {
-  salesChannelId: string;
-  languageId: string;
-  routeName: RouteName;
-  foreignKey: string;
-  pathInfo: string;
-  seoPathInfo: string;
-  isCanonical: boolean;
-  isModified: boolean;
-  isDeleted: boolean;
-  /**
-   * @deprecated removed from 6.5.0
-   */
-  isValid: null | boolean;
-  language?: null | boolean;
-  url: null | string;
-  customFields: CustomFields | null;
-  /**
-   * @deprecated removed from 6.5.0
-   */
-  error?: null | any;
-  _uniqueIdentifier?: string;
-  versionId?: null | string;
-  translated: [];
-  createdAt: Date | string;
-  updatedAt: Date | string | null;
-  extensions?: unknown;
-  id: string;
-  apiAlias: string;
-};
+export type SeoUrl = Schemas["SeoUrl"];
+// export type SeoUrl = {
+//   salesChannelId: string;
+//   languageId: string;
+//   routeName: RouteName;
+//   foreignKey: string;
+//   pathInfo: string;
+//   seoPathInfo: string;
+//   isCanonical: boolean;
+//   isModified: boolean;
+//   isDeleted: boolean;
+//   /**
+//    * @deprecated removed from 6.5.0
+//    */
+//   isValid: null | boolean;
+//   language?: null | boolean;
+//   url: null | string;
+//   customFields: CustomFields | null;
+//   /**
+//    * @deprecated removed from 6.5.0
+//    */
+//   error?: null | any;
+//   _uniqueIdentifier?: string;
+//   versionId?: null | string;
+//   translated: [];
+//   createdAt: Date | string;
+//   updatedAt: Date | string | null;
+//   extensions?: unknown;
+//   id: string;
+//   apiAlias: string;
+// };
 
 /**
- * @beta
+ * @deprecated use {@link Schemas['Category']} from "#shopware" import instead
  */
 export type StoreNavigationElement = Category;
 //   {
diff --git a/packages/types/shopware-6-client/models/content/newsletter/NewsletterInput.d.ts b/packages/types/shopware-6-client/models/content/newsletter/NewsletterInput.d.ts
index 3fdfd0284..6dd7587b9 100644
--- a/packages/types/shopware-6-client/models/content/newsletter/NewsletterInput.d.ts
+++ b/packages/types/shopware-6-client/models/content/newsletter/NewsletterInput.d.ts
@@ -1,20 +1,20 @@
-import { Tag } from "../../system/tag/Tag";
-import { CustomFields } from "../../common/CustomField";
+import type { RequestParameters } from "#shopware";
 
 /**
- * @public
+ * @deprecated use `RequestParameters<"subscribeToNewsletter">` from "#shopware" import instead
  */
-export type NewsletterInput = {
-  email: string;
-  option: "subscribe" | "unsubscribe";
-  storefrontUrl?: string;
-  salutationId?: string;
-  firstName?: string;
-  lastName?: string;
-  zipCode?: string;
-  city?: string;
-  street?: string;
-  tags?: Tag[];
-  languageId?: string;
-  customFields?: CustomFields;
-};
+export type NewsletterInput = RequestParameters<"subscribeToNewsletter">;
+// export type NewsletterInput = {
+//   email: string;
+//   option: "subscribe" | "unsubscribe";
+//   storefrontUrl?: string;
+//   salutationId?: string;
+//   firstName?: string;
+//   lastName?: string;
+//   zipCode?: string;
+//   city?: string;
+//   street?: string;
+//   tags?: Tag[];
+//   languageId?: string;
+//   customFields?: CustomFields;
+// };
diff --git a/packages/types/shopware-6-client/models/content/product/Product.d.ts b/packages/types/shopware-6-client/models/content/product/Product.d.ts
index 0617e3f25..991c9536e 100644
--- a/packages/types/shopware-6-client/models/content/product/Product.d.ts
+++ b/packages/types/shopware-6-client/models/content/product/Product.d.ts
@@ -17,139 +17,148 @@ import { SeoUrl } from "../navigation/Navigation";
 import { CmsPage } from "../cms/CmsPage";
 import { PropertyGroupOptionCart } from "../property/PropertyGroupOptionCart";
 import { PropertyGroupOption } from "../property/PropertyGroupOption";
+import type { Schemas } from "#shopware";
 
-export type CrossSelling = {
-  apiAlias: "cross_selling_element";
-  crossSelling: {
-    name: string;
-    position: number;
-    sortBy: string;
-    sortDirection: string;
-    limit: number;
-    active: boolean;
-    productId: string;
-    product: null | Product;
-    productStreamId: null | string;
-    type: string;
-    assignedProducts: Product[];
-    translations: unknown;
-    _uniqueIdentifier: string;
-    versionId: null | string;
-    translated: unknown;
-    createdAt: Date;
-    updatedAt: Date | string | null;
-    extensions: unknown;
-    id: string;
-    productVersionId: string;
-    apiAlias: string;
-  };
-  products: Product[];
-  streamId: string;
-  total: number;
-};
+/**
+ * @deprecated - use Schema["CrossSellingElementCollection"] instead from import "#shopware"
+ */
+export type CrossSelling = Schemas["CrossSellingElementCollection"];
+// export type CrossSelling = {
+//   apiAlias: "cross_selling_element";
+//   crossSelling: {
+//     name: string;
+//     position: number;
+//     sortBy: string;
+//     sortDirection: string;
+//     limit: number;
+//     active: boolean;
+//     productId: string;
+//     product: null | Product;
+//     productStreamId: null | string;
+//     type: string;
+//     assignedProducts: Product[];
+//     translations: unknown;
+//     _uniqueIdentifier: string;
+//     versionId: null | string;
+//     translated: unknown;
+//     createdAt: Date;
+//     updatedAt: Date | string | null;
+//     extensions: unknown;
+//     id: string;
+//     productVersionId: string;
+//     apiAlias: string;
+//   };
+//   products: Product[];
+//   streamId: string;
+//   total: number;
+// };
 
 /**
- * @public
+ * @deprecated - use Schema["Product"] instead from import "#shopware"
  */
-export type Product = {
-  active: boolean;
-  additionalText?: string | null;
-  apiAlias: "product";
-  autoIncrement: number;
-  available: boolean;
-  availableStock: number | null;
-  calculatedCheapestPrice: CalculatedPrice;
-  calculatedListingPrice: ListingPrice | null;
-  calculatedMaxPurchase: number;
-  calculatedPrice: CalculatedPrice;
-  calculatedPrices: CalculatedPrice[];
-  canonicalProduct: any;
-  canonicalProductId: string | null;
-  categories: Category[] | null;
-  categoriesRo: Category[] | null;
-  categoryIds: string[];
-  categoryTree: string[] | null;
-  cheapestPrice: ProductCheapestPrice | null;
-  childCount: number | null;
-  children: Product[] | null;
-  cmsPage: null | CmsPage;
-  cmsPageId: string | null;
-  configuratorSettings: PropertyGroup[] | null;
-  cover: ProductMedia;
-  coverId: string | null;
-  createdAt: Date | string;
-  crossSellings: CrossSelling[] | null;
-  customFields: CustomFields;
-  updatedAt: Date | string | null;
-  deliveryTime: DeliveryTime;
-  deliveryTimeId: string | null;
-  description: string | null;
-  displayGroup: string;
-  downloads: any;
-  ean: string | null;
-  extensions: [];
-  height: number | null;
-  id: string;
-  isCloseout: boolean | null;
-  isNew: boolean;
-  keywords: string | null;
-  length: number | null;
-  listingPrices: ListingPrice[] | null;
-  mainCategories: ProductMainCategories | null;
-  manufacturer: ProductManufacturer | null;
-  manufacturerId: string | null;
-  manufacturerNumber: string | null;
-  markAsTopseller: boolean | null;
-  maxPurchase: number | null;
-  media: ProductMedia[];
-  metaDescription: string | null;
-  metaTitle: string | null;
-  minPurchase: number | null;
-  name: string | null;
-  optionIds?: string[];
-  options: PropertyGroupOption[] | null;
-  packUnit: string | null;
-  packUnitPlural: string | null;
-  parent: Product | null;
-  parentId: string | null;
-  parentVersionId: string | null;
-  price: Price[] | null;
-  prices: ProductPrice[] | null;
-  productManufacturerVersionId: string | null;
-  productNumber: string;
-  productReviews: ProductReview[] | null;
-  properties: PropertyGroupOption[] | null;
-  propertyIds: [] | null;
-  purchasePrice: number | null;
-  purchaseSteps: number | null;
-  purchaseUnit: number | null;
-  ratingAverage: number | null;
-  referenceUnit: number | null;
-  releaseDate: Date | string | null;
-  restockTime: number;
-  sales: number;
-  seoCategory: Category | null;
-  seoUrls: SeoUrl[] | null;
-  shippingFree: boolean | null;
-  sortedProperties: PropertyGroup[] | null;
-  states: string[];
-  stock: number;
-  streamIds: string[] | null;
-  streams: ProductStreams | null;
-  tagIds: [] | null;
-  tags: Tag[] | null;
-  tax: Tax;
-  taxId: string | null;
-  translated: ProductTranslated;
-  translations: ProductTranslation[] | null;
-  unit: Unit | null;
-  unitId: string | null;
-  updatedAt: Date;
-  versionId: string;
-  weight: number | null;
-  width: number | null;
-};
+export type Product = Schemas["Product"];
+// export type Product = {
+//   active: boolean;
+//   additionalText?: string | null;
+//   apiAlias: "product";
+//   autoIncrement: number;
+//   available: boolean;
+//   availableStock: number | null;
+//   calculatedCheapestPrice: CalculatedPrice;
+//   calculatedListingPrice: ListingPrice | null;
+//   calculatedMaxPurchase: number;
+//   calculatedPrice: CalculatedPrice;
+//   calculatedPrices: CalculatedPrice[];
+//   canonicalProduct: any;
+//   canonicalProductId: string | null;
+//   categories: Category[] | null;
+//   categoriesRo: Category[] | null;
+//   categoryIds: string[];
+//   categoryTree: string[] | null;
+//   cheapestPrice: ProductCheapestPrice | null;
+//   childCount: number | null;
+//   children: Product[] | null;
+//   cmsPage: null | CmsPage;
+//   cmsPageId: string | null;
+//   configuratorSettings: PropertyGroup[] | null;
+//   cover: ProductMedia;
+//   coverId: string | null;
+//   createdAt: Date | string;
+//   crossSellings: CrossSelling[] | null;
+//   customFields: CustomFields;
+//   updatedAt: Date | string | null;
+//   deliveryTime: DeliveryTime;
+//   deliveryTimeId: string | null;
+//   description: string | null;
+//   displayGroup: string;
+//   downloads: any;
+//   ean: string | null;
+//   extensions: [];
+//   height: number | null;
+//   id: string;
+//   isCloseout: boolean | null;
+//   isNew: boolean;
+//   keywords: string | null;
+//   length: number | null;
+//   listingPrices: ListingPrice[] | null;
+//   mainCategories: ProductMainCategories | null;
+//   manufacturer: ProductManufacturer | null;
+//   manufacturerId: string | null;
+//   manufacturerNumber: string | null;
+//   markAsTopseller: boolean | null;
+//   maxPurchase: number | null;
+//   media: ProductMedia[];
+//   metaDescription: string | null;
+//   metaTitle: string | null;
+//   minPurchase: number | null;
+//   name: string | null;
+//   optionIds?: string[];
+//   options: PropertyGroupOption[] | null;
+//   packUnit: string | null;
+//   packUnitPlural: string | null;
+//   parent: Product | null;
+//   parentId: string | null;
+//   parentVersionId: string | null;
+//   price: Price[] | null;
+//   prices: ProductPrice[] | null;
+//   productManufacturerVersionId: string | null;
+//   productNumber: string;
+//   productReviews: ProductReview[] | null;
+//   properties: PropertyGroupOption[] | null;
+//   propertyIds: [] | null;
+//   purchasePrice: number | null;
+//   purchaseSteps: number | null;
+//   purchaseUnit: number | null;
+//   ratingAverage: number | null;
+//   referenceUnit: number | null;
+//   releaseDate: Date | string | null;
+//   restockTime: number;
+//   sales: number;
+//   seoCategory: Category | null;
+//   seoUrls: SeoUrl[] | null;
+//   shippingFree: boolean | null;
+//   sortedProperties: PropertyGroup[] | null;
+//   states: string[];
+//   stock: number;
+//   streamIds: string[] | null;
+//   streams: ProductStreams | null;
+//   tagIds: [] | null;
+//   tags: Tag[] | null;
+//   tax: Tax;
+//   taxId: string | null;
+//   translated: ProductTranslated;
+//   translations: ProductTranslation[] | null;
+//   unit: Unit | null;
+//   unitId: string | null;
+//   updatedAt: Date;
+//   versionId: string;
+//   weight: number | null;
+//   width: number | null;
+// };
 
+/**
+ * @deprecated - use Schema["LineItem"] instead from import "#shopware"
+ */
 export type CartProductItem = Product & {
   options: PropertyGroupOptionCart[];
 };
diff --git a/packages/types/shopware-6-client/models/content/product/ProductReview.d.ts b/packages/types/shopware-6-client/models/content/product/ProductReview.d.ts
index 70e673c11..ac4c83873 100644
--- a/packages/types/shopware-6-client/models/content/product/ProductReview.d.ts
+++ b/packages/types/shopware-6-client/models/content/product/ProductReview.d.ts
@@ -1,27 +1,25 @@
-import { SalesChannel } from "../../system/sales-channel/SalesChannel";
-import { Language } from "../../framework/language/Language";
-import { Product } from "./Product";
-import { Customer } from "../../checkout/customer/Customer";
+import type { Schemas } from "#shopware";
 
 /**
- * @public
+ * @deprecated use Schemas["ProductReview"] from "#shopware" import instead
  */
-export type ProductReview = {
-  id: string;
-  productId: string;
-  customerId: string;
-  salesChannelId: string;
-  languageId: string;
-  externalUser: string | null;
-  externalEmail: string | null;
-  points: number;
-  status: boolean;
-  comment: string | null;
-  salesChannel: SalesChannel | null;
-  language: Language | null;
-  customer: Customer | null;
-  product: Product | null;
-  content: string | null;
-  title: string | null;
-  createdAt: string;
-};
+export type ProductReview = Schemas["ProductReview"];
+// export type ProductReview = {
+//   id: string;
+//   productId: string;
+//   customerId: string;
+//   salesChannelId: string;
+//   languageId: string;
+//   externalUser: string | null;
+//   externalEmail: string | null;
+//   points: number;
+//   status: boolean;
+//   comment: string | null;
+//   salesChannel: SalesChannel | null;
+//   language: Language | null;
+//   customer: Customer | null;
+//   product: Product | null;
+//   content: string | null;
+//   title: string | null;
+//   createdAt: string;
+// };
diff --git a/packages/types/shopware-6-client/models/content/property/PropertyGroupOptionCart.d.ts b/packages/types/shopware-6-client/models/content/property/PropertyGroupOptionCart.d.ts
index d664de4e0..92d6c97df 100644
--- a/packages/types/shopware-6-client/models/content/property/PropertyGroupOptionCart.d.ts
+++ b/packages/types/shopware-6-client/models/content/property/PropertyGroupOptionCart.d.ts
@@ -1,5 +1,5 @@
 /**
- * @public
+ * @deprecated use {@link Schemas["LineItem"]} from "#shopware" import instead
  */
 export type PropertyGroupOptionCart = {
   group: string;
diff --git a/packages/types/shopware-6-client/models/framework/language/Language.d.ts b/packages/types/shopware-6-client/models/framework/language/Language.d.ts
index 9f16ccbb4..a5d6c6a47 100644
--- a/packages/types/shopware-6-client/models/framework/language/Language.d.ts
+++ b/packages/types/shopware-6-client/models/framework/language/Language.d.ts
@@ -35,66 +35,68 @@ import { SalesChannelDomain } from "../../system/sales-channel/SalesChannelDomai
 import { NumberRangeTypeTranslation } from "../../system/number-range/NumberRangeTypeTranslation";
 import { CustomFields } from "../../common/CustomField";
 import { Collection } from "../../common/Collection";
+import type { Schemas } from "#shopware";
 
 /**
- * @public
+ * @deprecated use {@link Schemas['Language']} from "#shopware" import instead
  */
-export type Language = {
-  translated: any[];
-  createdAt: Date | string;
-  updatedAt: Date | string | null;
-  parentId: string | null;
-  localeId: string;
-  translationCodeId: string | null;
-  translationCode: LanguageLocale | null;
-  name: string;
-  locale: Locale | null;
-  parent: Language | null;
-  children: Language[] | null;
-  id: string;
-  apiAlias: string;
-  customFields: CustomFields | null;
-  salesChannels?: SalesChannel[] | null;
-  customers?: Customer[] | null;
-  salesChannelDefaultAssignments?: SalesChannel[] | null;
-  categoryTranslations?: CategoryTranslation[] | null;
-  countryStateTranslations?: CountryStateTranslation[] | null;
-  countryTranslations?: CategoryTranslation[] | null;
-  currencyTranslations?: CurrencyTranslation[] | null;
-  customerGroupTranslations?: CustomerGroupTranslation[] | null;
-  localeTranslations?: LocaleTranslation[] | null;
-  mediaTranslations?: MediaTranslation[] | null;
-  paymentMethodTranslations?: PaymentMethodTranslation[] | null;
-  productManufacturerTranslations?: ProductManufacturerTranslation[] | null;
-  productTranslations?: ProductTranslation[] | null;
-  shippingMethodTranslations?: ShippingMethodTranslation[] | null;
-  unitTranslations?: UnitTranslation[] | null;
-  propertyGroupTranslations?: PropertyGroupTranslation[] | null;
-  propertyGroupOptionTranslations?: PropertyGroupOptionTranslation[] | null;
-  salesChannelTranslations?: SalesChannelTranslation[] | null;
-  salesChannelTypeTranslations?: SalesChannelTypeTranslation[] | null;
-  salutationTranslations?: SalutationTranslation[] | null;
-  salesChannelDomains?: SalesChannelDomain[] | null;
-  pluginTranslations?: PluginTranslation[] | null;
-  productStreamTranslations?: ProductStreamTranslation[] | null;
-  stateMachineTranslations?: Collection[] | null;
-  stateMachineStateTranslations?: Collection[] | null;
-  cmsPageTranslations?: Collection[] | null;
-  cmsSlotTranslations?: Collection[] | null;
-  mailTemplateTranslations?: MailTemplate[] | null;
-  mailHeaderFooterTranslation?: MailHeaderFooter[] | null;
-  documentTypeTranslations?: DocumentTypeTranslation[] | null;
-  deliveryTimeTranslations?: DeliveryTime[] | null;
-  newsletterRecipients?: NewsletterRecipient[] | null;
-  orders?: Order[] | null;
-  numberRangeTypeTranslations?: NumberRangeTypeTranslation[] | null;
-  productSearchKeywords?: ProductSearchKeyword[] | null;
-  productKeywordDictionaries?: ProductKeywordDictionary[] | null;
-  mailTemplateTypeTranslations?: MailTemplateTypeTranslation[] | null;
-  promotionTranslations?: PromotionTranslation[] | null;
-  numberRangeTranslations?: NumberRangeTranslation[] | null;
-  productReviews?: ProductReview[] | null;
-};
+export type Language = Schemas["Language"];
+// export type Language = {
+//   translated: any[];
+//   createdAt: Date | string;
+//   updatedAt: Date | string | null;
+//   parentId: string | null;
+//   localeId: string;
+//   translationCodeId: string | null;
+//   translationCode: LanguageLocale | null;
+//   name: string;
+//   locale: Locale | null;
+//   parent: Language | null;
+//   children: Language[] | null;
+//   id: string;
+//   apiAlias: string;
+//   customFields: CustomFields | null;
+//   salesChannels?: SalesChannel[] | null;
+//   customers?: Customer[] | null;
+//   salesChannelDefaultAssignments?: SalesChannel[] | null;
+//   categoryTranslations?: CategoryTranslation[] | null;
+//   countryStateTranslations?: CountryStateTranslation[] | null;
+//   countryTranslations?: CategoryTranslation[] | null;
+//   currencyTranslations?: CurrencyTranslation[] | null;
+//   customerGroupTranslations?: CustomerGroupTranslation[] | null;
+//   localeTranslations?: LocaleTranslation[] | null;
+//   mediaTranslations?: MediaTranslation[] | null;
+//   paymentMethodTranslations?: PaymentMethodTranslation[] | null;
+//   productManufacturerTranslations?: ProductManufacturerTranslation[] | null;
+//   productTranslations?: ProductTranslation[] | null;
+//   shippingMethodTranslations?: ShippingMethodTranslation[] | null;
+//   unitTranslations?: UnitTranslation[] | null;
+//   propertyGroupTranslations?: PropertyGroupTranslation[] | null;
+//   propertyGroupOptionTranslations?: PropertyGroupOptionTranslation[] | null;
+//   salesChannelTranslations?: SalesChannelTranslation[] | null;
+//   salesChannelTypeTranslations?: SalesChannelTypeTranslation[] | null;
+//   salutationTranslations?: SalutationTranslation[] | null;
+//   salesChannelDomains?: SalesChannelDomain[] | null;
+//   pluginTranslations?: PluginTranslation[] | null;
+//   productStreamTranslations?: ProductStreamTranslation[] | null;
+//   stateMachineTranslations?: Collection[] | null;
+//   stateMachineStateTranslations?: Collection[] | null;
+//   cmsPageTranslations?: Collection[] | null;
+//   cmsSlotTranslations?: Collection[] | null;
+//   mailTemplateTranslations?: MailTemplate[] | null;
+//   mailHeaderFooterTranslation?: MailHeaderFooter[] | null;
+//   documentTypeTranslations?: DocumentTypeTranslation[] | null;
+//   deliveryTimeTranslations?: DeliveryTime[] | null;
+//   newsletterRecipients?: NewsletterRecipient[] | null;
+//   orders?: Order[] | null;
+//   numberRangeTypeTranslations?: NumberRangeTypeTranslation[] | null;
+//   productSearchKeywords?: ProductSearchKeyword[] | null;
+//   productKeywordDictionaries?: ProductKeywordDictionary[] | null;
+//   mailTemplateTypeTranslations?: MailTemplateTypeTranslation[] | null;
+//   promotionTranslations?: PromotionTranslation[] | null;
+//   numberRangeTranslations?: NumberRangeTranslation[] | null;
+//   productReviews?: ProductReview[] | null;
+// };
 
 /**
  * @public
diff --git a/packages/types/shopware-6-client/models/system/country/Country.d.ts b/packages/types/shopware-6-client/models/system/country/Country.d.ts
index 0d5d5bcae..670e19444 100644
--- a/packages/types/shopware-6-client/models/system/country/Country.d.ts
+++ b/packages/types/shopware-6-client/models/system/country/Country.d.ts
@@ -4,6 +4,7 @@ import { OrderAddress } from "../../checkout/order/OrderAddress";
 import { CustomerAddress } from "../../checkout/customer/CustomerAddress";
 import { SalesChannel } from "../sales-channel/SalesChannel";
 import { CustomFields } from "../../common/CustomField";
+import type { Schemas } from "#shopware";
 
 type CountryTaxSetting = {
   enabled: boolean;
@@ -13,47 +14,48 @@ type CountryTaxSetting = {
 };
 
 /**
- * @public
+ * @deprecated use {@link Schemas['Country']} from "#shopware" import instead
  */
-export type Country = {
-  active: boolean;
-  createdAt: string;
-  customFields: CustomFields | null;
-  name: string | null;
-  iso: string | null;
-  updatedAt: Date | string | null;
-  versionId: string | null;
-  id: string;
-  position: number;
-  taxFree: boolean;
-  shippingAvailable: boolean;
-  iso3: string | null;
-  displayStateInRegistration: boolean;
-  forceStateInRegistration: boolean;
-  translations: CountryTranslation[] | null;
-  orderAddresses: OrderAddress[] | null;
-  customerAddress: CustomerAddress[] | null;
-  salesChannelDefaultAssignments: SalesChannel[] | null;
-  salesChannels: SalesChannel[] | null;
-  extensions: unknown;
-  _uniqueIdentifier: string;
-  translated: {
-    name: string;
-    customFields: CustomFields;
-    addressFormat: string[][];
-  };
-  companyTaxFree: boolean;
-  checkVatIdPattern: boolean;
-  vatIdPattern: string;
-  vatIdRequired: boolean;
-  customerTax: CountryTaxSetting;
-  companyTax: CountryTaxSetting;
-  states: CountryState[];
-  postalCodeRequired: boolean;
-  checkPostalCodePattern: boolean;
-  checkAdvancedPostalCodePattern: boolean;
-  advancedPostalCodePattern: null | string;
-  defaultPostalCodePattern: string;
-  addressFormat: string[][];
-  apiAlias: "country";
-};
+export type Country = Schemas["Country"];
+// export type Country = {
+//   active: boolean;
+//   createdAt: string;
+//   customFields: CustomFields | null;
+//   name: string | null;
+//   iso: string | null;
+//   updatedAt: Date | string | null;
+//   versionId: string | null;
+//   id: string;
+//   position: number;
+//   taxFree: boolean;
+//   shippingAvailable: boolean;
+//   iso3: string | null;
+//   displayStateInRegistration: boolean;
+//   forceStateInRegistration: boolean;
+//   translations: CountryTranslation[] | null;
+//   orderAddresses: OrderAddress[] | null;
+//   customerAddress: CustomerAddress[] | null;
+//   salesChannelDefaultAssignments: SalesChannel[] | null;
+//   salesChannels: SalesChannel[] | null;
+//   extensions: unknown;
+//   _uniqueIdentifier: string;
+//   translated: {
+//     name: string;
+//     customFields: CustomFields;
+//     addressFormat: string[][];
+//   };
+//   companyTaxFree: boolean;
+//   checkVatIdPattern: boolean;
+//   vatIdPattern: string;
+//   vatIdRequired: boolean;
+//   customerTax: CountryTaxSetting;
+//   companyTax: CountryTaxSetting;
+//   states: CountryState[];
+//   postalCodeRequired: boolean;
+//   checkPostalCodePattern: boolean;
+//   checkAdvancedPostalCodePattern: boolean;
+//   advancedPostalCodePattern: null | string;
+//   defaultPostalCodePattern: string;
+//   addressFormat: string[][];
+//   apiAlias: "country";
+// };
diff --git a/packages/types/shopware-6-client/models/system/country/CountryState.d.ts b/packages/types/shopware-6-client/models/system/country/CountryState.d.ts
index 8cf809fe3..6ae06eac9 100644
--- a/packages/types/shopware-6-client/models/system/country/CountryState.d.ts
+++ b/packages/types/shopware-6-client/models/system/country/CountryState.d.ts
@@ -1,32 +1,29 @@
-import { Country } from "./Country";
-import { CountryStateTranslation } from "./CountryStateTranslation";
-import { CustomerAddress } from "../../checkout/customer/CustomerAddress";
-import { OrderAddress } from "../../checkout/order/OrderAddress";
-import { CustomFields } from "../../common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
- * @public
+ * @deprecated use {@link Schemas['CountryState']} from "#shopware" import instead
  */
-export type CountryState = {
-  countryId: string;
-  shortCode: string;
-  name: string | null;
-  position: number;
-  active: boolean;
-  country: Country | null;
-  translations: CountryStateTranslation[] | null;
-  customerAddresses: CustomerAddress[] | null;
-  orderAddresses: OrderAddress[] | null;
-  customFields: CustomFields;
-  extensions: unknown;
-  _uniqueIdentifier: string;
-  versionId: string | null;
-  translated: {
-    name: string;
-    customFields: CustomFields;
-  };
-  createdAt: string;
-  updatedAt: Date | string | null;
-  id: string;
-  apiAlias: "country_state";
-};
+export type CountryState = Schemas["CountryState"];
+// export type CountryState = {
+//   countryId: string;
+//   shortCode: string;
+//   name: string | null;
+//   position: number;
+//   active: boolean;
+//   country: Country | null;
+//   translations: CountryStateTranslation[] | null;
+//   customerAddresses: CustomerAddress[] | null;
+//   orderAddresses: OrderAddress[] | null;
+//   customFields: CustomFields;
+//   extensions: unknown;
+//   _uniqueIdentifier: string;
+//   versionId: string | null;
+//   translated: {
+//     name: string;
+//     customFields: CustomFields;
+//   };
+//   createdAt: string;
+//   updatedAt: Date | string | null;
+//   id: string;
+//   apiAlias: "country_state";
+// };
diff --git a/packages/types/shopware-6-client/models/system/currency/Currency.d.ts b/packages/types/shopware-6-client/models/system/currency/Currency.d.ts
index c3389508a..c952e1d99 100644
--- a/packages/types/shopware-6-client/models/system/currency/Currency.d.ts
+++ b/packages/types/shopware-6-client/models/system/currency/Currency.d.ts
@@ -1,33 +1,28 @@
-import { CurrencyTranslation } from "./CurrencyTranslation";
-import { Order } from "../../checkout/order/Order";
-import { ShippingMethodPrice } from "../../checkout/shipping/ShippingMethodPrice";
-import { PromotionDiscountPrice } from "../../checkout/promotion/PromotionDiscountPrice";
-import { SalesChannel } from "../sales-channel/SalesChannel";
-import { SalesChannelDomain } from "../sales-channel/SalesChannelDomain";
-import { CustomFields } from "../../common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
- * @public
+ * @deprecated use `Schemas["Currency"]` from "#shopware" import instead
  */
-export type Currency = {
-  id: string;
-  isoCode: string;
-  factor: number;
-  symbol: string;
-  shortName: string | null;
-  name: string | null;
-  position: number;
-  decimalPrecision: number;
-  translations: CurrencyTranslation[] | null;
-  orders: Order[] | null;
-  salesChannels: SalesChannel[] | null;
-  salesChannelDefaultAssignments: SalesChannel[] | null;
-  salesChannelDomains: SalesChannelDomain[] | null;
-  customFields: CustomFields;
-  /**
-   * @deprecated removed from 6.5.0
-   */
-  shippingMethodPrices: ShippingMethodPrice[] | null;
-  promotionDiscountPrices: PromotionDiscountPrice[];
-  isSystemDefault: boolean | null;
-};
+export type Currency = Schemas["Currency"];
+// export type Currency = {
+//   id: string;
+//   isoCode: string;
+//   factor: number;
+//   symbol: string;
+//   shortName: string | null;
+//   name: string | null;
+//   position: number;
+//   decimalPrecision: number;
+//   translations: CurrencyTranslation[] | null;
+//   orders: Order[] | null;
+//   salesChannels: SalesChannel[] | null;
+//   salesChannelDefaultAssignments: SalesChannel[] | null;
+//   salesChannelDomains: SalesChannelDomain[] | null;
+//   customFields: CustomFields;
+//   /**
+//    * @deprecated removed from 6.5.0
+//    */
+//   shippingMethodPrices: ShippingMethodPrice[] | null;
+//   promotionDiscountPrices: PromotionDiscountPrice[];
+//   isSystemDefault: boolean | null;
+// };
diff --git a/packages/types/shopware-6-client/models/system/salutation/Salutation.d.ts b/packages/types/shopware-6-client/models/system/salutation/Salutation.d.ts
index ea068f55e..1dae22b4e 100644
--- a/packages/types/shopware-6-client/models/system/salutation/Salutation.d.ts
+++ b/packages/types/shopware-6-client/models/system/salutation/Salutation.d.ts
@@ -1,18 +1,20 @@
 import { SalutationTranslation } from "./SalutationTranslation";
 import { CustomFields } from "../models/common/CustomField";
+import type { Schemas } from "#shopware";
 /**
- * @public
+ * @deprecated use {Schemas['Salutation']} instead from "#shopware" import
  */
-export type Salutation = {
-  salutationKey: string;
-  id: string;
-  displayName: string | null;
-  letterName: string | null;
-  createdAt: string;
-  translations?: SalutationTranslation[] | null;
-  translated: object;
-  updatedAt: Date | string | null;
-  extensions?: object;
-  customFields: CustomFields;
-  apiAlias: string;
-};
+export type Salutation = Schemas["Salutation"];
+//   {
+//   salutationKey: string;
+//   id: string;
+//   displayName: string | null;
+//   letterName: string | null;
+//   createdAt: string;
+//   translations?: SalutationTranslation[] | null;
+//   translated: object;
+//   updatedAt: Date | string | null;
+//   extensions?: object;
+//   customFields: CustomFields;
+//   apiAlias: string;
+// };
diff --git a/packages/types/shopware-6-client/models/system/state-machine/StateMachineState.d.ts b/packages/types/shopware-6-client/models/system/state-machine/StateMachineState.d.ts
index 28a8564e8..86ddc867f 100644
--- a/packages/types/shopware-6-client/models/system/state-machine/StateMachineState.d.ts
+++ b/packages/types/shopware-6-client/models/system/state-machine/StateMachineState.d.ts
@@ -6,21 +6,23 @@ import { StateMachineTransition } from "./StateMachineTransition";
 import { StateMachineHistory } from "./StateMachineHistory";
 import { StateMachineStateTranslation } from "./StateMachineStateTranslation";
 import { CustomFields } from "../../common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
- * @public
+ * @deprecated - use Schema["StateMachineState"] instead from import "#shopware"
  */
-export type StateMachineState = {
-  name: string;
-  technicalName: string;
-  stateMachine: StateMachine | null;
-  fromStateMachineTransitions: StateMachineTransition[] | null;
-  toStateMachineTransitions: StateMachineTransition[] | null;
-  translations: StateMachineStateTranslation[];
-  orders: Order[] | null;
-  orderTransactions: OrderTransaction[] | null;
-  orderDeliveries: OrderDelivery[] | null;
-  fromStateMachineHistoryEntries: StateMachineHistory[] | null;
-  toStateMachineHistoryEntries: StateMachineHistory[] | null;
-  customFields: CustomFields;
-};
+export type StateMachineState = Schemas["StateMachineState"];
+// export type StateMachineState = {
+//   name: string;
+//   technicalName: string;
+//   stateMachine: StateMachine | null;
+//   fromStateMachineTransitions: StateMachineTransition[] | null;
+//   toStateMachineTransitions: StateMachineTransition[] | null;
+//   translations: StateMachineStateTranslation[];
+//   orders: Order[] | null;
+//   orderTransactions: OrderTransaction[] | null;
+//   orderDeliveries: OrderDelivery[] | null;
+//   fromStateMachineHistoryEntries: StateMachineHistory[] | null;
+//   toStateMachineHistoryEntries: StateMachineHistory[] | null;
+//   customFields: CustomFields;
+// };
diff --git a/packages/types/shopware-6-client/request/CreateOrder.d.ts b/packages/types/shopware-6-client/request/CreateOrder.d.ts
index 3cf4d5a3a..669e78c18 100644
--- a/packages/types/shopware-6-client/request/CreateOrder.d.ts
+++ b/packages/types/shopware-6-client/request/CreateOrder.d.ts
@@ -1,5 +1,6 @@
 /**
  * @public
+ * @deprecated use RequestParameters<"createOrder"> from "#shopware" import instead
  */
 export type CreateOrderParams = {
   customerComment?: string;
diff --git a/packages/types/shopware-6-client/request/CustomerRegistrationParams.d.ts b/packages/types/shopware-6-client/request/CustomerRegistrationParams.d.ts
index 99aa6042a..49e0aa066 100644
--- a/packages/types/shopware-6-client/request/CustomerRegistrationParams.d.ts
+++ b/packages/types/shopware-6-client/request/CustomerRegistrationParams.d.ts
@@ -1,29 +1,29 @@
-import { ShippingAddress } from "../models/checkout/customer/ShippingAddress";
-import { BillingAddress } from "../models/checkout/customer/BillingAddress";
+import type { RequestParameters } from "#shopware";
 
 /**
  *
  * docs: https://shopware.stoplight.io/docs/store-api/storeapi.json/paths/~1account~1register/post
  *
- * @beta
+ * @deprecated use {@link RequestParameters<'register'>} from "#shopware" import instead
  */
-export type CustomerRegistrationParams = {
-  salutationId: string;
-  firstName: string;
-  lastName: string;
-  /**
-   * Password for the customer. Required, unless `guest` is `true`
-   */
-  password?: string;
-  /**
-   * If set, will create a guest customer. Guest customers can re-use an email address and don't need a password.
-   */
-  guest?: boolean;
-  email: string;
-  title?: string;
-  birthdayYear?: number;
-  birthdayMonth?: number;
-  birthdayDay?: number;
-  billingAddress: Partial<BillingAddress> /** TODO: replace Partial with correct optional fields in BillingAddress */;
-  shippingAddress?: ShippingAddress;
-};
+export type CustomerRegistrationParams = RequestParameters<"register">;
+// export type CustomerRegistrationParams = {
+//   salutationId: string;
+//   firstName: string;
+//   lastName: string;
+//   /**
+//    * Password for the customer. Required, unless `guest` is `true`
+//    */
+//   password?: string;
+//   /**
+//    * If set, will create a guest customer. Guest customers can re-use an email address and don't need a password.
+//    */
+//   guest?: boolean;
+//   email: string;
+//   title?: string;
+//   birthdayYear?: number;
+//   birthdayMonth?: number;
+//   birthdayDay?: number;
+//   billingAddress: Partial<BillingAddress> /** TODO: replace Partial with correct optional fields in BillingAddress */;
+//   shippingAddress?: ShippingAddress;
+// };
diff --git a/packages/types/shopware-6-client/response/ContextUpdateResult.ts b/packages/types/shopware-6-client/response/ContextUpdateResult.ts
index 2ac8c97ba..7528fbffb 100644
--- a/packages/types/shopware-6-client/response/ContextUpdateResult.ts
+++ b/packages/types/shopware-6-client/response/ContextUpdateResult.ts
@@ -4,5 +4,5 @@
 export type ContextUpdateResult = {
   apiAlias: "array_struct";
   contextToken: string;
-  redirectUrl: null | string;
+  redirectUrl?: string;
 };
diff --git a/packages/types/shopware-6-client/response/EntityResult.d.ts b/packages/types/shopware-6-client/response/EntityResult.d.ts
index 83abd86b3..e0cd272d7 100644
--- a/packages/types/shopware-6-client/response/EntityResult.d.ts
+++ b/packages/types/shopware-6-client/response/EntityResult.d.ts
@@ -1,5 +1,5 @@
 /**
- * @beta
+ * @deprecated use {@link RequestReturnType} from "#shopware" import instead
  */
 export type EntityResult<ENTITY extends string, ELEMENTS_ENTITY_TYPE> = {
   entity: ENTITY;
diff --git a/packages/types/shopware-6-client/response/ListingResult.d.ts b/packages/types/shopware-6-client/response/ListingResult.d.ts
index b57f5f022..cf9ed1a3c 100644
--- a/packages/types/shopware-6-client/response/ListingResult.d.ts
+++ b/packages/types/shopware-6-client/response/ListingResult.d.ts
@@ -1,10 +1,11 @@
-import { Sort } from "../search/SearchCriteria";
-import {
-  Aggregations,
-  AggregationFilterEntityOption,
-  AggregationProductListingEntities,
-} from "../search/Aggregations";
-import { CustomFields } from "../models/common/CustomField";
+// import { Sort } from "../search/SearchCriteria";
+// import {
+//   Aggregations,
+//   AggregationFilterEntityOption,
+//   AggregationProductListingEntities,
+// } from "../search/Aggregations";
+// import { CustomFields } from "../models/common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
  * @public
@@ -21,42 +22,48 @@ export type ListingFilterCode =
 export type ListingFilterDisplayType = "text" | "media";
 
 /**
- * @public
+ * @deprecated use Schemas['ProductListingResult']['currentFilters'] from "#shopware" import instead
+ */
+export type ListingFilter = Schemas["ProductListingResult"]["currentFilters"];
+// export type ListingFilter = {
+//   id: string;
+//   label: string;
+//   name: string;
+//   code: ListingFilterCode;
+//   type?: "range" | "max";
+//   options?: AggregationFilterEntityOption[];
+//   entities?: AggregationProductListingEntities[];
+//   min?: number; // TODO: prepare proper listing filters based on code
+//   max?: number;
+//   value?: string;
+//   displayType?: ListingFilterDisplayType;
+//   customFields?: CustomFields;
+// };
+
+/**
+ * @deprecated use Schemas['ProductListingResult'] from "#shopware" import instead
  */
-export type ListingFilter = {
-  id: string;
-  label: string;
-  name: string;
-  code: ListingFilterCode;
-  type?: "range" | "max";
-  options?: AggregationFilterEntityOption[];
-  entities?: AggregationProductListingEntities[];
-  min?: number; // TODO: prepare proper listing filters based on code
-  max?: number;
-  value?: string;
-  displayType?: ListingFilterDisplayType;
-  customFields?: CustomFields;
-};
+export type ListingResult = Schemas["ProductListingResult"];
 
-export type ListingResult<T> = {
-  /**
-   * apiAlias - determines the entity name that can be used within "includes" functionality (added in store-api)
-   */
-  apiAlias: string;
-  total: number;
-  elements: T[];
-  sorting: string;
-  page: number;
-  limit: number;
-  sortings: Sort[];
-  availableSortings: Sort[];
-  aggregations: Aggregations;
-  currentFilters: {
-    manufacturer: string[];
-    properties: string[];
-    price: { min: null | number; max: null | number };
-    rating: number;
-    search: string | null;
-    "shipping-free": boolean | null;
-  };
-};
+//  {
+//   /**
+//    * apiAlias - determines the entity name that can be used within "includes" functionality (added in store-api)
+//    */
+//   apiAlias: string;
+//   total: number;
+//   elements: T[];
+//   sorting: string;
+//   page: number;
+//   limit: number;
+//   sortings: Sort[];
+//   availableSortings: Sort[];
+//   aggregations: Aggregations;
+//   currentFilters: {
+//     manufacturer: string[];
+//     properties: string[];
+//     price: { min: null | number; max: null | number };
+//     rating: number;
+//     search: string | null;
+//     "shipping-free": boolean | null;
+//   };
+// };
diff --git a/packages/types/shopware-6-client/response/ProductListingResult.d.ts b/packages/types/shopware-6-client/response/ProductListingResult.d.ts
index 662dab4f5..0724a5dc5 100644
--- a/packages/types/shopware-6-client/response/ProductListingResult.d.ts
+++ b/packages/types/shopware-6-client/response/ProductListingResult.d.ts
@@ -1,27 +1,32 @@
-import { Product } from "../models/content/product/Product";
-import { Sort } from "../search/SearchCriteria";
-import { Aggregations } from "../search/Aggregations";
+// import { Product } from "../models/content/product/Product";
+// import { Sort } from "../search/SearchCriteria";
+// import { Aggregations } from "../search/Aggregations";
+import type { Schemas } from "#shopware";
 
-export type ProductListingResult = {
-  /**
-   * apiAlias - determines the entity name that can be used within "includes" functionality (added in store-api)
-   */
-  apiAlias: string;
-  total: number;
-  elements: Product[];
-  sorting: string;
-  page: number;
-  limit: number;
-  sortings: Sort[];
-  availableSortings: Sort[];
-  aggregations: Aggregations;
-  entity: string;
-  currentFilters: {
-    manufacturer: string[];
-    properties: string[];
-    price: { min: null | number; max: null | number };
-    rating: number;
-    search: string | null;
-    "shipping-free": boolean | null;
-  };
-};
+/**
+ * @deprecated use Schemas['ProductListingResult'] from "#shopware" import instead
+ */
+export type ProductListingResult = Schemas["ProductListingResult"];
+// export type ProductListingResult = {
+//   /**
+//    * apiAlias - determines the entity name that can be used within "includes" functionality (added in store-api)
+//    */
+//   apiAlias: string;
+//   total: number;
+//   elements: Product[];
+//   sorting: string;
+//   page: number;
+//   limit: number;
+//   sortings: Sort[];
+//   availableSortings: Sort[];
+//   aggregations: Aggregations;
+//   entity: string;
+//   currentFilters: {
+//     manufacturer: string[];
+//     properties: string[];
+//     price: { min: null | number; max: null | number };
+//     rating: number;
+//     search: string | null;
+//     "shipping-free": boolean | null;
+//   };
+// };
diff --git a/packages/types/shopware-6-client/response/SessionContext.d.ts b/packages/types/shopware-6-client/response/SessionContext.d.ts
index b2c3cdc32..7e46e7ce2 100644
--- a/packages/types/shopware-6-client/response/SessionContext.d.ts
+++ b/packages/types/shopware-6-client/response/SessionContext.d.ts
@@ -1,17 +1,23 @@
 import { PaymentMethod } from "../models/checkout/payment/PaymentMethod";
 import { ShippingMethod } from "../models/checkout/shipping/ShippingMethod";
-import { ShippingAddress } from "../models/checkout/customer/ShippingAddress";
+// import { ShippingAddress } from "../models/checkout/customer/ShippingAddress";
 import { Country } from "../models/system/country/Country";
 import { Currency } from "../models/system/currency/Currency";
 import { Language } from "../models/framework/language/Language";
 import { Category } from "../models/content/category/Category";
-import { Customer } from "../models/checkout/customer/Customer";
+// import { Customer } from "../models/checkout/customer/Customer";
 import { CustomFields } from "../models/common/CustomField";
+import type { Schemas } from "#shopware";
 
-export type ContextTokenResponse = {
-  contextToken: string;
-  redirectUrl?: string;
-};
+// export type ContextTokenResponse = {
+//   apiAlias: "array_struct";
+//   contextToken: string;
+//   redirectUrl?: string;
+// };
+/**
+ * @deprecated use {@link Schemas['ContextTokenResponse']} from "#shopware" import instead
+ */
+export type ContextTokenResponse = Schemas["ContextTokenResponse"];
 
 export type SalesChannelDomain = {
   extensions: unknown;
@@ -80,46 +86,50 @@ export type SalesChannel = {
   apiAlias: "sales_channel";
 };
 
-export type SessionContext = {
-  token: string;
-  currentCustomerGroup: {
-    id: string;
-    name: string;
-  };
-  fallbackCustomerGroup: {
-    id: string;
-    name: string;
-  };
-  currency: Currency;
-  salesChannel: SalesChannel;
-  context: {
-    languageIdChain: string[];
-    versionId: null | string;
-    currencyId: string;
-    currencyFactor: number;
-    scope: "user" | string;
-    ruleIds: string[];
-    source: unknown;
-    considerInheritance: boolean;
-    taxState: "gross" | "net" | string;
-    rounding: {
-      decimals: number;
-      interval: number;
-      roundForNet: boolean;
-      apiAlias: "shopware_core_framework_data_abstraction_layer_pricing_cash_rounding_config";
-    };
-    apiAlias: "context";
-  };
-  taxRules: {
-    id: string;
-    name: string;
-  }[];
-  customer?: Customer;
-  paymentMethod: PaymentMethod;
-  shippingMethod: ShippingMethod;
-  shippingLocation: {
-    address: ShippingAddress;
-    country: Country;
-  };
-  apiAlias: "sales_channel_context";
-};
+/**
+ * @deprecated use {@link Schemas['SalesChannelContext']} from "#shopware" import instead
+ */
+export type SessionContext = Schemas["SalesChannelContext"];
+// export type SessionContext = {
+//   token: string;
+//   currentCustomerGroup: {
+//     id: string;
+//     name: string;
+//   };
+//   fallbackCustomerGroup: {
+//     id: string;
+//     name: string;
+//   };
+//   currency: Currency;
+//   salesChannel: SalesChannel;
+//   context: {
+//     languageIdChain: string[];
+//     versionId: null | string;
+//     currencyId: string;
+//     currencyFactor: number;
+//     scope: "user" | string;
+//     ruleIds: string[];
+//     source: unknown;
+//     considerInheritance: boolean;
+//     taxState: "gross" | "net" | string;
+//     rounding: {
+//       decimals: number;
+//       interval: number;
+//       roundForNet: boolean;
+//       apiAlias: "shopware_core_framework_data_abstraction_layer_pricing_cash_rounding_config";
+//     };
+//     apiAlias: "context";
+//   };
+//   taxRules: {
+//     id: string;
+//     name: string;
+//   }[];
+//   customer?: Customer;
+//   paymentMethod: PaymentMethod;
+//   shippingMethod: ShippingMethod;
+//   shippingLocation: {
+//     address: ShippingAddress;
+//     country: Country;
+//   };
+//   apiAlias: "sales_channel_context";
+// };
diff --git a/packages/types/shopware-6-client/response/SitemapResult.d.ts b/packages/types/shopware-6-client/response/SitemapResult.d.ts
index db0489a07..ba1395c7b 100644
--- a/packages/types/shopware-6-client/response/SitemapResult.d.ts
+++ b/packages/types/shopware-6-client/response/SitemapResult.d.ts
@@ -1,8 +1,11 @@
+import type { Schemas } from "#shopware";
+
 /**
- * @beta
+ * @deprecated use Schemas["Sitemap"] instead
  */
-export type SitemapResult = {
-  filename: string;
-  created: Date;
-  apiAlias: string;
-};
+export type SitemapResult = Schemas["Sitemap"][];
+// export type SitemapResult = {
+//   filename: string;
+//   created: Date;
+//   apiAlias: string;
+// };
diff --git a/packages/types/shopware-6-client/search/Aggregations.d.ts b/packages/types/shopware-6-client/search/Aggregations.d.ts
index 2256fccf2..0fd703d60 100644
--- a/packages/types/shopware-6-client/search/Aggregations.d.ts
+++ b/packages/types/shopware-6-client/search/Aggregations.d.ts
@@ -1,5 +1,6 @@
 import { Media } from "../models/content/media/Media";
 import { CustomFields } from "../models/common/CustomField";
+import type { Schemas } from "#shopware";
 
 /**
  * @beta
@@ -95,11 +96,13 @@ export type PriceAggregation = {
 
 /**
  * @public
+ * @deprecated use Schemas['ProductListingResult']['currentFilters'] from "#shopware" import instead
  */
-export type Aggregations = {
-  manufacturer: EntitiesAggregation<AggregationFilterEntity>;
-  price: PriceAggregation;
-  "shipping-free": MaxAggregation;
-  rating: MaxAggregation;
-  properties: EntitiesAggregation<AggregationFilterEntity>;
-};
+export type Aggregations = Schemas["ProductListingResult"]["aggregations"];
+// export type Aggregations = {
+//   manufacturer: EntitiesAggregation<AggregationFilterEntity>;
+//   price: PriceAggregation;
+//   "shipping-free": MaxAggregation;
+//   rating: MaxAggregation;
+//   properties: EntitiesAggregation<AggregationFilterEntity>;
+// };
diff --git a/packages/types/shopware-6-client/search/Association.d.ts b/packages/types/shopware-6-client/search/Association.d.ts
index 05b8c9137..3567f7f75 100644
--- a/packages/types/shopware-6-client/search/Association.d.ts
+++ b/packages/types/shopware-6-client/search/Association.d.ts
@@ -1,5 +1,5 @@
 /**
- * @beta
+ * @deprecated use {@link Schemas["Criteria"]} from "#shopware" import instead
  */
 export type ShopwareAssociation = {
   [name: string]: {
diff --git a/packages/types/shopware-6-client/search/SearchCriteria.d.ts b/packages/types/shopware-6-client/search/SearchCriteria.d.ts
index db576135a..9f4a8d10a 100644
--- a/packages/types/shopware-6-client/search/SearchCriteria.d.ts
+++ b/packages/types/shopware-6-client/search/SearchCriteria.d.ts
@@ -9,16 +9,18 @@ import { Aggregation } from "./Aggregation";
 import { TotalCountMode } from "./TotalCountMode";
 import { ShopwareAssociation } from "./Association";
 import { Grouping } from "./Grouping";
-import { StoreSort } from "./StoreSort";
+// import { StoreSort } from "./StoreSort";
+import type { Schemas } from "#shopware";
 
 /**
- * @public
+ * @deprecated use Schemas['ProductSorting'] from "#shopware" import instead
  */
-export type Sort = {
-  key: string;
-  priority: number;
-  label: string;
-};
+export type Sort = Schemas["ProductSorting"];
+// export type Sort = {
+//   key: string;
+//   priority: number;
+//   label: string;
+// };
 
 /**
  * @beta
@@ -52,34 +54,35 @@ export type SearchCriteria = {
 };
 
 /**
- * @beta
+ * @deprecated use Schemas['Criteria'] from "#shopware" import instead
  */
-export type ShopwareSearchParams = {
-  /**
-   *  Not mentioned in the store-api docs
-   */
-  p?: number | undefined;
-  page?: number | undefined;
-  limit?: number | undefined;
-  filter?:
-    | Array<EqualsFilter | EqualsAnyFilter | RangeFilter | MultiFilter>
-    | undefined;
-  sort?: Array<StoreSort> | undefined;
-  postFilter?:
-    | Array<EqualsFilter | EqualsAnyFilter | RangeFilter | MultiFilter>
-    | undefined;
-  associations?: ShopwareAssociation;
-  aggregations?: Array<Aggregation> | undefined;
-  grouping?: Array<Grouping>;
+export type ShopwareSearchParams = Schemas["Criteria"];
+// export type ShopwareSearchParams = {
+//   /**
+//    *  Not mentioned in the store-api docs
+//    */
+//   p?: number | undefined;
+//   page?: number | undefined;
+//   limit?: number | undefined;
+//   filter?:
+//     | Array<EqualsFilter | EqualsAnyFilter | RangeFilter | MultiFilter>
+//     | undefined;
+//   sort?: Array<StoreSort> | undefined;
+//   postFilter?:
+//     | Array<EqualsFilter | EqualsAnyFilter | RangeFilter | MultiFilter>
+//     | undefined;
+//   associations?: ShopwareAssociation;
+//   aggregations?: Array<Aggregation> | undefined;
+//   grouping?: Array<Grouping>;
 
-  /**
-   *  Not mentioned in the store-api docs
-   */
-  order?: string | undefined;
-  term?: string | undefined;
-  ids?: string[];
-  properties?: string | undefined;
-  manufacturer?: string | undefined;
-  includes?: Includes;
-  query?: string;
-};
+//   /**
+//    *  Not mentioned in the store-api docs
+//    */
+//   order?: string | undefined;
+//   term?: string | undefined;
+//   ids?: string[];
+//   properties?: string | undefined;
+//   manufacturer?: string | undefined;
+//   includes?: Includes;
+//   query?: string;
+// };
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
index fac0466ba..3e8e9edf5 100644
--- a/packages/types/tsconfig.json
+++ b/packages/types/tsconfig.json
@@ -1,5 +1,10 @@
 {
   "extends": "tsconfig/base.json",
   "include": ["shopware-6-client"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "paths": {
+      "#shopware": ["./types/api-types.ts"]
+    }
+  }
 }
diff --git a/packages/types/types/api-types.ts b/packages/types/types/api-types.ts
new file mode 100644
index 000000000..e14c93cb5
--- /dev/null
+++ b/packages/types/types/api-types.ts
@@ -0,0 +1,25 @@
+import { createAPIClient } from "@shopware/api-client";
+import type {
+  RequestParameters as DefaultRequestParameters,
+  RequestReturnType as DefaultRequestReturnType,
+} from "@shopware/api-client";
+import type {
+  operationPaths as defaultOperationPaths,
+  operations as defaultOperations,
+  components as defaultComponents,
+} from "@shopware/api-client/api-types";
+
+export type operations = defaultOperations<defaultComponents>;
+export type operationPaths = defaultOperationPaths;
+
+export type Schemas = defaultComponents["schemas"];
+
+export type ApiClient = ReturnType<
+  typeof createAPIClient<operations, operationPaths>
+>;
+
+export type RequestParameters<T extends keyof operations> =
+  DefaultRequestParameters<T, operations>;
+
+export type RequestReturnType<T extends keyof operations> =
+  DefaultRequestReturnType<T, operations>;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 51152aefa..8b7d79a60 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -90,6 +90,9 @@ importers:
       '@shopware-pwa/helpers-next':
         specifier: workspace:*
         version: link:../../packages/helpers
+      '@shopware-pwa/types':
+        specifier: workspace:*
+        version: link:../../packages/types
       flexsearch:
         specifier: ^0.7.31
         version: 0.7.31
@@ -138,20 +141,26 @@ importers:
   examples/adyen-dropin-component:
     devDependencies:
       '@adyen/adyen-web':
-        specifier: ^5.53.2
-        version: 5.53.2
+        specifier: ^5.53.3
+        version: 5.53.3
+      '@shopware-pwa/composables-next':
+        specifier: canary
+        version: link:../../packages/composables
       '@shopware-pwa/nuxt3-module':
         specifier: canary
         version: link:../../packages/nuxt3-module
       '@shopware-pwa/types':
         specifier: canary
         version: link:../../packages/types
+      '@shopware/api-client':
+        specifier: canary
+        version: link:../../packages/api-client-next
       '@unocss/nuxt':
         specifier: ^0.57.6
         version: 0.57.6(postcss@8.4.31)
       nuxt:
         specifier: ^3.8.1
-        version: 3.8.1(@types/node@14.18.33)(typescript@5.2.2)
+        version: 3.8.1(@types/node@14.18.33)(eslint@8.54.0)(typescript@5.2.2)(vue-tsc@1.8.22)
 
   examples/blank-playground:
     dependencies:
@@ -508,12 +517,12 @@ importers:
 
   examples/use-checkout:
     dependencies:
-      '@shopware-pwa/api-client':
-        specifier: canary
-        version: link:../../packages/api-client
       '@shopware-pwa/composables-next':
         specifier: canary
         version: link:../../packages/composables
+      '@shopware/api-client':
+        specifier: canary
+        version: link:../../packages/api-client-next
       js-cookie:
         specifier: ^3.0.5
         version: 3.0.5
@@ -647,27 +656,33 @@ importers:
       '@nuxt/kit':
         specifier: ^3.8.1
         version: 3.8.1(rollup@3.28.1)
-      '@shopware-pwa/api-client':
-        specifier: workspace:*
-        version: link:../api-client
       '@shopware-pwa/composables-next':
         specifier: workspace:*
         version: link:../composables
       '@shopware-pwa/helpers-next':
         specifier: workspace:*
         version: link:../helpers
+      '@shopware/api-client':
+        specifier: workspace:*
+        version: link:../api-client-next
       '@vuelidate/core':
         specifier: ^2.0.3
         version: 2.0.3(vue@3.3.8)
       '@vuelidate/validators':
         specifier: ^2.0.4
         version: 2.0.4(vue@3.3.8)
+      '@vueuse/core':
+        specifier: ^10.6.1
+        version: 10.6.1(vue@3.3.8)
       entities:
         specifier: ^4.5.0
         version: 4.5.0
       html-to-ast:
         specifier: ^0.0.6
         version: 0.0.6
+      vue:
+        specifier: ^3.3.8
+        version: 3.3.8(typescript@5.2.2)
     devDependencies:
       '@nuxt/schema':
         specifier: ^3.8.1
@@ -684,6 +699,9 @@ importers:
       eslint-plugin-vue:
         specifier: ^9.18.1
         version: 9.18.1(eslint@8.54.0)
+      nuxt:
+        specifier: ^3.8.1
+        version: 3.8.1(@types/node@14.18.33)(eslint@8.54.0)(rollup@3.28.1)(typescript@5.2.2)(vue-tsc@1.8.22)
       tsconfig:
         specifier: workspace:*
         version: link:../tsconfig
@@ -696,18 +714,21 @@ importers:
       vue-eslint-parser:
         specifier: ^9.3.2
         version: 9.3.2(eslint@8.54.0)
+      vue-router:
+        specifier: ^4.2.5
+        version: 4.2.5(vue@3.3.8)
       vue-tsc:
         specifier: ^1.8.22
         version: 1.8.22(typescript@5.2.2)
 
   packages/composables:
     dependencies:
-      '@shopware-pwa/api-client':
-        specifier: workspace:*
-        version: link:../api-client
       '@shopware-pwa/helpers-next':
         specifier: workspace:*
         version: link:../helpers
+      '@shopware/api-client':
+        specifier: workspace:*
+        version: link:../api-client-next
       '@vueuse/core':
         specifier: ^10.6.1
         version: 10.6.1(vue@3.3.8)
@@ -715,6 +736,9 @@ importers:
         specifier: ^1.1.0
         version: 1.1.0
     devDependencies:
+      '@nuxt/kit':
+        specifier: ^3.8.1
+        version: 3.8.1(rollup@3.28.1)
       '@shopware-pwa/types':
         specifier: workspace:*
         version: link:../types
@@ -794,12 +818,12 @@ importers:
       '@nuxt/kit':
         specifier: ^3.8.1
         version: 3.8.1(rollup@3.28.1)
-      '@shopware-pwa/api-client':
-        specifier: workspace:*
-        version: link:../api-client
       '@shopware-pwa/composables-next':
         specifier: workspace:*
         version: link:../composables
+      '@shopware/api-client':
+        specifier: workspace:*
+        version: link:../api-client-next
       js-cookie:
         specifier: ^3.0.5
         version: 3.0.5
@@ -813,6 +837,9 @@ importers:
       eslint-config-shopware:
         specifier: workspace:*
         version: link:../eslint-config-shopware
+      nuxt:
+        specifier: ^3.8.0
+        version: 3.8.1(@types/node@14.18.33)(eslint@8.54.0)(rollup@3.28.1)(typescript@5.2.2)(vue-tsc@1.8.22)
       tsconfig:
         specifier: workspace:*
         version: link:../tsconfig
@@ -875,6 +902,10 @@ importers:
         version: 0.34.6(happy-dom@12.10.3)
 
   packages/types:
+    dependencies:
+      '@shopware/api-client':
+        specifier: workspace:*
+        version: link:../api-client-next
     devDependencies:
       eslint-config-shopware:
         specifier: workspace:*
@@ -915,6 +946,9 @@ importers:
 
   templates/vue-blank:
     devDependencies:
+      '@shopware-pwa/api-client':
+        specifier: canary
+        version: link:../../packages/api-client
       '@shopware-pwa/nuxt3-module':
         specifier: canary
         version: link:../../packages/nuxt3-module
@@ -939,9 +973,6 @@ importers:
 
   templates/vue-demo-store:
     dependencies:
-      '@shopware-pwa/api-client':
-        specifier: canary
-        version: link:../../packages/api-client
       '@shopware-pwa/cms-base':
         specifier: canary
         version: link:../../packages/cms-base
@@ -957,6 +988,9 @@ importers:
       '@shopware-pwa/types':
         specifier: canary
         version: link:../../packages/types
+      '@shopware/api-client':
+        specifier: canary
+        version: link:../../packages/api-client-next
       '@unocss/nuxt':
         specifier: ^0.57.6
         version: 0.57.6(postcss@8.4.31)
@@ -1044,8 +1078,8 @@ packages:
     resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
     engines: {node: '>=0.10.0'}
 
-  /@adyen/adyen-web@5.53.2:
-    resolution: {integrity: sha512-hnOphMNTaauu9+cLvPVD4jxFxKZZV+DJJsKfRoldaafBt2Z/0zH0iol3ZnA9FjwWJjxBw8Qh4JXwu0lcx+uwIw==}
+  /@adyen/adyen-web@5.53.3:
+    resolution: {integrity: sha512-53nRJl2qxrpTr4YKa1D84GomXCDN6V7F9UKrlMUqyH7DEOVtBDxb8vJ85l/C76a0UTO3aPYJ+w+BdTHSJbhwGw==}
     dependencies:
       '@babel/runtime': 7.23.1
       '@babel/runtime-corejs3': 7.20.6
@@ -1392,6 +1426,7 @@ packages:
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@babel/core@7.23.3:
     resolution: {integrity: sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==}
@@ -1449,23 +1484,6 @@ packages:
       lru-cache: 5.1.1
       semver: 7.5.4
 
-  /@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.23.2):
-    resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.23.2
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.23.0
-      '@babel/helper-member-expression-to-functions': 7.22.15
-      '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.2)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      semver: 7.5.4
-
   /@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.23.3):
     resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==}
     engines: {node: '>=6.9.0'}
@@ -1516,7 +1534,7 @@ packages:
     resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.22.10
+      '@babel/types': 7.23.3
 
   /@babel/helper-module-transforms@7.23.0(@babel/core@7.23.0):
     resolution: {integrity: sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==}
@@ -1543,6 +1561,7 @@ packages:
       '@babel/helper-simple-access': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/helper-validator-identifier': 7.22.20
+    dev: false
 
   /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
@@ -1567,17 +1586,6 @@ packages:
     resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.2):
-    resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.23.2
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-member-expression-to-functions': 7.22.15
-      '@babel/helper-optimise-call-expression': 7.22.5
-
   /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.3):
     resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==}
     engines: {node: '>=6.9.0'}
@@ -1615,10 +1623,6 @@ packages:
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-identifier@7.22.5:
-    resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==}
-    engines: {node: '>=6.9.0'}
-
   /@babel/helper-validator-option@7.22.15:
     resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==}
     engines: {node: '>=6.9.0'}
@@ -1649,13 +1653,6 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/parser@7.23.0:
-    resolution: {integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.23.3
-
   /@babel/parser@7.23.3:
     resolution: {integrity: sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==}
     engines: {node: '>=6.0.0'}
@@ -1663,43 +1660,43 @@ packages:
     dependencies:
       '@babel/types': 7.23.3
 
-  /@babel/plugin-proposal-decorators@7.23.2(@babel/core@7.23.2):
+  /@babel/plugin-proposal-decorators@7.23.2(@babel/core@7.23.3):
     resolution: {integrity: sha512-eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.23.2
-      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.2)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.2)
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.3)
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/plugin-syntax-decorators': 7.22.10(@babel/core@7.23.2)
+      '@babel/plugin-syntax-decorators': 7.22.10(@babel/core@7.23.3)
 
-  /@babel/plugin-syntax-decorators@7.22.10(@babel/core@7.23.2):
+  /@babel/plugin-syntax-decorators@7.22.10(@babel/core@7.23.3):
     resolution: {integrity: sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.23.2
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.23.2):
+  /@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.23.2
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.2):
+  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.3):
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.23.2
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
 
   /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.23.2):
@@ -1710,6 +1707,7 @@ packages:
     dependencies:
       '@babel/core': 7.23.2
       '@babel/helper-plugin-utils': 7.22.5
+    dev: false
 
   /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==}
@@ -1729,13 +1727,13 @@ packages:
       '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.23.2):
+  /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.23.2
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
 
   /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.3):
@@ -1772,17 +1770,17 @@ packages:
       '@babel/types': 7.23.3
     dev: false
 
-  /@babel/plugin-transform-typescript@7.22.15(@babel/core@7.23.2):
+  /@babel/plugin-transform-typescript@7.22.15(@babel/core@7.23.3):
     resolution: {integrity: sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.23.2
+      '@babel/core': 7.23.3
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.2)
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.23.2)
+      '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.23.3)
 
   /@babel/plugin-transform-typescript@7.23.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-ogV0yWnq38CFwH20l2Afz0dfKuZBx9o/Y2Rmh5vuSS0YD1hswgEgTfyTzuSrT2q9btmHRSqYoSfwFUVaC1M1Jw==}
@@ -1840,15 +1838,15 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.22.10
-      '@babel/parser': 7.23.0
-      '@babel/types': 7.22.10
+      '@babel/parser': 7.23.3
+      '@babel/types': 7.23.3
 
   /@babel/traverse@7.23.2:
     resolution: {integrity: sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.22.13
-      '@babel/generator': 7.23.0
+      '@babel/generator': 7.23.3
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
@@ -1860,14 +1858,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/types@7.22.10:
-    resolution: {integrity: sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.5
-      to-fast-properties: 2.0.0
-
   /@babel/types@7.23.0:
     resolution: {integrity: sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==}
     engines: {node: '>=6.9.0'}
@@ -2935,16 +2925,16 @@ packages:
     dependencies:
       '@intlify/bundle-utils': 7.3.0(vue-i18n@9.3.0-beta.27)
       '@intlify/shared': 9.4.1
-      '@rollup/pluginutils': 5.0.4(rollup@3.28.1)
-      '@vue/compiler-sfc': 3.3.5
+      '@rollup/pluginutils': 5.0.5(rollup@3.28.1)
+      '@vue/compiler-sfc': 3.3.8
       debug: 4.3.4
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       js-yaml: 4.1.0
       json5: 2.2.3
       pathe: 1.1.1
       picocolors: 1.0.0
       source-map-js: 1.0.2
-      unplugin: 1.5.0
+      unplugin: 1.5.1
       vue-i18n: 9.3.0-beta.27(vue@3.3.8)
     transitivePeerDependencies:
       - rollup
@@ -3325,41 +3315,6 @@ packages:
   /@nuxt/devalue@2.0.2:
     resolution: {integrity: sha512-GBzP8zOc7CGWyFQS6dv1lQz8VVpz5C2yRszbXufwG/9zhStTIH50EtD87NmWbTMwXDvZLNg8GIpb1UFdH93JCA==}
 
-  /@nuxt/devtools-kit@1.0.0(nuxt@3.8.1):
-    resolution: {integrity: sha512-cNloBepQYCBW6x/ctfCvyYRZudxhfgh5w5JDswpCzn7KXmm8U6abG2jyT0FXIaceW1d5QYMpGCN1RUw24wSvOA==}
-    peerDependencies:
-      nuxt: ^3.7.4
-      vite: '*'
-    peerDependenciesMeta:
-      vite:
-        optional: true
-    dependencies:
-      '@nuxt/kit': 3.8.1(rollup@3.28.1)
-      '@nuxt/schema': 3.8.1(rollup@3.28.1)
-      execa: 7.2.0
-      nuxt: 3.8.1(@types/node@14.18.33)(typescript@5.2.2)
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-
-  /@nuxt/devtools-kit@1.0.0(nuxt@3.8.1)(rollup@3.28.1):
-    resolution: {integrity: sha512-cNloBepQYCBW6x/ctfCvyYRZudxhfgh5w5JDswpCzn7KXmm8U6abG2jyT0FXIaceW1d5QYMpGCN1RUw24wSvOA==}
-    peerDependencies:
-      nuxt: ^3.7.4
-      vite: '*'
-    peerDependenciesMeta:
-      vite:
-        optional: true
-    dependencies:
-      '@nuxt/kit': 3.8.1(rollup@3.28.1)
-      '@nuxt/schema': 3.8.1(rollup@3.28.1)
-      execa: 7.2.0
-      nuxt: 3.8.1(@types/node@14.18.33)(rollup@3.28.1)(typescript@5.2.2)
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-    dev: true
-
   /@nuxt/devtools-kit@1.0.2(nuxt@3.8.1):
     resolution: {integrity: sha512-iFi54NNCcPsF/jW14HbRlq3aOClOWdfiein0CvKoQ5shobHgn1s3xULh8o9QPKI2oTarcuJL+EFIK43CwfoXyw==}
     peerDependencies:
@@ -3376,7 +3331,6 @@ packages:
     transitivePeerDependencies:
       - rollup
       - supports-color
-    dev: true
 
   /@nuxt/devtools-kit@1.0.2(nuxt@3.8.1)(rollup@3.28.1):
     resolution: {integrity: sha512-iFi54NNCcPsF/jW14HbRlq3aOClOWdfiein0CvKoQ5shobHgn1s3xULh8o9QPKI2oTarcuJL+EFIK43CwfoXyw==}
@@ -3390,27 +3344,12 @@ packages:
       '@nuxt/kit': 3.8.1(rollup@3.28.1)
       '@nuxt/schema': 3.8.1(rollup@3.28.1)
       execa: 7.2.0
-      nuxt: 3.8.1(@types/node@14.18.33)(rollup@3.28.1)(typescript@5.2.2)
+      nuxt: 3.8.1(@types/node@14.18.33)(eslint@8.54.0)(rollup@3.28.1)(typescript@5.2.2)(vue-tsc@1.8.22)
     transitivePeerDependencies:
       - rollup
       - supports-color
     dev: true
 
-  /@nuxt/devtools-wizard@1.0.0:
-    resolution: {integrity: sha512-9OeZM2/Y4VuI06gdlDjmYM8yUzdfnywy4t2u2VAEfA2Lk7vk3U1lYn51IAqr+Gits9tp/Q9OiktMWmPLLNGgFw==}
-    hasBin: true
-    dependencies:
-      consola: 3.2.3
-      diff: 5.1.0
-      execa: 7.2.0
-      global-dirs: 3.0.1
-      magicast: 0.3.0
-      pathe: 1.1.1
-      pkg-types: 1.0.3
-      prompts: 2.4.2
-      rc9: 2.1.1
-      semver: 7.5.4
-
   /@nuxt/devtools-wizard@1.0.2:
     resolution: {integrity: sha512-fY9Y0eCJG7eSuUgnjImWVfLZPZymoHxjrVsdhfKs3yRJvB2siaabluxvdy2OTYc+WpIxuey0hjqpv+dVtnYw1A==}
     hasBin: true
@@ -3425,146 +3364,6 @@ packages:
       prompts: 2.4.2
       rc9: 2.1.1
       semver: 7.5.4
-    dev: true
-
-  /@nuxt/devtools@1.0.0(nuxt@3.8.1):
-    resolution: {integrity: sha512-pM5AvystXlFPYOsGbH8PBxEYkttiEWHsZnGw660iMw8QedB6mAweT21XX9LDS69cqnRY5uTFqVOmO9Y4EYL3hg==}
-    hasBin: true
-    peerDependencies:
-      nuxt: ^3.7.4
-      vite: '*'
-    peerDependenciesMeta:
-      vite:
-        optional: true
-    dependencies:
-      '@antfu/utils': 0.7.6
-      '@nuxt/devtools-kit': 1.0.0(nuxt@3.8.1)
-      '@nuxt/devtools-wizard': 1.0.0
-      '@nuxt/kit': 3.8.1(rollup@3.28.1)
-      birpc: 0.2.14
-      consola: 3.2.3
-      destr: 2.0.2
-      error-stack-parser-es: 0.1.1
-      execa: 7.2.0
-      fast-glob: 3.3.1
-      flatted: 3.2.9
-      get-port-please: 3.1.1
-      global-dirs: 3.0.1
-      h3: 1.8.2
-      hookable: 5.5.3
-      image-meta: 0.1.1
-      is-installed-globally: 0.4.0
-      launch-editor: 2.6.1
-      local-pkg: 0.5.0
-      magicast: 0.3.0
-      nitropack: 2.7.2
-      nuxt: 3.8.1(@types/node@14.18.33)(typescript@5.2.2)
-      nypm: 0.3.3
-      ofetch: 1.3.3
-      ohash: 1.1.3
-      pacote: 17.0.4
-      pathe: 1.1.1
-      perfect-debounce: 1.0.0
-      pkg-types: 1.0.3
-      rc9: 2.1.1
-      scule: 1.1.0
-      semver: 7.5.4
-      simple-git: 3.20.0
-      sirv: 2.0.3
-      unimport: 3.4.0(rollup@3.28.1)
-      vite-plugin-inspect: 0.7.40(@nuxt/kit@3.8.1)(rollup@3.28.1)
-      vite-plugin-vue-inspector: 4.0.0
-      which: 3.0.1
-      ws: 8.14.2
-    transitivePeerDependencies:
-      - '@azure/app-configuration'
-      - '@azure/cosmos'
-      - '@azure/data-tables'
-      - '@azure/identity'
-      - '@azure/keyvault-secrets'
-      - '@azure/storage-blob'
-      - '@capacitor/preferences'
-      - '@planetscale/database'
-      - '@upstash/redis'
-      - '@vercel/kv'
-      - bluebird
-      - bufferutil
-      - encoding
-      - idb-keyval
-      - rollup
-      - supports-color
-      - utf-8-validate
-      - xml2js
-
-  /@nuxt/devtools@1.0.0(nuxt@3.8.1)(rollup@3.28.1):
-    resolution: {integrity: sha512-pM5AvystXlFPYOsGbH8PBxEYkttiEWHsZnGw660iMw8QedB6mAweT21XX9LDS69cqnRY5uTFqVOmO9Y4EYL3hg==}
-    hasBin: true
-    peerDependencies:
-      nuxt: ^3.7.4
-      vite: '*'
-    peerDependenciesMeta:
-      vite:
-        optional: true
-    dependencies:
-      '@antfu/utils': 0.7.6
-      '@nuxt/devtools-kit': 1.0.0(nuxt@3.8.1)(rollup@3.28.1)
-      '@nuxt/devtools-wizard': 1.0.0
-      '@nuxt/kit': 3.8.1(rollup@3.28.1)
-      birpc: 0.2.14
-      consola: 3.2.3
-      destr: 2.0.2
-      error-stack-parser-es: 0.1.1
-      execa: 7.2.0
-      fast-glob: 3.3.1
-      flatted: 3.2.9
-      get-port-please: 3.1.1
-      global-dirs: 3.0.1
-      h3: 1.8.2
-      hookable: 5.5.3
-      image-meta: 0.1.1
-      is-installed-globally: 0.4.0
-      launch-editor: 2.6.1
-      local-pkg: 0.5.0
-      magicast: 0.3.0
-      nitropack: 2.7.2
-      nuxt: 3.8.1(@types/node@14.18.33)(rollup@3.28.1)(typescript@5.2.2)
-      nypm: 0.3.3
-      ofetch: 1.3.3
-      ohash: 1.1.3
-      pacote: 17.0.4
-      pathe: 1.1.1
-      perfect-debounce: 1.0.0
-      pkg-types: 1.0.3
-      rc9: 2.1.1
-      scule: 1.1.0
-      semver: 7.5.4
-      simple-git: 3.20.0
-      sirv: 2.0.3
-      unimport: 3.4.0(rollup@3.28.1)
-      vite-plugin-inspect: 0.7.40(@nuxt/kit@3.8.1)(rollup@3.28.1)
-      vite-plugin-vue-inspector: 4.0.0
-      which: 3.0.1
-      ws: 8.14.2
-    transitivePeerDependencies:
-      - '@azure/app-configuration'
-      - '@azure/cosmos'
-      - '@azure/data-tables'
-      - '@azure/identity'
-      - '@azure/keyvault-secrets'
-      - '@azure/storage-blob'
-      - '@capacitor/preferences'
-      - '@planetscale/database'
-      - '@upstash/redis'
-      - '@vercel/kv'
-      - bluebird
-      - bufferutil
-      - encoding
-      - idb-keyval
-      - rollup
-      - supports-color
-      - utf-8-validate
-      - xml2js
-    dev: true
 
   /@nuxt/devtools@1.0.2(nuxt@3.8.1):
     resolution: {integrity: sha512-nfqvRc36Sh20gDVs3pViHvcyyz3NmaNqgJnWUXgfjSCsT7G/p2wHsoNUXYYTF7kpk3kbNusftaWrIzAiTiXC9A==}
@@ -3633,7 +3432,6 @@ packages:
       - supports-color
       - utf-8-validate
       - xml2js
-    dev: true
 
   /@nuxt/devtools@1.0.2(nuxt@3.8.1)(rollup@3.28.1):
     resolution: {integrity: sha512-nfqvRc36Sh20gDVs3pViHvcyyz3NmaNqgJnWUXgfjSCsT7G/p2wHsoNUXYYTF7kpk3kbNusftaWrIzAiTiXC9A==}
@@ -3665,7 +3463,7 @@ packages:
       local-pkg: 0.5.0
       magicast: 0.3.2
       nitropack: 2.7.2
-      nuxt: 3.8.1(@types/node@14.18.33)(rollup@3.28.1)(typescript@5.2.2)
+      nuxt: 3.8.1(@types/node@14.18.33)(eslint@8.54.0)(rollup@3.28.1)(typescript@5.2.2)(vue-tsc@1.8.22)
       nypm: 0.3.3
       ofetch: 1.3.3
       ohash: 1.1.3
@@ -3720,11 +3518,11 @@ packages:
       mlly: 1.4.2
       pathe: 1.1.1
       pkg-types: 1.0.3
-      scule: 1.0.0
+      scule: 1.1.0
       semver: 7.5.4
       ufo: 1.3.1
       unctx: 2.3.1
-      unimport: 3.4.0(rollup@3.28.1)
+      unimport: 3.5.0(rollup@3.28.1)
       untyped: 1.4.0
     transitivePeerDependencies:
       - rollup
@@ -3815,7 +3613,7 @@ packages:
   /@nuxt/ui-templates@1.3.1:
     resolution: {integrity: sha512-5gc02Pu1HycOVUWJ8aYsWeeXcSTPe8iX8+KIrhyEtEoOSkY0eMBuo0ssljB8wALuEmepv31DlYe5gpiRwkjESA==}
 
-  /@nuxt/vite-builder@3.8.1(@types/node@14.18.33)(eslint@8.54.0)(typescript@5.2.2)(vue-tsc@1.8.22)(vue@3.3.8):
+  /@nuxt/vite-builder@3.8.1(@types/node@14.18.33)(eslint@8.54.0)(rollup@3.28.1)(typescript@5.2.2)(vue-tsc@1.8.22)(vue@3.3.8):
     resolution: {integrity: sha512-Ot/twGONxj22T9U4bxp771ibKVFlZxIiYDHY/e6mZsE4Blc0efKo6MzPPPo0W4/tXQbtKKEq41uINN3dMI3mag==}
     engines: {node: ^14.18.0 || >=16.10.0}
     peerDependencies:
@@ -3849,7 +3647,7 @@ packages:
       std-env: 3.4.3
       strip-literal: 1.3.0
       ufo: 1.3.1
-      unplugin: 1.5.0
+      unplugin: 1.5.1
       vite: 4.5.0(@types/node@14.18.33)
       vite-node: 0.33.0(@types/node@14.18.33)
       vite-plugin-checker: 0.6.2(eslint@8.54.0)(typescript@5.2.2)(vite@4.5.0)(vue-tsc@1.8.22)
@@ -3873,8 +3671,9 @@ packages:
       - vls
       - vti
       - vue-tsc
+    dev: true
 
-  /@nuxt/vite-builder@3.8.1(@types/node@14.18.33)(rollup@3.28.1)(typescript@5.2.2)(vue@3.3.8):
+  /@nuxt/vite-builder@3.8.1(@types/node@14.18.33)(eslint@8.54.0)(typescript@5.2.2)(vue-tsc@1.8.22)(vue@3.3.8):
     resolution: {integrity: sha512-Ot/twGONxj22T9U4bxp771ibKVFlZxIiYDHY/e6mZsE4Blc0efKo6MzPPPo0W4/tXQbtKKEq41uINN3dMI3mag==}
     engines: {node: ^14.18.0 || >=16.10.0}
     peerDependencies:
@@ -3908,7 +3707,7 @@ packages:
       std-env: 3.4.3
       strip-literal: 1.3.0
       ufo: 1.3.1
-      unplugin: 1.5.0
+      unplugin: 1.5.1
       vite: 4.5.0(@types/node@14.18.33)
       vite-node: 0.33.0(@types/node@14.18.33)
       vite-plugin-checker: 0.6.2(eslint@8.54.0)(typescript@5.2.2)(vite@4.5.0)(vue-tsc@1.8.22)
@@ -3932,7 +3731,6 @@ packages:
       - vls
       - vti
       - vue-tsc
-    dev: true
 
   /@nuxt/vite-builder@3.8.1(@types/node@20.3.2)(typescript@5.2.2)(vue-tsc@1.8.22)(vue@3.3.8):
     resolution: {integrity: sha512-Ot/twGONxj22T9U4bxp771ibKVFlZxIiYDHY/e6mZsE4Blc0efKo6MzPPPo0W4/tXQbtKKEq41uINN3dMI3mag==}
@@ -3968,7 +3766,7 @@ packages:
       std-env: 3.4.3
       strip-literal: 1.3.0
       ufo: 1.3.1
-      unplugin: 1.5.0
+      unplugin: 1.5.1
       vite: 4.5.0(@types/node@20.3.2)
       vite-node: 0.33.0(@types/node@20.3.2)
       vite-plugin-checker: 0.6.2(typescript@5.2.2)(vite@4.5.0)(vue-tsc@1.8.22)
@@ -4027,7 +3825,7 @@ packages:
       std-env: 3.4.3
       strip-literal: 1.3.0
       ufo: 1.3.1
-      unplugin: 1.5.0
+      unplugin: 1.5.1
       vite: 4.5.0(@types/node@20.5.1)
       vite-node: 0.33.0(@types/node@20.5.1)
       vite-plugin-checker: 0.6.2(eslint@8.54.0)(typescript@5.2.2)(vite@4.5.0)(vue-tsc@1.8.22)
@@ -4101,10 +3899,10 @@ packages:
       '@intlify/unplugin-vue-i18n': 0.13.0(vue-i18n@9.3.0-beta.27)
       '@mizchi/sucrase': 4.1.0
       '@nuxt/kit': 3.8.1(rollup@3.28.1)
-      '@vue/compiler-sfc': 3.3.4
+      '@vue/compiler-sfc': 3.3.8
       cookie-es: 1.0.0
       debug: 4.3.4
-      defu: 6.1.2
+      defu: 6.1.3
       estree-walker: 3.0.3
       is-https: 4.0.0
       js-cookie: 3.0.5
@@ -4113,8 +3911,8 @@ packages:
       mlly: 1.4.2
       pathe: 1.1.1
       pkg-types: 1.0.3
-      ufo: 1.3.0
-      unplugin: 1.5.0
+      ufo: 1.3.1
+      unplugin: 1.5.1
       unstorage: 1.9.0
       vue-i18n: 9.3.0-beta.27(vue@3.3.8)
       vue-i18n-routing: 0.13.4(vue-i18n@9.3.0-beta.27)(vue@3.3.8)
@@ -4292,7 +4090,7 @@ packages:
       open: 8.4.0
       picocolors: 1.0.0
       tiny-glob: 0.2.9
-      tslib: 2.6.1
+      tslib: 2.6.2
     dev: true
 
   /@playwright/test@1.40.0:
@@ -5517,8 +5315,8 @@ packages:
   /@types/babel__core@7.20.3:
     resolution: {integrity: sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==}
     dependencies:
-      '@babel/parser': 7.23.0
-      '@babel/types': 7.23.0
+      '@babel/parser': 7.23.3
+      '@babel/types': 7.23.3
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.18.3
@@ -5526,18 +5324,18 @@ packages:
   /@types/babel__generator@7.6.4:
     resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.3
 
   /@types/babel__template@7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.23.0
-      '@babel/types': 7.23.0
+      '@babel/parser': 7.23.3
+      '@babel/types': 7.23.3
 
   /@types/babel__traverse@7.18.3:
     resolution: {integrity: sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==}
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.23.3
 
   /@types/body-parser@1.19.2:
     resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
@@ -7009,34 +6807,16 @@ packages:
     dependencies:
       '@babel/types': 7.23.3
       '@rollup/pluginutils': 5.0.5(rollup@3.28.1)
-      '@vue/compiler-sfc': 3.3.8
-      ast-kit: 0.11.2(rollup@3.28.1)
-      local-pkg: 0.4.3
-      magic-string-ast: 0.3.0
-      vue: 3.3.8(typescript@5.2.2)
-    transitivePeerDependencies:
-      - rollup
-
-  /@vue/babel-helper-vue-transform-on@1.1.5:
-    resolution: {integrity: sha512-SgUymFpMoAyWeYWLAY+MkCK3QEROsiUnfaw5zxOVD/M64KQs8D/4oK6Q5omVA2hnvEOE0SCkH2TZxs/jnnUj7w==}
-
-  /@vue/babel-plugin-jsx@1.1.5(@babel/core@7.23.2):
-    resolution: {integrity: sha512-nKs1/Bg9U1n3qSWnsHhCVQtAzI6aQXqua8j/bZrau8ywT1ilXQbK4FwEJGmU8fV7tcpuFvWmmN7TMmV1OBma1g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.23.2
-      '@babel/helper-module-imports': 7.22.5
-      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.23.2)
-      '@babel/template': 7.22.5
-      '@babel/traverse': 7.23.2
-      '@babel/types': 7.22.10
-      '@vue/babel-helper-vue-transform-on': 1.1.5
-      camelcase: 6.3.0
-      html-tags: 3.3.1
-      svg-tags: 1.0.0
+      '@vue/compiler-sfc': 3.3.8
+      ast-kit: 0.11.2(rollup@3.28.1)
+      local-pkg: 0.4.3
+      magic-string-ast: 0.3.0
+      vue: 3.3.8(typescript@5.2.2)
     transitivePeerDependencies:
-      - supports-color
+      - rollup
+
+  /@vue/babel-helper-vue-transform-on@1.1.5:
+    resolution: {integrity: sha512-SgUymFpMoAyWeYWLAY+MkCK3QEROsiUnfaw5zxOVD/M64KQs8D/4oK6Q5omVA2hnvEOE0SCkH2TZxs/jnnUj7w==}
 
   /@vue/babel-plugin-jsx@1.1.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-nKs1/Bg9U1n3qSWnsHhCVQtAzI6aQXqua8j/bZrau8ywT1ilXQbK4FwEJGmU8fV7tcpuFvWmmN7TMmV1OBma1g==}
@@ -7048,7 +6828,7 @@ packages:
       '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.23.3)
       '@babel/template': 7.22.5
       '@babel/traverse': 7.23.2
-      '@babel/types': 7.22.10
+      '@babel/types': 7.23.3
       '@vue/babel-helper-vue-transform-on': 1.1.5
       camelcase: 6.3.0
       html-tags: 3.3.1
@@ -7056,84 +6836,24 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@vue/compiler-core@3.3.4:
-    resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==}
-    dependencies:
-      '@babel/parser': 7.23.3
-      '@vue/shared': 3.3.4
-      estree-walker: 2.0.2
-      source-map-js: 1.0.2
-    dev: true
-
-  /@vue/compiler-core@3.3.5:
-    resolution: {integrity: sha512-S8Ma+eICI40Y4UotR+iKR729Bma+wERn/xLc+Jz203s5WIW1Sx3qoiONqXGg3Q4vBMa+QHDncULya19ZSJuhog==}
-    dependencies:
-      '@babel/parser': 7.23.0
-      '@vue/shared': 3.3.5
-      estree-walker: 2.0.2
-      source-map-js: 1.0.2
-
   /@vue/compiler-core@3.3.8:
     resolution: {integrity: sha512-hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g==}
     dependencies:
-      '@babel/parser': 7.23.0
+      '@babel/parser': 7.23.3
       '@vue/shared': 3.3.8
       estree-walker: 2.0.2
       source-map-js: 1.0.2
 
-  /@vue/compiler-dom@3.3.4:
-    resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==}
-    dependencies:
-      '@vue/compiler-core': 3.3.4
-      '@vue/shared': 3.3.4
-    dev: true
-
-  /@vue/compiler-dom@3.3.5:
-    resolution: {integrity: sha512-dxt6QntN9T/NtnV6Pz+/nmcoo3ULnsYCnRpvEyY73wbk1tzzx7dnwngUN1cXkyGNu9c3UE7llhq/5T54lKwyhQ==}
-    dependencies:
-      '@vue/compiler-core': 3.3.5
-      '@vue/shared': 3.3.5
-
   /@vue/compiler-dom@3.3.8:
     resolution: {integrity: sha512-+PPtv+p/nWDd0AvJu3w8HS0RIm/C6VGBIRe24b9hSyNWOAPEUosFZ5diwawwP8ip5sJ8n0Pe87TNNNHnvjs0FQ==}
     dependencies:
       '@vue/compiler-core': 3.3.8
       '@vue/shared': 3.3.8
 
-  /@vue/compiler-sfc@3.3.4:
-    resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==}
-    dependencies:
-      '@babel/parser': 7.23.0
-      '@vue/compiler-core': 3.3.4
-      '@vue/compiler-dom': 3.3.4
-      '@vue/compiler-ssr': 3.3.4
-      '@vue/reactivity-transform': 3.3.4
-      '@vue/shared': 3.3.4
-      estree-walker: 2.0.2
-      magic-string: 0.30.5
-      postcss: 8.4.31
-      source-map-js: 1.0.2
-    dev: true
-
-  /@vue/compiler-sfc@3.3.5:
-    resolution: {integrity: sha512-M6ys4iReSbrF4NTcMCnJiBioCpzXjfkfXwkdziknRyps+pG0DkwpDfQT7zQ0q91/rCR/Ejz64b5H6C4HBhX41w==}
-    dependencies:
-      '@babel/parser': 7.23.0
-      '@vue/compiler-core': 3.3.5
-      '@vue/compiler-dom': 3.3.5
-      '@vue/compiler-ssr': 3.3.5
-      '@vue/reactivity-transform': 3.3.5
-      '@vue/shared': 3.3.5
-      estree-walker: 2.0.2
-      magic-string: 0.30.5
-      postcss: 8.4.31
-      source-map-js: 1.0.2
-    dev: true
-
   /@vue/compiler-sfc@3.3.8:
     resolution: {integrity: sha512-WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA==}
     dependencies:
-      '@babel/parser': 7.23.0
+      '@babel/parser': 7.23.3
       '@vue/compiler-core': 3.3.8
       '@vue/compiler-dom': 3.3.8
       '@vue/compiler-ssr': 3.3.8
@@ -7144,20 +6864,6 @@ packages:
       postcss: 8.4.31
       source-map-js: 1.0.2
 
-  /@vue/compiler-ssr@3.3.4:
-    resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==}
-    dependencies:
-      '@vue/compiler-dom': 3.3.4
-      '@vue/shared': 3.3.4
-    dev: true
-
-  /@vue/compiler-ssr@3.3.5:
-    resolution: {integrity: sha512-v7p2XuEpOcgjd6c49NqOnq3UTJOv5Uo9tirOyGnEadwxTov2O1J3/TUt4SgAAnwA+9gcUyH5c3lIOFsBe+UIyw==}
-    dependencies:
-      '@vue/compiler-dom': 3.3.5
-      '@vue/shared': 3.3.5
-    dev: true
-
   /@vue/compiler-ssr@3.3.8:
     resolution: {integrity: sha512-hXCqQL/15kMVDBuoBYpUnSYT8doDNwsjvm3jTefnXr+ytn294ySnT8NlsFHmTgKNjwpuFy7XVV8yTeLtNl/P6w==}
     dependencies:
@@ -7198,34 +6904,14 @@ packages:
     dependencies:
       '@volar/language-core': 1.10.10
       '@volar/source-map': 1.10.10
-      '@vue/compiler-dom': 3.3.5
-      '@vue/shared': 3.3.5
+      '@vue/compiler-dom': 3.3.8
+      '@vue/shared': 3.3.8
       computeds: 0.0.1
       minimatch: 9.0.3
       muggle-string: 0.3.1
       typescript: 5.2.2
       vue-template-compiler: 2.7.14
 
-  /@vue/reactivity-transform@3.3.4:
-    resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==}
-    dependencies:
-      '@babel/parser': 7.23.3
-      '@vue/compiler-core': 3.3.4
-      '@vue/shared': 3.3.4
-      estree-walker: 2.0.2
-      magic-string: 0.30.5
-    dev: true
-
-  /@vue/reactivity-transform@3.3.5:
-    resolution: {integrity: sha512-OhpBD1H32pIapRzqy31hWwTFLf9STP+0uk5bVOQWXACTa2Rt/RPhvX4zixbPgMGo6iP+S+tFpZzUdcG8AASn8A==}
-    dependencies:
-      '@babel/parser': 7.23.3
-      '@vue/compiler-core': 3.3.5
-      '@vue/shared': 3.3.5
-      estree-walker: 2.0.2
-      magic-string: 0.30.5
-    dev: true
-
   /@vue/reactivity-transform@3.3.8:
     resolution: {integrity: sha512-49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw==}
     dependencies:
@@ -7262,13 +6948,6 @@ packages:
       '@vue/shared': 3.3.8
       vue: 3.3.8(typescript@5.2.2)
 
-  /@vue/shared@3.3.4:
-    resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==}
-    dev: true
-
-  /@vue/shared@3.3.5:
-    resolution: {integrity: sha512-oNJN1rCtkqm1cIxU1BuZVEVRWIp4DhaxXucEzzZ/iDKHP71ZxhkBPNK+URySiECH6aiOZzC60PS2bd6JFznvNA==}
-
   /@vue/shared@3.3.8:
     resolution: {integrity: sha512-8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw==}
 
@@ -9778,7 +9457,7 @@ packages:
       eslint: 8.54.0
       eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.11.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.6.0)(eslint@8.54.0)
       eslint-plugin-import: 2.28.1(@typescript-eslint/parser@6.11.0)(eslint-import-resolver-typescript@3.6.0)(eslint@8.54.0)
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       get-tsconfig: 4.5.0
       is-core-module: 2.13.0
       is-glob: 4.0.3
@@ -10790,13 +10469,6 @@ packages:
     engines: {node: '>=18'}
     dependencies:
       ini: 4.1.1
-    dev: true
-
-  /global-dirs@3.0.1:
-    resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
-    engines: {node: '>=10'}
-    dependencies:
-      ini: 2.0.0
 
   /globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
@@ -10835,7 +10507,7 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
       dir-glob: 3.0.1
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       ignore: 5.2.4
       merge2: 1.4.1
       slash: 4.0.0
@@ -11380,13 +11052,8 @@ packages:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
 
-  /image-meta@0.1.1:
-    resolution: {integrity: sha512-+oXiHwOEPr1IE5zY0tcBLED/CYcre15J4nwL50x3o0jxWqEkyjrusiKP3YSU+tr9fvJp33ZcP5Gpj2295g3aEw==}
-    engines: {node: '>=10.18.0'}
-
   /image-meta@0.2.0:
     resolution: {integrity: sha512-ZBGjl0ZMEMeOC3Ns0wUF/5UdUmr3qQhBSCniT0LxOgGGIRHiNFOkMtIHB7EOznRU47V2AxPgiVP+s+0/UCU0Hg==}
-    dev: true
 
   /import-fresh@3.3.0:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
@@ -11428,14 +11095,9 @@ packages:
   /ini@1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
 
-  /ini@2.0.0:
-    resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
-    engines: {node: '>=10'}
-
   /ini@4.1.1:
     resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
 
   /inline-style-parser@0.1.1:
     resolution: {integrity: sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==}
@@ -11636,20 +11298,12 @@ packages:
     dependencies:
       is-docker: 3.0.0
 
-  /is-installed-globally@0.4.0:
-    resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      global-dirs: 3.0.1
-      is-path-inside: 3.0.3
-
   /is-installed-globally@1.0.0:
     resolution: {integrity: sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==}
     engines: {node: '>=18'}
     dependencies:
       global-directory: 4.0.1
       is-path-inside: 4.0.0
-    dev: true
 
   /is-interactive@2.0.0:
     resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==}
@@ -11690,7 +11344,6 @@ packages:
   /is-path-inside@4.0.0:
     resolution: {integrity: sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==}
     engines: {node: '>=12'}
-    dev: true
 
   /is-plain-obj@1.1.0:
     resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
@@ -12428,20 +12081,12 @@ packages:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  /magicast@0.3.0:
-    resolution: {integrity: sha512-ZsEzw35h7xYoFlWHIyxU6zmH4sdwzdmY0DY4s/Lie/qKimeijz2jRw8/OV2248kt/y6FbvoTvGRKyB7y/Mpx8w==}
-    dependencies:
-      '@babel/parser': 7.23.3
-      '@babel/types': 7.23.3
-      source-map-js: 1.0.2
-
   /magicast@0.3.2:
     resolution: {integrity: sha512-Fjwkl6a0syt9TFN0JSYpOybxiMCkYNEeOTnOTNRbjphirLakznZXAqrXgj/7GG3D1dvETONNwrBfinvAbpunDg==}
     dependencies:
       '@babel/parser': 7.23.3
       '@babel/types': 7.23.3
       source-map-js: 1.0.2
-    dev: true
 
   /make-dir@3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
@@ -13869,112 +13514,7 @@ packages:
     optionalDependencies:
       fsevents: 2.3.3
 
-  /nuxt@3.8.1(@types/node@14.18.33)(eslint@8.54.0)(typescript@5.2.2)(vue-tsc@1.8.22):
-    resolution: {integrity: sha512-RSGO56Gv0x2f6AXWw4o4GoBaVdsD0qkPCjrX7Ud/jzH3cRJoyYMPuq/9AOLvf2o1ecZWl39j5elqJ4QHmggyOA==}
-    engines: {node: ^14.18.0 || >=16.10.0}
-    hasBin: true
-    peerDependencies:
-      '@parcel/watcher': ^2.1.0
-      '@types/node': ^14.18.0 || >=16.10.0
-    peerDependenciesMeta:
-      '@parcel/watcher':
-        optional: true
-      '@types/node':
-        optional: true
-    dependencies:
-      '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 1.0.0(nuxt@3.8.1)
-      '@nuxt/kit': 3.8.1(rollup@3.28.1)
-      '@nuxt/schema': 3.8.1(rollup@3.28.1)
-      '@nuxt/telemetry': 2.5.2(rollup@3.28.1)
-      '@nuxt/ui-templates': 1.3.1
-      '@nuxt/vite-builder': 3.8.1(@types/node@14.18.33)(eslint@8.54.0)(typescript@5.2.2)(vue-tsc@1.8.22)(vue@3.3.8)
-      '@types/node': 14.18.33
-      '@unhead/dom': 1.8.3
-      '@unhead/ssr': 1.8.3
-      '@unhead/vue': 1.8.3(vue@3.3.8)
-      '@vue/shared': 3.3.8
-      acorn: 8.11.2
-      c12: 1.5.1
-      chokidar: 3.5.3
-      cookie-es: 1.0.0
-      defu: 6.1.3
-      destr: 2.0.2
-      devalue: 4.3.2
-      esbuild: 0.19.5
-      escape-string-regexp: 5.0.0
-      estree-walker: 3.0.3
-      fs-extra: 11.1.1
-      globby: 13.2.2
-      h3: 1.8.2
-      hookable: 5.5.3
-      jiti: 1.21.0
-      klona: 2.0.6
-      knitwork: 1.0.0
-      magic-string: 0.30.5
-      mlly: 1.4.2
-      nitropack: 2.7.2
-      nuxi: 3.9.1
-      nypm: 0.3.3
-      ofetch: 1.3.3
-      ohash: 1.1.3
-      pathe: 1.1.1
-      perfect-debounce: 1.0.0
-      pkg-types: 1.0.3
-      radix3: 1.1.0
-      scule: 1.1.0
-      std-env: 3.4.3
-      strip-literal: 1.3.0
-      ufo: 1.3.1
-      ultrahtml: 1.5.2
-      uncrypto: 0.1.3
-      unctx: 2.3.1
-      unenv: 1.7.4
-      unimport: 3.4.0(rollup@3.28.1)
-      unplugin: 1.5.0
-      unplugin-vue-router: 0.7.0(rollup@3.28.1)(vue-router@4.2.5)(vue@3.3.8)
-      untyped: 1.4.0
-      vue: 3.3.8(typescript@5.2.2)
-      vue-bundle-renderer: 2.0.0
-      vue-devtools-stub: 0.1.0
-      vue-router: 4.2.5(vue@3.3.8)
-    transitivePeerDependencies:
-      - '@azure/app-configuration'
-      - '@azure/cosmos'
-      - '@azure/data-tables'
-      - '@azure/identity'
-      - '@azure/keyvault-secrets'
-      - '@azure/storage-blob'
-      - '@capacitor/preferences'
-      - '@planetscale/database'
-      - '@upstash/redis'
-      - '@vercel/kv'
-      - bluebird
-      - bufferutil
-      - encoding
-      - eslint
-      - idb-keyval
-      - less
-      - lightningcss
-      - meow
-      - optionator
-      - rollup
-      - sass
-      - stylelint
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - typescript
-      - utf-8-validate
-      - vite
-      - vls
-      - vti
-      - vue-tsc
-      - xml2js
-    dev: true
-
-  /nuxt@3.8.1(@types/node@14.18.33)(rollup@3.28.1)(typescript@5.2.2):
+  /nuxt@3.8.1(@types/node@14.18.33)(eslint@8.54.0)(rollup@3.28.1)(typescript@5.2.2)(vue-tsc@1.8.22):
     resolution: {integrity: sha512-RSGO56Gv0x2f6AXWw4o4GoBaVdsD0qkPCjrX7Ud/jzH3cRJoyYMPuq/9AOLvf2o1ecZWl39j5elqJ4QHmggyOA==}
     engines: {node: ^14.18.0 || >=16.10.0}
     hasBin: true
@@ -13988,12 +13528,12 @@ packages:
         optional: true
     dependencies:
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 1.0.0(nuxt@3.8.1)(rollup@3.28.1)
+      '@nuxt/devtools': 1.0.2(nuxt@3.8.1)(rollup@3.28.1)
       '@nuxt/kit': 3.8.1(rollup@3.28.1)
       '@nuxt/schema': 3.8.1(rollup@3.28.1)
       '@nuxt/telemetry': 2.5.2(rollup@3.28.1)
       '@nuxt/ui-templates': 1.3.1
-      '@nuxt/vite-builder': 3.8.1(@types/node@14.18.33)(rollup@3.28.1)(typescript@5.2.2)(vue@3.3.8)
+      '@nuxt/vite-builder': 3.8.1(@types/node@14.18.33)(eslint@8.54.0)(rollup@3.28.1)(typescript@5.2.2)(vue-tsc@1.8.22)(vue@3.3.8)
       '@types/node': 14.18.33
       '@unhead/dom': 1.8.3
       '@unhead/ssr': 1.8.3
@@ -14035,8 +13575,8 @@ packages:
       uncrypto: 0.1.3
       unctx: 2.3.1
       unenv: 1.7.4
-      unimport: 3.4.0(rollup@3.28.1)
-      unplugin: 1.5.0
+      unimport: 3.5.0(rollup@3.28.1)
+      unplugin: 1.5.1
       unplugin-vue-router: 0.7.0(rollup@3.28.1)(vue-router@4.2.5)(vue@3.3.8)
       untyped: 1.4.0
       vue: 3.3.8(typescript@5.2.2)
@@ -14079,7 +13619,7 @@ packages:
       - xml2js
     dev: true
 
-  /nuxt@3.8.1(@types/node@14.18.33)(typescript@5.2.2):
+  /nuxt@3.8.1(@types/node@14.18.33)(eslint@8.54.0)(typescript@5.2.2)(vue-tsc@1.8.22):
     resolution: {integrity: sha512-RSGO56Gv0x2f6AXWw4o4GoBaVdsD0qkPCjrX7Ud/jzH3cRJoyYMPuq/9AOLvf2o1ecZWl39j5elqJ4QHmggyOA==}
     engines: {node: ^14.18.0 || >=16.10.0}
     hasBin: true
@@ -14093,7 +13633,7 @@ packages:
         optional: true
     dependencies:
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 1.0.0(nuxt@3.8.1)
+      '@nuxt/devtools': 1.0.2(nuxt@3.8.1)
       '@nuxt/kit': 3.8.1(rollup@3.28.1)
       '@nuxt/schema': 3.8.1(rollup@3.28.1)
       '@nuxt/telemetry': 2.5.2(rollup@3.28.1)
@@ -14132,7 +13672,7 @@ packages:
       perfect-debounce: 1.0.0
       pkg-types: 1.0.3
       radix3: 1.1.0
-      scule: 1.0.0
+      scule: 1.1.0
       std-env: 3.4.3
       strip-literal: 1.3.0
       ufo: 1.3.1
@@ -14140,8 +13680,8 @@ packages:
       uncrypto: 0.1.3
       unctx: 2.3.1
       unenv: 1.7.4
-      unimport: 3.4.0(rollup@3.28.1)
-      unplugin: 1.5.0
+      unimport: 3.5.0(rollup@3.28.1)
+      unplugin: 1.5.1
       unplugin-vue-router: 0.7.0(rollup@3.28.1)(vue-router@4.2.5)(vue@3.3.8)
       untyped: 1.4.0
       vue: 3.3.8(typescript@5.2.2)
@@ -14197,7 +13737,7 @@ packages:
         optional: true
     dependencies:
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 1.0.0(nuxt@3.8.1)
+      '@nuxt/devtools': 1.0.2(nuxt@3.8.1)
       '@nuxt/kit': 3.8.1(rollup@3.28.1)
       '@nuxt/schema': 3.8.1(rollup@3.28.1)
       '@nuxt/telemetry': 2.5.2(rollup@3.28.1)
@@ -14244,8 +13784,8 @@ packages:
       uncrypto: 0.1.3
       unctx: 2.3.1
       unenv: 1.7.4
-      unimport: 3.4.0(rollup@3.28.1)
-      unplugin: 1.5.0
+      unimport: 3.5.0(rollup@3.28.1)
+      unplugin: 1.5.1
       unplugin-vue-router: 0.7.0(rollup@3.28.1)(vue-router@4.2.5)(vue@3.3.8)
       untyped: 1.4.0
       vue: 3.3.8(typescript@5.2.2)
@@ -14301,7 +13841,7 @@ packages:
         optional: true
     dependencies:
       '@nuxt/devalue': 2.0.2
-      '@nuxt/devtools': 1.0.0(nuxt@3.8.1)
+      '@nuxt/devtools': 1.0.2(nuxt@3.8.1)
       '@nuxt/kit': 3.8.1(rollup@3.28.1)
       '@nuxt/schema': 3.8.1(rollup@3.28.1)
       '@nuxt/telemetry': 2.5.2(rollup@3.28.1)
@@ -14348,8 +13888,8 @@ packages:
       uncrypto: 0.1.3
       unctx: 2.3.1
       unenv: 1.7.4
-      unimport: 3.4.0(rollup@3.28.1)
-      unplugin: 1.5.0
+      unimport: 3.5.0(rollup@3.28.1)
+      unplugin: 1.5.1
       unplugin-vue-router: 0.7.0(rollup@3.28.1)(vue-router@4.2.5)(vue@3.3.8)
       untyped: 1.4.0
       vue: 3.3.8(typescript@5.2.2)
@@ -16062,6 +15602,7 @@ packages:
 
   /scule@1.0.0:
     resolution: {integrity: sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==}
+    dev: true
 
   /scule@1.1.0:
     resolution: {integrity: sha512-vRUjqhyM/YWYzT+jsMk6tnl3NkY4A4soJ8uyh3O6Um+JXEQL9ozUCe7pqrxn3CSKokw0hw3nFStfskzpgYwR0g==}
@@ -16749,7 +16290,7 @@ packages:
     engines: {node: ^14.18.0 || >=16.0.0}
     dependencies:
       '@pkgr/utils': 2.3.1
-      tslib: 2.6.1
+      tslib: 2.6.2
     dev: true
 
   /tabbable@6.2.0:
@@ -17108,13 +16649,8 @@ packages:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: false
 
-  /tslib@2.6.1:
-    resolution: {integrity: sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==}
-    dev: true
-
   /tslib@2.6.2:
     resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
-    dev: false
 
   /tsx@4.1.1:
     resolution: {integrity: sha512-zyPn5BFMB0TB5kMLbYPNx4x/oL/oSlaecdKCv6WeJ0TeSEfx8RTJWjuB5TZ2dSewktgfBsBO/HNA9mrMWqLXMA==}
@@ -17426,7 +16962,7 @@ packages:
       acorn: 8.11.2
       estree-walker: 3.0.3
       magic-string: 0.30.5
-      unplugin: 1.5.0
+      unplugin: 1.5.1
 
   /undici-types@5.25.3:
     resolution: {integrity: sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==}
@@ -17499,7 +17035,7 @@ packages:
     dependencies:
       '@rollup/pluginutils': 5.0.4(rollup@3.28.1)
       escape-string-regexp: 5.0.0
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       local-pkg: 0.4.3
       magic-string: 0.30.5
       mlly: 1.4.2
@@ -17507,7 +17043,7 @@ packages:
       pkg-types: 1.0.3
       scule: 1.1.0
       strip-literal: 1.3.0
-      unplugin: 1.5.0
+      unplugin: 1.5.1
     transitivePeerDependencies:
       - rollup
 
@@ -17524,10 +17060,9 @@ packages:
       pkg-types: 1.0.3
       scule: 1.1.0
       strip-literal: 1.3.0
-      unplugin: 1.5.0
+      unplugin: 1.5.1
     transitivePeerDependencies:
       - rollup
-    dev: true
 
   /unimport@3.5.0(rollup@3.29.4):
     resolution: {integrity: sha512-0Ei1iTeSYxs7oxxUf79/KaBc2dPjZxe7qdVpw7yIz5YcdTZjmBYO6ToLDW+fX9QOHiueZ3xtwb5Z/wqaSfXx6A==}
@@ -17542,7 +17077,7 @@ packages:
       pkg-types: 1.0.3
       scule: 1.1.0
       strip-literal: 1.3.0
-      unplugin: 1.5.0
+      unplugin: 1.5.1
     transitivePeerDependencies:
       - rollup
 
@@ -17797,27 +17332,19 @@ packages:
       '@vue-macros/common': 1.8.0(rollup@3.28.1)(vue@3.3.8)
       ast-walker-scope: 0.5.0(rollup@3.28.1)
       chokidar: 3.5.3
-      fast-glob: 3.3.1
+      fast-glob: 3.3.2
       json5: 2.2.3
       local-pkg: 0.4.3
       mlly: 1.4.2
       pathe: 1.1.1
       scule: 1.1.0
-      unplugin: 1.5.0
+      unplugin: 1.5.1
       vue-router: 4.2.5(vue@3.3.8)
       yaml: 2.3.3
     transitivePeerDependencies:
       - rollup
       - vue
 
-  /unplugin@1.5.0:
-    resolution: {integrity: sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==}
-    dependencies:
-      acorn: 8.11.2
-      chokidar: 3.5.3
-      webpack-sources: 3.2.3
-      webpack-virtual-modules: 0.5.0
-
   /unplugin@1.5.1:
     resolution: {integrity: sha512-0QkvG13z6RD+1L1FoibQqnvTwVBXvS4XSPwAyinVgoOCl2jAgwzdUKmEj05o4Lt8xwQI85Hb6mSyYkcAGwZPew==}
     dependencies:
@@ -18341,31 +17868,6 @@ packages:
       vscode-uri: 3.0.7
       vue-tsc: 1.8.22(typescript@5.2.2)
 
-  /vite-plugin-inspect@0.7.40(@nuxt/kit@3.8.1)(rollup@3.28.1):
-    resolution: {integrity: sha512-tsfva6MCg0ch6ckReWHvJ/9xf/zjTuJvakONf2qcMBB/iu9JqiRixfxMa/yLGrlNaBe6fUZHOVhtN2Me3Kthow==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@nuxt/kit': '*'
-      vite: ^3.1.0 || ^4.0.0
-    peerDependenciesMeta:
-      '@nuxt/kit':
-        optional: true
-      vite:
-        optional: true
-    dependencies:
-      '@antfu/utils': 0.7.6
-      '@nuxt/kit': 3.8.1(rollup@3.28.1)
-      '@rollup/pluginutils': 5.0.5(rollup@3.28.1)
-      debug: 4.3.4
-      error-stack-parser-es: 0.1.1
-      fs-extra: 11.1.1
-      open: 9.1.0
-      picocolors: 1.0.0
-      sirv: 2.0.3
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-
   /vite-plugin-inspect@0.7.42(@nuxt/kit@3.8.1)(rollup@3.28.1):
     resolution: {integrity: sha512-JCyX86wr3siQc+p9Kd0t8VkFHAJag0RaQVIpdFGSv5FEaePEVB6+V/RGtz2dQkkGSXQzRWrPs4cU3dRKg32bXw==}
     engines: {node: '>=14'}
@@ -18390,7 +17892,6 @@ packages:
     transitivePeerDependencies:
       - rollup
       - supports-color
-    dev: true
 
   /vite-plugin-vue-inspector@4.0.0:
     resolution: {integrity: sha512-xNjMbRj3YrebuuInTvlC8ghPtzT+3LjMIQPeeR/5CaFd+WcbA9wBnECZmlcP3GITCVED0SxGmTyoJ3iVKsK4vQ==}
@@ -18400,13 +17901,13 @@ packages:
       vite:
         optional: true
     dependencies:
-      '@babel/core': 7.23.2
-      '@babel/plugin-proposal-decorators': 7.23.2(@babel/core@7.23.2)
-      '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.23.2)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.2)
-      '@babel/plugin-transform-typescript': 7.22.15(@babel/core@7.23.2)
-      '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.23.2)
-      '@vue/compiler-dom': 3.3.5
+      '@babel/core': 7.23.3
+      '@babel/plugin-proposal-decorators': 7.23.2(@babel/core@7.23.3)
+      '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.3)
+      '@babel/plugin-transform-typescript': 7.22.15(@babel/core@7.23.3)
+      '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.23.3)
+      '@vue/compiler-dom': 3.3.8
       kolorist: 1.8.0
       magic-string: 0.30.5
     transitivePeerDependencies:
@@ -18995,9 +18496,6 @@ packages:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
     engines: {node: '>=10.13.0'}
 
-  /webpack-virtual-modules@0.5.0:
-    resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
-
   /webpack-virtual-modules@0.6.0:
     resolution: {integrity: sha512-KnaMTE6EItz/f2q4Gwg5/rmeKVi79OR58NoYnwDJqCk9ywMtTGbBnBcfoBtN4QbYu0lWXvyMoH2Owxuhe4qI6Q==}
 
diff --git a/templates/astro/src/components/Session.vue b/templates/astro/src/components/Session.vue
index ab93b93cc..6fc0ae83d 100644
--- a/templates/astro/src/components/Session.vue
+++ b/templates/astro/src/components/Session.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
-import { useSessionContext, useUser } from "@shopware-pwa/composables-next";
+import {
+  useSessionContext,
+  useUser,
+} from "@shopware-pwa/composables-next/dist";
 
 const { currency, selectedPaymentMethod, refreshSessionContext } =
   useSessionContext();
diff --git a/templates/astro/src/entrypoints/_shopware.ts b/templates/astro/src/entrypoints/_shopware.ts
index 7f2c08af3..abd937e0f 100644
--- a/templates/astro/src/entrypoints/_shopware.ts
+++ b/templates/astro/src/entrypoints/_shopware.ts
@@ -1,5 +1,5 @@
 import type { App } from "vue";
-import { createShopwareContext } from "@shopware-pwa/composables-next";
+import { createShopwareContext } from "@shopware-pwa/composables-next/dist";
 import { createInstance } from "@shopware-pwa/api-client";
 import Cookies from "js-cookie";
 
diff --git a/templates/vue-blank/nuxt.config.ts b/templates/vue-blank/nuxt.config.ts
index ef711e43b..4ebb63d9b 100644
--- a/templates/vue-blank/nuxt.config.ts
+++ b/templates/vue-blank/nuxt.config.ts
@@ -1,5 +1,6 @@
 // https://v3.nuxtjs.org/api/configuration/nuxt.config
 export default defineNuxtConfig({
+  extends: ["@shopware-pwa/composables-next", "@shopware-pwa/cms-base"],
   runtimeConfig: {
     public: {
       shopware: {
@@ -8,7 +9,6 @@ export default defineNuxtConfig({
       },
     },
   },
-  modules: ["@vueuse/nuxt", "@shopware-pwa/nuxt3-module"],
   /**
    * Commented because of the StackBlitz error
    * Issue: https://github.com/shopware/frontends/issues/88
diff --git a/templates/vue-blank/package.json b/templates/vue-blank/package.json
index 726f7a1da..6f005697d 100644
--- a/templates/vue-blank/package.json
+++ b/templates/vue-blank/package.json
@@ -9,6 +9,7 @@
     "preview": "nuxt preview"
   },
   "devDependencies": {
+    "@shopware-pwa/api-client": "canary",
     "@shopware-pwa/nuxt3-module": "canary",
     "@types/node": "^20.3.2",
     "@vueuse/nuxt": "^10.6.1",
diff --git a/templates/vue-blank/plugins/02.shopware.ts b/templates/vue-blank/plugins/02.shopware.ts
new file mode 100644
index 000000000..0314b4db1
--- /dev/null
+++ b/templates/vue-blank/plugins/02.shopware.ts
@@ -0,0 +1,91 @@
+import { createInstance } from "@shopware-pwa/api-client";
+import Cookies from "js-cookie";
+
+export default defineNuxtPlugin((app) => {
+  const runtimeConfig = useRuntimeConfig();
+
+  const useUserCookieContext =
+    !!runtimeConfig.public?.shopware?.useUserContextInSSR || !app.ssrContext;
+
+  const contextToken = useCookie("sw-context-token", {
+    maxAge: 60 * 60 * 24 * 365,
+    sameSite: "Lax",
+    path: "/",
+  });
+  const languageId = useCookie("sw-language-id", {
+    maxAge: 60 * 60 * 24 * 365,
+    sameSite: "Lax",
+    path: "/",
+  });
+
+  // workaround for SSG case, where cookies contains additional dot in name, related: https://github.com/shopware/frontends/commit/ee5b8a71e1e016c973a7852efa3b85a136e6ea14
+  const cookieContextToken = Cookies.get("sw-context-token");
+  const cookieLanguageId = Cookies.get("sw-language-id");
+
+  if (
+    !runtimeConfig.public?.shopware?.shopwareEndpoint ||
+    !runtimeConfig.public?.shopware?.shopwareAccessToken
+  ) {
+    throw new Error(
+      "Make sure that shopwareEndpoint and shopwareAccessToken are settled in the configuration",
+    );
+  }
+
+  /**
+   * Server config has bigger prio than client
+   */
+  const instance = createInstance({
+    endpoint:
+      runtimeConfig?.shopware?.shopwareEndpoint ||
+      runtimeConfig.public.shopware.shopwareEndpoint,
+    accessToken: runtimeConfig.public.shopware.shopwareAccessToken,
+    timeout: runtimeConfig.public.shopware.shopwareAccessToken || 10000,
+    auth: {
+      username:
+        "<%= options.shopwareApiClient.auth ? options.shopwareApiClient.auth.username : undefined %>",
+      password:
+        "<%=  options.shopwareApiClient.auth ? options.shopwareApiClient.auth.password : undefined %>",
+    },
+    contextToken: useUserCookieContext
+      ? contextToken.value || cookieContextToken
+      : "",
+    languageId: useUserCookieContext
+      ? languageId.value || cookieLanguageId
+      : undefined,
+  });
+  /**
+   * Save current contextToken when its change
+   */
+  instance.onConfigChange(({ config }) => {
+    try {
+      // only save cookies on client side render
+      if (useUserCookieContext) {
+        contextToken.value = config.contextToken;
+        languageId.value = config.languageId;
+        Cookies.set("sw-context-token", config.contextToken || "", {
+          expires: 365, //days
+          sameSite: "Lax",
+          path: "/",
+        });
+        Cookies.set("sw-language-id", config.languageId || "", {
+          expires: 365, //days
+          sameSite: "Lax",
+          path: "/",
+        });
+      }
+    } catch (e) {
+      // Sometimes cookie is set on server after request is send, it can fail silently
+    }
+  });
+  const shopwareContext = createShopwareContext(app.vueApp, {
+    apiInstance: instance,
+    enableDevtools: true,
+    shopwareDefaults: {},
+    devStorefrontUrl: runtimeConfig.public.shopware?.devStorefrontUrl || null,
+  });
+  app.vueApp.provide("shopware", shopwareContext);
+  const sessionContextData = ref();
+  app.vueApp.provide("swSessionContext", sessionContextData);
+  // in case someone tries to use it in nuxt specific code like middleware
+  useState("swSessionContext", () => sessionContextData);
+});
diff --git a/templates/vue-demo-store/app.vue b/templates/vue-demo-store/app.vue
index 5279fd0cc..c80641e35 100644
--- a/templates/vue-demo-store/app.vue
+++ b/templates/vue-demo-store/app.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { getSessionContext } from "@shopware-pwa/api-client";
-import type { SessionContext } from "@shopware-pwa/types";
 import { getPrefix } from "./i18n/src/helpers/prefix";
+import type { Schemas } from "#shopware";
 
 /**
  * Init breadcrumbs context
@@ -16,9 +15,9 @@ useHead({
   },
 });
 
-const { apiInstance } = useShopwareContext();
-const sessionContextData = ref();
-sessionContextData.value = await getSessionContext(apiInstance);
+const { apiClient } = useShopwareContext();
+const sessionContextData = ref<Schemas["SalesChannelContext"]>();
+sessionContextData.value = await apiClient.invoke("readContext get /context");
 
 // If you enable runtimeConfig.shopware.useUserContextInSSR, then you can use this code to share session between server and client.
 // const { data: sessionContextData } = await useAsyncData(
@@ -45,7 +44,7 @@ usePrice({
   localeCode: localeFromHeader,
 });
 
-useSessionContext(sessionContextData.value as SessionContext);
+useSessionContext(sessionContextData.value);
 
 const { getWishlistProducts } = useWishlist();
 const { refreshCart } = useCart();
diff --git a/templates/vue-demo-store/components/FrontendAccountCustomerGroupRegistrationPage.vue b/templates/vue-demo-store/components/FrontendAccountCustomerGroupRegistrationPage.vue
index 187d7cd49..a5cbd4e79 100644
--- a/templates/vue-demo-store/components/FrontendAccountCustomerGroupRegistrationPage.vue
+++ b/templates/vue-demo-store/components/FrontendAccountCustomerGroupRegistrationPage.vue
@@ -1,23 +1,20 @@
 <script setup lang="ts">
-import { invokeGet } from "@shopware-pwa/api-client";
-import type { CustomerGroup } from "@shopware-pwa/types";
-
 const props = defineProps<{
   navigationId: string;
 }>();
 
-const { apiInstance } = useShopwareContext();
+const { apiClient } = useShopwareContext();
 
 const { data: registrationResponse } = await useAsyncData(
   "cmsNavigation" + props.navigationId,
   async () => {
-    const response = await invokeGet<CustomerGroup>(
+    const response = await apiClient.invoke(
+      "getCustomerGroupRegistrationInfo get /customer-group-registration/config/{customerGroupId}",
       {
-        address: `/store-api/customer-group-registration/config/${props.navigationId}`,
+        customerGroupId: props.navigationId,
       },
-      apiInstance,
     );
-    return response?.data || {};
+    return response || {};
   },
 );
 </script>
diff --git a/templates/vue-demo-store/components/FrontendDetailPage.vue b/templates/vue-demo-store/components/FrontendDetailPage.vue
index 4eb7e7ff1..3d303f606 100644
--- a/templates/vue-demo-store/components/FrontendDetailPage.vue
+++ b/templates/vue-demo-store/components/FrontendDetailPage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useProductSearch } from "@shopware-pwa/composables-next";
+import { useProductSearch } from "#imports";
 import { getCategoryBreadcrumbs } from "@shopware-pwa/helpers-next";
 
 const props = defineProps<{
@@ -18,8 +18,12 @@ const { data: productResponse } = await useAsyncData(
   },
 );
 
+if (!productResponse.value) {
+  console.error("No product found for navigationId: " + props.navigationId);
+  throw new Error("No product found for navigationId: " + props.navigationId);
+}
 const breadcrumbs = getCategoryBreadcrumbs(
-  productResponse.value?.product.seoCategory,
+  productResponse.value.product.seoCategory,
   {
     startIndex: 2,
   },
@@ -27,8 +31,8 @@ const breadcrumbs = getCategoryBreadcrumbs(
 useBreadcrumbs(breadcrumbs);
 
 const { product } = useProduct(
-  productResponse.value?.product,
-  productResponse.value?.configurator,
+  productResponse.value.product,
+  productResponse.value.configurator,
 );
 
 useCmsHead(product, { mainShopTitle: "Shopware Frontends Demo Store" });
diff --git a/templates/vue-demo-store/components/FrontendLandingPage.vue b/templates/vue-demo-store/components/FrontendLandingPage.vue
index dbff6307b..6292c5d8c 100644
--- a/templates/vue-demo-store/components/FrontendLandingPage.vue
+++ b/templates/vue-demo-store/components/FrontendLandingPage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useLandingSearch } from "@shopware-pwa/composables-next";
+import { useLandingSearch } from "#imports";
 import type { LandingPage } from "@shopware-pwa/types";
 
 const props = defineProps<{
diff --git a/templates/vue-demo-store/components/FrontendNavigationPage.vue b/templates/vue-demo-store/components/FrontendNavigationPage.vue
index 782774a91..21741340f 100644
--- a/templates/vue-demo-store/components/FrontendNavigationPage.vue
+++ b/templates/vue-demo-store/components/FrontendNavigationPage.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { Category } from "@shopware-pwa/types";
-import { useCategorySearch } from "@shopware-pwa/composables-next";
+import { useCategorySearch } from "#imports";
 import type { Ref } from "vue";
 import { getCategoryBreadcrumbs } from "@shopware-pwa/helpers-next";
 import { useCmsHead } from "@/composables/useCmsHead";
+import type { Schemas } from "#shopware";
 
 const props = defineProps<{
   navigationId: string;
@@ -24,13 +24,14 @@ const { data: categoryResponse } = await useAsyncData(
     return category;
   },
 );
+if (categoryResponse.value) {
+  const breadcrumbs = getCategoryBreadcrumbs(categoryResponse.value, {
+    startIndex: 2,
+  });
+  useBreadcrumbs(breadcrumbs);
+}
 
-const breadcrumbs = getCategoryBreadcrumbs(categoryResponse.value, {
-  startIndex: 2,
-});
-useBreadcrumbs(breadcrumbs);
-
-const { category } = useCategory(categoryResponse as Ref<Category>);
+const { category } = useCategory(categoryResponse as Ref<Schemas["Category"]>);
 useCmsHead(category, { mainShopTitle: "Shopware Frontends Demo Store" });
 </script>
 
diff --git a/templates/vue-demo-store/components/account/AccountAddressCard.vue b/templates/vue-demo-store/components/account/AccountAddressCard.vue
index 0314e2179..152cf9523 100644
--- a/templates/vue-demo-store/components/account/AccountAddressCard.vue
+++ b/templates/vue-demo-store/components/account/AccountAddressCard.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { getTranslatedProperty } from "@shopware-pwa/helpers-next";
 import type { CustomerAddress, Country, Salutation } from "@shopware-pwa/types";
 const { pushSuccess, pushError } = useNotifications();
 const {
@@ -115,9 +116,9 @@ const addressSaved = () => {
         <span data-testid="address-box-city">{{ address.city }}</span>
       </p>
       <p v-if="address.country" class="text-sm">
-        <span>({{ address.country.translated.name }}</span>
+        <span>({{ getTranslatedProperty(address.country, "name") }}</span>
         <span v-if="address.countryState"
-          >, {{ address.countryState.translated.name }}</span
+          >, {{ getTranslatedProperty(address.countryState, "name") }}</span
         >)
       </p>
     </div>
diff --git a/templates/vue-demo-store/components/account/AccountAddressForm.vue b/templates/vue-demo-store/components/account/AccountAddressForm.vue
index 436f21dc2..c91236bd9 100644
--- a/templates/vue-demo-store/components/account/AccountAddressForm.vue
+++ b/templates/vue-demo-store/components/account/AccountAddressForm.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import type { ClientApiError, CustomerAddress } from "@shopware-pwa/types";
+import type { Schemas } from "#shopware";
+import { ApiClientError } from "@shopware/api-client";
+import type { ApiError } from "@shopware/api-client";
 
 const {
   createCustomerAddress,
@@ -15,7 +17,7 @@ const emits = defineEmits<{
 
 const props = withDefaults(
   defineProps<{
-    address?: CustomerAddress;
+    address?: Schemas["CustomerAddress"];
     title?: string;
   }>(),
   {
@@ -28,7 +30,7 @@ const { getSalutations } = useSalutations();
 const { t } = useI18n();
 const { pushError } = useNotifications();
 
-const formData = reactive<CustomerAddress>({
+const formData = reactive<Schemas["CustomerAddress"]>({
   countryId: props.address?.countryId ?? "",
   countryStateId: props.address?.countryStateId ?? "",
   salutationId: props.address?.salutationId ?? "",
@@ -38,21 +40,22 @@ const formData = reactive<CustomerAddress>({
   city: props.address?.city ?? "",
   street: props.address?.street ?? "",
   id: props.address?.id ?? "",
-});
+} as Schemas["CustomerAddress"]);
 
 const invokeSave = async (): Promise<void> => {
   try {
     const saveAddress = formData.id
       ? updateCustomerAddress
       : createCustomerAddress;
-    await saveAddress(formData as CustomerAddress);
+    await saveAddress(formData as Schemas["CustomerAddress"]);
     loadCustomerAddresses();
     emits("success");
   } catch (e) {
-    const errors = e as ClientApiError;
-    errors?.messages?.forEach((element) => {
-      pushError(errorMessageBuilder(element) || t("messages.error"));
-    });
+    if (e instanceof ApiClientError) {
+      e.details.errors.forEach((element: ApiError) => {
+        pushError(errorMessageBuilder(element) || t("messages.error"));
+      });
+    }
   }
 };
 
diff --git a/templates/vue-demo-store/components/account/AccountLoginForm.vue b/templates/vue-demo-store/components/account/AccountLoginForm.vue
index c05c60314..627654844 100644
--- a/templates/vue-demo-store/components/account/AccountLoginForm.vue
+++ b/templates/vue-demo-store/components/account/AccountLoginForm.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { ClientApiError } from "@shopware-pwa/types";
+import { ApiClientError, type ApiError } from "@shopware/api-client";
 
 const emits = defineEmits<{
   (e: "success"): void;
@@ -37,8 +37,11 @@ const invokeLogin = async (): Promise<void> => {
     emits("close");
     mergeWishlistProducts();
   } catch (error) {
-    const e = error as ClientApiError;
-    loginErrors.value = e.messages.map(({ detail }) => detail);
+    if (error instanceof ApiClientError) {
+      loginErrors.value = error.details.errors.map(
+        ({ detail }: ApiError) => detail,
+      );
+    }
   }
 };
 
diff --git a/templates/vue-demo-store/components/account/AccountOrder.vue b/templates/vue-demo-store/components/account/AccountOrder.vue
index f01c44b3b..bbd60d64a 100644
--- a/templates/vue-demo-store/components/account/AccountOrder.vue
+++ b/templates/vue-demo-store/components/account/AccountOrder.vue
@@ -11,7 +11,7 @@ const toggleView = () => (isExpand.value = !isExpand.value);
 const { currency } = useSessionContext();
 
 const orderDate = computed(() =>
-  new Date(props?.order?.orderDate).toLocaleDateString(
+  new Date(props.order.orderDate).toLocaleDateString(
     (typeof navigator !== "undefined" && navigator.language) || "en-US",
   ),
 );
diff --git a/templates/vue-demo-store/components/account/AccountOrderDetails.vue b/templates/vue-demo-store/components/account/AccountOrderDetails.vue
index d4669e84f..cb38a5a8e 100644
--- a/templates/vue-demo-store/components/account/AccountOrderDetails.vue
+++ b/templates/vue-demo-store/components/account/AccountOrderDetails.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { Schemas } from "#shopware";
+
 const props = defineProps<{
   orderId: string;
 }>();
@@ -11,7 +13,9 @@ onMounted(() => {
   loadOrderDetails();
 });
 
-const lineItems = computed(() => order.value?.lineItems || []);
+const lineItems = computed<Array<Schemas["OrderLineItem"]>>(
+  () => order.value?.lineItems || [],
+);
 </script>
 
 <script lang="ts">
diff --git a/templates/vue-demo-store/components/account/AccountOrderDownloads.vue b/templates/vue-demo-store/components/account/AccountOrderDownloads.vue
index 89f561065..5939ae129 100644
--- a/templates/vue-demo-store/components/account/AccountOrderDownloads.vue
+++ b/templates/vue-demo-store/components/account/AccountOrderDownloads.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
-import type { OrderDocument } from "@shopware-pwa/types";
+import type { Schemas } from "#shopware";
 import { downloadFile } from "@shopware-pwa/helpers-next";
 
 const props = defineProps<{
-  documents: OrderDocument[];
+  documents: Schemas["Document"][];
 }>();
 
 const { getDocumentFile } = useOrderDetails(props.documents[0].orderId);
 
-const getMediaFileHandler = async (documentObject: OrderDocument) => {
+const getMediaFileHandler = async (documentObject: Schemas["Document"]) => {
   const response = await getDocumentFile(
     documentObject.id,
     documentObject.deepLinkCode,
diff --git a/templates/vue-demo-store/components/account/AccountOrderItem.vue b/templates/vue-demo-store/components/account/AccountOrderItem.vue
index 58d697be8..471bbd1e6 100644
--- a/templates/vue-demo-store/components/account/AccountOrderItem.vue
+++ b/templates/vue-demo-store/components/account/AccountOrderItem.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
+import type { Schemas } from "#shopware";
 import { getMainImageUrl, isProduct } from "@shopware-pwa/helpers-next";
-import type { OrderLineItem } from "@shopware-pwa/types";
 
 const props = defineProps<{
-  orderItem: OrderLineItem;
+  orderItem: Schemas["OrderLineItem"];
 }>();
 
 const isPromotion = computed(() => isProduct(props.orderItem.payload));
@@ -35,8 +35,12 @@ const productOptions = computed(() =>
         <p class="ml-4">{{ itemRegularPrice }} EUR</p>
       </div>
       <p class="mt-1 text-sm text-gray-500">
-        <span v-for="option in productOptions" :key="option.group" class="mr-2">
-          {{ option.group }}: {{ option.option }}
+        <span
+          v-for="option in productOptions"
+          :key="option.group.name"
+          class="mr-2"
+        >
+          {{ option.group.name }}: {{ option.option }}
         </span>
       </p>
     </div>
diff --git a/templates/vue-demo-store/components/account/AccountOrderLineItem.vue b/templates/vue-demo-store/components/account/AccountOrderLineItem.vue
index c27ffb020..191564cbd 100644
--- a/templates/vue-demo-store/components/account/AccountOrderLineItem.vue
+++ b/templates/vue-demo-store/components/account/AccountOrderLineItem.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import type { OrderLineItem } from "@shopware-pwa/types";
 import {
   getSmallestThumbnailUrl,
   getMedia,
   downloadFile,
 } from "@shopware-pwa/helpers-next";
+import type { Schemas } from "#shopware";
 const props = defineProps<{
-  lineItem: OrderLineItem;
+  lineItem: Schemas["OrderLineItem"];
 }>();
 
 const { getMediaFile } = useOrderDetails(props.lineItem.orderId);
diff --git a/templates/vue-demo-store/components/account/AccountPersonalData.vue b/templates/vue-demo-store/components/account/AccountPersonalData.vue
index 79ab8bdb6..996004da8 100644
--- a/templates/vue-demo-store/components/account/AccountPersonalData.vue
+++ b/templates/vue-demo-store/components/account/AccountPersonalData.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useVuelidate } from "@vuelidate/core";
-import type { ClientApiError } from "@shopware-pwa/types";
 import { customValidators } from "@/i18n/utils/i18n-validators";
+import { ApiClientError, type ApiError } from "@shopware/api-client";
 const { required, minLength, requiredIf, email, sameAs } = customValidators();
 
 const { user, refreshUser, updatePersonalInfo, updateEmail } = useUser();
@@ -103,8 +103,9 @@ const invokeUpdate = async (): Promise<void> => {
 
     refreshUser();
   } catch (err) {
-    const e = err as ClientApiError;
-    errorMessages.value = e.messages.map((m) => m.detail);
+    if (err instanceof ApiClientError) {
+      errorMessages.value = err.details.errors.map((m: ApiError) => m.detail);
+    }
   } finally {
     loadingData.value = false;
   }
diff --git a/templates/vue-demo-store/components/account/AccountRecoverPassword.vue b/templates/vue-demo-store/components/account/AccountRecoverPassword.vue
index a5f8c1db6..e9bee43e3 100644
--- a/templates/vue-demo-store/components/account/AccountRecoverPassword.vue
+++ b/templates/vue-demo-store/components/account/AccountRecoverPassword.vue
@@ -9,7 +9,7 @@ const isSuccess = ref(false);
 
 const formData = ref({
   email: "",
-  storefrontUrl: apiInstance.config.endpoint,
+  storefrontUrl: apiInstance.config.endpoint || "",
 });
 
 const recoverPasswordErrors = computed(
diff --git a/templates/vue-demo-store/components/account/AccountRegisterForm.vue b/templates/vue-demo-store/components/account/AccountRegisterForm.vue
index 5ebd13f62..abc132026 100644
--- a/templates/vue-demo-store/components/account/AccountRegisterForm.vue
+++ b/templates/vue-demo-store/components/account/AccountRegisterForm.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useVuelidate } from "@vuelidate/core";
-import type { ClientApiError } from "@shopware-pwa/types";
 import { customValidators } from "@/i18n/utils/i18n-validators";
+import { ApiClientError, type ApiError } from "@shopware/api-client";
 
 const { required, minLength, email, requiredIf } = customValidators();
 const props = defineProps<{
@@ -107,9 +107,11 @@ const invokeSubmit = async () => {
         $v.value.$reset();
       }
     } catch (error) {
-      let message =
-        (error as ClientApiError)?.messages?.[0]?.detail || t("messages.error");
-      pushError(message);
+      if (error instanceof ApiClientError) {
+        error.details.errors.forEach((m: ApiError) => {
+          pushError(m.detail || t("messages.error"));
+        });
+      }
     } finally {
       loading.value = false;
     }
diff --git a/templates/vue-demo-store/components/account/AccountResetPasswordForm.vue b/templates/vue-demo-store/components/account/AccountResetPasswordForm.vue
index 3f37f7aa7..1771de334 100644
--- a/templates/vue-demo-store/components/account/AccountResetPasswordForm.vue
+++ b/templates/vue-demo-store/components/account/AccountResetPasswordForm.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
 import { useVuelidate } from "@vuelidate/core";
-import { confirmPasswordReset } from "@shopware-pwa/api-client";
-import type { ClientApiError } from "@shopware-pwa/types";
 import { customValidators } from "@/i18n/utils/i18n-validators";
+import { ApiClientError } from "@shopware/api-client";
 
 const { required, minLength, sameAs } = customValidators();
-const { apiInstance } = useShopwareContext();
+const { apiClient } = useShopwareContext();
 
 const state = reactive({
   password: {
@@ -40,17 +39,19 @@ const invokeReset = async (): Promise<void> => {
     if (!isFormCorrect) {
       return;
     } else {
-      await confirmPasswordReset(
+      await apiClient.invoke(
+        "recoveryPassword post /account/recovery-password-confirm",
         {
-          newPassword: state.password.newPasswordConfirm,
           hash: hashQuery,
+          newPassword: state.password.newPasswordConfirm,
+          newPasswordConfirm: state.password.newPasswordConfirm,
         },
-        apiInstance,
       );
     }
   } catch (err) {
-    const error = err as ClientApiError;
-    state.error = error.messages[0].detail;
+    if (err instanceof ApiClientError) {
+      state.error = err.details.errors?.[0]?.detail;
+    }
   }
 };
 </script>
diff --git a/templates/vue-demo-store/components/checkout/CheckoutCartItem.vue b/templates/vue-demo-store/components/checkout/CheckoutCartItem.vue
index ec8ee35a3..34a22ae0d 100644
--- a/templates/vue-demo-store/components/checkout/CheckoutCartItem.vue
+++ b/templates/vue-demo-store/components/checkout/CheckoutCartItem.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
+import type { Schemas } from "#shopware";
 import { getSmallestThumbnailUrl } from "@shopware-pwa/helpers-next";
-import type { LineItem } from "@shopware-pwa/types";
 
 const props = withDefaults(
   defineProps<{
-    cartItem: LineItem;
+    cartItem: Schemas["LineItem"];
     maxQty?: number;
   }>(),
   {
@@ -112,9 +112,9 @@ const removeCartItem = async () => {
         v-model="quantity"
         type="number"
         :disabled="isLoading"
-        :min="cartItem.quantityInformation?.minPurchase || 1"
-        :max="cartItem.quantityInformation?.maxPurchase || maxQty"
-        :step="cartItem.quantityInformation?.purchaseSteps || 1"
+        :min="(cartItem as any).quantityInformation?.minPurchase || 1"
+        :max="(cartItem as any).quantityInformation?.maxPurchase || maxQty"
+        :step="(cartItem as any).quantityInformation?.purchaseSteps || 1"
         data-testid="cart-product-qty-select"
         name="quantity"
         aria-label="Cart item quantity"
diff --git a/templates/vue-demo-store/components/layout/LayoutStoreSearch.vue b/templates/vue-demo-store/components/layout/LayoutStoreSearch.vue
index 637bec943..21637aac1 100644
--- a/templates/vue-demo-store/components/layout/LayoutStoreSearch.vue
+++ b/templates/vue-demo-store/components/layout/LayoutStoreSearch.vue
@@ -101,7 +101,7 @@ watch(enter, (value) => {
       class="absolute border-gray-100 border-t-1 duration-300 left-0 mt-2 overflow-hidden right-0 rounded-b-md shadow-md transition-height w-auto z-1"
     >
       <NuxtLink
-        v-for="product in getProducts.slice(0, displayTotal)"
+        v-for="product in getProducts?.slice(0, displayTotal)"
         :key="product.id"
         :to="formatLink(getProductRoute(product))"
         data-testid="layout-search-suggest-link"
diff --git a/templates/vue-demo-store/components/layout/LayoutTopNavigation.vue b/templates/vue-demo-store/components/layout/LayoutTopNavigation.vue
index c33d041a7..54f8f538c 100644
--- a/templates/vue-demo-store/components/layout/LayoutTopNavigation.vue
+++ b/templates/vue-demo-store/components/layout/LayoutTopNavigation.vue
@@ -5,13 +5,13 @@ import {
   getSmallestThumbnailUrl,
 } from "@shopware-pwa/helpers-next";
 const { navigationElements } = useNavigation();
-const currentMenuPosition = ref<string | null>(null);
+const currentMenuPosition = ref<string>();
 
 const menuHtmlElement = ref(null);
 const localePath = useLocalePath();
 const { formatLink } = useInternationalization(localePath);
 
-onClickOutside(menuHtmlElement, () => (currentMenuPosition.value = null));
+onClickOutside(menuHtmlElement, () => (currentMenuPosition.value = undefined));
 </script>
 
 <template>
@@ -59,10 +59,10 @@ onClickOutside(menuHtmlElement, () => (currentMenuPosition.value = null));
         <div
           v-if="
             currentMenuPosition === navigationElement.id &&
-            navigationElement?.children?.length
+            navigationElement?.children.length
           "
           class="absolute z-10 -ml-4 mt-3 transform px-2 w-screen max-w-md xl:max-w-screen-sm sm:px-0 lg:ml-0 lg:left-1/4 lg:-translate-x-1/6"
-          @mouseleave="currentMenuPosition = null"
+          @mouseleave="currentMenuPosition = undefined"
         >
           <div
             class="rounded-lg shadow-lg ring-1 ring-black ring-opacity-5 overflow-hidden"
diff --git a/templates/vue-demo-store/components/listing-filters/ListingFilter.vue b/templates/vue-demo-store/components/listing-filters/ListingFilter.vue
index 859ed4d55..a574ac232 100644
--- a/templates/vue-demo-store/components/listing-filters/ListingFilter.vue
+++ b/templates/vue-demo-store/components/listing-filters/ListingFilter.vue
@@ -1,5 +1,4 @@
-<script setup lang="ts">
-import type { ListingFilter } from "@shopware-pwa/types";
+<script setup lang="ts" generic="ListingFilter extends { code: string }">
 import ListingFiltersPrice from "./ListingFiltersPrice.vue";
 import ListingFiltersProperties from "./ListingFiltersProperties.vue";
 import ListingFiltersRating from "./ListingFiltersRating.vue";
diff --git a/templates/vue-demo-store/components/listing-filters/ListingFilters.vue b/templates/vue-demo-store/components/listing-filters/ListingFilters.vue
index 9b8e27a0e..21fb5fec5 100644
--- a/templates/vue-demo-store/components/listing-filters/ListingFilters.vue
+++ b/templates/vue-demo-store/components/listing-filters/ListingFilters.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { RequestParameters } from "#shopware";
 import ListingFilter from "./ListingFilter.vue";
 import { computed, provide, reactive } from "vue";
 import type { ComputedRef, UnwrapNestedRefs } from "vue";
@@ -37,19 +38,19 @@ const searchSelectedFilters: UnwrapNestedRefs<{
 });
 /* eslint-enable */
 
-const searchCriteriaForRequest: ComputedRef<{
-  [code: string]: string | string[] | number | number[] | boolean | undefined;
-}> = computed(() => ({
-  // turn Set to array and then into string with | separator
-  manufacturer: [...searchSelectedFilters.manufacturer]?.join("|"),
-  // turn Set to array and then into string with | separator
-  properties: [...searchSelectedFilters.properties]?.join("|"),
-  "min-price": searchSelectedFilters["min-price"],
-  "max-price": searchSelectedFilters["max-price"],
-  order: getCurrentSortingOrder.value,
-  "shipping-free": searchSelectedFilters["shipping-free"],
-  rating: searchSelectedFilters["rating"],
-}));
+const searchCriteriaForRequest: ComputedRef<RequestParameters<"searchPage">> =
+  computed(() => ({
+    // turn Set to array and then into string with | separator
+    manufacturer: [...searchSelectedFilters.manufacturer]?.join("|"),
+    // turn Set to array and then into string with | separator
+    properties: [...searchSelectedFilters.properties]?.join("|"),
+    "min-price": searchSelectedFilters["min-price"],
+    "max-price": searchSelectedFilters["max-price"],
+    order: getCurrentSortingOrder.value,
+    "shipping-free": searchSelectedFilters["shipping-free"],
+    rating: searchSelectedFilters["rating"],
+    search: "",
+  }));
 
 for (const param in route.query) {
   if (searchSelectedFilters.hasOwnProperty(param)) {
@@ -107,7 +108,7 @@ const clearFilters = async () => {
   search({
     ...route.query,
     ...filtersToQuery(searchCriteriaForRequest.value),
-  });
+  } as RequestParameters<"searchPage">);
 
   await router.push({
     query: {
@@ -120,7 +121,7 @@ const clearFilters = async () => {
 async function invokeCleanFilters() {
   await search({
     ...route.query,
-  });
+  } as unknown as RequestParameters<"searchPage">);
   clearFilters();
 }
 
diff --git a/templates/vue-demo-store/components/listing-filters/ListingFiltersPrice.vue b/templates/vue-demo-store/components/listing-filters/ListingFiltersPrice.vue
index 140a50192..61a19a49e 100644
--- a/templates/vue-demo-store/components/listing-filters/ListingFiltersPrice.vue
+++ b/templates/vue-demo-store/components/listing-filters/ListingFiltersPrice.vue
@@ -1,5 +1,15 @@
-<script setup lang="ts">
-import type { ListingFilter } from "@shopware-pwa/types";
+<script
+  setup
+  lang="ts"
+  generic="
+    ListingFilter extends {
+      code: string;
+      min?: number;
+      max?: number;
+      label: string;
+    }
+  "
+>
 import { reactive, ref, watch } from "vue";
 
 const emits = defineEmits<{
@@ -66,7 +76,7 @@ watch(() => prices.max, debounceMaxPriceUpdate);
         @click="toggle"
       >
         <span class="font-medium text-gray-900 text-left">{{
-          filter.label
+          props.filter.label
         }}</span>
         <span class="ml-6 flex items-center">
           <i
diff --git a/templates/vue-demo-store/components/listing-filters/ListingFiltersProperties.vue b/templates/vue-demo-store/components/listing-filters/ListingFiltersProperties.vue
index 44dedcd38..49982702f 100644
--- a/templates/vue-demo-store/components/listing-filters/ListingFiltersProperties.vue
+++ b/templates/vue-demo-store/components/listing-filters/ListingFiltersProperties.vue
@@ -1,7 +1,18 @@
-<script setup lang="ts">
-import type { ListingFilter } from "@shopware-pwa/types";
+<script
+  setup
+  lang="ts"
+  generic="
+    ListingFilter extends {
+      code: string;
+      label: string;
+      name: string;
+      options: Array<Schemas['PropertyGroupOption']>;
+    }
+  "
+>
 import { inject, ref } from "vue";
 import { getTranslatedProperty } from "@shopware-pwa/helpers-next";
+import type { Schemas } from "#shopware";
 
 defineProps<{
   filter: ListingFilter;
@@ -26,7 +37,7 @@ const toggle = () => {
         @click="toggle"
       >
         <span class="font-medium text-gray-900 text-left">{{
-          filter.label
+          props.filter.label
         }}</span>
         <span class="ml-6 flex items-center">
           <i
@@ -43,17 +54,20 @@ const toggle = () => {
       <div v-show="isFilterVisible" id="filter-section-0" class="pt-6">
         <div class="space-y-4">
           <div
-            v-for="option in filter.options || filter.entities"
+            v-for="option in props.filter.options || props.filter.entities"
             :key="`${option.id}-${selectedOptionIds?.includes(option.id)}`"
             class="flex items-center"
             @click="
-              emits('select-value', { code: filter.code, value: option.id })
+              emits('select-value', {
+                code: props.filter.code,
+                value: option.id,
+              })
             "
           >
             <input
-              :id="`filter-mobile-${filter.code}-${option.id}`"
+              :id="`filter-mobile-${props.filter.code}-${option.id}`"
               :checked="selectedOptionIds?.includes(option.id)"
-              :name="filter.name"
+              :name="props.filter.name"
               :value="option.name"
               type="checkbox"
               class="h-4 w-4 border-gray-300 rounded text-indigo-600 focus:ring-indigo-500"
diff --git a/templates/vue-demo-store/components/listing-filters/ListingFiltersRating.vue b/templates/vue-demo-store/components/listing-filters/ListingFiltersRating.vue
index 20da58eb3..1a65d85ae 100644
--- a/templates/vue-demo-store/components/listing-filters/ListingFiltersRating.vue
+++ b/templates/vue-demo-store/components/listing-filters/ListingFiltersRating.vue
@@ -1,10 +1,18 @@
-<script setup lang="ts">
+<script
+  setup
+  lang="ts"
+  generic="
+    ListingFilter extends {
+      code: string;
+      label: string;
+    }
+  "
+>
 import type {
   EntitiesAggregation,
   AggregationFilterEntity,
   PriceAggregation,
   MaxAggregation,
-  ListingFilter,
 } from "@shopware-pwa/types";
 import { computed, ref } from "vue";
 
@@ -56,7 +64,7 @@ const toggle = () => {
         @click="toggle"
       >
         <span class="font-medium text-gray-900 text-left">{{
-          filter.label
+          props.filter.label
         }}</span>
         <span class="ml-6 flex items-center">
           <i
diff --git a/templates/vue-demo-store/components/listing-filters/ListingFiltersShippingFree.vue b/templates/vue-demo-store/components/listing-filters/ListingFiltersShippingFree.vue
index e5524d4dd..40f3dfa7c 100644
--- a/templates/vue-demo-store/components/listing-filters/ListingFiltersShippingFree.vue
+++ b/templates/vue-demo-store/components/listing-filters/ListingFiltersShippingFree.vue
@@ -1,8 +1,18 @@
-<script setup lang="ts">
+<script
+  setup
+  lang="ts"
+  generic="
+    ListingFilter extends {
+      id: string;
+      code: string;
+      label: string;
+      name: string;
+    }
+  "
+>
 import type {
   AggregationFilterEntity,
   EntitiesAggregation,
-  ListingFilter,
   MaxAggregation,
   PriceAggregation,
 } from "@shopware-pwa/types";
@@ -50,7 +60,7 @@ onClickOutside(dropdownElement, () => (isFilterVisible.value = false));
         @click="toggle"
       >
         <span class="font-medium text-gray-900 text-left">{{
-          filter.label
+          props.filter.label
         }}</span>
         <span class="ml-6 flex items-center">
           <i
@@ -68,19 +78,19 @@ onClickOutside(dropdownElement, () => (isFilterVisible.value = false));
         <div class="space-y-4">
           <div class="flex items-center" @click="onChangeOption()">
             <input
-              :id="`filter-mobile-${filter.id || filter.code}`"
+              :id="`filter-mobile-${props.filter.id || props.filter.code}`"
               :checked="currentFilterData"
-              :name="filter.name"
-              :value="filter.name"
+              :name="props.filter.name"
+              :value="props.filter.name"
               type="checkbox"
               class="h-4 w-4 border-gray-300 rounded text-indigo-600 focus:ring-indigo-500"
             />
 
             <label
-              :for="`filter-mobile-${filter.id || filter.code}`"
+              :for="`filter-mobile-${props.filter.id || props.filter.code}`"
               class="ml-3 text-gray-600"
             >
-              {{ filter.label }}
+              {{ props.filter.label }}
             </label>
           </div>
         </div>
diff --git a/templates/vue-demo-store/components/product/ProductCard.vue b/templates/vue-demo-store/components/product/ProductCard.vue
index d65d7bd3c..40af0b29a 100644
--- a/templates/vue-demo-store/components/product/ProductCard.vue
+++ b/templates/vue-demo-store/components/product/ProductCard.vue
@@ -2,15 +2,12 @@
 import type { BoxLayout, DisplayMode } from "@shopware-pwa/composables-next";
 import {
   getProductName,
-  getProductThumbnailUrl,
   getProductRoute,
   getProductFromPrice,
+  getSmallestThumbnailUrl,
 } from "@shopware-pwa/helpers-next";
-import type {
-  ClientApiError,
-  Product,
-  PropertyGroupOption,
-} from "@shopware-pwa/types";
+import type { Schemas } from "#shopware";
+import { ApiClientError } from "@shopware/api-client";
 
 const { pushSuccess, pushError } = useNotifications();
 const { t } = useI18n();
@@ -20,7 +17,7 @@ const { formatLink } = useInternationalization(localePath);
 
 const props = withDefaults(
   defineProps<{
-    product: Product;
+    product: Schemas["Product"];
     layoutType?: BoxLayout;
     displayMode?: DisplayMode;
   }>(),
@@ -45,16 +42,17 @@ const toggleWishlistProduct = async () => {
         }),
       );
     } catch (error) {
-      const e = error as ClientApiError;
-      const reason = e?.messages?.[0]?.detail
-        ? `Reason: ${e?.messages?.[0]?.detail}`
-        : "";
-      return pushError(
-        `${props.product?.translated?.name} cannot be added to wishlist.\n${reason}`,
-        {
-          timeout: 5000,
-        },
-      );
+      if (error instanceof ApiClientError) {
+        const reason = error.details.errors?.[0]?.detail
+          ? `Reason: ${error.details.errors?.[0]?.detail}`
+          : "";
+        return pushError(
+          `${props.product?.translated?.name} cannot be added to wishlist.\n${reason}`,
+          {
+            timeout: 5000,
+          },
+        );
+      }
     }
   }
   removeFromWishlist();
@@ -81,9 +79,9 @@ function roundUp(num: number) {
 }
 
 const srcPath = computed(() => {
-  return `${getProductThumbnailUrl(product.value)}?&height=${roundUp(
-    height.value,
-  )}&fit=crop`;
+  return `${getSmallestThumbnailUrl(
+    product.value.cover?.media,
+  )}?&height=${roundUp(height.value)}&fit=crop`;
 });
 </script>
 
@@ -149,8 +147,8 @@ const srcPath = computed(() => {
         :key="option.id"
         class="inline-flex items-center rounded-md bg-gray-50 px-2 py-1 text-xs font-medium text-gray-600 ring-1 ring-inset ring-gray-500/10"
       >
-        {{ (option as PropertyGroupOption).group.name }}:
-        {{ (option as PropertyGroupOption).name }}
+        {{ option.group.name }}:
+        {{ option.name }}
       </span>
     </div>
     <div class="px-4 pb-4">
diff --git a/templates/vue-demo-store/components/product/ProductGallery.vue b/templates/vue-demo-store/components/product/ProductGallery.vue
index e7288a8fa..71bb4a65d 100644
--- a/templates/vue-demo-store/components/product/ProductGallery.vue
+++ b/templates/vue-demo-store/components/product/ProductGallery.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { CmsElementImageGallery } from "@shopware-pwa/composables-next";
 import type { Product } from "@shopware-pwa/types";
 
 const props = defineProps<{
diff --git a/templates/vue-demo-store/components/product/ProductPrice.vue b/templates/vue-demo-store/components/product/ProductPrice.vue
index b728f049f..e97de6e14 100644
--- a/templates/vue-demo-store/components/product/ProductPrice.vue
+++ b/templates/vue-demo-store/components/product/ProductPrice.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { useProductPrice } from "@shopware-pwa/composables-next";
 import type { Product } from "@shopware-pwa/types";
 
 const props = defineProps<{
diff --git a/templates/vue-demo-store/components/product/ProductStatic.vue b/templates/vue-demo-store/components/product/ProductStatic.vue
index 0c5a841af..7c8a0db60 100644
--- a/templates/vue-demo-store/components/product/ProductStatic.vue
+++ b/templates/vue-demo-store/components/product/ProductStatic.vue
@@ -1,24 +1,24 @@
 <script setup lang="ts">
-import type { Product, ProductReview } from "@shopware-pwa/types";
 import {
   getProductRoute,
   getTranslatedProperty,
 } from "@shopware-pwa/helpers-next";
-import { getProductReviews } from "@shopware-pwa/api-client";
 import type { Ref } from "vue";
+import type { Schemas } from "#shopware";
 
 const props = defineProps<{
-  product: Product;
+  product: Schemas["Product"];
 }>();
-const reviews: Ref<ProductReview[]> = ref([]);
+const reviews: Ref<Schemas["ProductReview"][]> = ref([]);
 const router = useRouter();
 
-const { apiInstance } = useShopwareContext();
+const { apiClient } = useShopwareContext();
 onMounted(async () => {
-  const reviewsResponse = await getProductReviews(
-    props.product.id,
-    undefined,
-    apiInstance,
+  const reviewsResponse = await apiClient.invoke(
+    "readProductReviews post /product/{productId}/reviews",
+    {
+      productId: props.product.id,
+    },
   );
   reviews.value = reviewsResponse?.elements || [];
 });
@@ -35,7 +35,7 @@ const description = computed(() =>
 );
 const properties = computed(() => props.product?.properties || []);
 
-const handleVariantChange = (val: Product) => {
+const handleVariantChange = (val: Schemas["Product"]) => {
   const newRoute = getProductRoute(val);
   router.push(newRoute);
 };
diff --git a/templates/vue-demo-store/components/shared/SharedAccountAddressForm.vue b/templates/vue-demo-store/components/shared/SharedAccountAddressForm.vue
index cb72ddadf..59d118ded 100644
--- a/templates/vue-demo-store/components/shared/SharedAccountAddressForm.vue
+++ b/templates/vue-demo-store/components/shared/SharedAccountAddressForm.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
-import type {
-  CustomerAddress,
-  ClientApiError,
-  ShopwareError,
-} from "@shopware-pwa/types";
 import { useVuelidate } from "@vuelidate/core";
 import { customValidators } from "@/i18n/utils/i18n-validators";
+import { ApiClientError } from "@shopware/api-client";
+import type { ApiError } from "@shopware/api-client";
+import type { Schemas } from "#shopware";
 
 const { required, minLength, requiredIf } = customValidators();
 
@@ -20,7 +18,7 @@ const emits = defineEmits<{
 
 const props = withDefaults(
   defineProps<{
-    address?: CustomerAddress;
+    address?: Schemas["CustomerAddress"];
     title?: string;
   }>(),
   {
@@ -54,13 +52,15 @@ const invokeSave = async (): Promise<void> => {
     $v.value.$touch();
     const valid = await $v.value.$validate();
     if (valid) {
-      await saveAddress(formData as CustomerAddress);
+      await saveAddress(formData as Schemas["CustomerAddress"]);
       emits("success");
     }
   } catch (errors) {
-    (errors as ClientApiError).messages.forEach((element: ShopwareError) => {
-      pushError(errorMessageBuilder(element) || t("messages.error"));
-    });
+    if (errors instanceof ApiClientError) {
+      errors.details.errors.forEach((element: ApiError) => {
+        pushError(errorMessageBuilder(element) || t("messages.error"));
+      });
+    }
   }
 };
 
diff --git a/templates/vue-demo-store/components/shared/SharedListingProductPrice.vue b/templates/vue-demo-store/components/shared/SharedListingProductPrice.vue
index 938fca24c..efabe0c6e 100644
--- a/templates/vue-demo-store/components/shared/SharedListingProductPrice.vue
+++ b/templates/vue-demo-store/components/shared/SharedListingProductPrice.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { useProductPrice } from "@shopware-pwa/composables-next";
 import type { Product } from "@shopware-pwa/types";
 
 const props = defineProps<{
diff --git a/templates/vue-demo-store/composables/useCart.ts b/templates/vue-demo-store/composables/useCart.ts
new file mode 100644
index 000000000..c7d0eb387
--- /dev/null
+++ b/templates/vue-demo-store/composables/useCart.ts
@@ -0,0 +1,32 @@
+import type { Schemas } from "#shopware";
+import { useCartFunction as swUseCart } from "@shopware-pwa/composables-next";
+
+const _useCart = (): UseCartReturn => {
+  const useCartData: UseCartReturn = swUseCart();
+  const _storeCart = useContext<undefined | Schemas["Cart"]>("swCart");
+  const { apiClient } = useShopwareContext();
+
+  async function refreshCart(
+    newCart?: Schemas["Cart"],
+  ): Promise<Schemas["Cart"]> {
+    if (newCart) {
+      _storeCart.value = newCart;
+      return newCart;
+    }
+
+    const result = await apiClient.invoke(
+      "readCart get /checkout/cart?name",
+      {},
+    );
+    _storeCart.value = result;
+    useCartData.refreshCart(_storeCart.value);
+    return result;
+  }
+
+  return {
+    ...useCartData,
+    refreshCart,
+  };
+};
+
+export const useCart = createSharedComposable(_useCart);
diff --git a/templates/vue-demo-store/composables/useCartNotification.ts b/templates/vue-demo-store/composables/useCartNotification.ts
index c00cf50bd..b8319acb1 100644
--- a/templates/vue-demo-store/composables/useCartNotification.ts
+++ b/templates/vue-demo-store/composables/useCartNotification.ts
@@ -1,10 +1,11 @@
-import type { CartErrors, CartError } from "@shopware-pwa/types";
+import type { Schemas } from "#shopware";
+import type { CartError } from "@shopware-pwa/types";
 
 const successCodes = ["promotion-discount-added"];
 
 export type useCartNotificationReturn = {
   codeErrorsNotification(): void;
-  getErrorsCodes(): CartError[] | undefined;
+  getErrorsCodes(): CartError[];
 };
 
 /**
@@ -22,8 +23,8 @@ export function useCartNotification(): useCartNotificationReturn {
    * @returns {void}
    */
   const codeErrorsNotification = () => {
-    const errors: CartErrors | null = consumeCartErrors();
-    if (!errors) return;
+    const errors: Schemas["Cart"]["errors"] = consumeCartErrors();
+    if (!errors || Array.isArray(errors)) return;
 
     Object.keys(errors).forEach((element) => {
       if (successCodes.includes(errors[element].messageKey)) {
@@ -40,8 +41,8 @@ export function useCartNotification(): useCartNotificationReturn {
    * @returns CartError[] | undefined
    */
   const getErrorsCodes = () => {
-    const errors: CartErrors | null = consumeCartErrors();
-    if (!errors) return;
+    const errors: Schemas["Cart"]["errors"] = consumeCartErrors();
+    if (!errors || Array.isArray(errors)) return [];
 
     return Object.keys(errors).reduce((acc, element) => {
       if (!successCodes.includes(errors[element].messageKey))
diff --git a/templates/vue-demo-store/composables/useShopwareContext.ts b/templates/vue-demo-store/composables/useShopwareContext.ts
new file mode 100644
index 000000000..d5700b23c
--- /dev/null
+++ b/templates/vue-demo-store/composables/useShopwareContext.ts
@@ -0,0 +1,20 @@
+import type { ApiClient } from "#shopware";
+import type { ShopwareContext } from "@shopware-pwa/composables-next";
+
+export function useShopwareContext() {
+  const shopwareContext = inject<ShopwareContext | null>("shopware", null);
+
+  const apiClient = inject<ApiClient>("apiClient");
+
+  if (!shopwareContext || !apiClient)
+    throw new Error("Critical error. Shopware context is not provided.");
+
+  return {
+    /**
+     * @deprecated use `apiClient` instead
+     */
+    apiInstance: shopwareContext.apiInstance,
+    apiClient,
+    devStorefrontUrl: shopwareContext.devStorefrontUrl,
+  };
+}
diff --git a/templates/vue-demo-store/composables/useUser.ts b/templates/vue-demo-store/composables/useUser.ts
new file mode 100644
index 000000000..b4f214c26
--- /dev/null
+++ b/templates/vue-demo-store/composables/useUser.ts
@@ -0,0 +1,11 @@
+import { useUser as swUseUser } from "@shopware-pwa/composables-next";
+
+export const useUser = () => {
+  const useUserData = swUseUser();
+
+  // here you can experiment with overriding the default composable
+
+  return {
+    ...useUserData,
+  };
+};
diff --git a/templates/vue-demo-store/error.vue b/templates/vue-demo-store/error.vue
index c0946be01..ac3bd2398 100644
--- a/templates/vue-demo-store/error.vue
+++ b/templates/vue-demo-store/error.vue
@@ -7,33 +7,44 @@ const props = defineProps<{
   };
 }>();
 
-const { t } = useI18n();
-const localePath = useLocalePath();
-const { formatLink } = useInternationalization(localePath);
+let isFormattedError = true;
+let errMessage = "";
 
-const errorMessageMap: { [key: number]: string } = {
-  404: t("errorPages.404"),
-  408: t("errorPages.408"),
-  500: t("errorPages.500"),
-  502: t("errorPages.502"),
-  503: t("errorPages.503"),
-};
+try {
+  const { t } = useI18n();
+  const localePath = useLocalePath();
+  const { formatLink } = useInternationalization(localePath);
+
+  const errorMessageMap: { [key: number]: string } = {
+    404: t("errorPages.404"),
+    408: t("errorPages.408"),
+    500: t("errorPages.500"),
+    502: t("errorPages.502"),
+    503: t("errorPages.503"),
+  };
 
-const errorMessage =
-  props.error.statusMessage ||
-  errorMessageMap[props.error.statusCode as keyof typeof errorMessageMap];
+  errMessage =
+    props.error.statusMessage ||
+    errorMessageMap[props.error.statusCode as keyof typeof errorMessageMap];
 
-if (props.error.statusCode === 412) {
-  // setting a timeout here to ensure we are the last error message in terminal
-  setTimeout(() => {
-    console.error(
-      "Looks like your API connection is not working. Check your nuxt configuration (shopwareEndpoint and shopwareAccessToken). 🤞",
-    );
-    console.error(
-      "For more help ➡️  https://frontends.shopware.com/resources/troubleshooting.html",
-    );
-  }, 2.0 * 1000);
+  if (props.error.statusCode === 412) {
+    // setting a timeout here to ensure we are the last error message in terminal
+    setTimeout(() => {
+      console.error(
+        "Looks like your API connection is not working. Check your nuxt configuration (shopwareEndpoint and shopwareAccessToken). 🤞",
+      );
+      console.error(
+        "For more help ➡️  https://frontends.shopware.com/resources/troubleshooting.html",
+      );
+    }, 2.0 * 1000);
+  }
+} catch (e) {
+  console.error("Problem with loading error page", e);
+  isFormattedError = false;
 }
+
+const statusCode = isFormattedError ? props.error.statusCode : "Error";
+const errorMessage = isFormattedError ? errMessage : props.error.message;
 </script>
 
 <script lang="ts">
@@ -50,7 +61,7 @@ export default {
       <div class="max-w-md text-center">
         <h1 class="mb-4 font-extrabold text-9xl">
           <span class="sr-only">{{ $t("error") }}</span
-          >{{ props.error.statusCode }}
+          >{{ statusCode }}
         </h1>
         <p
           v-if="errorMessage"
@@ -73,7 +84,7 @@ export default {
           </div>
         </DevOnly>
         <NuxtLink
-          :to="formatLink(`/`)"
+          :to="isFormattedError ? formatLink(`/`) : `/`"
           class="block w-full lg:w-auto justify-center py-3 px-8 border shadow-sm text-sm font-medium rounded-md text-white bg-brand-light hover:bg-brand-dark focus:outline-none focus:ring-2 focus:ring-brand-primary"
         >
           {{ $t("goBackHome") }}
diff --git a/templates/vue-demo-store/nuxt.config.ts b/templates/vue-demo-store/nuxt.config.ts
index 9f3811e42..128727398 100644
--- a/templates/vue-demo-store/nuxt.config.ts
+++ b/templates/vue-demo-store/nuxt.config.ts
@@ -1,5 +1,9 @@
 // https://v3.nuxtjs.org/docs/directory-structure/nuxt.config
 export default defineNuxtConfig({
+  extends: [
+    "@shopware-pwa/composables-next/nuxt-layer",
+    "@shopware-pwa/cms-base",
+  ],
   runtimeConfig: {
     shopware: {
       /**
@@ -10,7 +14,7 @@ export default defineNuxtConfig({
     },
     public: {
       shopware: {
-        shopwareEndpoint: "https://demo-frontends.shopware.store",
+        shopwareEndpoint: "https://demo-frontends.shopware.store/store-api/",
         shopwareAccessToken: "SWSCBHFSNTVMAWNZDNFKSHLAYW",
         devStorefrontUrl: "",
       },
@@ -69,7 +73,6 @@ export default defineNuxtConfig({
     "@vueuse/nuxt",
     "@unocss/nuxt",
     "@shopware-pwa/nuxt3-module",
-    "@shopware-pwa/cms-base",
     "@nuxt/devtools",
     "@nuxtjs/i18n",
   ],
diff --git a/templates/vue-demo-store/package.json b/templates/vue-demo-store/package.json
index 8c49ca095..958d1318b 100644
--- a/templates/vue-demo-store/package.json
+++ b/templates/vue-demo-store/package.json
@@ -13,12 +13,12 @@
     "analyze": "nuxt analyze"
   },
   "dependencies": {
-    "@shopware-pwa/api-client": "canary",
     "@shopware-pwa/cms-base": "canary",
     "@shopware-pwa/composables-next": "canary",
     "@shopware-pwa/helpers-next": "canary",
     "@shopware-pwa/nuxt3-module": "canary",
     "@shopware-pwa/types": "canary",
+    "@shopware/api-client": "canary",
     "@unocss/nuxt": "^0.57.6",
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
diff --git a/templates/vue-demo-store/pages/[...all].vue b/templates/vue-demo-store/pages/[...all].vue
index b784691e1..72211cf3c 100644
--- a/templates/vue-demo-store/pages/[...all].vue
+++ b/templates/vue-demo-store/pages/[...all].vue
@@ -8,11 +8,9 @@ export default {
 import { resolveComponent } from "vue";
 import type { Ref } from "vue";
 import { pascalCase } from "scule";
-import {
-  useNavigationContext,
-  useNavigationSearch,
-} from "@shopware-pwa/composables-next";
-import type { SeoUrl } from "@shopware-pwa/types";
+import { useNavigationContext, useNavigationSearch } from "#imports";
+import type { Schemas } from "#shopware";
+
 const { clearBreadcrumbs } = useBreadcrumbs();
 
 const NOT_FOUND_COMPONENT = "errors/RoutingNotFound";
@@ -39,7 +37,7 @@ const { data: seoResult } = await useAsyncData(
 );
 
 const { routeName, foreignKey } = useNavigationContext(
-  seoResult as Ref<SeoUrl>,
+  seoResult as Ref<Schemas["SeoUrl"]>,
 );
 
 const componentName = routeName.value;
diff --git a/templates/vue-demo-store/pages/checkout/index.vue b/templates/vue-demo-store/pages/checkout/index.vue
index fc9f883be..3cb700a61 100644
--- a/templates/vue-demo-store/pages/checkout/index.vue
+++ b/templates/vue-demo-store/pages/checkout/index.vue
@@ -5,9 +5,10 @@ export default {
 </script>
 <script setup lang="ts">
 import { useVuelidate } from "@vuelidate/core";
-import type { ClientApiError, ShopwareError } from "@shopware-pwa/types";
 import { getShippingMethodDeliveryTime } from "@shopware-pwa/helpers-next";
 import { customValidators } from "@/i18n/utils/i18n-validators";
+import type { RequestParameters } from "#shopware";
+import { ApiClientError, type ApiError } from "@shopware/api-client";
 
 const { required, minLength, requiredIf, email } = customValidators();
 
@@ -88,7 +89,7 @@ const selectedShippingAddress = computed({
     isLoading[`shipping-${shippingAddressId}`] = true;
     await setActiveShippingAddress({ id: shippingAddressId });
     if (shippingAddressId === selectedBillingAddress.value)
-      state.customShipping = false;
+      customShipping.value = false;
     isLoading[`shipping-${shippingAddressId}`] = false;
   },
 });
@@ -101,7 +102,7 @@ const selectedBillingAddress = computed({
     isLoading[`billing-${billingAddressId}`] = true;
     await setActiveBillingAddress({ id: billingAddressId });
     if (billingAddressId === selectedShippingAddress.value)
-      state.customShipping = false;
+      customShipping.value = false;
     isLoading[`billing-${billingAddressId}`] = false;
   },
 });
@@ -116,7 +117,7 @@ const isCheckoutAvailable = computed(() => {
 
 const isUserSession = computed(() => isLoggedIn.value || isGuestSession.value);
 
-const state = reactive({
+const state = reactive<RequestParameters<"register">>({
   salutationId: "",
   firstName: "",
   lastName: "",
@@ -130,9 +131,12 @@ const state = reactive({
     countryId: "",
     countryStateId: "",
   },
-  customShipping: false,
+  acceptedDataProtection: true,
+  storefrontUrl: "",
 });
 
+const customShipping = ref(false);
+
 const terms = reactive({
   tos: false,
   revocation: false,
@@ -228,7 +232,7 @@ const refreshAddresses = async () => {
   isLoading["addresses"] = false;
 };
 
-const registerErrors = ref<ShopwareError[]>([]);
+const registerErrors = ref<ApiError[]>([]);
 const invokeSubmit = async () => {
   $v.value.$touch();
   registerErrors.value = [];
@@ -241,8 +245,9 @@ const invokeSubmit = async () => {
         await push("/");
       }
     } catch (error) {
-      const e = error as ClientApiError;
-      registerErrors.value = e.messages;
+      if (error instanceof ApiClientError) {
+        registerErrors.value = error.details.errors;
+      }
     }
   }
 };
@@ -799,7 +804,7 @@ const addAddressModalController = useModal();
               <label for="customShipping" class="field-label">
                 <input
                   id="customShipping"
-                  v-model="state.customShipping"
+                  v-model="customShipping"
                   data-testid="checkout-custom-shipping-address-checkbox"
                   name="privacy"
                   type="checkbox"
@@ -807,7 +812,7 @@ const addAddressModalController = useModal();
                 />
                 {{ $t("checkout.differentBillingAddress") }}
               </label>
-              <div v-if="state.customShipping">
+              <div v-if="customShipping">
                 <div
                   v-for="address in customerAddresses"
                   :key="address.id"
diff --git a/templates/vue-demo-store/pages/checkout/success/[id]/index.vue b/templates/vue-demo-store/pages/checkout/success/[id]/index.vue
index b9d801ecf..12533fd4c 100644
--- a/templates/vue-demo-store/pages/checkout/success/[id]/index.vue
+++ b/templates/vue-demo-store/pages/checkout/success/[id]/index.vue
@@ -63,7 +63,7 @@ const isExpand = ref(false);
 
 const toggleView = () => (isExpand.value = !isExpand.value);
 
-const formatDate = (date: Date) =>
+const formatDate = (date: Date | string) =>
   new Date(date).toLocaleDateString(
     (typeof navigator !== "undefined" && navigator.language) || "en-US",
   );
diff --git a/templates/vue-demo-store/pages/newsletter-subscribe.vue b/templates/vue-demo-store/pages/newsletter-subscribe.vue
index 7d042fee2..7cd05d9ef 100644
--- a/templates/vue-demo-store/pages/newsletter-subscribe.vue
+++ b/templates/vue-demo-store/pages/newsletter-subscribe.vue
@@ -1,18 +1,13 @@
 <script setup lang="ts">
-import { newsletterConfirmation } from "@shopware-pwa/api-client";
-
 const route = useRoute();
-const { apiInstance } = useShopwareContext();
+const { apiClient } = useShopwareContext();
 const error = ref(false);
 
 try {
-  await newsletterConfirmation(
-    {
-      em: route.query.em as string,
-      hash: route.query.hash as string,
-    },
-    apiInstance,
-  );
+  await apiClient.invoke("confirmNewsletter post /newsletter/confirm", {
+    em: route.query.em as string,
+    hash: route.query.hash as string,
+  });
 } catch (e) {
   error.value = true;
 }
diff --git a/templates/vue-demo-store/pages/search.vue b/templates/vue-demo-store/pages/search.vue
index 0c41b619d..8dc0fcc2c 100644
--- a/templates/vue-demo-store/pages/search.vue
+++ b/templates/vue-demo-store/pages/search.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { ListingResult, Product } from "@shopware-pwa/types";
+import type { RequestParameters } from "#shopware";
+import type { Schemas } from "#shopware";
 const route = useRoute();
 const router = useRouter();
 
@@ -25,7 +26,7 @@ useBreadcrumbs([
 const cacheKey = computed(() => `productSearch-${JSON.stringify(route.query)}`);
 const loadProducts = async (cacheKey: string) => {
   const { data: productSearch } = await useAsyncData(cacheKey, async () => {
-    await search(route.query);
+    await search(route.query as unknown as RequestParameters<"searchPage">);
     return getCurrentListing.value;
   });
 
@@ -35,7 +36,7 @@ let productSearch = await loadProducts(cacheKey.value);
 
 watch(cacheKey, async (newCacheKey) => {
   productSearch = await loadProducts(newCacheKey);
-  setInitialListing(productSearch.value as Partial<ListingResult<Product>>);
+  setInitialListing(productSearch.value as Schemas["ProductListingResult"]);
 });
 
 const changePage = async (page: number) => {
@@ -46,7 +47,7 @@ const changePage = async (page: number) => {
     },
   });
 };
-setInitialListing(productSearch.value as Partial<ListingResult<Product>>);
+setInitialListing(productSearch.value as Schemas["ProductListingResult"]);
 </script>
 
 <script lang="ts">
@@ -68,7 +69,7 @@ export default {
     </div>
 
     <h1 class="mb-8 mt-8 md:mt-0 text-3xl text-center">
-      <span v-if="products.length"
+      <span v-if="products?.length"
         >{{ $t("search.resultsHeader") }} "<strong>{{
           route.query.query
         }}</strong
diff --git a/templates/vue-demo-store/pages/wishlist.vue b/templates/vue-demo-store/pages/wishlist.vue
index a23ebd217..806b82e92 100644
--- a/templates/vue-demo-store/pages/wishlist.vue
+++ b/templates/vue-demo-store/pages/wishlist.vue
@@ -5,12 +5,11 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { getProducts } from "@shopware-pwa/api-client";
-import type { ClientApiError, Product } from "@shopware-pwa/types";
+import type { Schemas } from "#shopware";
 
 const { items, clearWishlist } = useWishlist();
-const { apiInstance } = useShopwareContext();
-const products = ref<Product[]>([]);
+const { apiClient } = useShopwareContext();
+const products = ref<Schemas["Product"][]>([]);
 const isLoading = ref(false);
 const { t } = useI18n();
 const localePath = useLocalePath();
@@ -33,21 +32,15 @@ const loadProductsByItemIds = async (itemIds: string[]): Promise<void> => {
   isLoading.value = true;
 
   try {
-    const result = await getProducts(
-      {
-        ids: itemIds || items.value,
-      },
-      apiInstance,
-    );
+    const result = await apiClient.invoke("readProduct post /product", {
+      ids: itemIds || items.value,
+    });
 
-    if (result) {
+    if (result?.elements) {
       products.value = result.elements;
     }
   } catch (error) {
-    console.error(
-      "[wishlist][loadProductsByItemIds]",
-      (error as ClientApiError).messages,
-    );
+    console.error("[wishlist][loadProductsByItemIds]", error);
   }
 
   isLoading.value = false;
diff --git a/templates/vue-demo-store/server/apiBuilder.ts b/templates/vue-demo-store/server/apiBuilder.ts
index 0fc7d1a99..4e1aec2ab 100644
--- a/templates/vue-demo-store/server/apiBuilder.ts
+++ b/templates/vue-demo-store/server/apiBuilder.ts
@@ -1,9 +1,11 @@
-import { createInstance } from "@shopware-pwa/api-client";
+import { createAPIClient } from "@shopware/api-client";
+import type { operationPaths, operations } from "#shopware";
+
 const runtimeConfig = useRuntimeConfig();
 
-const apiContext = createInstance({
-  endpoint: runtimeConfig.public.shopware.shopwareEndpoint,
+const apiClient = createAPIClient<operations, operationPaths>({
   accessToken: runtimeConfig.public.shopware.shopwareAccessToken,
+  baseURL: runtimeConfig.public.shopware.shopwareEndpoint,
 });
 
-export default apiContext;
+export default apiClient;
diff --git a/templates/vue-demo-store/server/routes/sitemap.xml.ts b/templates/vue-demo-store/server/routes/sitemap.xml.ts
index 7ce341010..03d8af806 100644
--- a/templates/vue-demo-store/server/routes/sitemap.xml.ts
+++ b/templates/vue-demo-store/server/routes/sitemap.xml.ts
@@ -1,8 +1,6 @@
-import { getSitemap } from "@shopware-pwa/api-client";
 import { streamToPromise, SitemapIndexStream } from "sitemap";
 import { Readable } from "stream";
-import type { SitemapResult } from "@shopware-pwa/types";
-import apiContext from "../apiBuilder";
+import apiClient from "../apiBuilder";
 import getURL from "requrl";
 
 type Sitemap = {
@@ -11,10 +9,10 @@ type Sitemap = {
 
 export default defineEventHandler(async (event) => {
   const sitemaps: Sitemap[] = [];
-  const response = await getSitemap(apiContext);
+  const response = await apiClient.invoke("readSitemap get /sitemap");
   const smis = new SitemapIndexStream();
 
-  response.forEach((element: SitemapResult) => {
+  response.forEach((element) => {
     sitemaps.push({
       url: element.filename,
     });
diff --git a/templates/vue-demo-store/shopware.d.ts b/templates/vue-demo-store/shopware.d.ts
new file mode 100644
index 000000000..c8e0d87d3
--- /dev/null
+++ b/templates/vue-demo-store/shopware.d.ts
@@ -0,0 +1,36 @@
+declare module "#shopware" {
+  import type { createAPIClient } from "@shopware/api-client";
+  import type {
+    operationPaths as defaultOperationPaths,
+    operations as defaultOperations,
+    components as defaultComponents,
+  } from "@shopware/api-client/api-types";
+  import type {
+    RequestParameters as DefaultRequestParameters,
+    RequestReturnType as DefaultRequestReturnType,
+  } from "@shopware/api-client";
+
+  type changedComponents = defaultComponents;
+  // example how to extend Cart schema:
+  // type changedComponents = components & {
+  //   schemas: {
+  //     Cart: components["schemas"]["Cart"] & {
+  //       myspecialfield: "hello field";
+  //     };
+  //   };
+  // };
+
+  export type operations = defaultOperations<changedComponents>;
+  export type operationPaths = defaultOperationPaths;
+  export type Schemas = changedComponents["schemas"];
+
+  // we're exporting our own Api Client definition as it depends on our own instance
+  export type ApiClient = ReturnType<
+    typeof createAPIClient<operations, operationPaths>
+  >;
+  export type RequestParameters<T extends keyof operations> =
+    DefaultRequestParameters<T, operations>;
+
+  export type RequestReturnType<T extends keyof operations> =
+    DefaultRequestReturnType<T, operations>;
+}
diff --git a/templates/vue-vite-blank/src/App.vue b/templates/vue-vite-blank/src/App.vue
index 507a8e0cc..f449b6aa8 100644
--- a/templates/vue-vite-blank/src/App.vue
+++ b/templates/vue-vite-blank/src/App.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useSessionContext } from "@shopware-pwa/composables-next";
+import { useSessionContext } from "@shopware-pwa/composables-next/dist";
 // This starter template is using Vue 3 <script setup> SFCs
 // Check out https://vuejs.org/api/sfc-script-setup.html#script-setup
 import Frontends from "./components/Frontends.vue";
diff --git a/templates/vue-vite-blank/src/components/Frontends.vue b/templates/vue-vite-blank/src/components/Frontends.vue
index 3c4bf4cbd..30551410e 100644
--- a/templates/vue-vite-blank/src/components/Frontends.vue
+++ b/templates/vue-vite-blank/src/components/Frontends.vue
@@ -3,7 +3,7 @@ import {
   useSessionContext,
   useCheckout,
   useUser,
-} from "@shopware-pwa/composables-next";
+} from "@shopware-pwa/composables-next/dist";
 defineProps<{
   template: string;
 }>();
diff --git a/templates/vue-vite-blank/src/main.ts b/templates/vue-vite-blank/src/main.ts
index 8ce91a3a2..78da56433 100644
--- a/templates/vue-vite-blank/src/main.ts
+++ b/templates/vue-vite-blank/src/main.ts
@@ -2,7 +2,7 @@ import { createApp } from "vue";
 import "./style.css";
 import App from "./App.vue";
 
-import { createShopwareContext } from "@shopware-pwa/composables-next";
+import { createShopwareContext } from "@shopware-pwa/composables-next/dist";
 import { createInstance } from "@shopware-pwa/api-client";
 
 const apiInstance = createInstance({