diff --git a/Block/Adminhtml/Order/View/BreadApiVersionInfo.php b/Block/Adminhtml/Order/View/BreadApiVersionInfo.php
new file mode 100644
index 00000000..815ec6ec
--- /dev/null
+++ b/Block/Adminhtml/Order/View/BreadApiVersionInfo.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Admin order management block info
+ * 
+ * @since 2.3.0
+ * @author Maritim, Kip
+ */
+
+namespace Bread\BreadCheckout\Block\Adminhtml\Order\View;
+
+class BreadApiVersionInfo extends \Magento\Sales\Block\Adminhtml\Order\View {
+
+    /**
+     * 
+     * @param \Magento\Backend\Block\Widget\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Sales\Model\Config $salesConfig
+     * @param \Magento\Sales\Helper\Reorder $reorderHelper
+     * @param array $data
+     */
+    public function __construct(
+            \Magento\Backend\Block\Widget\Context $context,
+            \Magento\Framework\Registry $registry,
+            \Magento\Sales\Model\Config $salesConfig,
+            \Magento\Sales\Helper\Reorder $reorderHelper,
+            array $data = []
+    ) {
+        $this->_reorderHelper = $reorderHelper;
+        $this->_coreRegistry = $registry;
+        $this->_salesConfig = $salesConfig;
+        parent::__construct($context, $registry, $salesConfig, $reorderHelper, $data);
+    }
+
+}
diff --git a/Helper/Category.php b/Helper/Category.php
index 43ac04dc..6ea2a3d5 100644
--- a/Helper/Category.php
+++ b/Helper/Category.php
@@ -67,7 +67,11 @@ public function useDefaultButtonSizeCategory($store = \Magento\Store\Model\Scope
      */
     public function getBreadCategories($store = \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
     {
-        return explode(",", $this->scopeConfig->getValue(self::XML_CONFIG_SELECT_CATEGORIES, $store));
+        $selectedCategories  =$this->scopeConfig->getValue(self::XML_CONFIG_SELECT_CATEGORIES, $store);
+        if(!is_null($selectedCategories)) {
+            return explode(",", $this->scopeConfig->getValue(self::XML_CONFIG_SELECT_CATEGORIES, $store));
+        }
+        return array();
     }
 
     /**
@@ -105,6 +109,11 @@ public function isEnabledForCategory($category)
         if (!$this->isActive() || !$this->isEnabledOnCAT() || empty($category)) {
             return false;
         }
+        $breadCategories = $this->getBreadCategories();
+        if(count($breadCategories) < 1) {
+            return true;
+        }
+
         return in_array($category->getId(), $this->getBreadCategories());
     }
 }
diff --git a/Helper/Data.php b/Helper/Data.php
index f410417d..e3e86e5a 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -63,6 +63,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper {
     const XML_CONFIG_API_SECRET_KEY = 'payment/breadcheckout/api_secret_key';
     const XML_CONFIG_API_SANDBOX_PUB_KEY = 'payment/breadcheckout/api_sandbox_public_key';
     const XML_CONFIG_API_SANDBOX_SECRET_KEY = 'payment/breadcheckout/api_sandbox_secret_key';
+    const XML_CONFIG_CLASSIC_API_PUB_KEY = 'payment/breadcheckout/classic_api_public_key';
+    const XML_CONFIG_CLASSIC_API_SECRET_KEY = 'payment/breadcheckout/classic_api_secret_key';
+    const XML_CONFIG_CLASSIC_API_SANDBOX_PUB_KEY = 'payment/breadcheckout/classic_api_sandbox_public_key';
+    const XML_CONFIG_CLASSIC_API_SANDBOX_SECRET_KEY = 'payment/breadcheckout/classic_api_sandbox_secret_key';
     const XML_CONFIG_JS_LIB_LOCATION = 'payment/breadcheckout/js_location';
     const XML_CONFIG_BUTTON_ON_PRODUCTS = 'payment/breadcheckout/button_on_products';
     const XML_CONFIG_BUTTON_DESIGN = 'payment/breadcheckout/button_design';
@@ -238,12 +242,25 @@ public function getProductTypeMessage($store = \Magento\Store\Model\ScopeInterfa
      * @param  null $store
      * @return mixed
      */
-    public function getApiPublicKey($storeCode = null, $store = \Magento\Store\Model\ScopeInterface::SCOPE_STORE) {
-        if ($this->scopeConfig->getValue(self::XML_CONFIG_API_MODE, $store)) {
-            return $this->scopeConfig->getValue(self::XML_CONFIG_API_PUB_KEY, $store, $storeCode);
+    public function getApiPublicKey($breadApiVersion = null,  $storeCode = null, $store = \Magento\Store\Model\ScopeInterface::SCOPE_STORE) {
+        $apiVersion = $this->getApiVersion();
+        if(!is_null($breadApiVersion)) {
+            $apiVersion = $breadApiVersion;
+        }
+        if($apiVersion === 'bread_2') {
+            if ($this->scopeConfig->getValue(self::XML_CONFIG_API_MODE, $store)) {
+                return $this->scopeConfig->getValue(self::XML_CONFIG_API_PUB_KEY, $store, $storeCode);
+            } else {
+                return $this->scopeConfig->getValue(self::XML_CONFIG_API_SANDBOX_PUB_KEY, $store, $storeCode);
+            }
         } else {
-            return $this->scopeConfig->getValue(self::XML_CONFIG_API_SANDBOX_PUB_KEY, $store, $storeCode);
+            if ($this->scopeConfig->getValue(self::XML_CONFIG_API_MODE, $store)) {
+                return $this->scopeConfig->getValue(self::XML_CONFIG_CLASSIC_API_PUB_KEY, $store, $storeCode);
+            } else {
+                return $this->scopeConfig->getValue(self::XML_CONFIG_CLASSIC_API_SANDBOX_PUB_KEY, $store, $storeCode);
+            }
         }
+        
     }
 
     /**
@@ -252,15 +269,31 @@ public function getApiPublicKey($storeCode = null, $store = \Magento\Store\Model
      * @param  null $store
      * @return string
      */
-    public function getApiSecretKey($storeCode = null, $store = \Magento\Store\Model\ScopeInterface::SCOPE_STORE) {
-        if ($this->scopeConfig->getValue(self::XML_CONFIG_API_MODE, $store)) {
-            return (string) $this->encryptor->decrypt(
-                            $this->scopeConfig->getValue(self::XML_CONFIG_API_SECRET_KEY, $store, $storeCode)
-            );
+    public function getApiSecretKey($breadApiVersion = null, $storeCode = null, $store = \Magento\Store\Model\ScopeInterface::SCOPE_STORE) {
+        $apiVersion = $this->getApiVersion();
+        if(!is_null($breadApiVersion)) {
+            $apiVersion = $breadApiVersion;
+        }
+        if($apiVersion === 'bread_2') {
+            if ($this->scopeConfig->getValue(self::XML_CONFIG_API_MODE, $store)) {
+                return (string) $this->encryptor->decrypt(
+                                $this->scopeConfig->getValue(self::XML_CONFIG_API_SECRET_KEY, $store, $storeCode)
+                );
+            } else {
+                return (string) $this->encryptor->decrypt(
+                                $this->scopeConfig->getValue(self::XML_CONFIG_API_SANDBOX_SECRET_KEY, $store, $storeCode)
+                );
+            }
         } else {
-            return (string) $this->encryptor->decrypt(
-                            $this->scopeConfig->getValue(self::XML_CONFIG_API_SANDBOX_SECRET_KEY, $store, $storeCode)
-            );
+            if ($this->scopeConfig->getValue(self::XML_CONFIG_API_MODE, $store)) {
+                return (string) $this->encryptor->decrypt(
+                                $this->scopeConfig->getValue(self::XML_CONFIG_CLASSIC_API_SECRET_KEY, $store, $storeCode)
+                );
+            } else {
+                return (string) $this->encryptor->decrypt(
+                                $this->scopeConfig->getValue(self::XML_CONFIG_CLASSIC_API_SANDBOX_SECRET_KEY, $store, $storeCode)
+                );
+            }
         }
     }
 
@@ -307,8 +340,11 @@ public function getJsLibLocation($store = \Magento\Store\Model\ScopeInterface::S
      * @param  null $store
      * @return mixed
      */
-    public function getTransactionApiUrl($storeCode = null, $store = \Magento\Store\Model\ScopeInterface::SCOPE_STORE) {
+    public function getTransactionApiUrl($breadApiVersion = null, $storeCode = null, $store = \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $apiVersion = null) {
         $apiVersion = $this->getApiVersion($storeCode, $store);
+        if(!is_null($breadApiVersion)) {
+            $apiVersion = $breadApiVersion;
+        }
         if($apiVersion === 'bread_2') {
             $tenant = strtoupper($this->getConfigClient($storeCode, $store));
             if ($this->scopeConfig->getValue(self::XML_CONFIG_API_MODE, $store, $storeCode)) {
@@ -1004,8 +1040,9 @@ public function getPlatformApiUri($tenant, $env) {
      * @return string
      */
     public function getApiVersion($storeCode = null, $store = \Magento\Store\Model\ScopeInterface::SCOPE_STORE) {
-        if($this->scopeConfig->getValue(self::XML_CONFIG_API_VERSION, $store, $storeCode)) {
-            return (string) $this->scopeConfig->getValue(self::XML_CONFIG_API_VERSION, $store, $storeCode);
+        $apiVersion = $this->scopeConfig->getValue(self::XML_CONFIG_API_VERSION, $store, $storeCode);
+        if($apiVersion) {
+            return (string) $apiVersion;
         } else {
             return 'bread_2';
         }
diff --git a/Model/Payment/Api/Client.php b/Model/Payment/Api/Client.php
index f856ebd8..7e60e202 100644
--- a/Model/Payment/Api/Client.php
+++ b/Model/Payment/Api/Client.php
@@ -106,15 +106,23 @@ public function setOrder(\Magento\Sales\Model\Order $order)
     public function cancel($breadTransactionId, $amount = 0, $lineItems = [])
     {
         $this->logger->info('Call API Cancel method. Bread trxId: '. $breadTransactionId);
+             
+        $apiVersion = $this->helper->getApiVersion();
+        $payment = $this->order->getPayment();
+        $paymentApiVersion = $payment->getData('bread_api_version');
+        $this->logger->info('Payment API version: '. $paymentApiVersion);
+        if(!is_null($paymentApiVersion) && in_array($paymentApiVersion, ['classic','bread_2'])) {
+            $apiVersion = strtolower($paymentApiVersion);
+        }
+        
         /* Check if already canceled in bread */
-        $transaction = $this->getInfo($breadTransactionId);
+        $transaction = $this->getInfo($breadTransactionId, $apiVersion);
         if (strtoupper($transaction['status']) === self::STATUS_CANCELED || strtoupper($transaction['status']) === 'CANCELLED') {
             $this->logger->info('Transaction is already canceled in Bread. Bread trxId: '. $breadTransactionId);
             return $transaction;
         }
         
-        $apiVersion = $this->helper->getApiVersion();
-
+        
         if ($apiVersion === 'bread_2') {
             $this->logger->info('Bread platform transaction. Bread trxId: '. $breadTransactionId);
             $currency = $transaction['totalAmount']['currency'];
@@ -178,6 +186,12 @@ public function authorize($breadTransactionId, $amount, $merchantOrderId = null)
         $validateAmount = $this->getInfo($breadTransactionId);
         $this->logger->info('Trx: ' . json_encode($validateAmount));
         $apiVersion = $this->helper->getApiVersion();
+        
+        $payment = $this->order->getPayment();
+        $paymentApiVersion = $payment->getData('bread_api_version');
+        if(!is_null($paymentApiVersion) && in_array($paymentApiVersion, ['classic','bread_2'])) {
+            $apiVersion = strtolower($paymentApiVersion);
+        }
 
         // set transaction id so it can be fetched for split payment cancel
         $this->setBreadTransactionId($breadTransactionId);
@@ -229,10 +243,11 @@ public function authorize($breadTransactionId, $amount, $merchantOrderId = null)
                 'orderId' => $merchantOrderId
             ]);
             $data = '{"externalID":"' . $merchantOrderId . '","metadata":{"externalMerchantData":"externalInfo"}}';
+            
             $updateMerchantOrderIdResult = $this->call(
                     $this->getTransactionInfoUrl($breadTransactionId),
                     $data,
-                    \Zend_Http_Client::PUT,
+                    \Zend_Http_Client::PATCH,
                     false
             );
             $this->logger->info('Response: ' . json_encode($updateMerchantOrderIdResult) . 'Bread trxId: '. $breadTransactionId);
@@ -311,6 +326,13 @@ public function settle($breadTransactionId, $amount = null, $currency = null)
     {
         $this->logger->info('Call API settle method. Bread trxId: '. $breadTransactionId);
         $apiVersion = $this->helper->getApiVersion();
+        
+        $payment = $this->order->getPayment();
+        $paymentApiVersion = $payment->getData('bread_api_version');
+        if(!is_null($paymentApiVersion) && in_array($paymentApiVersion, ['classic','bread_2'])) {
+            $apiVersion = strtolower($paymentApiVersion);
+        }
+        
         if ($apiVersion === 'bread_2') {
             $validateAmount = $this->getInfo($breadTransactionId);
             $currency = trim($validateAmount['totalAmount']['currency']);
@@ -358,7 +380,14 @@ public function settle($breadTransactionId, $amount = null, $currency = null)
     public function refund($breadTransactionId, $amount = 0, $lineItems = [], $currency = null)
     {
         $this->logger->info('Call API refund method. Bread trxId: '. $breadTransactionId);
-        $apiVersion = $this->helper->getApiVersion();
+        $apiVersion = $this->helper->getApiVersion();  
+        
+        $payment = $this->order->getPayment();
+        $paymentApiVersion = $payment->getData('bread_api_version');
+        if(!is_null($paymentApiVersion) && in_array($paymentApiVersion, ['classic','bread_2'])) {
+            $apiVersion = strtolower($paymentApiVersion);
+        }
+        
         if ($apiVersion === 'bread_2') {
             $validateAmount = $this->getInfo($breadTransactionId);
             $currency = trim($validateAmount['totalAmount']['currency']);
@@ -397,11 +426,11 @@ public function refund($breadTransactionId, $amount = 0, $lineItems = [], $curre
      * @return mixed
      * @throws \Exception
      */
-    public function getInfo($breadTransactionId)
+    public function getInfo($breadTransactionId, $apiVersion = null)
     {
         $this->logger->info('Call API getInfo method. Bread trxId: '. $breadTransactionId);
         return $this->call(
-            $this->getTransactionInfoUrl($breadTransactionId),
+            $this->getTransactionInfoUrl($breadTransactionId, $apiVersion),
             [],
             \Zend_Http_Client::GET
         );
@@ -433,7 +462,7 @@ public function submitCartData($data)
      */
     public function getAsLowAs($data)
     {
-        $baseUrl = $this->helper->getTransactionApiUrl($this->getStoreId());
+        $baseUrl = $this->helper->getTransactionApiUrl('classic', $this->getStoreId());
         $asLowAsUrl = join('/', [ trim($baseUrl, '/'), 'aslowas' ]);
         return $this->call(
             $asLowAsUrl,
@@ -455,11 +484,21 @@ public function getAsLowAs($data)
      */
     protected function call($url, $data, $method = \Zend_Http_Client::POST, $jsonEncode = true)
     {
+        $this->logger->info('We are at call');
         $storeId = $this->getStoreId();
-        $username   = $this->helper->getApiPublicKey($storeId);
-        $password   = $this->helper->getApiSecretKey($storeId);
         $apiVersion = $this->helper->getApiVersion();
         
+        if(!is_null($this->order)) {
+            $payment = $this->order->getPayment();
+            $paymentApiVersion = $payment->getData('bread_api_version');
+            if (!is_null($paymentApiVersion) && in_array($paymentApiVersion, ['classic', 'bread_2'])) {
+                $apiVersion = strtolower($paymentApiVersion);
+            }
+        }
+        $this->logger->info("API Version :: " . $apiVersion );
+        $username   = $this->helper->getApiPublicKey($apiVersion, $storeId);
+        $password   = $this->helper->getApiSecretKey($apiVersion, $storeId);
+            
         if($apiVersion === 'bread_2') {
             try {
                 $authToken = $this->helper->getAuthToken();
@@ -639,7 +678,7 @@ protected function callBread($url, $authToken, $data, $method = \Zend_Http_Clien
                 curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
             }
 
-            if ($method == \Zend_Http_Client::PUT) {
+            if ($method == \Zend_Http_Client::PUT || $method == \Zend_Http_Client::PATCH) {
                 $authorization = "Authorization: Bearer " . $authToken;
                 curl_setopt($curl, CURLOPT_HTTPHEADER, [
                     'Content-Type: application/json',
@@ -764,7 +803,7 @@ public function sendEmail($cartId, $email, $name)
     public function setShippingDetails($transactionId, $trackingNumber, $carrierName)
     {
         $apiVersion = $this->helper->getApiVersion();
-        $baseUrl = $this->helper->getTransactionApiUrl($this->getStoreId());
+        $baseUrl = $this->helper->getTransactionApiUrl(null, $this->getStoreId());
 
         if ($apiVersion === 'bread_2') {
 
@@ -797,10 +836,13 @@ public function setShippingDetails($transactionId, $trackingNumber, $carrierName
      * @param  $transactionId
      * @return string
      */
-    protected function getTransactionInfoUrl($transactionId)
-    {
+    protected function getTransactionInfoUrl($transactionId, $breadApiVersion = null)
+    {   
         $apiVersion = $this->helper->getApiVersion();
-        $baseUrl = $this->helper->getTransactionApiUrl($this->getStoreId());
+        if(!is_null($breadApiVersion)) {
+            $apiVersion = $breadApiVersion;
+        }
+        $baseUrl = $this->helper->getTransactionApiUrl($apiVersion, $this->getStoreId());
         if ($apiVersion === 'bread_2') {
             return join('/', [trim($baseUrl, '/'), 'transaction', trim($transactionId, '/')]);
         } else {
@@ -816,7 +858,7 @@ protected function getTransactionInfoUrl($transactionId)
      */
     protected function getUpdateTransactionUrl($transactionId)
     {
-        $baseUrl = $this->helper->getTransactionApiUrl($this->getStoreId());
+        $baseUrl = $this->helper->getTransactionApiUrl('classic', $this->getStoreId());
         return join(
             '/',
             [ trim($baseUrl, '/'), 'transactions/actions', trim($transactionId, '/') ]
@@ -830,7 +872,8 @@ protected function getUpdateTransactionUrl($transactionId)
      * @return string
      */
     protected function getAuthTokenUrl() {
-        $baseUrl = $this->helper->getTransactionApiUrl($this->getStoreId());
+        $baseUrl = $this->helper->getTransactionApiUrl('bread_2', $this->getStoreId());
+        //return join('/', [trim($baseUrl, '/'), 'auth/service/authorize']);
         return join('/', [trim($baseUrl, '/'), 'auth/sa/authenticate']);
     }
     
@@ -851,6 +894,7 @@ protected function generateAuthToken($url, $apiKey, $apiSecret) {
         $curl = curl_init($url);
         try {
             curl_setopt($curl, CURLOPT_HEADER, 0);
+            curl_setopt($curl, CURLOPT_USERPWD, $apiKey. ':' . $apiSecret);
             curl_setopt($curl, CURLOPT_TIMEOUT, 30);
             curl_setopt($curl, CURLOPT_POST, 1);
             curl_setopt($curl, CURLOPT_HTTPHEADER, [
@@ -948,7 +992,7 @@ protected function getStoreId()
      * @param type $action
      */
     protected function getUpdateTransactionUrlPlatform($transactionId, $action) {
-        $baseUrl = $this->helper->getTransactionApiUrl($this->getStoreId());
+        $baseUrl = $this->helper->getTransactionApiUrl('bread_2', $this->getStoreId());
         $url = join('/', [trim($baseUrl, '/'), 'transaction', $transactionId, $action]);
         return $url;
     }
diff --git a/Model/System/Config/Source/ApiVersion.php b/Model/System/Config/Source/ApiVersion.php
index 876ec1e0..36cb4cba 100644
--- a/Model/System/Config/Source/ApiVersion.php
+++ b/Model/System/Config/Source/ApiVersion.php
@@ -20,7 +20,7 @@ class ApiVersion implements \Magento\Framework\Option\ArrayInterface {
     public function toOptionArray() {
         return [
             ['value' => 'classic', 'label' => __('Bread Classic')],
-            ['value' => 'bread_2', 'label' => __('Bread 2.0')]
+            ['value' => 'bread_2', 'label' => __('Bread Platform')]
         ];
     }
 
@@ -32,7 +32,7 @@ public function toOptionArray() {
     public function toArray() {
         return [
             'classic' => __('Bread Classic'),
-            'bread_2' => __('Bread 2.0')
+            'bread_2' => __('Bread Platform')
         ];
     }
 
diff --git a/Observer/SaveBreadApiVersionObserver.php b/Observer/SaveBreadApiVersionObserver.php
new file mode 100644
index 00000000..06ad3fa0
--- /dev/null
+++ b/Observer/SaveBreadApiVersionObserver.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Save bread API version for transactions that belong to Bread payment
+ * method
+ * 
+ * @since 2.3.0
+ * @author Maritim, Kip
+ */
+
+namespace Bread\BreadCheckout\Observer;
+
+use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
+
+class SaveBreadApiVersionObserver implements ObserverInterface {
+
+    /**
+     * 
+     * @var type
+     */
+    protected $logger;
+
+    /**
+     * 
+     * @var type
+     */
+    protected $_state;
+
+    /**
+     * @var object 
+     */
+    protected $_quoteRepository;
+    protected $helper;
+
+    /**
+     * 
+     * @param \Bread\BreadCheckout\Helper\Log $logger
+     * @param \Magento\Framework\App\State $state
+     */
+    public function __construct(
+            \Bread\BreadCheckout\Helper\Log $logger,
+            \Magento\Framework\App\State $state,
+            \Magento\Quote\Model\QuoteRepository $quoteRepository,
+            \Bread\BreadCheckout\Helper\Quote $helper
+    ) {
+        $this->logger = $logger;
+        $this->_state = $state;
+        $this->_quoteRepository = $quoteRepository;
+        $this->helper = $helper;
+    }
+
+    /**
+     * 
+     * @param EventObserver $observer
+     */
+    public function execute(EventObserver $observer) {
+
+        if ($this->_state->getAreaCode() != \Magento\Framework\App\Area::AREA_ADMINHTML) {
+            $paymentOrder = $observer->getEvent()->getPayment();
+            $order = $paymentOrder->getOrder();
+            $quote = $this->_quoteRepository->get($order->getQuoteId());
+            $paymentQuote = $quote->getPayment();
+            $method = $paymentQuote->getMethodInstance()->getCode();
+            if ($method === \Bread\BreadCheckout\Model\Ui\ConfigProvider::CODE) {
+                $paymentOrder->setData('bread_api_version', $this->helper->getApiVersion());
+                $paymentQuote->setData('bread_api_version', $this->helper->getApiVersion());
+            }
+        }
+    }
+
+}
diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
new file mode 100644
index 00000000..53ba3267
--- /dev/null
+++ b/Setup/InstallSchema.php
@@ -0,0 +1,51 @@
+<?php 
+
+/**
+ * InstallSchema for v2.0
+ *
+ * @since 2.3.0
+ * @author Maritim, Kip
+ *
+ */
+
+namespace Bread\BreadCheckout\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+class InstallSchema implements InstallSchemaInterface {
+
+    /**
+     *
+     * @param SchemaSetupInterface $setup
+     * @param ModuleContextInterface $context
+     */
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context) {
+
+        $setup->startSetup();
+
+        $setup->getConnection()->addColumn(
+                $setup->getTable('quote_payment'),
+                'bread_api_version',
+                [
+                    'type' => 'text',
+                    'nullable' => true,
+                    'comment' => 'Bread version'
+                ]
+        );
+
+        $setup->getConnection()->addColumn(
+                $setup->getTable('sales_order_payment'),
+                'bread_api_version',
+                [
+                    'type' => 'text',
+                    'nullable' => true,
+                    'comment' => 'Bread version'
+                ]
+        );
+
+        $setup->endSetup();
+    }
+
+}
diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
new file mode 100644
index 00000000..3c8be796
--- /dev/null
+++ b/Setup/UpgradeSchema.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Add bread api_version to quote and order info
+ *
+ * @since 2.3.0
+ * @author Maritim, Kip
+ */
+
+namespace Bread\BreadCheckout\Setup;
+
+use Magento\Framework\Setup\UpgradeSchemaInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+
+class UpgradeSchema implements UpgradeSchemaInterface {
+
+    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context) {
+
+        $setup->startSetup();
+
+        //Extension setup before 2.2.0 did not have the bread_api_version tracking
+        //column againt quote and order object
+        if (version_compare($context->getVersion(), '2.3.0', '<')) {
+            $setup->getConnection()->addColumn(
+                    $setup->getTable('quote_payment'),
+                    'bread_api_version',
+                    [
+                        'type' => 'text',
+                        'nullable' => true,
+                        'comment' => 'Bread version'
+                    ]
+            );
+
+            $setup->getConnection()->addColumn(
+                    $setup->getTable('sales_order_payment'),
+                    'bread_api_version',
+                    [
+                        'type' => 'text',
+                        'nullable' => true,
+                        'comment' => 'Bread version'
+                    ]
+            );
+        }
+
+        $setup->endSetup();
+    }
+
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 36f7f328..3a5f19c0 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "Offers Bread Pay financing and checkout tools for your Magento store",
     "license": "MIT",
     "minimum-stability": "stable",
-    "version": "2.2.1",
+    "version": "2.3.0",
     "require": {
         "php": "~7.0.13||~7.1.0||~7.1.3||~7.2.0||~7.3.0||~7.4.0||~8.0.0||~8.1.0"
     },
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 94c4ada3..b5fc8570 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -32,6 +32,7 @@
 		            <label>Live API Public Key</label>
                     <depends>
                         <field id="api_mode">1</field>
+                        <field id="api_version">bread_2</field>
                     </depends>
                 </field>
                 <field id="api_secret_key" type="obscure" sortOrder="4" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -40,6 +41,7 @@
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <depends>
                         <field id="api_mode">1</field>
+                        <field id="api_version">bread_2</field>
                     </depends>
                 </field>
                 <field id="api_integration_key" type="text" sortOrder="5" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -55,6 +57,7 @@
                     <label>Sandbox API Public Key</label>
                     <depends>
                         <field id="api_mode">0</field>
+                        <field id="api_version">bread_2</field>
                     </depends>
                 </field>
                 <field id="api_sandbox_secret_key" type="obscure" sortOrder="7" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -63,6 +66,7 @@
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <depends>
                         <field id="api_mode">0</field>
+                        <field id="api_version">bread_2</field>
                     </depends>
                 </field>
                 <field id="api_sandbox_integration_key" type="text" sortOrder="8" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -73,44 +77,78 @@
                         <field id="api_version">bread_2</field>
                     </depends>
                 </field>
-                <field id="payment_action" type="select" sortOrder="9" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="classic_api_public_key" type="text" sortOrder="9" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <validate>validate-length maximum-length-60 validate-length minimum-length-20</validate>
+		            <label>Classic Live API Public Key</label>
+                    <depends>
+                        <field id="api_mode">1</field>
+                        <field id="api_version">classic</field>
+                    </depends>
+                </field>
+                <field id="classic_api_secret_key" type="obscure" sortOrder="10" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+		            <validate>validate-length maximum-length-60</validate>
+                    <label>Classic Live API Secret Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="api_mode">1</field>
+                        <field id="api_version">classic</field>
+                    </depends>
+                </field>
+                <field id="classic_api_sandbox_public_key" type="text" sortOrder="11" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <validate>validate-length maximum-length-60 validate-length minimum-length-20</validate>
+                    <label>Classic Sandbox API Public Key</label>
+                    <depends>
+                        <field id="api_mode">0</field>
+                        <field id="api_version">classic</field>
+                    </depends>
+                </field>
+                <field id="classic_api_sandbox_secret_key" type="obscure" sortOrder="12" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <validate>validate-length maximum-length-60</validate>
+                    <label>Classic Sandbox API Secret Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="api_mode">0</field>
+                        <field id="api_version">classic</field>
+                    </depends>
+                </field>
+                <field id="payment_action" type="select" sortOrder="13" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Payment Action</label>
                     <source_model>Bread\BreadCheckout\Model\System\Config\Source\PaymentAction</source_model>
                 </field>
-                <field id="sort_order" type="text" sortOrder="10" translate="label" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="sort_order" type="text" sortOrder="14" translate="label" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sort Order</label>
                     <comment>The Position In the Payment Method List In Checkout</comment>
                     <validate>validate-number</validate>
                 </field>
-                <field id="enabled_on_product_page" type="select" sortOrder="11" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enabled_on_product_page" type="select" sortOrder="15" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enabled on Product Details Page</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
                         <field id="active">1</field>
                     </depends>
                 </field>
-                <field id="enabled_on_cart_page" type="select" sortOrder="12" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enabled_on_cart_page" type="select" sortOrder="16" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enabled on Cart Overview Page</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
                         <field id="active">1</field>
                     </depends>
                 </field>
-                <field id="as_low_as" type="select" sortOrder="13" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="as_low_as" type="select" sortOrder="17" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Show "as low as" pricing to not-logged-in users</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
                         <field id="active">1</field>
                     </depends>
                 </field>
-                <field id="display_as_payment_method" type="select" sortOrder="14" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="display_as_payment_method" type="select" sortOrder="18" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Display as Payment Method on Checkout</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
                         <field id="active">1</field>
                     </depends>
                 </field>
-                <field id="healthcare_mode" type="select" sortOrder="15" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="healthcare_mode" type="select" sortOrder="19" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Healthcare mode</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
@@ -124,7 +162,7 @@
                                 ]]>
                     </comment>
                 </field>
-                <field id="show_splitpay_label" type="select" sortOrder="16" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="show_splitpay_label" type="select" sortOrder="20" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Show Splipay label on checkout title</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
@@ -132,7 +170,7 @@
                         <field id="api_version">classic</field>
                     </depends>
                 </field>
-                <field id="use_default_button_size" type="select" sortOrder="17" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="use_default_button_size" type="select" sortOrder="21" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Use default button size</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
@@ -140,11 +178,11 @@
                         <field id="api_version">classic</field>
                     </depends>
                 </field>
-                <field id="button_on_products" type="select" sortOrder="18" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="button_on_products" type="select" sortOrder="22" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Display as Button on Product Detail Pages When Logged In</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="button_design" type="textarea" sortOrder="19" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="button_design" type="textarea" sortOrder="23" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Bread Button Design</label>
                     <comment>
                         <![CDATA[
@@ -154,7 +192,7 @@
                         ]]>
                     </comment>
                 </field>
-                <field id="title" type="text" sortOrder="20" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="title" type="text" sortOrder="24" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Payment Method Title</label>
                     <comment>
                         <![CDATA[
@@ -164,7 +202,7 @@
                         ]]>
                     </comment>
                 </field>
-                <field id="incomplete_checkout_message" type="textarea" sortOrder="21" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="incomplete_checkout_message" type="textarea" sortOrder="25" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Incomplete Bread Checkout error</label>
                     <comment>
                         <![CDATA[
@@ -174,7 +212,7 @@
                         ]]>
                     </comment>
                 </field>
-                <field id="allowcheckoutpdp" type="select" sortOrder="22" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="allowcheckoutpdp" type="select" sortOrder="26" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Allow Checkout From Bread Pop Up On Product Page</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
@@ -193,7 +231,7 @@
                         <field id="api_version">classic</field>
                     </depends>
                 </field>
-                <field id="allowcheckoutcart" type="select" sortOrder="23" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="allowcheckoutcart" type="select" sortOrder="27" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Allow Checkout From Bread Pop Up On Cart Page</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
@@ -212,25 +250,25 @@
                         <field id="api_version">classic</field>
                     </depends>
                 </field>
-                <field id="enableonminicart" type="select" sortOrder="24" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enableonminicart" type="select" sortOrder="28" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enabled on Minicart page</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
                         <field id="active">1</field>
                     </depends>
                 </field>
-                <field id="allowminicartcheckout" type="select" sortOrder="25" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="allowminicartcheckout" type="select" sortOrder="29" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Allow checkout from mini cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
                         <field id="api_version">classic</field>
                     </depends>
                 </field>
-                <field id="embedded" type="select" sortOrder="26" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="embedded" type="select" sortOrder="30" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable Embedded Checkout</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="split_auto_cancel" type="select" sortOrder="27" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="split_auto_cancel" type="select" sortOrder="31" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Auto-cancel Failed Split-Pay Orders</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
@@ -244,7 +282,7 @@
                         <field id="api_version">classic</field>
                     </depends>    
                 </field>
-                <field id="per_month" type="select" sortOrder="28" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="per_month" type="select" sortOrder="32" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label><![CDATA[Show "As Low As" price]]></label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
@@ -258,7 +296,7 @@
                         <field id="api_version">classic</field>
                     </depends>
                 </field>
-                <field id="product_type_msg" type="textarea" sortOrder="29" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="product_type_msg" type="textarea" sortOrder="33" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Invalid product type message</label>
                     <comment>
                         <![CDATA[
@@ -268,11 +306,11 @@
 				            ]]>
                     </comment>
                 </field>
-                <field id="tenant" type="select" sortOrder="30" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="tenant" type="select" sortOrder="34" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Tenant</label>
                     <source_model>Bread\BreadCheckout\Model\System\Config\Source\Tenant</source_model>
                 </field>
-                <group id="bread_advanced" type="text" sortOrder="31" showInDefault="1" showInWebsite="1" showInStore="1" translate="label">
+                <group id="bread_advanced" type="text" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="1" translate="label">
                     <label>Bread Advanced Settings</label>
                     <field id="targeted_financing" type="select" sortOrder="1" translate="label" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Enable Targeted Financing</label>
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
index d0a5b1a2..aeeab28c 100644
--- a/etc/csp_whitelist.xml
+++ b/etc/csp_whitelist.xml
@@ -3,32 +3,30 @@
     <policies>
         <policy id="script-src">
             <values>
-                <value id="classic-sandbox-base" type="host">https://checkout-sandbox.getbread.com/bread.js</value>
-                <value id="classic-production-base" type="host">https://checkout.getbread.com/bread.js</value>
-                <value id="platform-sandbox-base" type="host">https://connect-preview.breadpayments.com/sdk.js</value>
-                <value id="platform-production-base" type="host">https://connect.breadpayments.com/sdk.js</value>
-                <value id="platform-sandbox-rbc-base" type="host">https://connect-preview.rbc.breadpayments.com/sdk.js</value>
-                <value id="platform-production-rbc-base" type="host">https://connect.rbcpayplan.com/sdk.js</value>
+                <value id="bread_classic_script" type="host">*.getbread.com</value>
+                <value id="bread_platform_script" type="host">*.breadpayments.com</value>
+                <value id="bread_platform_script_ca" type="host">*.rbcpayplan.com</value>
             </values>
         </policy>
         <policy id="connect-src">
             <values>
-                <value id="bread-sandbox" type="host">https://checkout-sandbox.getbread.com</value>
-                <value id="bread-production" type="host">https://checkout.getbread.com</value>
-                <value id="platform-sandbox-rbc" type="host">https://api-preview.rbc.breadpayments.com</value>
-                <value id="platform-production-rbc" type="host">https://api.rbcpayplan.com</value>
-                <value id="platform-sandbox-core" type="host">https://api-preview.platform.breadpayments.com</value>
-                <value id="platform-production-core" type="host">https://api.platform.breadpayments.com</value>
+                <value id="bread_classic_connect" type="host">*.getbread.com</value>
+                <value id="bread_platform_connect" type="host">*.breadpayments.com</value>
+                <value id="bread_platform_connect_ca" type="host">*.rbcpayplan.com</value>
             </values>
         </policy>
         <policy id="frame-src">
             <values>
-                <value id="bread-sandbox" type="host">https://checkout-sandbox.getbread.com</value>
-                <value id="bread-production" type="host">https://checkout.getbread.com</value>
-                <value id="platform-sandbox" type="host">https://api-preview.platform.breadpayments.com</value>
-                <value id="platform-production" type="host">https://api.platform.breadpayments.com</value>
-                <value id="platform-sandbox-rbc" type="host">https://api-preview.rbc.breadpayments.com</value>
-                <value id="platform-production-rbc" type="host">https://api.rbcpayplan.com</value>
+                <value id="bread_classic_frame" type="host">*.getbread.com</value>
+                <value id="bread_platform_frame" type="host">*.breadpayments.com</value>
+                <value id="bread_platform_frame_ca" type="host">*.rbcpayplan.com</value>
+            </values>
+        </policy>
+        <policy id="img-src">
+            <values>
+                <value id="bread_classic_img" type="host">*.getbread.com</value>
+                <value id="bread_platform_img" type="host">*.breadpayments.com</value>
+                <value id="bread_platform_img_ca" type="host">*.rbcpayplan.com</value>
             </values>
         </policy>
     </policies>
diff --git a/etc/events.xml b/etc/events.xml
new file mode 100644
index 00000000..f180c5ab
--- /dev/null
+++ b/etc/events.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="sales_order_payment_save_before">
+        <observer name="save_bread_api_version" instance="Bread\BreadCheckout\Observer\SaveBreadApiVersionObserver"/>
+    </event>
+</config>
diff --git a/etc/module.xml b/etc/module.xml
index 60370da7..f4b85f5a 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Bread_BreadCheckout" setup_version="2.2.1">
+    <module name="Bread_BreadCheckout" setup_version="2.3.0">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Sales"/>
diff --git a/view/adminhtml/layout/sales_order_view.xml b/view/adminhtml/layout/sales_order_view.xml
new file mode 100644
index 00000000..5db3d81e
--- /dev/null
+++ b/view/adminhtml/layout/sales_order_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="payment_additional_info">
+            <block class="Bread\BreadCheckout\Block\Adminhtml\Order\View\BreadApiVersionInfo" name="bread_breadcheckout_api_infos" template="Bread_BreadCheckout::breadcheckout/api_version_info.phtml" />
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/adminhtml/templates/breadcheckout/api_version_info.phtml b/view/adminhtml/templates/breadcheckout/api_version_info.phtml
new file mode 100644
index 00000000..0bcd39d8
--- /dev/null
+++ b/view/adminhtml/templates/breadcheckout/api_version_info.phtml
@@ -0,0 +1,23 @@
+<?php 
+
+/**
+ * Fetch the Bread API version and payment info below
+ */
+
+use \Bread\BreadCheckout\Model\Ui\ConfigProvider;
+
+$payment = $block->getOrder()->getPayment();
+$method = $payment->getMethodInstance()->getCode();
+$version = $payment->getData('bread_api_version');
+if($version === 'bread_2') {
+    $version = 'platform';
+}
+?>
+
+<?php if($method == ConfigProvider::CODE && $version != "") : ?>
+<div class="admin__page-section-item-content">
+    <hr>
+    <strong><?php echo __('Bread gateway version: ') ?></strong>
+    <span class="price"><?= $version; ?></span>                        
+</div>
+<?php endif; ?>
\ No newline at end of file