diff --git a/.github/workflows/behat_ui.yml b/.github/workflows/behat_ui.yml
index c810302c48..8c25c99e33 100644
--- a/.github/workflows/behat_ui.yml
+++ b/.github/workflows/behat_ui.yml
@@ -33,6 +33,7 @@ jobs:
       PIMCORE_INSTALL_MYSQL_PORT: "3306"
       PANTHER_EXTERNAL_BASE_URI: "http://localhost:9080/index_test.php"
       PANTHER_CHROME_ARGUMENTS: "--disable-dev-shm-usage"
+      PANTHER_DEVTOOLS: "0"
       PIMCORE_KERNEL_CLASS: 'Kernel'
 
     strategy:
diff --git a/docs/03_Bundles/Menu_Bundle.md b/docs/03_Bundles/Menu_Bundle.md
index c5f34feb0f..5277296c8a 100644
--- a/docs/03_Bundles/Menu_Bundle.md
+++ b/docs/03_Bundles/Menu_Bundle.md
@@ -37,7 +37,7 @@ public function registerBundlesToCollection(BundleCollection $collection)
 
    ```php
    <?php
-   namespace AppBundle\Menu;
+   namespace App\CoreShop\Menu;
 
    use CoreShop\Bundle\MenuBundle\Builder\MenuBuilderInterface;
    use Knp\Menu\FactoryInterface;
@@ -60,8 +60,7 @@ public function registerBundlesToCollection(BundleCollection $collection)
    Register your menu builder class in the Symfony container.
 
    ```yml 
-   app.my_menu:
-       class: AppBundle\Menu\MyMenuBuilder
+   App\CoreShop\Menu\MyMenuBuilder:
        tags:
            - { name: coreshop.menu, type: my_menu, menu: my_menu }
    ```
diff --git a/docs/03_Bundles/Pimcore_Bundle.md b/docs/03_Bundles/Pimcore_Bundle.md
index 724c0e67fb..3d4ef27497 100644
--- a/docs/03_Bundles/Pimcore_Bundle.md
+++ b/docs/03_Bundles/Pimcore_Bundle.md
@@ -141,7 +141,7 @@ the `CoreShop\Component\Pimcore\Event\SlugGenerationEvent` Event.
 
 declare(strict_types=1);
 
-namespace App\EventListener;
+namespace App\CoreShop\EventListener;
 
 use CoreShop\Component\Pimcore\Event\SlugGenerationEvent;
 use Pimcore\Model\DataObject\PressRelease;
diff --git a/docs/03_Bundles/Resource_Bundle/04_Pimocre_Entities_for_Projects_using_AsPimcoreModel_Attribute.md b/docs/03_Bundles/Resource_Bundle/04_Pimocre_Entities_for_Projects_using_AsPimcoreModel_Attribute.md
index 68e7d98092..aa2275e013 100644
--- a/docs/03_Bundles/Resource_Bundle/04_Pimocre_Entities_for_Projects_using_AsPimcoreModel_Attribute.md
+++ b/docs/03_Bundles/Resource_Bundle/04_Pimocre_Entities_for_Projects_using_AsPimcoreModel_Attribute.md
@@ -9,13 +9,13 @@
 
 ### PimcoreEntity
 
-Create PimcoreEntity.php in the AppBundle/Model directory.
+Create PimcoreEntity.php in the App/Model directory.
 
 ```php
 <?php
-// AppBundle/Model/PimcoreEntity.php
+// App/Model/PimcoreEntity.php
 
-namespace AppBundle\Model;
+namespace App\Model;
 
 use CoreShop\Bundle\ResourceBundle\Attribute\AsPimcoreModel;
 use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;
diff --git a/docs/03_Bundles/Resource_Bundle/05_Pimocre_Entities_for_Projects_using_Resource_Config.md b/docs/03_Bundles/Resource_Bundle/05_Pimocre_Entities_for_Projects_using_Resource_Config.md
index bb275b744a..4a28cb87fe 100644
--- a/docs/03_Bundles/Resource_Bundle/05_Pimocre_Entities_for_Projects_using_Resource_Config.md
+++ b/docs/03_Bundles/Resource_Bundle/05_Pimocre_Entities_for_Projects_using_Resource_Config.md
@@ -9,11 +9,11 @@
 
 ### PimcoreEntity
 
-Create PimcoreEntity.php in the AppBundle/Model directory.
+Create PimcoreEntity.php in the App/Model directory.
 
 ```php
 <?php
-// AppBundle/Model/PimcoreEntity.php
+// App/Model/PimcoreEntity.php
 
 abstract class PimcoreEntity extends AbstractPimcoreModel implements PimcoreModelInterface 
 {
diff --git a/docs/03_Bundles/Resource_Bundle/index.md b/docs/03_Bundles/Resource_Bundle/index.md
index f4e7b60d90..a8b8147e6b 100644
--- a/docs/03_Bundles/Resource_Bundle/index.md
+++ b/docs/03_Bundles/Resource_Bundle/index.md
@@ -97,7 +97,7 @@ jms_serializer:
 
 ```yaml
 # config/jms_serializer/CustomEntity.yml
-AppBundle\Model\CustomEntity:
+App\Model\CustomEntity:
   exclusion_policy: ALL
   xml_root_name: custom_entity
   properties:
diff --git a/docs/03_Bundles/SEO_Bundle.md b/docs/03_Bundles/SEO_Bundle.md
index f2f7e385cf..2d75119607 100644
--- a/docs/03_Bundles/SEO_Bundle.md
+++ b/docs/03_Bundles/SEO_Bundle.md
@@ -57,9 +57,9 @@ Implement a custom extractor for the Product class:
 
 ```php
 <?php
-// src/AppBundle/SEO/Extractor/ProductVideoExtractor.php
+// src/App/CoreShop/SEO/Extractor/ProductVideoExtractor.php
 
-namespace AppBundle\SEO\Extractor;
+namespace App\CoreShop\SEO\Extractor;
 
 //...
 
@@ -69,12 +69,11 @@ final class ProductVideoExtractor implements ExtractorInterface
 }
 ```
 
-Register the service in your `services.yml`:
+Register the service in your `config/services.yaml`:
 
 ```yml
-# src/AppBundle/Resources/config/services.yml
 services:
-    AppBundle\SEO\Extractor\ProductVideoExtractor:
+    App\CoreShop\SEO\Extractor\ProductVideoExtractor:
         tags:
             - { name: coreshop.seo.extractor, type: product_video }
 ```
diff --git a/docs/03_Development/01_Extending_Guide/01_Extend_CoreShop_Resources.md b/docs/03_Development/01_Extending_Guide/01_Extend_CoreShop_Resources.md
index 7380473834..81ddeccb24 100644
--- a/docs/03_Development/01_Extending_Guide/01_Extend_CoreShop_Resources.md
+++ b/docs/03_Development/01_Extending_Guide/01_Extend_CoreShop_Resources.md
@@ -1,45 +1,30 @@
 # Extend CoreShop Resources
 
-All models in Coreshop are placed in the `Coreshop\Component\*ComponentName*\Model` namespaces alongside with their
-interfaces.
+All models in Coreshop are placed in the ```Coreshop\Component\*ComponentName*\Model``` namespaces alongside with their interfaces.
 
-> Many models in CoreShop are extended in the Core component. If the model you are willing to override exists in the
-> Core you should be extending the Core one, not the base model from the component.
+> Many models in CoreShop are extended in the Core component. If the model you are willing to override exists in the Core you should be extending the Core one, not the base model from the component.
 
 ## How to Customize a Model
 
-First things first: If you want to extend coreshop models your Bundle must extend the `AbstractResourceBundle`. Next you
-have set your supported drivers. Just add the following lines of code to your bundle class:
+### Doctrine ORM
 
-```php
-public function getSupportedDrivers(): array
-{
-return [
-CoreShopResourceBundle::DRIVER_DOCTRINE_ORM
-];
-}
-```
-
-After that have to tell the bundle where your models are. For that, add the override the following method in your bundle
-class and return the model namespace. Here is an example for the `AppBundle`:
+Depending on your Doctrine ORM configuration, you need to place your Models in the right Folder. The Default configuration, places them in the `Entity` directory:
 
-```php
-protected function getModelNamespace(): string
-{
-return "AppBundle\Model";
-}
+```yaml
+doctrine:
+  orm:
+    mappings:
+      App:
+        type: attribute
+        dir: '%kernel.project_dir%/src/App/Entity'
+        is_bundle: false
+        prefix: App\Entity
+        alias: App
 ```
 
-Here a quick overview for you which directories are important for you, when customizing CoreShop models.
+### Example Model
 
-| Folder                                    | Description                                   |
-|-------------------------------------------|-----------------------------------------------|
-| `AcmeBundle/Model` or `AcmeBundle/Entity` | Where your models are living                  |
-| `AcmeBundle/config/doctrine/model`        | Put your doctrine `.yml` config files in here |
-| `AcmeBundle/config/serializer`            | The serializer configs for the models         |
-
-Let’s take the `CoreShop\Component\Currency\Model\Currency` as an example. This one is extended in Core. How can you
-check that?
+Let’s take the [```CoreShop\Component\Currency\Model\Currency```](https://github.com/coreshop/CoreShop/blob/master/src/CoreShop/Component/Currency/Model/Currency.php) as an example. This one is extended in Core. How can you check that?
 
 First of all, you need to find the current used class by doing following:
 
@@ -47,70 +32,57 @@ First of all, you need to find the current used class by doing following:
 $ php bin/console debug:container --parameter=coreshop.model.currency.class
 ```
 
-As a result you will get the `CoreShop\Component\Core\Model\Currency` - this is the class that you need to be extending.
+As a result you will get the [```CoreShop\Component\Core\Model\Currency```](https://github.com/coreshop/CoreShop/blob/master/src/CoreShop/Component/Core/Model/Currency.php) - this is the class that you need to be extending.
 
-Assuming you want to add a field called **flag**:
+Assuming you want to add a field called **flag**
 
-**1.** The first thing to do is to write your own class which will extend the base `Currency` class:
+**1.** The first thing to do is to write your own class which will extend the base ```Currency``` class
 
 ```php
 <?php
 
-namespace AppBundle\Entity;
+namespace App\Entity;
 
 use CoreShop\Component\Core\Model\Currency as BaseCurrency;
+use Doctrine\ORM\Mapping as ORM;
 
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="coreshop_currency")
+ */
 class Currency extends BaseCurrency
 {
     /**
-     * @var bool
+     * @ORM\Column(type="boolean")
      */
-    private $flag;
+    private bool $flag = false;
 
-    /**
-     * @return bool
-     */
-    public function getFlag()
+    public function getFlag(): bool
     {
         return $this->flag;
     }
 
-    /**
-     * @param bool $flag
-     */
-    public function setFlag($flag)
+    public function setFlag(bool $flag): void
     {
         $this->flag = $flag;
     }
 }
 ```
 
-**2.** Next define your entity’s mapping. The file should be placed
-in `AppBundle/Resources/config/doctrine/Currency.orm.yml`:
-
-```yaml
-AppBundle\Entity\Currency:
-  type: mappedSuperclass
-  table: coreshop_currency
-  fields:
-    flag:
-      type: boolean
-      nullable: true
-```
+**2**. Finally you’ll need to override the model’s class in the ```config/config.yaml```.
 
-**3.** Finally, you’ll need to override the model’s class in the `app/config/config.yml`.
+Under the core_shop_* where * is the name of the bundle of the model you are customizing, in our case it will be the CoreShopCurrencyBundle -> core_shop_currency.
 
-Under the `core_shop_currency`, modify as follows:
 
 ```yaml
 core_shop_currency:
-  resources:
-    currency:
-      classes:
-        model: AppBundle\Entity\Currency
+    resources:
+        currency:
+            classes:
+                model: App\Entity\Currency
 ```
 
-**4.** Update the database. There are two ways to do it:
+**3**. Update the database. There are two ways to do it.
 
 via direct database schema update:
 
@@ -118,9 +90,24 @@ via direct database schema update:
 $ php bin/console doctrine:schema:update --force
 ```
 
-via migrations (recommended):
+via migrations:
+Which we strongly recommend over updating the schema.
 
 ```bash
 $ php bin/console doctrine:migrations:diff
 $ php bin/console doctrine:migrations:migrate
 ```
+
+**4**. We also need a serializer group for the new field. This is done in the ```config/jms_serializer/Currency.yaml``` file.
+
+```yaml
+App\Entity\Currency:
+  exclusion_policy: ALL
+  xml_root_name: store
+  properties:
+    flag:
+      expose: true
+      type: bool
+      groups: [Detailed]
+
+```
\ No newline at end of file
diff --git a/docs/03_Development/01_Extending_Guide/02_Extend_CoreShop_Forms.md b/docs/03_Development/01_Extending_Guide/02_Extend_CoreShop_Forms.md
index ae25f9858f..48d415453a 100644
--- a/docs/03_Development/01_Extending_Guide/02_Extend_CoreShop_Forms.md
+++ b/docs/03_Development/01_Extending_Guide/02_Extend_CoreShop_Forms.md
@@ -1,7 +1,7 @@
 # Customizing Forms
 
 The forms in CoreShop are placed in the `CoreShop\Bundle\*BundleName*\Form\Type` namespaces and the extensions will be
-placed in `AppBundle\Form\Extension`.
+placed in `App\CoreShop\Form\Extension`.
 
 ## Why would you customize a Form?
 
@@ -46,7 +46,7 @@ this is the class that you need to be extending.
 ```php
 <?php
 
-namespace AppBundle\Form\Extension;
+namespace App\CoreShop\Form\Extension;
 
 use CoreShop\Bundle\StoreBundle\Form\Type\StoreType;
 use Symfony\Component\Form\AbstractTypeExtension;
@@ -70,17 +70,16 @@ final class StoreTypeExtension extends AbstractTypeExtension
 }
 ```
 
-**3.** After creating your class, register this extension as a service in the `AppBundle/Resources/config/services.yml`:
+**3.** After creating your class, register this extension as a service in the `config/services.yaml`:
 
 ```yaml
 services:
