diff --git a/composer.json b/composer.json
index e0a9884..fbbd697 100644
--- a/composer.json
+++ b/composer.json
@@ -4,17 +4,17 @@
     "type": "library",
     "description": "DreamCommerce common bundle",
     "require": {
-        "php": "^7.4",
+        "php": ">=8.2",
         "psr/http-message": "^1.0",
         "webmozart/assert": "^1.2",
-        "laminas/laminas-stdlib": "^3.1"
+        "laminas/laminas-stdlib": "^3.1",
+        "sylius/resource-bundle": "^1.11"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.5.7",
         "doctrine/orm": "^2.10.3",
         "guzzlehttp/guzzle": "^6.2",
         "phpunit/phpunit": "^10.0-dev",
-        "sylius/resource-bundle": "v1.9.0-BETA.1",
         "friendsofphp/php-cs-fixer": "^v2.19.3",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "symfony/browser-kit": "v6.0.3",
@@ -43,7 +43,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "DreamCommerce\\Tests\\Common\\": "test/src/DreamCommerce/Tests/Common",
+            "DreamCommerce\\Tests\\Compontent\\Common\\": "test/src/DreamCommerce/Tests/Compontent/Common",
             "DreamCommerce\\Tests\\CommonBundle\\": "test/src/DreamCommerce/Tests/CommonBundle",
             "DreamCommerce\\Fixtures\\CommonBundle\\": "test/src/DreamCommerce/Fixtures/CommonBundle/"
         }
@@ -56,7 +56,8 @@
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev",
-            "dev-develop": "1.1-dev"
+            "dev-develop": "1.1-dev",
+            "dev-dev8.2": "2.0-dev"
         }
     }
 }
diff --git a/src/DreamCommerce/Bundle/CommonBundle/DependencyInjection/Configuration.php b/src/DreamCommerce/Bundle/CommonBundle/DependencyInjection/Configuration.php
index d44994b..9a95493 100644
--- a/src/DreamCommerce/Bundle/CommonBundle/DependencyInjection/Configuration.php
+++ b/src/DreamCommerce/Bundle/CommonBundle/DependencyInjection/Configuration.php
@@ -25,15 +25,12 @@ final class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder();
+        $treeBuilder = new TreeBuilder('dream_commerce');
 
-        $rootNode = $treeBuilder
-            ->root('dream_commerce')
-                ->addDefaultsIfNotSet()
+        $rootNode = $treeBuilder->getRootNode()->addDefaultsIfNotSet()
                 ->children();
-        ;
 
         $this->addJmsSection($rootNode);
 
diff --git a/src/DreamCommerce/Bundle/CommonBundle/DependencyInjection/DreamCommerceCommonExtension.php b/src/DreamCommerce/Bundle/CommonBundle/DependencyInjection/DreamCommerceCommonExtension.php
index ad3c331..7f90581 100644
--- a/src/DreamCommerce/Bundle/CommonBundle/DependencyInjection/DreamCommerceCommonExtension.php
+++ b/src/DreamCommerce/Bundle/CommonBundle/DependencyInjection/DreamCommerceCommonExtension.php
@@ -38,7 +38,7 @@ public function load(array $config, ContainerBuilder $container)
         ;
     }
 
-    public function getAlias()
+    public function getAlias(): string
     {
         return self::ALIAS;
     }
diff --git a/src/DreamCommerce/Bundle/CommonBundle/Resources/config/services.xml b/src/DreamCommerce/Bundle/CommonBundle/Resources/config/services.xml
index 0e05638..b7b7237 100644
--- a/src/DreamCommerce/Bundle/CommonBundle/Resources/config/services.xml
+++ b/src/DreamCommerce/Bundle/CommonBundle/Resources/config/services.xml
@@ -8,7 +8,6 @@
         <parameter key="dream_commerce.http_client.class">DreamCommerce\Component\Common\Http\GuzzleClient</parameter>
         <parameter key="dream_commerce.datetime_factory.class">DreamCommerce\Component\Common\Factory\DateTimeFactory</parameter>
         <parameter key="dream_commerce.uri_factory.class">DreamCommerce\Component\Common\Factory\GuzzleUriFactory</parameter>
-        <parameter key="dream_commerce.twig.variable_extension.class">DreamCommerce\Bundle\CommonBundle\Twig\Extension\VariableExtension</parameter>
         <parameter key="dream_commerce.jms.serializer.sylius_constructor.class">DreamCommerce\Component\Common\JMS\Serializer\Construction\SyliusConstructor</parameter>
         <parameter key="dream_commerce.jms.serializer.date_handler.class">DreamCommerce\Component\Common\JMS\Serializer\Handler\DateHandler</parameter>
     </parameters>
@@ -22,10 +21,6 @@
             <argument type="service" id="dream_commerce.guzzle_client" />
         </service>
 
-        <service id="dream_commerce.twig.variable_extension" class="%dream_commerce.twig.variable_extension.class%" public="false">
-            <tag name="twig.extension" />
-        </service>
-
         <service id="dream_commerce.jms.serializer.sylius_constructor" class="%dream_commerce.jms.serializer.sylius_constructor.class%" public="false">
             <argument type="service" id="service_container" />
             <argument type="service" id="sylius.resource_registry" />
diff --git a/src/DreamCommerce/Bundle/CommonBundle/Twig/Extension/VariableExtension.php b/src/DreamCommerce/Bundle/CommonBundle/Twig/Extension/VariableExtension.php
deleted file mode 100644
index 945d593..0000000
--- a/src/DreamCommerce/Bundle/CommonBundle/Twig/Extension/VariableExtension.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/*
- * (c) 2017 DreamCommerce
- *
- * @package DreamCommerce\Component\Common
- * @author Michał Korus <michal.korus@dreamcommerce.com>
- * @link https://www.dreamcommerce.com
- */
-
-declare(strict_types=1);
-
-namespace DreamCommerce\Bundle\CommonBundle\Twig\Extension;
-
-use ReflectionClass;
-use Twig_Extension;
-use Twig_SimpleFunction;
-use Twig_SimpleTest;
-
-class VariableExtension extends Twig_Extension
-{
-    public function getTests()
-    {
-        $tests = array(
-            'instanceof' =>  new Twig_SimpleTest(
-                'instanceof',
-                function ($var, $instance) {
-                    return $var instanceof $instance;
-                }
-            )
-        );
-
-        $methods = array(
-            'object',
-            'array',
-            'bool',
-            'numeric',
-            'scalar'
-        );
-
-        foreach ($methods as $method) {
-            $tests[$method] = new Twig_SimpleTest(
-                $method,
-                function ($var) use ($method) {
-                    return call_user_func('is_' . $method, $var);
-                }
-            );
-        }
-
-        foreach (array( 'int', 'integer' ) as $test) {
-            $tests[$test] = new Twig_SimpleTest(
-                $test,
-                function ($var) {
-                    return is_numeric($var) && (string)(int)$var == (string)$var;
-                }
-            );
-        }
-        $tests['float'] = new Twig_SimpleTest(
-            'float',
-            function ($var) {
-                return is_numeric($var) && (string)(float)$var == (string)$var;
-            }
-        );
-
-        return $tests;
-    }
-
-    public function getFunctions()
-    {
-        return array(
-            'short_class' => new Twig_SimpleFunction(
-                'short_class',
-                function ($object) {
-                    return (new ReflectionClass($object))->getShortName();
-                }
-            ),
-            'class' => new Twig_SimpleFunction(
-                'class',
-                function ($object) {
-                    return (new ReflectionClass($object))->getName();
-                }
-            )
-        );
-    }
-}