diff --git a/Application/Controller/Admin/Alert.php b/Application/Controller/Admin/Alert.php
index 97f53bb..11924a4 100644
--- a/Application/Controller/Admin/Alert.php
+++ b/Application/Controller/Admin/Alert.php
@@ -11,7 +11,7 @@
  * PostFinanceCheckout
  *
  * This module allows you to interact with the PostFinanceCheckout payment service using OXID eshop.
- * Using this module requires a PostFinanceCheckout account (https://www.postfinance-checkout.ch/user/signup)
+ * Using this module requires a PostFinanceCheckout account (https://checkout.postfinance.ch/user/signup)
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Application/Model/VoidJob.php b/Application/Model/VoidJob.php
index 41bc86d..12cee05 100644
--- a/Application/Model/VoidJob.php
+++ b/Application/Model/VoidJob.php
@@ -11,7 +11,7 @@
  * PostFinanceCheckout
  *
  * This module allows you to interact with the PostFinanceCheckout payment service using OXID eshop.
- * Using this module requires a PostFinanceCheckout account (https://www.postfinance-checkout.ch/user/signup)
+ * Using this module requires a PostFinanceCheckout account (https://checkout.postfinance.ch/user/signup)
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/Core/Exception/OptimisticLockingException.php b/Core/Exception/OptimisticLockingException.php
index 4f4a893..07ce9cc 100644
--- a/Core/Exception/OptimisticLockingException.php
+++ b/Core/Exception/OptimisticLockingException.php
@@ -13,7 +13,7 @@
  * PostFinanceCheckout
  *
  * This module allows you to interact with the PostFinanceCheckout payment service using OXID eshop.
- * Using this module requires a PostFinanceCheckout account (https://www.postfinance-checkout.ch/user/signup)
+ * Using this module requires a PostFinanceCheckout account (https://checkout.postfinance.ch/user/signup)
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/README.md b/README.md
index def6296..1d0bab7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # OXID 6.0
 
-v1.0.20, 2020-2
+v1.0.21, 2020-4
 
 This repository contains the OXID  PostFinance Checkout payment module that enables the shop to process payments with [PostFinance Checkout](https://www.postfinance.ch/checkout).
 
@@ -13,8 +13,8 @@ This repository contains the OXID  PostFinance Checkout payment module that enab
 
 ## Documentation
 
-* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/oxid-6.0/1.0.20/docs/en/documentation.html)
+* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/oxid-6.0/1.0.21/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/oxid-6.0/blob/1.0.20/LICENSE) for more information.
\ No newline at end of file
+Please see the [license file](https://github.com/pfpayments/oxid-6.0/blob/1.0.21/LICENSE) for more information.
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
index def6296..5bba808 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
-# OXID 6.0
+# OXID 6.X
 
-v1.0.20, 2020-2
+v1.0.21, 2020-4
 
 This repository contains the OXID  PostFinance Checkout payment module that enables the shop to process payments with [PostFinance Checkout](https://www.postfinance.ch/checkout).
 
@@ -8,13 +8,13 @@ This repository contains the OXID  PostFinance Checkout payment module that enab
 
 ## Requirements
 
-* [Oxid](https://www.oxid-esales.com/) 6.0
+* [Oxid](https://www.oxid-esales.com/) 6.0, 6.1, 6.2
 * [PHP](http://php.net/) 5.6 or later
 
 ## Documentation
 
-* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/oxid-6.0/1.0.20/docs/en/documentation.html)
+* [English](https://plugin-documentation.postfinance-checkout.ch/pfpayments/oxid-6.0/1.0.21/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/oxid-6.0/blob/1.0.20/LICENSE) for more information.
\ No newline at end of file
+Please see the [license file](https://github.com/pfpayments/oxid-6.0/blob/1.0.21/LICENSE) for more information.
\ No newline at end of file
diff --git a/docs/en/documentation.html b/docs/en/documentation.html
index 0fd02cc..42bfe55 100644
--- a/docs/en/documentation.html
+++ b/docs/en/documentation.html
@@ -4,24 +4,24 @@
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-		<meta name="keywords" value="PostFinance Checkout, Oxid 6.0, Oxid plugin, Payment, Payment Integration, Documentation"><meta name="description" value="The documentation for the Oxid PostFinance Checkout plugin that enables processing payments with PostFinance Checkout.">		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/oxid-6.0/master/docs/en/documentation.html" />
-		<title>PostFinance Checkout OXID 6.0</title>
+		<meta name="keywords" value="PostFinance Checkout, Oxid 6.0. Oxid 6.1, Oxid 6.2, Oxid plugin, Payment, Payment Integration, Documentation"><meta name="description" value="The documentation for the Oxid PostFinance Checkout plugin that enables processing payments with PostFinance Checkout.">		<link rel="canonical" href="https://plugin-documentation.wallee.com/wallee-payment/oxid-6.0/master/docs/en/documentation.html" />
+		<title>PostFinance Checkout OXID 6.X</title>
 		<link href="assets/base.css" rel="stylesheet" />
 	</head>
 	<body class="documentation">
 		<div class="layout-wrapper">
 							<div class="layout-title">
-					<h1>PostFinance Checkout OXID 6.0</h1>
+					<h1>PostFinance Checkout OXID 6.X</h1>
 <h2>Documentation</h2>				</div>
 										<div class="layout-navigation">
 					<ul class="nav">
 	<li>
-		<a href="https://www.postfinance-checkout.ch/user/signup">
+		<a href="https://checkout.postfinance.ch/user/signup">
 			Sign Up
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/oxid-6.0/releases/tag/1.0.20/">
+		<a href="https://github.com/pfpayments/oxid-6.0/releases/tag/1.0.21/">
 			Source
 		</a>
 	</li>
@@ -48,7 +48,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/pfpayments/oxid-6.0/releases/tag/1.0.20/">Download</a> the extension.</p>
+<p><a href="https://github.com/pfpayments/oxid-6.0/releases/tag/1.0.21/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload them to the root directory of your store using FTP/SSH.</p>
@@ -77,7 +77,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Under Extensions &gt; Modules &gt; PostFinance Checkout, switch to the settings of the activated module and enter the PostFinance Checkout Space ID, User ID and Authentification Key that you can create in the <a href="https://www.postfinance-checkout.ch/space/select?target=/space/assistant" target="_blank">setup assistant</a>. Alternatively, you can manually create an <a href="https://www.postfinance-checkout.ch/en-us/doc/permission-concept#_create_application_users" target="_blank">application user</a>.</p>
+<p>Under Extensions &gt; Modules &gt; PostFinance Checkout, switch to the settings of the activated module and enter the PostFinance Checkout Space ID, User ID and Authentification Key that you can create in the <a href="https://checkout.postfinance.ch/space/select?target=/space/assistant" target="_blank">setup assistant</a>. Alternatively, you can manually create an <a href="https://checkout.postfinance.ch/en-us/doc/permission-concept#_create_application_users" target="_blank">application user</a>.</p>
 <div class="paragraph">
 <p><span class="image"><img src="resource/settings.png" alt="Payment configuration"/></span></p>
 </div>
@@ -147,7 +147,7 @@ <h2>
 <div class="title">Note</div>
 </td>
 <td class="content">
-Additional payment methods are directly added in PostFinance Checkout. This can be done in the <a href="https://www.postfinance-checkout.ch/space/select?target=/space/assistant/payment" target="_blank">setup assistant</a>. Changes are synchronized automatically.
+Additional payment methods are directly added in PostFinance Checkout. This can be done in the <a href="https://checkout.postfinance.ch/space/select?target=/space/assistant/payment" target="_blank">setup assistant</a>. Changes are synchronized automatically.
 </td>
 </tr>
 </table>
@@ -159,7 +159,7 @@ <h2>
 	</div>
 	<div class="section-body">
 					<div class="paragraph">
-<p>If you want to change the payment method description, title, logo, etc you need to do this in the <a href="https://www.postfinance-checkout.ch/space/select?target=/payment/method-configuration/list" target="_blank">payment method configuration</a>. Changes will be synchronized automatically.</p>
+<p>If you want to change the payment method description, title, logo, etc you need to do this in the <a href="https://checkout.postfinance.ch/space/select?target=/payment/method-configuration/list" target="_blank">payment method configuration</a>. Changes will be synchronized automatically.</p>
 </div>					</div>
 </div>			</div>
 </div>	<div class="chapter" id="_state_graph">
@@ -171,7 +171,7 @@ <h1>
 					<div class="paragraph">
 <p>The Payment Process of PostFinance Checkout is <strong>completely standardized for every payment method</strong> you can process. This gives you the ability to simply add
 a payment method or processor without changes inside of your Magento configuration. An overview about the states and the payment processes of PostFinance Checkout
-can be found in the <a href="https://www.postfinance-checkout.ch/en-us/doc/payment/transaction-process" target="_blank">Payment Documentation</a>.</p>
+can be found in the <a href="https://checkout.postfinance.ch/en-us/doc/payment/transaction-process" target="_blank">Payment Documentation</a>.</p>
 </div><div class="paragraph">
 <p>In the following section we provide you an overview about how the PostFinance Checkout states are mapped into the OXID eSales State graph for orders.</p>
 </div>							<div class="section" id="_state_mapping_of_oxid_esales_orders">
@@ -240,7 +240,7 @@ <h2>
 	</div>
 	<div class="section-body">
 					<div class="paragraph">
-<p>You have the possibility for your transactions to have the payment only authorized after the order is placed. Inside the <a href="https://www.postfinance-checkout.ch/space/select?target=/payment/connector-configuration/list" target="_blank">connector configuration</a> you have the option, if the payment method supports it, to define whether the payment should be completed immediately or deferred.</p>
+<p>You have the possibility for your transactions to have the payment only authorized after the order is placed. Inside the <a href="https://checkout.postfinance.ch/space/select?target=/payment/connector-configuration/list" target="_blank">connector configuration</a> you have the option, if the payment method supports it, to define whether the payment should be completed immediately or deferred.</p>
 </div><div class="paragraph">
 <p>In order to capture a transaction, navigate to Administer Orders &#8594; PostFinance Checkout Transactions, open the transaction and click on the <code>Complete</code> button.</p>
 </div><div class="admonitionblock note">
@@ -339,7 +339,7 @@ <h2>
 </li>
 </ul>
 </div><div class="paragraph">
-<p>You can find more information about manual tasks in our <a href="https://www.postfinance-checkout.ch/en-us/doc/manual-tasks" target="_blank">Manual Task Documentation</a>.</p>
+<p>You can find more information about manual tasks in our <a href="https://checkout.postfinance.ch/en-us/doc/manual-tasks" target="_blank">Manual Task Documentation</a>.</p>
 </div>					</div>
 </div>					<div class="section" id="_limitations_of_the_synchronization_between_whitelabelname_and_oxid_esales">
 	<div class="section-title">
@@ -355,7 +355,7 @@ <h2>
 cannot be synchronized it will be sent to the processor but it could be that you do not see it inside
 your OXID eSales backend.</p>
 </div><div class="paragraph">
-<p>You can find more information about Refunds in PostFinance Checkout in our <a href="https://www.postfinance-checkout.ch/en-us/doc/payment/refund" target="_blank">Refund Documentation</a>.</p>
+<p>You can find more information about Refunds in PostFinance Checkout in our <a href="https://checkout.postfinance.ch/en-us/doc/payment/refund" target="_blank">Refund Documentation</a>.</p>
 </div>					</div>
 </div>					<div class="section" id="_tokenization">
 	<div class="section-title">
@@ -365,7 +365,7 @@ <h2>
 	<div class="section-body">
 					<div class="paragraph">
 <p>In case the payment method supports tokenization you can store the payment details of your customer for future purchases.
-In order to use this feature make sure that the <strong>One-Click-Payment Mode</strong> in your <a href="https://www.postfinance-checkout.ch/space/select?target=/payment/method-configuration/list">payment method configuration</a> is set to <code>allow</code> or <code>force</code> storage.</p>
+In order to use this feature make sure that the <strong>One-Click-Payment Mode</strong> in your <a href="https://checkout.postfinance.ch/space/select?target=/payment/method-configuration/list">payment method configuration</a> is set to <code>allow</code> or <code>force</code> storage.</p>
 </div><div class="admonitionblock note">
 <table>
 <tr>
diff --git a/metadata.php b/metadata.php
index df429e7..0a10409 100644
--- a/metadata.php
+++ b/metadata.php
@@ -29,7 +29,7 @@
         'en' => 'PFC PostFinanceCheckout Module'
     ),
     'thumbnail' => 'out/pictures/picture.png',
-    'version' => '1.0.20',
+    'version' => '1.0.21',
     'author' => 'customweb GmbH',
     'url' => 'https://www.customweb.com',
     'email' => 'info@customweb.com',
@@ -141,7 +141,7 @@
 			'name' => 'pfcPostFinanceCheckoutLogLevel',
 			'type' => 'select',
 			'value' => 'Error',
-			'constrains' => 'Error|Info|Debug'
+			'constraints' => 'Error|Info|Debug'
 		),
 		array(
 			'group' => 'pfcPostFinanceCheckoutSpaceViewSettings',
@@ -153,16 +153,5 @@
     'events' => array(
         'onActivate' => Pfc\PostFinanceCheckout\Core\PostFinanceCheckoutModule::class . '::onActivate',
         'onDeactivate' => Pfc\PostFinanceCheckout\Core\PostFinanceCheckoutModule::class . '::onDeactivate'
-    ),
-    'transaction_states' => array(
-        'POSTFINANCECHECKOUT_' . \PostFinanceCheckout\Sdk\Model\TransactionState::DECLINE,
-        'POSTFINANCECHECKOUT_' . \PostFinanceCheckout\Sdk\Model\TransactionState::FULFILL,
-        'POSTFINANCECHECKOUT_' . \PostFinanceCheckout\Sdk\Model\TransactionState::COMPLETED,
-        'POSTFINANCECHECKOUT_' . \PostFinanceCheckout\Sdk\Model\TransactionState::PENDING,
-        'POSTFINANCECHECKOUT_' . \PostFinanceCheckout\Sdk\Model\TransactionState::FAILED,
-        'POSTFINANCECHECKOUT_' . \PostFinanceCheckout\Sdk\Model\TransactionState::AUTHORIZED,
-        'POSTFINANCECHECKOUT_' . \PostFinanceCheckout\Sdk\Model\TransactionState::CONFIRMED,
-        'POSTFINANCECHECKOUT_' . \PostFinanceCheckout\Sdk\Model\TransactionState::VOIDED,
-        'POSTFINANCECHECKOUT_' . \PostFinanceCheckout\Sdk\Model\TransactionState::PROCESSING
     )
 );
\ No newline at end of file