-  app.form.extension.type.customer_profile:
-    class: AppBundle\Form\Extension\StoreTypeExtension
+  App\CoreShop\Form\Extension\StoreTypeExtension:
     tags:
       - { name: form.type_extension, extended_type: CoreShop\Bundle\StoreBundle\Form\Type\StoreType }
 ```
 
-In our case you will need to extend the ExtJs Form as well: `src/AppBundle/Resources/public/pimcore/js/store.js`.
+In our case you will need to extend the ExtJs Form as well: `public/coreshop/js/store.js`.
 
 In **ExtJs** your new store file need to look like this:
 
@@ -111,5 +110,5 @@ And you need to configure it to be loaded as well:
 core_shop_store:
   pimcore_admin:
     js:
-      custom_store: '/bundles/app/pimcore/js/store.js'
+      custom_store: '/coreshop/js/store.js'
 ```
diff --git a/docs/03_Development/01_Extending_Guide/03_Extend_CoreShop_DataObjects.md b/docs/03_Development/01_Extending_Guide/03_Extend_CoreShop_DataObjects.md
index 9bbf048f92..d552dba5ec 100644
--- a/docs/03_Development/01_Extending_Guide/03_Extend_CoreShop_DataObjects.md
+++ b/docs/03_Development/01_Extending_Guide/03_Extend_CoreShop_DataObjects.md
@@ -13,7 +13,7 @@ core_shop_order:
     order:
       classes:
         model: 'Pimcore\Model\DataObject\MyOrderClass'
-        install_file: '@AppBundle/Resources/install/pimcore/classes/MyOrderClass.json'
-        repository: AppBundle\Repository\OrderRepository
-        factory: AppBundle\Factory\OrderFactory
+        install_file: 'config/Resources/install/pimcore/classes/MyOrderClass.json'
+        repository: App\Repository\OrderRepository
+        factory: App\Factory\OrderFactory
 ```
\ No newline at end of file
diff --git a/docs/03_Development/01_Extending_Guide/04_Extending_Rule_Actions.md b/docs/03_Development/01_Extending_Guide/04_Extending_Rule_Actions.md
index 68002f2dc5..550154c2d2 100644
--- a/docs/03_Development/01_Extending_Guide/04_Extending_Rule_Actions.md
+++ b/docs/03_Development/01_Extending_Guide/04_Extending_Rule_Actions.md
@@ -20,8 +20,7 @@ Rules, we need to use
 [```CoreShop\Component\Product\Rule\Action\ProductPriceActionProcessorInterface```](https://github.com/coreshop/CoreShop/blob/master/src/CoreShop/Component/Product/Rule/Action/ProductPriceActionProcessorInterface.php)
 
 ```php
