diff --git a/composer.json b/composer.json
index 518faae..e7d8c52 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "sequra/magento2-core": "~2.1"
+        "sequra/magento2-core": "~2.2"
     },
     "autoload": {
         "files": [
diff --git a/etc/di.xml b/etc/di.xml
index 534fc3a..983fba0 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -6,18 +6,6 @@
 -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <!-- Payment Method Facade configuration -->
-    <virtualType name="SequraPartpaymentsConfig" type="Sequra\Core\Model\Config">
-        <arguments>
-            <argument name="methodCode" xsi:type="const">\Sequra\Partpayments\Model\Ui\ConfigProvider::CODE</argument>
-        </arguments>
-    </virtualType>
-    <type name="Sequra\Partpayments\Block\Widget\Teaser">
-        <arguments>
-            <argument name="config" xsi:type="object">SequraPartpaymentsConfig</argument>
-        </arguments>
-    </type>
-
     <!-- Payment Method Facade configuration -->
     <virtualType name="SequraPartpaymentsGatewayFacade" type="Magento\Payment\Model\Method\Adapter">
         <arguments>
@@ -31,7 +19,7 @@
     </virtualType>
 
     <!-- Configuration reader -->
-    <virtualType name="SequraPartpaymentsGatewayConfig" type="Magento\Payment\Gateway\Config\Config">
+    <virtualType name="SequraPartpaymentsGatewayConfig" type="Sequra\Core\Model\Config">
         <arguments>
             <argument name="methodCode" xsi:type="const">\Sequra\Partpayments\Model\Ui\ConfigProvider::CODE</argument>
         </arguments>
@@ -50,22 +38,30 @@
         </arguments>
     </virtualType>
 
-    <virtualType name="SequraPartpaymentsCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
-        <arguments>
-            <argument name="config" xsi:type="object">SequraPartpaymentsGatewayConfig</argument>
-        </arguments>
-    </virtualType>
     <virtualType name="SequraPartpaymentsValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
         <arguments>
             <argument name="validators" xsi:type="array">
                 <item name="country" xsi:type="string">SequraPartpaymentsCountryValidator</item>
+                <!--Core validator -->
+                <item name="currency" xsi:type="string">SequraGatewayCurrencyValidator</item>
             </argument>
         </arguments>
     </virtualType>
+    <virtualType name="SequraPartpaymentsCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">SequraPartpaymentsGatewayConfig</argument>
+        </arguments>
+    </virtualType>
 
     <type name="Sequra\Partpayments\Block\Info">
         <arguments>
             <argument name="config" xsi:type="object">SequraPartpaymentsGatewayConfig</argument>
         </arguments>
     </type>
+
+    <type name="Sequra\Partpayments\Block\Widget\Teaser">
+        <arguments>
+            <argument name="config" xsi:type="object">SequraPartpaymentsGatewayConfig</argument>
+        </arguments>
+    </type>
 </config>