-//AppBundle/CoreShop/CustomAction.php
-namespace AppBundle\CoreShop;
+namespace App\CoreShop;
 
 final class CustomAction implements \CoreShop\Component\Product\Rule\Action\ProductPriceActionProcessorInterface
 {
@@ -38,8 +37,7 @@ We also need a FormType for the actions configurations:
 
 ```php
 <?php
-//AppBundle/Form/Type/CustomActionType.php
-namespace AppBundle\Form\Type;
+namespace App\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -47,9 +45,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 final class CustomActionType extends AbstractType
 {
-    /**
-     * {@inheritdoc}
-     */
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
@@ -62,7 +57,7 @@ final class CustomActionType extends AbstractType
 With configuration, comes a Javascript file as well:
 
 ```javascript
-//AppBundle/Resources/public/pimcore/js/custom_action.js
+// public/coreshop/js/custom_action.js
 
 pimcore.registerNS('coreshop.product.pricerule.actions.custom');
 coreshop.product.pricerule.actions.custom = Class.create(coreshop.rules.actions.abstract, {
@@ -107,10 +102,9 @@ bin/console assets:install web
 We now need to create our Service Definition for our Custom Action:
 
 ```yaml
-app.product_price_rule.custom:
-  class: AppBundle\CoreShop\CustomAction
+App\CoreShop\CustomAction:
   tags:
-    - { name: coreshop.product_price_rule.action, type: custom, form-type: AppBundle\Form\Type\CustomActionType }
+    - { name: coreshop.product_price_rule.action, type: custom, form-type: App\CoreShop\Form\Type\CustomActionType }
 ```
 
 and add this to your config.yml:
@@ -119,5 +113,5 @@ and add this to your config.yml:
 core_shop_product:
   pimcore_admin:
     js:
-      custom_action: '/bundles/app/pimcore/js/custom_action.js'
+      custom_action: '/coreshop/js/custom_action.js'
 ```
diff --git a/docs/03_Development/01_Extending_Guide/05_Extending_Rule_Conditions.md b/docs/03_Development/01_Extending_Guide/05_Extending_Rule_Conditions.md
index 66de5d57bb..9ed13fd82d 100644
--- a/docs/03_Development/01_Extending_Guide/05_Extending_Rule_Conditions.md
+++ b/docs/03_Development/01_Extending_Guide/05_Extending_Rule_Conditions.md
@@ -21,8 +21,8 @@ Rules, we need to use
 [```CoreShop\Component\Rule\Condition\ConditionCheckerInterface```](https://github.com/coreshop/CoreShop/blob/master/src/CoreShop/Component/Rule/Condition/ConditionCheckerInterface.php)
 
 ```php
-//AppBundle/CoreShop/CustomCondition.php
-namespace AppBundle\CoreShop;
+//src/App/CoreShop/CustomCondition.php
+namespace App\CoreShop;
 
 use CoreShop\Component\Resource\Model\ResourceInterface;
 use CoreShop\Component\Rule\Model\RuleInterface;
@@ -39,26 +39,22 @@ return true;
 We also need a FormType for the conditions configurations:
 
 ```php
-//AppBundle/Form/Type/CustomConditionType.php
-namespace AppBundle\Form\Type;
+//src/App/CoreShop/Form/Type/CustomConditionType.php
+namespace App\CoreShop\Form\Type;
 
 final class CustomConditionType extends AbstractType
 {
-/**
-* {@inheritdoc}
-*/
-public function buildForm(FormBuilderInterface $builder, array $options): void
-{
-$builder
-->add('some_value', TextType::class)
-;
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+       $builder->add('some_value', TextType::class);
+    }
 }
 ```
 
 With configuration, comes a Javascript file as well:
 
 ```javascript
-//AppBundle/Resources/public/pimcore/js/custom_condition.js
+//public/coreshop/js/custom_condition.js
 
 pimcore.registerNS('coreshop.product.pricerule.conditions.custom');
 coreshop.product.pricerule.conditions.custom = Class.create(coreshop.rules.conditions.abstract, {
@@ -91,22 +87,14 @@ coreshop.product.pricerule.conditions.custom = Class.create(coreshop.rules.condi
 });
 ```
 
-Don't forget to run the following command afterwards to deploy it if needed. If you're using the latest symfony
-structure, omit the `web`.
-
-```php
-bin/console assets:install
-```
-
 ## Registering the Custom Condition to the Container and load the Javascript File
 
 We now need to create our Service Definition for our Custom Condition:
 
 ```yaml
-app.product_price_rule.custom_condition:
-  class: AppBundle\CoreShop\CustomCondition
+App\CoreShop\CustomCondition:
   tags:
-    - { name: coreshop.product_price_rule.condition, type: custom, form-type: AppBundle\Form\Type\CustomConditionType }
+    - { name: coreshop.product_price_rule.condition, type: custom, form-type: App\CoreShop\Form\Type\CustomConditionType }
 ```
 
 and add this to your config.yml:
@@ -115,4 +103,4 @@ and add this to your config.yml:
 core_shop_product:
     pimcore_admin:
         js:
-            custom_condition: '/bundles/app/pimcore/js/custom_condition.js'
+            custom_condition: '/coreshop/js/custom_condition.js'
diff --git a/docs/03_Development/02_Localization/02_Countries/02_Context.md b/docs/03_Development/02_Localization/02_Countries/02_Context.md
index d8a1e27fbb..bbbdbd1a09 100644
--- a/docs/03_Development/02_Localization/02_Countries/02_Context.md
+++ b/docs/03_Development/02_Localization/02_Countries/02_Context.md
@@ -58,13 +58,12 @@ And configure the service:
 
 ```yaml
 services:
-app.coreshop.country.context.request.document_based:
-class: AppBundle\CoreShop\Address\Context\DocumentBasedRequestRequestResolver
-arguments:
-  - '@Pimcore\Http\Request\Resolver\DocumentResolver'
-  - '@coreshop.repository.country'
-tags:
-  - { name: coreshop.context.country.request_based.resolver }
+   App\CoreShop\Address\Context\DocumentBasedRequestRequestResolver:
+      arguments:
+        - '@Pimcore\Http\Request\Resolver\DocumentResolver'
+        - '@coreshop.repository.country'
+      tags:
+        - { name: coreshop.context.country.request_based.resolver }
 ```
 
 CoreShop will now resolve the current country based on the Pimcore site being accessed.
diff --git a/docs/03_Development/03_Products/02_Price_Calculation.md b/docs/03_Development/03_Products/02_Price_Calculation.md
index 4f1d0d2be8..f599e3ec6d 100644
--- a/docs/03_Development/03_Products/02_Price_Calculation.md
+++ b/docs/03_Development/03_Products/02_Price_Calculation.md
@@ -45,7 +45,7 @@ the Discount. Note that this example is a demonstration and not a practical impl
 
 <?php
 
-namespace AppBundle\CoreShop\Product;
+namespace App\CoreShop\Product;
 
 use CoreShop\Component\Product\Calculator\ProductPriceCalculatorInterface;
 use CoreShop\Component\Product\Model\ProductInterface;
@@ -59,8 +59,7 @@ final class CustomPriceCalculator implements ProductPriceCalculatorInterface
 Registration of the custom service in the container:
 
 ```yml
-app.coreshop.product.price_calculator.custom:
-  class: AppBundle\CoreShop\Product\CustomPriceCalculator
+App\CoreShop\Product\CustomPriceCalculator:
   tags:
     - { name: coreshop.product.price_calculator, type: custom, priority: 1 }
 ```
diff --git a/docs/03_Development/06_Order/04_Cart_Processor.md b/docs/03_Development/06_Order/04_Cart_Processor.md
index c1682c85d7..8f6ca8a1b8 100644
--- a/docs/03_Development/06_Order/04_Cart_Processor.md
+++ b/docs/03_Development/06_Order/04_Cart_Processor.md
@@ -30,7 +30,7 @@ Here's an example of a custom Cart Processor that calculates a unique field for
 ```php
 <?php
 
-namespace AppBundle\CoreShop\Order\Cart\Processor;
+namespace App\CoreShop\Order\Cart\Processor;
 
 use CoreShop\Component\Order\Model\OrderInterface;
 use CoreShop\Component\Order\Processor\CartProcessorInterface;
@@ -47,8 +47,7 @@ final class CustomCartProcessor implements CartProcessorInterface
 Registration of the processor:
 
 ```yaml
-app.coreshop.cart.processor.custom:
-  class: AppBundle\CoreShop\Order\Cart\Processor\CustomCartProcessor
+App\CoreShop\Order\Cart\Processor\CustomCartProcessor:
   tags:
     - { name: coreshop.cart_processor, priority: 200 }
 ```
diff --git a/docs/03_Development/06_Order/13_Number_Generator.md b/docs/03_Development/06_Order/13_Number_Generator.md
index 770c6c44bd..9232416665 100644
--- a/docs/03_Development/06_Order/13_Number_Generator.md
+++ b/docs/03_Development/06_Order/13_Number_Generator.md
@@ -22,10 +22,11 @@ This example shows a custom implementation that adds padding to the number:
 ```php
 final class CustomNumberGenerator implements NumberGeneratorInterface
 {
-public function __construct(
-private NumberGeneratorInterface $numberGenerator, // decorated service
-) {
-}
+    public function __construct(
+        private NumberGeneratorInterface $numberGenerator, // decorated service
+    ) {
+    
+    }
 
     public function generate(ResourceInterface $model): string
     {
@@ -39,7 +40,7 @@ private NumberGeneratorInterface $numberGenerator, // decorated service
 Symfony service definition:
 
 ```yaml
-  App\Order\CustomNumberGenerator:
+  App\CoreShop\Order\CustomNumberGenerator:
     decorates: coreshop.order.number_generator.default
     decoration_priority: 1
     arguments:
diff --git a/docs/03_Development/06_Order/14_Backend_Management/01_OrderList_Filter.md b/docs/03_Development/06_Order/14_Backend_Management/01_OrderList_Filter.md
index 1d4f088b37..dd9764da87 100644
--- a/docs/03_Development/06_Order/14_Backend_Management/01_OrderList_Filter.md
+++ b/docs/03_Development/06_Order/14_Backend_Management/01_OrderList_Filter.md
@@ -8,7 +8,7 @@ Your Customer is able to filter orders on specific conditions.
 ## Register Filter Service
 
 ```yml
-AppBundle\CoreShop\OrderList\Filter\DemoFilter:
+App\CoreShop\OrderList\Filter\DemoFilter:
     tags:
         - { name: coreshop.grid.filter, type: demo }
 ```
@@ -20,7 +20,7 @@ In this example we want to filter orders with available shipments in state "read
 ```php
 <?php
 
-namespace AppBundle\CoreShop\OrderList\Filter;
+namespace App\CoreShop\OrderList\Filter;
 
 use CoreShop\Component\Pimcore\DataObject\Grid\GridFilterInterface;
 use Pimcore\Db\ZendCompatibility\QueryBuilder;
diff --git a/docs/03_Development/06_Order/14_Backend_Management/02_OrderList_Action.md b/docs/03_Development/06_Order/14_Backend_Management/02_OrderList_Action.md
index b794d6bb8c..0f09ee5ad8 100644
--- a/docs/03_Development/06_Order/14_Backend_Management/02_OrderList_Action.md
+++ b/docs/03_Development/06_Order/14_Backend_Management/02_OrderList_Action.md
@@ -7,7 +7,7 @@ Actions allows you to process orders rapidly, right in the order grid view.
 ## Register Filter Service
 
 ```yml
-AppBundle\CoreShop\OrderList\Action\Demo:
+App\CoreShop\OrderList\Action\Demo:
     arguments:
         $stateMachineManager: '@coreshop.state_machine_manager'
         $shipmentRepository: '@coreshop.repository.order_shipment'
@@ -22,7 +22,7 @@ In this example we want to apply the shipment transition "ship" to selected orde
 ```php
 <?php
 
-namespace AppBundle\CoreShop\OrderList\Action;
+namespace App\CoreShop\OrderList\Action;
 
 use CoreShop\Component\Order\Repository\OrderShipmentRepositoryInterface;
 use CoreShop\Bundle\WorkflowBundle\Manager\StateMachineManagerInterface;
diff --git a/docs/03_Development/06_Order/16_State_Management/02_Create_Callbacks.md b/docs/03_Development/06_Order/16_State_Management/02_Create_Callbacks.md
index 59b8fe97ef..cd889756a7 100644
--- a/docs/03_Development/06_Order/16_State_Management/02_Create_Callbacks.md
+++ b/docs/03_Development/06_Order/16_State_Management/02_Create_Callbacks.md
@@ -15,7 +15,7 @@ core_shop_workflow:
                 after:
                     do_something_special:
                         on: ['confirm']
-                        do: ['@AppBundle\EventListener\SpecialListener', 'doSomething']
+                        do: ['@App\CoreShop\EventListener\SpecialListener', 'doSomething']
                         args: ['object']
                         priority: -10 # fire action early!
 ```
@@ -32,7 +32,7 @@ And your Service:
 ```php
 <?php
 
-namespace AppBundle\EventListener;
+namespace App\CoreShop\EventListener;
 
 use CoreShop\Component\Core\Model\CustomerInterface;
 use CoreShop\Component\Core\Model\OrderInterface;
@@ -68,7 +68,7 @@ core_shop_workflow:
                 before:
                     check_something:
                         on: ['create']
-                        do: ['@AppBundle\EventListener\SpecialListener', 'checkSomething']
+                        do: ['@App\CoreShop\EventListener\SpecialListener', 'checkSomething']
                         args: ['object']
                         priority: 0
 ```
@@ -87,7 +87,7 @@ Just remove the exception and the transition gets applied as expected.
 ```php
 <?php
 
-namespace AppBundle\EventListener;
+namespace App\CoreShop\EventListener;
 
 use CoreShop\Component\Core\Model\OrderShipmentInterface;
 
@@ -99,7 +99,7 @@ final class SpecialListener
     public function checkSomething(OrderShipmentInterface $shipment)
     {
         // check something and throw an exeption
-        throw new \Exception('something is wrong...');
+        throw new \Exception('do something here...');
     }
 }
 ```
diff --git a/docs/03_Development/06_Order/16_State_Management/04_Extend_Workflows.md b/docs/03_Development/06_Order/16_State_Management/04_Extend_Workflows.md
index 980ee2b4e3..b0ac7f137d 100644
--- a/docs/03_Development/06_Order/16_State_Management/04_Extend_Workflows.md
+++ b/docs/03_Development/06_Order/16_State_Management/04_Extend_Workflows.md
@@ -45,7 +45,7 @@ To allow the transition to show up, you need to implement a simple event listene
 
 ```yml
 # app/config/services
-AppBundle\EventListener\WorkflowListener:
+App\CoreShop\EventListener\WorkflowListener:
     autowire: true
     tags:
         - { name: kernel.event_listener, event: coreshop.workflow.valid_transitions, method: parseTransitions}
@@ -54,7 +54,7 @@ AppBundle\EventListener\WorkflowListener:
 ```php
 <?php
 
-namespace AppBundle\EventListener;
+namespace App\CoreShop\EventListener;
 
 use CoreShop\Bundle\OrderBundle\Event\WorkflowTransitionEvent;
 
diff --git a/docs/03_Development/06_Order/17_Purchasable.md b/docs/03_Development/06_Order/17_Purchasable.md
index 20781b2e0e..0237395169 100644
--- a/docs/03_Development/06_Order/17_Purchasable.md
+++ b/docs/03_Development/06_Order/17_Purchasable.md
@@ -21,7 +21,7 @@ This example creates a `ProductSetCalculator`, which calculates prices for each
 ```php
 <?php
 
-namespace AppBundle\CoreShop\Order\Calculator;
+namespace App\CoreShop\Order\Calculator;
 
 use CoreShop\Component\Order\Calculator\PurchasablePriceCalculatorInterface;use Pimcore\Model\Product\ProductSet;
 
@@ -34,8 +34,7 @@ final class ProductSetCalculator implements PurchasablePriceCalculatorInterface
 Service registration in the container:
 
 ```yml
-app.coreshop.order.purchasable.price_calculator.product_set:
-    class: AppBundle\CoreShop\Order\Calculator\ProductSetCalculator
+App\CoreShop\Order\Calculator\ProductSetCalculator:
     arguments:
         - '@coreshop.order.purchasable.price_calculator'
     tags:
diff --git a/docs/03_Development/08_Index_and_Filters/01_Index/01_Interpreter.md b/docs/03_Development/08_Index_and_Filters/01_Index/01_Interpreter.md
index f2ac2b33f4..3b0ca609d7 100644
--- a/docs/03_Development/08_Index_and_Filters/01_Index/01_Interpreter.md
+++ b/docs/03_Development/08_Index_and_Filters/01_Index/01_Interpreter.md
@@ -22,7 +22,7 @@ To create a custom interpreter, you'll need to develop two key components:
 Create a FormType class to handle the input data for your interpreter:
 
 ```php
-namespace AppBundle\Index\Form\Type;
+namespace App\CoreShop\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
@@ -50,7 +50,7 @@ final class MyInterpreterType extends AbstractType
 Implement the `InterpreterInterface` to define how your interpreter processes data:
 
 ```php
-namespace AppBundle\CoreShop\Index\Interpreter;
+namespace App\CoreShop\Index\Interpreter;
 
 use CoreShop\Component\Index\Interpreter\InterpreterInterface;
 
@@ -70,10 +70,9 @@ class MyInterpreter implements InterpreterInterface
 Register your new interpreter as a service with the tag `coreshop.index.interpreter`, specifying its type and form:
 
 ```yaml
-app.index.interpreter.my_interpreter:
-  class: AppBundle\CoreShop\Index\Interpreter\MyInterpreter
+App\CoreShop\Index\Interpreter\MyInterpreter:
   tags:
-    - { name: coreshop.index.interpreter, type: my_interpreter, form-type: AppBundle\Index\Form\Type\MyInterpreterType }
+    - { name: coreshop.index.interpreter, type: my_interpreter, form-type: App\CoreShop\Form\Type\MyInterpreterType }
 ```
 
 With these steps, you can enhance the indexing process in CoreShop with custom logic, tailored to your specific
diff --git a/docs/03_Development/08_Index_and_Filters/01_Index/02_Extension.md b/docs/03_Development/08_Index_and_Filters/01_Index/02_Extension.md
index 74d2273f1c..973bbbb1d0 100644
--- a/docs/03_Development/08_Index_and_Filters/01_Index/02_Extension.md
+++ b/docs/03_Development/08_Index_and_Filters/01_Index/02_Extension.md
@@ -31,7 +31,7 @@ Here's a brief example to illustrate how you might implement and register an ind
 
 declare(strict_types=1);
 
-namespace AppBundle\Index\Extension;
+namespace App\CoreShop\Index\Extension;
 
 use CoreShop\Component\Core\Model\CategoryInterface;
 use CoreShop\Component\Core\Model\ProductInterface;
@@ -103,8 +103,7 @@ And then register the extension in your service configuration:
 
 ```yaml
 services:
-  app.index.extension.my_custom_extension:
-    class: AppBundle\Index\Extension\MyCustomExtension
+  App\CoreShop\Index\Extension\MyCustomExtension:
     tags:
       - { name: coreshop.index.extension }
 ```
diff --git a/docs/03_Development/08_Index_and_Filters/02_Filter/01_Custom_Filter.md b/docs/03_Development/08_Index_and_Filters/02_Filter/01_Custom_Filter.md
index f4ad76b7e2..1f10698ae7 100644
--- a/docs/03_Development/08_Index_and_Filters/02_Filter/01_Custom_Filter.md
+++ b/docs/03_Development/08_Index_and_Filters/02_Filter/01_Custom_Filter.md
@@ -6,7 +6,7 @@
 - And a FilterConditionProcessorInterface, which checks if a cart fulfills the condition.
 
 ```php
-namespace AppBundle\Filter\Form\Type\Condition;
+namespace App\CoreShop\Form\Type\Condition;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
@@ -35,7 +35,7 @@ final class MyFilterCondition extends AbstractType
 ```
 
 ```php
-namespace AppBundle\Filter;
+namespace App\CoreShop\Filter;
 
 use CoreShop\Component\Address\Model\AddressInterface;
 use CoreShop\Component\Core\Model\CarrierInterface;
@@ -57,16 +57,11 @@ class MyFilterCondition extends FilterConditionProcessorInterface
 }
 ```
 
-**2**. Register MyFilterCondition as service with tag ```coreshop.filter.condition_type```, type and form
+**2**. Register MyFilterCondition as service with tag ```coreshop.filter.condition_type```, type and form. We are also adding the ```autoconfigure: false``` to prevent autoconfiguration of the service. (This is only needed if you use autoconfiguration in your project)
 
 ```yaml
-app.coreshop.shipping_rule.condition.my_rule:
-    class: AppBundle\Shipping\Rule\Condition\MyRuleConditionChecker
+App\CoreShop\Filter\MyFilterCondition:
+    autoconfigure: false
     tags:
-      - { name: coreshop.shipping_rule.condition, type: my_rule, form-type: AppBundle\Shipping\Form\Type\Condition\MyRuleConfigurationType }
-
-app.filter.condition_type.my_filter_condition:
-    class: AppBundle\Filter\MyFilterCondition
-    tags:
-      - { name: coreshop.filter.condition_type, type: app-my-filter, form-type: AppBundle\Filter\Form\Type\Condition\MyFilterCondition}
+      - { name: coreshop.filter.condition_type, type: app-my-filter, form-type: App\Filter\Form\Type\Condition\MyFilterCondition}
 ```
diff --git a/docs/03_Development/09_Notification_Rules/03_Custom_Types.md b/docs/03_Development/09_Notification_Rules/03_Custom_Types.md
index c18862c537..2ac1d97b6e 100644
--- a/docs/03_Development/09_Notification_Rules/03_Custom_Types.md
+++ b/docs/03_Development/09_Notification_Rules/03_Custom_Types.md
@@ -15,8 +15,7 @@ Here's an example of defining a service for a custom notification condition:
 
 ```yaml
 services:
-app.coreshop.notification_rule.condition.order.custom_notification_condition:
-  class: AppBundle\CoreShop\Notification\CustomNotificationCondition
-  tags:
-    - { name: coreshop.notification_rule.condition, type: custom_condition, notification-type: custom, form-type: AppBundle\Form\Type\CoreShop\CustomConditionType }
+    App\CoreShop\Notification\CustomNotificationCondition:
+      tags:
+        - { name: coreshop.notification_rule.condition, type: custom_condition, notification-type: custom, form-type: App\CoreShop\Form\Type\CoreShop\CustomConditionType }
 ```
diff --git a/docs/03_Development/10_Payment/01_Payment_Provider.md b/docs/03_Development/10_Payment/01_Payment_Provider.md
index 8b7e7be05d..3c37e4b2d8 100644
--- a/docs/03_Development/10_Payment/01_Payment_Provider.md
+++ b/docs/03_Development/10_Payment/01_Payment_Provider.md
@@ -38,7 +38,7 @@ To add Sofort as a new gateway configuration, create the following files:
 1. **Form Type for Configuration Values**:
 
  ```php
- namespace AppBundle\CoreShop\Form\Type;
+ namespace App\CoreShop\Form\Type;
 
  use Symfony\Component\Form\AbstractType;
  // ... other use statements ...
@@ -56,11 +56,10 @@ Then, register the FormType in the service container:
 
 ```yaml
 services:
-  app.coreshop.form.type.gateway_configuration.sofort:
-    class: AppBundle\Form\Type\SofortGatewayConfigurationType
-    tags:
-      - { name: coreshop.gateway_configuration_type, type: sofort }
-      - { name: form.type }
+   App\CoreShop\Form\Type\SofortGatewayConfigurationType:
+      tags:
+         - { name: coreshop.gateway_configuration_type, type: sofort }
+         - { name: form.type }
 ```
 
 2. **ExtJs Form for Sofort**:
@@ -68,6 +67,7 @@ services:
    Create a JavaScript file for the ExtJs Form:
 
  ```js
+// public/coreshop/js/sofort.js
 pimcore.registerNS('coreshop.provider.gateways.sofort');
 coreshop.provider.gateways.sofort = Class.create(coreshop.provider.gateways.abstract, {
   getLayout: function (config) {
@@ -82,7 +82,7 @@ Register the new JavaScript file:
 core_shop_payment:
   pimcore_admin:
     js:
-      sofort_gateway: '/bundles/app/pimcore/js/sofort.js'
+      sofort_gateway: '/coreshop/js/sofort.js'
 ```
 
 After reloading Pimcore, you should see the new Factory available.
diff --git a/docs/03_Development/11_Stores/02_Context.md b/docs/03_Development/11_Stores/02_Context.md
index be4adecf3b..a616f0fbe7 100644
--- a/docs/03_Development/11_Stores/02_Context.md
+++ b/docs/03_Development/11_Stores/02_Context.md
@@ -65,7 +65,7 @@ To resolve a Store based on a Pimcore document, such as differentiating between
 1. Create the RequestBased Store Context:
 
 ```php
-namespace AppBundle\CoreShop\Store\Context;
+namespace App\CoreShop\Store\Context;
 
 // ... other use statements ...
 
@@ -75,12 +75,11 @@ final class DocumentBasedRequestRequestResolver implements RequestResolverInterf
 }
 ```
 
-2. Configure the service in `src/AppBundle/Resources/config/services.yml`:
+2. Configure the service in `config/services.yaml`:
 
 ```yaml
 services:
-  app.coreshop.store.context.request.document_based:
-    class: AppBundle\CoreShop\Store\Context\DocumentBasedRequestRequestResolver
+   App\CoreShop\Store\Context\DocumentBasedRequestRequestResolver:
     arguments:
       - '@coreshop.repository.store'
     tags:
@@ -119,7 +118,7 @@ are on page `/en` we want to resolve to Store `Store EN`:
 ```php
 <?php
 
-namespace AppBundle\CoreShop\Store\Context;
+namespace App\CoreShop\Store\Context;
 
 use CoreShop\Component\Store\Context\RequestBased\RequestResolverInterface;
 use CoreShop\Component\Store\Repository\StoreRepositoryInterface;
@@ -150,12 +149,11 @@ final class DocumentBasedRequestRequestResolver implements RequestResolverInterf
 }
 ```
 
-Now we need to configure the service in `src/AppBundle/Resources/config/services.yml`
+Now we need to configure the service in `config/services.yaml`
 
 ```yaml
 services:
-  app.coreshop.store.context.request.document_based:
-    class: AppBundle\CoreShop\Store\Context\DocumentBasedRequestRequestResolver
+  App\CoreShop\Store\Context\DocumentBasedRequestRequestResolver:
     arguments:
       - '@coreshop.repository.store'
     tags:
diff --git a/docs/03_Development/13_Ecommerce_Tracking/index.md b/docs/03_Development/13_Ecommerce_Tracking/index.md
index af24c7f6b0..358e391cc2 100644
--- a/docs/03_Development/13_Ecommerce_Tracking/index.md
+++ b/docs/03_Development/13_Ecommerce_Tracking/index.md
@@ -92,8 +92,7 @@ To add a custom tracker:
 2. Register the tracker as a service:
 
 ```yaml
-app.tracking.tracker.my_tracker:
-  class: AppBundle\Tracker\CustomTracker
+App\CoreShop\Tracker\CustomTracker:
   parent: coreshop.tracking.tracker.ecommerce_tracker
   tags:
     - { name: coreshop.tracking.tracker, type: app-custom-tracker }
diff --git a/docs/03_Development/15_Frontend_Bundle/01_Controllers.md b/docs/03_Development/15_Frontend_Bundle/01_Controllers.md
index 6bb695fba2..345e9356f8 100644
--- a/docs/03_Development/15_Frontend_Bundle/01_Controllers.md
+++ b/docs/03_Development/15_Frontend_Bundle/01_Controllers.md
@@ -34,7 +34,7 @@ Create a new controller by inheriting from the CoreShop FrontendController:
 ```php
 <?php
 
-namespace AppBundle\Controller;
+namespace App\CoreShop\Controller;
 
 use CoreShop\Component\Core\Model\ProductInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -57,7 +57,7 @@ After creating your custom controller, update the configuration to use it:
 ```yaml
 core_shop_frontend:
   controllers:
-    product: AppBundle\Controller\ProductController
+    product: App\CoreShop\Controller\ProductController
 ```
 
 By following these steps, you can effectively customize and extend the functionality of CoreShop's FrontendBundle
diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/install/pimcore/classes/CoreShopProductBundle/CoreShopProduct.json b/src/CoreShop/Bundle/CoreBundle/Resources/install/pimcore/classes/CoreShopProductBundle/CoreShopProduct.json
index b89e158efe..0a459b2977 100644
--- a/src/CoreShop/Bundle/CoreBundle/Resources/install/pimcore/classes/CoreShopProductBundle/CoreShopProduct.json
+++ b/src/CoreShop/Bundle/CoreBundle/Resources/install/pimcore/classes/CoreShopProductBundle/CoreShopProduct.json
@@ -1,82 +1,81 @@
 {
     "id": "cs_product",
-    "description": null,
+    "title": "",
+    "description": "",
+    "modificationDate": 1725350845,
     "parentClass": "CoreShop\\Component\\Core\\Model\\Product",
-    "useTraits": null,
+    "implementsInterfaces": "",
+    "listingParentClass": "",
+    "useTraits": "",
+    "listingUseTraits": "",
     "allowInherit": true,
     "allowVariants": true,
     "showVariants": true,
-    "generateTypeDeclarations": true,
-    "linkGeneratorReference": "@CoreShop\\Component\\Pimcore\\DataObject\\CompositeLinkGenerator",
     "layoutDefinitions": {
-        "fieldtype": "panel",
-        "labelWidth": 100,
-        "layout": null,
         "name": "pimcore_root",
         "type": null,
         "region": null,
         "title": null,
-        "width": null,
-        "height": null,
+        "width": 0,
+        "height": 0,
         "collapsible": false,
-        "collapsed": null,
+        "collapsed": false,
         "bodyStyle": null,
         "datatype": "layout",
-        "permissions": null,
         "children": [
             {
-                "fieldtype": "tabpanel",
                 "name": "Layout",
                 "type": null,
                 "region": null,
                 "title": "",
-                "width": null,
-                "height": null,
+                "width": 0,
+                "height": 0,
                 "collapsible": false,
                 "collapsed": false,
                 "bodyStyle": "",
                 "datatype": "layout",
-                "permissions": null,
                 "children": [
                     {
-                        "fieldtype": "panel",
-                        "labelWidth": 100,
-                        "layout": null,
                         "name": "informations",
                         "type": null,
                         "region": null,
                         "title": "coreshop.product.informations",
-                        "width": null,
-                        "height": null,
+                        "width": 0,
+                        "height": 0,
                         "collapsible": false,
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
-                                "fieldtype": "fieldset",
-                                "labelWidth": 100,
                                 "name": "Layout",
                                 "type": null,
                                 "region": null,
                                 "title": null,
-                                "width": null,
-                                "height": null,
+                                "width": 0,
+                                "height": 0,
                                 "collapsible": false,
-                                "collapsed": null,
+                                "collapsed": false,
                                 "bodyStyle": null,
                                 "datatype": "layout",
-                                "permissions": null,
                                 "children": [
                                     {
+                                        "name": "localizedfields",
+                                        "title": "",
+                                        "tooltip": "",
+                                        "mandatory": false,
+                                        "noteditable": false,
+                                        "index": false,
+                                        "locked": false,
+                                        "style": "",
+                                        "permissions": null,
                                         "fieldtype": "localizedfields",
+                                        "relationType": false,
+                                        "invisible": false,
+                                        "visibleGridView": true,
+                                        "visibleSearch": true,
                                         "children": [
                                             {
-                                                "fieldtype": "input",
-                                                "width": null,
-                                                "columnLength": 190,
-                                                "regex": "",
                                                 "name": "name",
                                                 "title": "coreshop.product.name",
                                                 "tooltip": "",
@@ -86,16 +85,22 @@
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
-                                                "datatype": "data",
+                                                "fieldtype": "input",
                                                 "relationType": false,
                                                 "invisible": false,
                                                 "visibleGridView": true,
-                                                "visibleSearch": true
+                                                "visibleSearch": true,
+                                                "defaultValue": null,
+                                                "columnLength": 190,
+                                                "regex": "",
+                                                "regexFlags": [],
+                                                "unique": false,
+                                                "showCharCount": false,
+                                                "width": null,
+                                                "defaultValueGenerator": "",
+                                                "datatype": "data"
                                             },
                                             {
-                                                "fieldtype": "textarea",
-                                                "width": "",
-                                                "height": "",
                                                 "name": "shortDescription",
                                                 "title": "coreshop.product.short_description",
                                                 "tooltip": "",
@@ -105,18 +110,19 @@
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
-                                                "datatype": "data",
+                                                "fieldtype": "textarea",
                                                 "relationType": false,
                                                 "invisible": false,
                                                 "visibleGridView": true,
-                                                "visibleSearch": true
+                                                "visibleSearch": true,
+                                                "maxLength": null,
+                                                "showCharCount": false,
+                                                "excludeFromSearchIndex": false,
+                                                "height": "",
+                                                "width": "",
+                                                "datatype": "data"
                                             },
                                             {
-                                                "fieldtype": "urlSlug",
-                                                "width": "",
-                                                "domainLabelWidth": null,
-                                                "action": "CoreShop\\Bundle\\FrontendBundle\\Controller\\ProductController::detailSlugAction",
-                                                "availableSites": [],
                                                 "name": "slug",
                                                 "title": "coreshop.product.slug",
                                                 "tooltip": "",
@@ -126,41 +132,34 @@
                                                 "locked": false,
                                                 "style": "",
                                                 "permissions": null,
-                                                "datatype": "data",
+                                                "fieldtype": "urlSlug",
                                                 "relationType": false,
                                                 "invisible": false,
                                                 "visibleGridView": false,
-                                                "visibleSearch": false
+                                                "visibleSearch": false,
+                                                "domainLabelWidth": null,
+                                                "action": "CoreShop\\Bundle\\FrontendBundle\\Controller\\ProductController::detailSlugAction",
+                                                "availableSites": [],
+                                                "width": "",
+                                                "datatype": "data"
                                             }
                                         ],
-                                        "name": "localizedfields",
                                         "region": null,
                                         "layout": null,
-                                        "title": "",
-                                        "width": "",
-                                        "height": "",
                                         "maxTabs": null,
-                                        "labelWidth": null,
+                                        "border": false,
+                                        "provideSplitView": false,
+                                        "tabPosition": "top",
                                         "hideLabelsWhenTabsReached": null,
-                                        "fieldDefinitionsCache": null,
-                                        "tooltip": "",
-                                        "mandatory": false,
-                                        "noteditable": false,
-                                        "index": null,
-                                        "locked": false,
-                                        "style": "",
-                                        "permissions": null,
-                                        "datatype": "data",
-                                        "relationType": false,
-                                        "invisible": false,
-                                        "visibleGridView": true,
-                                        "visibleSearch": true
+                                        "permissionView": null,
+                                        "permissionEdit": null,
+                                        "labelWidth": 100,
+                                        "labelAlign": "left",
+                                        "width": "",
+                                        "height": "",
+                                        "datatype": "data"
                                     },
                                     {
-                                        "fieldtype": "input",
-                                        "width": null,
-                                        "columnLength": 190,
-                                        "regex": "",
                                         "name": "sku",
                                         "title": "coreshop.product.sku",
                                         "tooltip": "",
@@ -170,17 +169,22 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "input",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": true,
-                                        "visibleSearch": true
-                                    },
-                                    {
-                                        "fieldtype": "input",
-                                        "width": null,
+                                        "visibleSearch": true,
+                                        "defaultValue": null,
                                         "columnLength": 190,
                                         "regex": "",
+                                        "regexFlags": [],
+                                        "unique": false,
+                                        "showCharCount": false,
+                                        "width": null,
+                                        "defaultValueGenerator": "",
+                                        "datatype": "data"
+                                    },
+                                    {
                                         "name": "ean",
                                         "title": "coreshop.product.ean13",
                                         "tooltip": "",
@@ -190,15 +194,22 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "input",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": true,
-                                        "visibleSearch": true
+                                        "visibleSearch": true,
+                                        "defaultValue": null,
+                                        "columnLength": 190,
+                                        "regex": "",
+                                        "regexFlags": [],
+                                        "unique": false,
+                                        "showCharCount": false,
+                                        "width": null,
+                                        "defaultValueGenerator": "",
+                                        "datatype": "data"
                                     },
                                     {
-                                        "fieldtype": "checkbox",
-                                        "defaultValue": 0,
                                         "name": "active",
                                         "title": "coreshop.product.active",
                                         "tooltip": "",
@@ -208,17 +219,33 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "checkbox",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": true,
-                                        "visibleSearch": true
+                                        "visibleSearch": true,
+                                        "defaultValue": 0,
+                                        "defaultValueGenerator": "",
+                                        "datatype": "data"
                                     },
                                     {
+                                        "name": "digitalProduct",
+                                        "title": "coreshop.product.digital_product",
+                                        "tooltip": "",
+                                        "mandatory": false,
+                                        "noteditable": false,
+                                        "index": false,
+                                        "locked": false,
+                                        "style": "",
+                                        "permissions": null,
                                         "fieldtype": "booleanSelect",
+                                        "relationType": false,
+                                        "invisible": false,
+                                        "visibleGridView": false,
+                                        "visibleSearch": false,
                                         "yesLabel": "isDigitalProduct",
                                         "noLabel": "noDigitalProduct",
-                                        "emptyLabel": null,
+                                        "emptyLabel": "empty",
                                         "options": [
                                             {
                                                 "key": "empty",
@@ -233,46 +260,44 @@
                                                 "value": -1
                                             }
                                         ],
-                                        "name": "digitalProduct",
-                                        "title": "coreshop.product.digital_product",
-                                        "tooltip": "",
-                                        "mandatory": false,
-                                        "noteditable": false,
-                                        "index": false,
-                                        "locked": false,
-                                        "style": "",
-                                        "permissions": null,
-                                        "datatype": "data",
-                                        "relationType": false,
-                                        "invisible": false,
-                                        "visibleGridView": false,
-                                        "visibleSearch": false
+                                        "width": null,
+                                        "datatype": "data"
                                     },
                                     {
-                                        "fieldtype": "coreShopRelation",
-                                        "width": "",
-                                        "relationType": true,
-                                        "pathFormatterClass": "",
-                                        "stack": "coreshop.manufacturer",
                                         "name": "manufacturer",
                                         "title": "coreshop.product.manufacturer",
+                                        "tooltip": null,
                                         "mandatory": false,
                                         "noteditable": true,
                                         "index": false,
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "coreShopRelation",
+                                        "relationType": true,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
+                                        "visibleSearch": false,
+                                        "classes": [
+                                            {
+                                                "classes": "CoreShopManufacturer"
+                                            }
+                                        ],
+                                        "displayMode": null,
+                                        "pathFormatterClass": "",
+                                        "assetInlineDownloadAllowed": false,
+                                        "allowToClearRelation": true,
+                                        "objectsAllowed": true,
+                                        "assetsAllowed": false,
+                                        "assetTypes": [],
+                                        "documentsAllowed": false,
+                                        "documentTypes": [],
+                                        "width": "",
+                                        "stack": "coreshop.manufacturer",
+                                        "returnConcrete": false,
+                                        "datatype": "data"
                                     },
                                     {
-                                        "fieldtype": "coreShopStoreMultiselect",
-                                        "options": [],
-                                        "width": "",
-                                        "height": "",
-                                        "maxItems": null,
                                         "name": "stores",
                                         "title": "coreshop.product.stores",
                                         "tooltip": "",
@@ -282,43 +307,68 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "coreShopStoreMultiselect",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
+                                        "visibleSearch": false,
+                                        "options": null,
+                                        "maxItems": null,
+                                        "renderType": null,
+                                        "dynamicOptions": false,
+                                        "defaultValue": null,
+                                        "height": "",
+                                        "width": "",
+                                        "defaultValueGenerator": "",
+                                        "optionsProviderType": null,
+                                        "optionsProviderClass": null,
+                                        "optionsProviderData": null,
+                                        "datatype": "data"
                                     }
                                 ],
-                                "locked": false
+                                "locked": false,
+                                "fieldtype": "fieldset",
+                                "labelWidth": 100,
+                                "labelAlign": "left"
                             }
                         ],
-                        "locked": false
-                    },
-                    {
+                        "locked": false,
                         "fieldtype": "panel",
-                        "labelWidth": 100,
                         "layout": null,
+                        "border": false,
+                        "icon": null,
+                        "labelWidth": 100,
+                        "labelAlign": "left"
+                    },
+                    {
                         "name": "seo",
                         "type": null,
                         "region": null,
                         "title": "coreshop.product.seo",
-                        "width": null,
-                        "height": null,
+                        "width": 0,
+                        "height": 0,
                         "collapsible": false,
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
+                                "name": "localizedfields",
+                                "title": "",
+                                "tooltip": "",
+                                "mandatory": false,
+                                "noteditable": false,
+                                "index": false,
+                                "locked": false,
+                                "style": "",
+                                "permissions": null,
                                 "fieldtype": "localizedfields",
+                                "relationType": false,
+                                "invisible": false,
+                                "visibleGridView": true,
+                                "visibleSearch": true,
                                 "children": [
                                     {
-                                        "fieldtype": "input",
-                                        "width": null,
-                                        "columnLength": 190,
-                                        "regex": "",
-                                        "unique": false,
                                         "name": "pimcoreMetaTitle",
                                         "title": "coreshop.product.seo_meta_title",
                                         "tooltip": "",
@@ -328,16 +378,22 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "input",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": true,
-                                        "visibleSearch": true
+                                        "visibleSearch": true,
+                                        "defaultValue": null,
+                                        "columnLength": 190,
+                                        "regex": "",
+                                        "regexFlags": [],
+                                        "unique": false,
+                                        "showCharCount": false,
+                                        "width": null,
+                                        "defaultValueGenerator": "",
+                                        "datatype": "data"
                                     },
                                     {
-                                        "fieldtype": "textarea",
-                                        "width": "",
-                                        "height": "",
                                         "name": "pimcoreMetaDescription",
                                         "title": "coreshop.product.seo_meta_description",
                                         "tooltip": "",
@@ -347,63 +403,72 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "textarea",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
+                                        "visibleSearch": false,
+                                        "maxLength": null,
+                                        "showCharCount": false,
+                                        "excludeFromSearchIndex": false,
+                                        "height": "",
+                                        "width": "",
+                                        "datatype": "data"
                                     }
                                 ],
-                                "name": "localizedfields",
                                 "region": null,
                                 "layout": null,
-                                "title": "",
-                                "width": "",
-                                "height": "",
                                 "maxTabs": null,
-                                "labelWidth": null,
+                                "border": false,
+                                "provideSplitView": false,
+                                "tabPosition": "top",
                                 "hideLabelsWhenTabsReached": null,
-                                "fieldDefinitionsCache": null,
-                                "tooltip": "",
-                                "mandatory": false,
-                                "noteditable": false,
-                                "index": null,
-                                "locked": false,
-                                "style": "",
-                                "permissions": null,
-                                "datatype": "data",
-                                "relationType": false,
-                                "invisible": false,
-                                "visibleGridView": true,
-                                "visibleSearch": true
+                                "permissionView": null,
+                                "permissionEdit": null,
+                                "labelWidth": 100,
+                                "labelAlign": "left",
+                                "width": "",
+                                "height": "",
+                                "datatype": "data"
                             }
                         ],
-                        "locked": false
-                    },
-                    {
+                        "locked": false,
                         "fieldtype": "panel",
-                        "labelWidth": 100,
                         "layout": null,
+                        "border": false,
+                        "icon": null,
+                        "labelWidth": 100,
+                        "labelAlign": "left"
+                    },
+                    {
                         "name": "details",
                         "type": null,
                         "region": null,
                         "title": "coreshop.product.details",
-                        "width": null,
-                        "height": null,
+                        "width": 0,
+                        "height": 0,
                         "collapsible": false,
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
+                                "name": "localizedfields",
+                                "title": null,
+                                "tooltip": "",
+                                "mandatory": false,
+                                "noteditable": false,
+                                "index": false,
+                                "locked": false,
+                                "style": "",
+                                "permissions": null,
                                 "fieldtype": "localizedfields",
+                                "relationType": false,
+                                "invisible": false,
+                                "visibleGridView": true,
+                                "visibleSearch": true,
                                 "children": [
                                     {
-                                        "fieldtype": "wysiwyg",
-                                        "width": "",
-                                        "height": "",
-                                        "toolbarConfig": "",
                                         "name": "description",
                                         "title": "coreshop.product.description",
                                         "tooltip": "",
@@ -413,43 +478,44 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "wysiwyg",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
+                                        "visibleSearch": false,
+                                        "toolbarConfig": "",
+                                        "excludeFromSearchIndex": false,
+                                        "maxCharacters": 0,
+                                        "height": "",
+                                        "width": "",
+                                        "datatype": "data"
                                     }
                                 ],
-                                "name": "localizedfields",
                                 "region": null,
                                 "layout": null,
-                                "title": null,
-                                "width": "",
-                                "height": "",
                                 "maxTabs": null,
-                                "labelWidth": null,
+                                "border": false,
+                                "provideSplitView": false,
+                                "tabPosition": "top",
                                 "hideLabelsWhenTabsReached": null,
-                                "fieldDefinitionsCache": null,
-                                "tooltip": "",
-                                "mandatory": false,
-                                "noteditable": false,
-                                "index": null,
-                                "locked": false,
-                                "style": "",
-                                "permissions": null,
-                                "datatype": "data",
-                                "relationType": false,
-                                "invisible": false,
-                                "visibleGridView": true,
-                                "visibleSearch": true
+                                "permissionView": null,
+                                "permissionEdit": null,
+                                "labelWidth": 100,
+                                "labelAlign": "left",
+                                "width": "",
+                                "height": "",
+                                "datatype": "data"
                             }
                         ],
-                        "locked": false
-                    },
-                    {
+                        "locked": false,
                         "fieldtype": "panel",
                         "layout": null,
                         "border": false,
+                        "icon": null,
+                        "labelWidth": 100,
+                        "labelAlign": "left"
+                    },
+                    {
                         "name": "attributes",
                         "type": null,
                         "region": null,
@@ -460,26 +526,8 @@
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
-                                "fieldtype": "coreShopRelation",
-                                "stack": "coreshop.purchasable",
-                                "returnConcrete": true,
-                                "relationType": true,
-                                "objectsAllowed": true,
-                                "assetsAllowed": false,
-                                "documentsAllowed": false,
-                                "width": null,
-                                "assetUploadPath": null,
-                                "assetTypes": [],
-                                "documentTypes": [],
-                                "classes": [
-                                    {
-                                        "classes": "CoreShopProduct"
-                                    }
-                                ],
-                                "pathFormatterClass": "",
                                 "name": "mainVariant",
                                 "title": "Main Variant",
                                 "tooltip": "",
@@ -489,27 +537,31 @@
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
+                                "fieldtype": "coreShopRelation",
+                                "relationType": true,
                                 "invisible": true,
                                 "visibleGridView": false,
-                                "visibleSearch": false
-                            },
-                            {
-                                "fieldtype": "coreShopRelations",
-                                "stack": "coreshop.attribute_group",
-                                "relationType": true,
+                                "visibleSearch": false,
+                                "classes": [
+                                    {
+                                        "classes": "CoreShopProduct"
+                                    }
+                                ],
+                                "displayMode": null,
+                                "pathFormatterClass": "",
+                                "assetInlineDownloadAllowed": false,
+                                "allowToClearRelation": true,
                                 "objectsAllowed": true,
                                 "assetsAllowed": false,
-                                "documentsAllowed": false,
-                                "width": null,
-                                "height": "",
-                                "maxItems": null,
-                                "assetUploadPath": null,
                                 "assetTypes": [],
+                                "documentsAllowed": false,
                                 "documentTypes": [],
-                                "enableTextSelection": false,
-                                "classes": [],
-                                "pathFormatterClass": "",
+                                "width": null,
+                                "stack": "coreshop.purchasable",
+                                "returnConcrete": true,
+                                "datatype": "data"
+                            },
+                            {
                                 "name": "allowedAttributeGroups",
                                 "title": "coreshop.product.allowed_attribute_groups",
                                 "tooltip": "",
@@ -519,27 +571,33 @@
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
-                                "invisible": false,
-                                "visibleGridView": false,
-                                "visibleSearch": false
-                            },
-                            {
                                 "fieldtype": "coreShopRelations",
-                                "stack": "coreshop.attribute",
                                 "relationType": true,
+                                "invisible": false,
+                                "visibleGridView": false,
+                                "visibleSearch": false,
+                                "classes": [
+                                    {
+                                        "classes": "CoreShopAttributeGroup"
+                                    }
+                                ],
+                                "displayMode": null,
+                                "pathFormatterClass": "",
+                                "maxItems": null,
+                                "assetInlineDownloadAllowed": false,
+                                "allowToClearRelation": true,
                                 "objectsAllowed": true,
                                 "assetsAllowed": false,
-                                "documentsAllowed": false,
-                                "width": null,
-                                "height": "",
-                                "maxItems": null,
-                                "assetUploadPath": null,
                                 "assetTypes": [],
+                                "documentsAllowed": false,
                                 "documentTypes": [],
                                 "enableTextSelection": false,
-                                "classes": [],
-                                "pathFormatterClass": "",
+                                "width": null,
+                                "height": "",
+                                "stack": "coreshop.attribute_group",
+                                "datatype": "data"
+                            },
+                            {
                                 "name": "attributes",
                                 "title": "coreshop.product.attributes",
                                 "tooltip": "",
@@ -549,79 +607,135 @@
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
+                                "fieldtype": "coreShopRelations",
+                                "relationType": true,
                                 "invisible": false,
                                 "visibleGridView": false,
-                                "visibleSearch": false
+                                "visibleSearch": false,
+                                "classes": [
+                                    {
+                                        "classes": "CoreShopAttributeValue"
+                                    },
+                                    {
+                                        "classes": "CoreShopAttributeColor"
+                                    }
+                                ],
+                                "displayMode": null,
+                                "pathFormatterClass": "",
+                                "maxItems": null,
+                                "assetInlineDownloadAllowed": false,
+                                "allowToClearRelation": true,
+                                "objectsAllowed": true,
+                                "assetsAllowed": false,
+                                "assetTypes": [],
+                                "documentsAllowed": false,
+                                "documentTypes": [],
+                                "enableTextSelection": false,
+                                "width": null,
+                                "height": "",
+                                "stack": "coreshop.attribute",
+                                "datatype": "data"
                             }
                         ],
                         "locked": false,
+                        "fieldtype": "panel",
+                        "layout": null,
+                        "border": false,
                         "icon": "",
                         "labelWidth": 0,
                         "labelAlign": "left"
                     },
                     {
-                        "fieldtype": "panel",
-                        "labelWidth": 100,
-                        "layout": null,
                         "name": "categories",
                         "type": null,
                         "region": null,
                         "title": "coreshop.product.categories",
-                        "width": null,
-                        "height": null,
+                        "width": 0,
+                        "height": 0,
                         "collapsible": false,
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
-                                "fieldtype": "coreShopRelations",
-                                "height": "400",
-                                "width": "",
-                                "relationType": true,
-                                "pathFormatterClass": "",
-                                "stack": "coreshop.category",
                                 "name": "categories",
                                 "title": "coreshop.product.categories",
+                                "tooltip": null,
                                 "mandatory": false,
                                 "noteditable": false,
                                 "index": false,
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
+                                "fieldtype": "coreShopRelations",
+                                "relationType": true,
                                 "invisible": false,
                                 "visibleGridView": false,
-                                "visibleSearch": false
+                                "visibleSearch": false,
+                                "classes": [
+                                    {
+                                        "classes": "CoreShopCategory"
+                                    }
+                                ],
+                                "displayMode": null,
+                                "pathFormatterClass": "",
+                                "maxItems": null,
+                                "assetInlineDownloadAllowed": false,
+                                "allowToClearRelation": true,
+                                "objectsAllowed": true,
+                                "assetsAllowed": false,
+                                "assetTypes": [],
+                                "documentsAllowed": false,
+                                "documentTypes": [],
+                                "enableTextSelection": false,
+                                "width": "",
+                                "height": 400,
+                                "stack": "coreshop.category",
+                                "datatype": "data"
                             }
                         ],
-                        "locked": false
-                    },
-                    {
+                        "locked": false,
                         "fieldtype": "panel",
-                        "labelWidth": 100,
                         "layout": null,
+                        "border": false,
+                        "icon": null,
+                        "labelWidth": 100,
+                        "labelAlign": "left"
+                    },
+                    {
                         "name": "images",
                         "type": null,
                         "region": null,
                         "title": "coreshop.product.images",
-                        "width": null,
-                        "height": null,
+                        "width": 0,
+                        "height": 0,
                         "collapsible": false,
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
+                                "name": "images",
+                                "title": "coreshop.product.images",
+                                "tooltip": "",
+                                "mandatory": false,
+                                "noteditable": false,
+                                "index": false,
+                                "locked": false,
+                                "style": "",
+                                "permissions": null,
                                 "fieldtype": "manyToManyRelation",
-                                "width": "",
-                                "height": "",
+                                "relationType": true,
+                                "invisible": false,
+                                "visibleGridView": true,
+                                "visibleSearch": true,
+                                "classes": [],
+                                "displayMode": null,
+                                "pathFormatterClass": "",
                                 "maxItems": null,
+                                "assetInlineDownloadAllowed": false,
                                 "assetUploadPath": "",
-                                "relationType": true,
+                                "allowToClearRelation": true,
                                 "objectsAllowed": false,
                                 "assetsAllowed": true,
                                 "assetTypes": [
@@ -631,157 +745,171 @@
                                 ],
                                 "documentsAllowed": false,
                                 "documentTypes": [],
-                                "lazyLoading": true,
-                                "classes": [],
-                                "pathFormatterClass": "",
-                                "name": "images",
-                                "title": "coreshop.product.images",
-                                "tooltip": "",
-                                "mandatory": false,
-                                "noteditable": false,
-                                "index": false,
-                                "locked": false,
-                                "style": "",
-                                "permissions": null,
-                                "datatype": "data",
-                                "invisible": false,
-                                "visibleGridView": true,
-                                "visibleSearch": true
+                                "enableTextSelection": false,
+                                "width": "",
+                                "height": "",
+                                "datatype": "data"
                             }
                         ],
-                        "locked": false
-                    },
-                    {
+                        "locked": false,
                         "fieldtype": "panel",
-                        "labelWidth": 165,
                         "layout": null,
+                        "border": false,
+                        "icon": null,
+                        "labelWidth": 100,
+                        "labelAlign": "left"
+                    },
+                    {
                         "name": "stock",
                         "type": null,
                         "region": null,
                         "title": "coreshop.product.stock",
-                        "width": null,
-                        "height": null,
+                        "width": 0,
+                        "height": 0,
                         "collapsible": false,
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
-                                "fieldtype": "numeric",
-                                "width": "",
-                                "defaultValue": null,
-                                "integer": true,
-                                "unsigned": false,
-                                "minValue": null,
-                                "maxValue": null,
-                                "unique": false,
-                                "decimalSize": null,
-                                "decimalPrecision": null,
-                                "name": "onHold",
-                                "title": "coreshop.product.on_hold",
-                                "tooltip": "",
-                                "mandatory": false,
-                                "noteditable": true,
-                                "index": false,
-                                "locked": false,
-                                "style": "",
-                                "permissions": null,
-                                "datatype": "data",
-                                "relationType": false,
-                                "invisible": false,
-                                "visibleGridView": false,
-                                "visibleSearch": false
-                            },
-                            {
-                                "fieldtype": "numeric",
+                                "name": "stock",
+                                "type": null,
+                                "region": null,
+                                "title": "coreshop.product.stock",
                                 "width": "",
-                                "defaultValue": null,
-                                "integer": true,
-                                "unsigned": false,
-                                "minValue": null,
-                                "maxValue": null,
-                                "unique": false,
-                                "decimalSize": null,
-                                "decimalPrecision": null,
-                                "name": "onHand",
-                                "title": "coreshop.product.on_hand",
-                                "tooltip": "",
-                                "mandatory": false,
-                                "noteditable": false,
-                                "index": false,
-                                "locked": false,
-                                "style": "",
-                                "permissions": null,
-                                "datatype": "data",
-                                "relationType": false,
-                                "invisible": false,
-                                "visibleGridView": false,
-                                "visibleSearch": false
-                            },
-                            {
-                                "fieldtype": "booleanSelect",
-                                "yesLabel": "isTracked",
-                                "noLabel": "notTracked",
-                                "emptyLabel": null,
-                                "options": [
+                                "height": "",
+                                "collapsible": false,
+                                "collapsed": false,
+                                "bodyStyle": "",
+                                "datatype": "layout",
+                                "children": [
+                                    {
+                                        "name": "stockOnHoldLabel",
+                                        "type": null,
+                                        "region": null,
+                                        "title": "",
+                                        "width": "",
+                                        "height": "",
+                                        "collapsible": false,
+                                        "collapsed": false,
+                                        "bodyStyle": "",
+                                        "datatype": "layout",
+                                        "children": [],
+                                        "locked": false,
+                                        "fieldtype": "text",
+                                        "html": "",
+                                        "renderingClass": "@CoreShop\\Bundle\\InventoryBundle\\Pimcore\\Renderer\\StockOnHandRenderer",
+                                        "renderingData": "",
+                                        "border": false
+                                    },
                                     {
-                                        "key": "empty",
-                                        "value": 0
+                                        "name": "onHold",
+                                        "title": "coreshop.product.on_hold",
+                                        "tooltip": "",
+                                        "mandatory": false,
+                                        "noteditable": true,
+                                        "index": false,
+                                        "locked": false,
+                                        "style": "",
+                                        "permissions": null,
+                                        "fieldtype": "numeric",
+                                        "relationType": false,
+                                        "invisible": true,
+                                        "visibleGridView": false,
+                                        "visibleSearch": false,
+                                        "defaultValue": null,
+                                        "integer": true,
+                                        "unsigned": false,
+                                        "minValue": null,
+                                        "maxValue": null,
+                                        "unique": false,
+                                        "decimalSize": null,
+                                        "decimalPrecision": null,
+                                        "width": "",
+                                        "defaultValueGenerator": "",
+                                        "datatype": "data"
                                     },
                                     {
-                                        "key": "isTracked",
-                                        "value": 1
+                                        "name": "onHand",
+                                        "title": "coreshop.product.on_hand",
+                                        "tooltip": "",
+                                        "mandatory": false,
+                                        "noteditable": false,
+                                        "index": false,
+                                        "locked": false,
+                                        "style": "",
+                                        "permissions": null,
+                                        "fieldtype": "numeric",
+                                        "relationType": false,
+                                        "invisible": false,
+                                        "visibleGridView": false,
+                                        "visibleSearch": false,
+                                        "defaultValue": null,
+                                        "integer": true,
+                                        "unsigned": false,
+                                        "minValue": null,
+                                        "maxValue": null,
+                                        "unique": false,
+                                        "decimalSize": null,
+                                        "decimalPrecision": null,
+                                        "width": "",
+                                        "defaultValueGenerator": "",
+                                        "datatype": "data"
                                     },
                                     {
-                                        "key": "notTracked",
-                                        "value": -1
+                                        "name": "isTracked",
+                                        "title": "coreshop.product.is_tracked",
+                                        "tooltip": "",
+                                        "mandatory": false,
+                                        "noteditable": false,
+                                        "index": false,
+                                        "locked": false,
+                                        "style": "",
+                                        "permissions": null,
+                                        "fieldtype": "booleanSelect",
+                                        "relationType": false,
+                                        "invisible": false,
+                                        "visibleGridView": false,
+                                        "visibleSearch": false,
+                                        "yesLabel": "isTracked",
+                                        "noLabel": "notTracked",
+                                        "emptyLabel": "empty",
+                                        "options": [
+                                            {
+                                                "key": "empty",
+                                                "value": 0
+                                            },
+                                            {
+                                                "key": "isTracked",
+                                                "value": 1
+                                            },
+                                            {
+                                                "key": "notTracked",
+                                                "value": -1
+                                            }
+                                        ],
+                                        "width": "",
+                                        "datatype": "data"
                                     }
                                 ],
-                                "name": "isTracked",
-                                "title": "coreshop.product.is_tracked",
-                                "tooltip": "",
-                                "mandatory": false,
-                                "noteditable": false,
-                                "index": false,
                                 "locked": false,
-                                "style": "",
-                                "permissions": null,
-                                "datatype": "data",
-                                "relationType": false,
-                                "invisible": false,
-                                "visibleGridView": false,
-                                "visibleSearch": false
+                                "fieldtype": "fieldset",
+                                "labelWidth": 0,
+                                "labelAlign": "left"
                             },
                             {
-                                "fieldtype": "fieldset",
-                                "labelWidth": 150,
                                 "name": "quantity_restrictions",
                                 "type": null,
                                 "region": null,
                                 "title": "coreshop.product.quantity_restrictions",
-                                "width": null,
-                                "height": null,
+                                "width": 0,
+                                "height": 0,
                                 "collapsible": false,
                                 "collapsed": false,
                                 "bodyStyle": "",
                                 "datatype": "layout",
-                                "permissions": null,
                                 "children": [
                                     {
-                                        "fieldtype": "numeric",
-                                        "width": "",
-                                        "defaultValue": 0,
-                                        "queryColumnType": "double",
-                                        "columnType": "double",
-                                        "phpdocType": "float",
-                                        "integer": true,
-                                        "unsigned": false,
-                                        "minValue": 0,
-                                        "maxValue": null,
-                                        "unique": false,
-                                        "decimalSize": null,
-                                        "decimalPrecision": null,
                                         "name": "minimumQuantityToOrder",
                                         "title": "coreshop.product.minimum_quantity_to_order",
                                         "tooltip": "",
@@ -791,19 +919,12 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "numeric",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
-                                    },
-                                    {
-                                        "fieldtype": "numeric",
-                                        "width": "",
-                                        "defaultValue": null,
-                                        "queryColumnType": "double",
-                                        "columnType": "double",
-                                        "phpdocType": "float",
+                                        "visibleSearch": false,
+                                        "defaultValue": 0,
                                         "integer": true,
                                         "unsigned": false,
                                         "minValue": 0,
@@ -811,6 +932,11 @@
                                         "unique": false,
                                         "decimalSize": null,
                                         "decimalPrecision": null,
+                                        "width": "",
+                                        "defaultValueGenerator": "",
+                                        "datatype": "data"
+                                    },
+                                    {
                                         "name": "maximumQuantityToOrder",
                                         "title": "coreshop.product.maximal_quantity_to_order",
                                         "tooltip": "",
@@ -820,54 +946,63 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "numeric",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
+                                        "visibleSearch": false,
+                                        "defaultValue": null,
+                                        "integer": true,
+                                        "unsigned": false,
+                                        "minValue": 0,
+                                        "maxValue": null,
+                                        "unique": false,
+                                        "decimalSize": null,
+                                        "decimalPrecision": null,
+                                        "width": "",
+                                        "defaultValueGenerator": "",
+                                        "datatype": "data"
                                     }
                                 ],
-                                "locked": false
+                                "locked": false,
+                                "fieldtype": "fieldset",
+                                "labelWidth": 150,
+                                "labelAlign": "left"
                             }
                         ],
-                        "locked": false
-                    },
-                    {
+                        "locked": false,
                         "fieldtype": "panel",
-                        "labelWidth": 100,
                         "layout": null,
+                        "border": false,
+                        "icon": "",
+                        "labelWidth": 165,
+                        "labelAlign": "left"
+                    },
+                    {
                         "name": "price_and_units",
                         "type": null,
                         "region": null,
                         "title": "coreshop.product.price_and_units",
-                        "width": null,
-                        "height": null,
+                        "width": 0,
+                        "height": 0,
                         "collapsible": false,
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
-                                "fieldtype": "fieldset",
-                                "labelWidth": 100,
                                 "name": "Layout",
                                 "type": null,
                                 "region": null,
                                 "title": "",
-                                "width": null,
-                                "height": null,
+                                "width": 0,
+                                "height": 0,
                                 "collapsible": false,
                                 "collapsed": false,
                                 "bodyStyle": "",
                                 "datatype": "layout",
-                                "permissions": null,
                                 "children": [
                                     {
-                                        "fieldtype": "coreShopProductUnitDefinitions",
-                                        "width": "",
-                                        "defaultValue": null,
-                                        "phpdocType": "array",
                                         "name": "unitDefinitions",
                                         "title": "coreshop.product.unit_definitions",
                                         "tooltip": "",
@@ -877,19 +1012,17 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "coreShopProductUnitDefinitions",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
-                                    },
-                                    {
-                                        "fieldtype": "coreShopStoreValues",
-                                        "width": "",
+                                        "visibleSearch": false,
+                                        "width": null,
                                         "defaultValue": null,
                                         "phpdocType": "array",
-                                        "minValue": null,
-                                        "maxValue": null,
+                                        "datatype": "data"
+                                    },
+                                    {
                                         "name": "storeValues",
                                         "title": "coreshop.product.store_values",
                                         "tooltip": "",
@@ -899,26 +1032,18 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "coreShopStoreValues",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
-                                    },
-                                    {
-                                        "fieldtype": "numeric",
-                                        "width": "",
-                                        "defaultValue": 0,
-                                        "queryColumnType": "double",
-                                        "columnType": "double",
-                                        "phpdocType": "float",
-                                        "integer": true,
-                                        "unsigned": false,
+                                        "visibleSearch": false,
+                                        "width": null,
+                                        "phpdocType": "array",
                                         "minValue": null,
                                         "maxValue": null,
-                                        "unique": false,
-                                        "decimalSize": null,
-                                        "decimalPrecision": null,
+                                        "datatype": "data"
+                                    },
+                                    {
                                         "name": "itemQuantityFactor",
                                         "title": "coreshop.product.item_quantity_factor",
                                         "tooltip": "coreshop.product.item_quantity_factor.tooltip",
@@ -928,18 +1053,24 @@
                                         "locked": false,
                                         "style": "padding: 10px 0;",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "numeric",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
-                                    },
-                                    {
-                                        "fieldtype": "coreShopMoney",
-                                        "width": "",
-                                        "defaultValue": null,
+                                        "visibleSearch": false,
+                                        "defaultValue": 0,
+                                        "integer": true,
+                                        "unsigned": false,
                                         "minValue": null,
                                         "maxValue": null,
+                                        "unique": false,
+                                        "decimalSize": null,
+                                        "decimalPrecision": null,
+                                        "width": "",
+                                        "defaultValueGenerator": "",
+                                        "datatype": "data"
+                                    },
+                                    {
                                         "name": "wholesalePrice",
                                         "title": "coreshop.product.wholesale_price",
                                         "tooltip": "",
@@ -949,18 +1080,20 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "coreShopMoney",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
-                                    },
-                                    {
-                                        "fieldtype": "coreShopMoneyCurrency",
-                                        "width": "",
-                                        "phpdocType": "CoreShop\\Component\\Currency\\Model\\Money",
+                                        "visibleSearch": false,
+                                        "width": null,
+                                        "defaultValue": null,
+                                        "phpdocType": "int",
                                         "minValue": null,
                                         "maxValue": null,
+                                        "nullable": false,
+                                        "datatype": "data"
+                                    },
+                                    {
                                         "name": "wholesaleBuyingPrice",
                                         "title": "coreshop.product.wholesale_buying_price",
                                         "tooltip": "",
@@ -970,37 +1103,44 @@
                                         "locked": false,
                                         "style": "",
                                         "permissions": null,
-                                        "datatype": "data",
+                                        "fieldtype": "coreShopMoneyCurrency",
                                         "relationType": false,
                                         "invisible": false,
                                         "visibleGridView": false,
-                                        "visibleSearch": false
+                                        "visibleSearch": false,
+                                        "width": 0,
+                                        "minValue": 0,
+                                        "maxValue": 0,
+                                        "datatype": "data"
                                     }
                                 ],
-                                "locked": false
+                                "locked": false,
+                                "fieldtype": "fieldset",
+                                "labelWidth": 100,
+                                "labelAlign": "left"
                             }
                         ],
-                        "locked": false
-                    },
-                    {
+                        "locked": false,
                         "fieldtype": "panel",
-                        "labelWidth": 100,
                         "layout": null,
+                        "border": false,
+                        "icon": null,
+                        "labelWidth": 100,
+                        "labelAlign": "left"
+                    },
+                    {
                         "name": "price_rules",
                         "type": null,
                         "region": null,
                         "title": "coreshop.product.price_rules",
-                        "width": null,
-                        "height": null,
+                        "width": 0,
+                        "height": 0,
                         "collapsible": false,
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
-                                "fieldtype": "coreShopProductSpecificPriceRules",
-                                "height": null,
                                 "name": "specificPriceRules",
                                 "title": "coreshop.product.product_specific_price_rules",
                                 "tooltip": "",
@@ -1010,15 +1150,15 @@
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
+                                "fieldtype": "coreShopProductSpecificPriceRules",
                                 "relationType": false,
                                 "invisible": false,
                                 "visibleGridView": false,
-                                "visibleSearch": false
+                                "visibleSearch": false,
+                                "height": null,
+                                "datatype": "data"
                             },
                             {
-                                "fieldtype": "coreShopProductQuantityPriceRules",
-                                "height": null,
                                 "name": "quantityPriceRules",
                                 "title": "coreshop.product.quantity_price_rules",
                                 "tooltip": "",
@@ -1028,40 +1168,36 @@
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
+                                "fieldtype": "coreShopProductQuantityPriceRules",
                                 "relationType": false,
                                 "invisible": false,
                                 "visibleGridView": false,
-                                "visibleSearch": false
+                                "visibleSearch": false,
+                                "height": null,
+                                "datatype": "data"
                             }
                         ],
-                        "locked": false
-                    },
-                    {
+                        "locked": false,
                         "fieldtype": "panel",
-                        "labelWidth": 100,
                         "layout": null,
+                        "border": false,
+                        "icon": null,
+                        "labelWidth": 100,
+                        "labelAlign": "left"
+                    },
+                    {
                         "name": "shipping",
                         "type": null,
                         "region": null,
                         "title": "coreshop.product.shipping",
-                        "width": null,
-                        "height": null,
+                        "width": 0,
+                        "height": 0,
                         "collapsible": false,
                         "collapsed": false,
                         "bodyStyle": "",
                         "datatype": "layout",
-                        "permissions": null,
                         "children": [
                             {
-                                "fieldtype": "numeric",
-                                "width": "",
-                                "defaultValue": null,
-                                "integer": false,
-                                "unsigned": false,
-                                "minValue": null,
-                                "maxValue": null,
-                                "decimalPrecision": null,
                                 "name": "weight",
                                 "title": "coreshop.product.weight",
                                 "tooltip": "",
@@ -1071,21 +1207,24 @@
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
+                                "fieldtype": "numeric",
                                 "relationType": false,
                                 "invisible": false,
                                 "visibleGridView": false,
-                                "visibleSearch": false
-                            },
-                            {
-                                "fieldtype": "numeric",
-                                "width": "",
+                                "visibleSearch": false,
                                 "defaultValue": null,
                                 "integer": false,
                                 "unsigned": false,
                                 "minValue": null,
                                 "maxValue": null,
+                                "unique": false,
+                                "decimalSize": null,
                                 "decimalPrecision": null,
+                                "width": "",
+                                "defaultValueGenerator": "",
+                                "datatype": "data"
+                            },
+                            {
                                 "name": "height",
                                 "title": "coreshop.product.height",
                                 "tooltip": "",
@@ -1095,21 +1234,24 @@
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
+                                "fieldtype": "numeric",
                                 "relationType": false,
                                 "invisible": false,
                                 "visibleGridView": false,
-                                "visibleSearch": false
-                            },
-                            {
-                                "fieldtype": "numeric",
-                                "width": "",
+                                "visibleSearch": false,
                                 "defaultValue": null,
                                 "integer": false,
                                 "unsigned": false,
                                 "minValue": null,
                                 "maxValue": null,
+                                "unique": false,
+                                "decimalSize": null,
                                 "decimalPrecision": null,
+                                "width": "",
+                                "defaultValueGenerator": "",
+                                "datatype": "data"
+                            },
+                            {
                                 "name": "width",
                                 "title": "coreshop.product.width",
                                 "tooltip": "",
@@ -1119,21 +1261,24 @@
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
+                                "fieldtype": "numeric",
                                 "relationType": false,
                                 "invisible": false,
                                 "visibleGridView": false,
-                                "visibleSearch": false
-                            },
-                            {
-                                "fieldtype": "numeric",
-                                "width": "",
+                                "visibleSearch": false,
                                 "defaultValue": null,
                                 "integer": false,
                                 "unsigned": false,
                                 "minValue": null,
                                 "maxValue": null,
+                                "unique": false,
+                                "decimalSize": null,
                                 "decimalPrecision": null,
+                                "width": "",
+                                "defaultValueGenerator": "",
+                                "datatype": "data"
+                            },
+                            {
                                 "name": "depth",
                                 "title": "coreshop.product.depth",
                                 "tooltip": "",
@@ -1143,27 +1288,58 @@
                                 "locked": false,
                                 "style": "",
                                 "permissions": null,
-                                "datatype": "data",
+                                "fieldtype": "numeric",
                                 "relationType": false,
                                 "invisible": false,
                                 "visibleGridView": false,
-                                "visibleSearch": false
+                                "visibleSearch": false,
+                                "defaultValue": null,
+                                "integer": false,
+                                "unsigned": false,
+                                "minValue": null,
+                                "maxValue": null,
+                                "unique": false,
+                                "decimalSize": null,
+                                "decimalPrecision": null,
+                                "width": "",
+                                "defaultValueGenerator": "",
+                                "datatype": "data"
                             }
                         ],
-                        "locked": false
+                        "locked": false,
+                        "fieldtype": "panel",
+                        "layout": null,
+                        "border": false,
+                        "icon": null,
+                        "labelWidth": 100,
+                        "labelAlign": "left"
                     }
                 ],
-                "locked": false
+                "locked": false,
+                "fieldtype": "tabpanel",
+                "border": false,
+                "tabPosition": "top"
             }
         ],
-        "locked": false
+        "locked": false,
+        "fieldtype": "panel",
+        "layout": null,
+        "border": false,
+        "icon": null,
+        "labelWidth": 100,
+        "labelAlign": "left"
     },
-    "icon": null,
-    "previewUrl": null,
+    "icon": "",
     "group": "CoreShop",
+    "showAppLoggerTab": false,
+    "linkGeneratorReference": "@CoreShop\\Component\\Pimcore\\DataObject\\CompositeLinkGenerator",
+    "previewGeneratorReference": "",
+    "compositeIndices": [],
+    "showFieldLookup": false,
     "propertyVisibility": {
         "grid": {
             "id": true,
+            "key": false,
             "path": true,
             "published": true,
             "modificationDate": true,
@@ -1171,10 +1347,12 @@
         },
         "search": {
             "id": true,
+            "key": false,
             "path": true,
             "published": true,
             "modificationDate": true,
             "creationDate": true
         }
-    }
-}
+    },
+    "enableGridLocking": false
+}
\ No newline at end of file
diff --git a/src/CoreShop/Bundle/CurrencyBundle/CoreExtension/MoneyCurrency.php b/src/CoreShop/Bundle/CurrencyBundle/CoreExtension/MoneyCurrency.php
index 3a5d9f0b45..eb7efa17b3 100644
--- a/src/CoreShop/Bundle/CurrencyBundle/CoreExtension/MoneyCurrency.php
+++ b/src/CoreShop/Bundle/CurrencyBundle/CoreExtension/MoneyCurrency.php
@@ -18,7 +18,6 @@
 
 namespace CoreShop\Bundle\CurrencyBundle\CoreExtension;
 
-use Carbon\Carbon;
 use CoreShop\Bundle\ResourceBundle\Pimcore\CacheMarshallerInterface;
 use CoreShop\Component\Currency\Model\CurrencyInterface;
 use CoreShop\Component\Currency\Model\Money;
@@ -232,7 +231,7 @@ public function getDataForGrid(?Money $data, Concrete $object = null, array $par
                 'id' => $data->getCurrency()?->getId(),
                 'name' => $data->getCurrency()?->getName(),
                 'isoCode' => $data->getCurrency()?->getIsoCode(),
-            ]
+            ],
         ];
     }
 
diff --git a/src/CoreShop/Bundle/InventoryBundle/Pimcore/Renderer/StockOnHandRenderer.php b/src/CoreShop/Bundle/InventoryBundle/Pimcore/Renderer/StockOnHandRenderer.php
new file mode 100644
index 0000000000..f505664355
--- /dev/null
+++ b/src/CoreShop/Bundle/InventoryBundle/Pimcore/Renderer/StockOnHandRenderer.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * CoreShop
+ *
+ * This source file is available under two different licenses:
+ *  - GNU General Public License version 3 (GPLv3)
+ *  - CoreShop Commercial License (CCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ * @copyright  Copyright (c) CoreShop GmbH (https://www.coreshop.org)
+ * @license    https://www.coreshop.org/license     GPLv3 and CCL
+ *
+ */
+
+namespace CoreShop\Bundle\InventoryBundle\Pimcore\Renderer;
+
+use CoreShop\Component\Inventory\Model\StockableInterface;
+use Pimcore\Model\DataObject\ClassDefinition\Layout\DynamicTextLabelInterface;
+use Pimcore\Model\DataObject\Concrete;
+use Twig\Environment;
+use Webmozart\Assert\Assert;
+
+class StockOnHandRenderer implements DynamicTextLabelInterface
+{
+    public function __construct(
+        private Environment $twig,
+    ) {
+    }
+
+    public function renderLayoutText(string $data, ?Concrete $object, array $params): string
+    {
+        Assert::isInstanceOf($object, StockableInterface::class);
+
+        return $this->twig->render('@CoreShopInventory/pimcore/stock_text.html.twig', [
+            'stockable' => $object,
+        ]);
+    }
+}
diff --git a/src/CoreShop/Bundle/InventoryBundle/Resources/config/services.yml b/src/CoreShop/Bundle/InventoryBundle/Resources/config/services.yml
index f3da17f5f9..af6e564928 100755
--- a/src/CoreShop/Bundle/InventoryBundle/Resources/config/services.yml
+++ b/src/CoreShop/Bundle/InventoryBundle/Resources/config/services.yml
@@ -17,3 +17,7 @@ services:
           - '@CoreShop\Component\Inventory\Checker\AvailabilityCheckerInterface'
         tags:
             - { name: twig.extension }
+
+    CoreShop\Bundle\InventoryBundle\Pimcore\Renderer\StockOnHandRenderer:
+        arguments:
+            - '@twig'
\ No newline at end of file
diff --git a/src/CoreShop/Bundle/InventoryBundle/Resources/translations/messages.de.yml b/src/CoreShop/Bundle/InventoryBundle/Resources/translations/messages.de.yml
new file mode 100644
index 0000000000..d2ac590890
--- /dev/null
+++ b/src/CoreShop/Bundle/InventoryBundle/Resources/translations/messages.de.yml
@@ -0,0 +1,6 @@
+coreshop:
+    inventory:
+        stock:
+            on_hand: 'Verfügbare Lagerbestände: %on_hand%'
+            on_hold: 'Reservierte Lagerbestände: %on_hold%'
+            not_tracked: 'Lagerbestände nicht verfolgt'
diff --git a/src/CoreShop/Bundle/InventoryBundle/Resources/translations/messages.en.yml b/src/CoreShop/Bundle/InventoryBundle/Resources/translations/messages.en.yml
new file mode 100644
index 0000000000..60ca2cb7b5
--- /dev/null
+++ b/src/CoreShop/Bundle/InventoryBundle/Resources/translations/messages.en.yml
@@ -0,0 +1,6 @@
+coreshop:
+    inventory:
+        stock:
+            on_hand: 'Available Stock on Hand: %on_hand%'
+            on_hold: 'Reserved Stock: %on_hold%'
+            not_tracked: 'Stock not tracked'
diff --git a/src/CoreShop/Bundle/InventoryBundle/Resources/views/pimcore/stock_text.html.twig b/src/CoreShop/Bundle/InventoryBundle/Resources/views/pimcore/stock_text.html.twig
new file mode 100644
index 0000000000..ebff282407
--- /dev/null
+++ b/src/CoreShop/Bundle/InventoryBundle/Resources/views/pimcore/stock_text.html.twig
@@ -0,0 +1,9 @@
+{% if stockable.isTracked %}
+<div class="alert alert-success">
+    <strong>{{ 'coreshop.inventory.stock.on_hand'|trans({'%on_hand%': stockable.onHand ?: 0}) }}</strong> / {{ 'coreshop.inventory.stock.on_hold'|trans({'%on_hold%': stockable.onHold ?: 0}) }}
+</div>
+{% else %}
+<div class="alert alert-warning">
+    {{ 'coreshop.inventory.stock.not_tracked'|trans }}
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/src/CoreShop/Bundle/PayumBundle/Exception/ReplyToSymfonyResponseConverter.php b/src/CoreShop/Bundle/PayumBundle/Exception/ReplyToSymfonyResponseConverter.php
index 1ecb0f26f1..906d316149 100644
--- a/src/CoreShop/Bundle/PayumBundle/Exception/ReplyToSymfonyResponseConverter.php
+++ b/src/CoreShop/Bundle/PayumBundle/Exception/ReplyToSymfonyResponseConverter.php
@@ -18,12 +18,34 @@
 
 namespace CoreShop\Bundle\PayumBundle\Exception;
 
-use Payum\Core\Bridge\Symfony\ReplyToSymfonyResponseConverter as BaseReplyToSymfonyResponseConverter;
 use Payum\Core\Reply\ReplyInterface;
+use Symfony\Component\HttpFoundation\Response;
 
-class ReplyToSymfonyResponseConverter extends BaseReplyToSymfonyResponseConverter
+/**
+ * @psalm-suppress TypeDoesNotContainType
+ */
+if (false) {
+    //This is just for the IDE
+    class BaseCoreShopReplayToSymfonyResponseConverter
+    {
+        public function convert(ReplyInterface $reply): Response
+        {
+            throw new \RuntimeException('Not implemented');
+        }
+    }
+}
+
+if (class_exists('Payum\Bundle\PayumBundle\ReplyToSymfonyResponseConverter')) {
+    \class_alias(\Payum\Bundle\PayumBundle\ReplyToSymfonyResponseConverter::class, 'CoreShop\Bundle\PayumBundle\Exception\BaseCoreShopReplayToSymfonyResponseConverter');
+} elseif (class_exists('Payum\Core\Bridge\Symfony\ReplyToSymfonyResponseConverter')) {
+    \class_alias(\Payum\Core\Bridge\Symfony\ReplyToSymfonyResponseConverter::class, 'CoreShop\Bundle\PayumBundle\Exception\BaseCoreShopReplayToSymfonyResponseConverter');
+} else {
+    throw new \RuntimeException('Cannot find Payum ReplyToSymfonyResponseConverter class');
+}
+
+class ReplyToSymfonyResponseConverter extends BaseCoreShopReplayToSymfonyResponseConverter
 {
-    public function convert(ReplyInterface $reply)
+    public function convert(ReplyInterface $reply): Response
     {
         if ($reply instanceof ReplyException && null !== $reply->getPrevious()) {
             throw $reply->getPrevious();
diff --git a/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/GridController.php b/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/GridController.php
index 8cdc4ea1df..7d6cbb5af3 100644
--- a/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/GridController.php
+++ b/src/CoreShop/Bundle/PimcoreBundle/Controller/Admin/GridController.php
@@ -37,6 +37,12 @@ public function getGridFiltersAction(
         TranslatorInterface $translator,
     ): Response {
         $services = [];
+        /**
+         * @var \Pimcore\Model\User $user
+         *
+         * @psalm-suppress InternalMethod
+         */
+        $user = $this->getAdminUser();
         /** @var GridFilterInterface $service */
         foreach ($gridFilterServiceRegistry->all() as $id => $service) {
             if ($service->supports($listType) !== true) {
@@ -45,7 +51,7 @@ public function getGridFiltersAction(
 
             $services[] = [
                 'id' => $id,
-                'name' => $translator->trans($service->getName(), [], 'admin'),
+                'name' => $translator->trans($service->getName(), [], 'admin', $user->getLanguage()),
             ];
         }
 
@@ -58,6 +64,12 @@ public function getGridActionsAction(
         TranslatorInterface $translator,
     ): Response {
         $services = [];
+        /**
+         * @var \Pimcore\Model\User $user
+         *
+         * @psalm-suppress InternalMethod
+         */
+        $user = $this->getAdminUser();
         /** @var GridActionInterface $service */
         foreach ($gridActionServiceRegistry->all() as $id => $service) {
             if ($service->supports($listType) !== true) {
@@ -66,7 +78,7 @@ public function getGridActionsAction(
 
             $services[] = [
                 'id' => $id,
-                'name' => $translator->trans($service->getName(), [], 'admin'),
+                'name' => $translator->trans($service->getName(), [], 'admin', $user->getLanguage()),
             ];
         }
 
diff --git a/src/CoreShop/Bundle/StorageListBundle/DependencyInjection/CoreShopStorageListExtension.php b/src/CoreShop/Bundle/StorageListBundle/DependencyInjection/CoreShopStorageListExtension.php
index 65c9dfbea1..a0d20fb1d6 100644
--- a/src/CoreShop/Bundle/StorageListBundle/DependencyInjection/CoreShopStorageListExtension.php
+++ b/src/CoreShop/Bundle/StorageListBundle/DependencyInjection/CoreShopStorageListExtension.php
@@ -295,13 +295,13 @@ public function load(array $configs, ContainerBuilder $container): void
                                 [
                                     'event' => LogoutEvent::class,
                                     'method' => 'onLogoutSuccess',
-                                    'dispatcher' => 'security.event_dispatcher.coreshop_frontend'
-                                ]
+                                    'dispatcher' => 'security.event_dispatcher.coreshop_frontend',
+                                ],
                             );
 
                             $container->setDefinition(
-                                'coreshop.storage_list.logout_subscriber.'.$name,
-                                $logoutSubscriber
+                                'coreshop.storage_list.logout_subscriber.' . $name,
+                                $logoutSubscriber,
                             );
                         }
                     }