diff --git a/Api/Data/EraseCustomerInterface.php b/Api/Data/EraseCustomerInterface.php
index 94a50e8..0bcd71e 100644
--- a/Api/Data/EraseCustomerInterface.php
+++ b/Api/Data/EraseCustomerInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
@@ -17,29 +17,29 @@ interface EraseCustomerInterface extends ExtensibleDataInterface
     /**#@+
      * Constants for fields keys
      */
-    const ID = 'entity_id';
-    const CUSTOMER_ID = 'customer_id';
-    const SCHEDULED_AT = 'scheduled_at';
-    const STATE = 'state';
-    const STATUS = 'status';
-    const ERASED_AT = 'erased_at';
+    public const ID = 'entity_id';
+    public const CUSTOMER_ID = 'customer_id';
+    public const SCHEDULED_AT = 'scheduled_at';
+    public const STATE = 'state';
+    public const STATUS = 'status';
+    public const ERASED_AT = 'erased_at';
     /**#@-*/
 
     /**#@+
      * Constants for State values
      */
-    const STATE_PENDING = 'pending';
-    const STATE_PROCESSING = 'processing';
-    const STATE_COMPLETE = 'complete';
+    public const STATE_PENDING = 'pending';
+    public const STATE_PROCESSING = 'processing';
+    public const STATE_COMPLETE = 'complete';
     /**#@-*/
 
     /**#@+
      * Constants for Status values
      */
-    const STATUS_READY = 'ready';
-    const STATUS_RUNNING = 'running';
-    const STATUS_FAILED = 'failed';
-    const STATUS_SUCCEED = 'succeed';
+    public const STATUS_READY = 'ready';
+    public const STATUS_RUNNING = 'running';
+    public const STATUS_FAILED = 'failed';
+    public const STATUS_SUCCEED = 'succeed';
     /**#@-*/
 
     /**
@@ -122,7 +122,7 @@ public function setStatus(string $status): EraseCustomerInterface;
      *
      * @return string|null
      */
-    public function getErasedAt();
+    public function getErasedAt(): ?string;
 
     /**
      * Set the erased at
diff --git a/Api/Data/EraseCustomerSearchResultsInterface.php b/Api/Data/EraseCustomerSearchResultsInterface.php
index 57875dc..9278685 100644
--- a/Api/Data/EraseCustomerSearchResultsInterface.php
+++ b/Api/Data/EraseCustomerSearchResultsInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/Api/EraseCustomerManagementInterface.php b/Api/EraseCustomerManagementInterface.php
index 64e4944..836b5d3 100644
--- a/Api/EraseCustomerManagementInterface.php
+++ b/Api/EraseCustomerManagementInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/Api/EraseCustomerRepositoryInterface.php b/Api/EraseCustomerRepositoryInterface.php
index 24dea46..ed0d2c2 100644
--- a/Api/EraseCustomerRepositoryInterface.php
+++ b/Api/EraseCustomerRepositoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/Block/Messages/PrivacyMessagePopup.php b/Block/Messages/PrivacyMessagePopup.php
index d82a27f..d730c01 100644
--- a/Block/Messages/PrivacyMessagePopup.php
+++ b/Block/Messages/PrivacyMessagePopup.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -9,6 +9,7 @@
 
 use Magento\Cms\Block\Block;
 use Magento\Cms\Helper\Page as HelperPage;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
@@ -19,7 +20,7 @@
  */
 class PrivacyMessagePopup extends Template
 {
-    const COOKIE_NAME = 'cookies-policy';
+    public const COOKIE_NAME = 'cookies-policy';
 
     /**
      * @var \Opengento\Gdpr\Model\Config
@@ -36,11 +37,6 @@ class PrivacyMessagePopup extends Template
      */
     private $jsonSerializer;
 
-    /**
-     * @var string
-     */
-    protected $_template = 'Opengento_Gdpr::messages/popup.phtml';
-
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Opengento\Gdpr\Model\Config $config
@@ -53,7 +49,9 @@ public function __construct(
         Config $config,
         HelperPage $helperPage,
         Json $jsonSerializer,
-        array $data = []
+        array $data = [
+            'template' => 'Opengento_Gdpr::messages/popup.phtml',
+        ]
     ) {
         $this->config = $config;
         $this->helperPage = $helperPage;
@@ -64,7 +62,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getJsLayout()
+    public function getJsLayout(): string
     {
         $this->jsLayout['components']['enhanced-privacy-cookie-policy']['config'] = [
             'cookieName' => self::COOKIE_NAME,
@@ -78,7 +76,7 @@ public function getJsLayout()
     /**
      * {@inheritdoc}
      */
-    protected function _toHtml()
+    protected function _toHtml(): string
     {
         return $this->config->isCookieDisclosureEnabled() ? parent::_toHtml() : '';
     }
@@ -87,17 +85,20 @@ protected function _toHtml()
      * Retrieve the cookie disclosure information html
      *
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getCookieDisclosureInformation(): string
     {
         if (!$this->hasData('cookie_disclosure_information')) {
-            $block = $this->getLayout()->createBlock(
-                Block::class,
-                'opengento.gdpr.cookie.disclosure.information',
-                ['data' => ['block_id' => $this->config->getCookieDisclosureInformationBlockId()]]
-            );
-            $this->setData('cookie_disclosure_information', $block->toHtml());
+            try {
+                $block = $this->getLayout()->createBlock(
+                    Block::class,
+                    'opengento.gdpr.cookie.disclosure.information',
+                    ['data' => ['block_id' => $this->config->getCookieDisclosureInformationBlockId()]]
+                );
+                $this->setData('cookie_disclosure_information', $block->toHtml());
+            } catch (LocalizedException $e) {
+                $this->setData('cookie_disclosure_information', '');
+            }
         }
         
         return (string) $this->_getData('cookie_disclosure_information');
diff --git a/Console/Command/EraseCommand.php b/Console/Command/EraseCommand.php
index 6e4786a..bf8e338 100644
--- a/Console/Command/EraseCommand.php
+++ b/Console/Command/EraseCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -25,7 +25,7 @@ final class EraseCommand extends Command
     /**#@+
      * Input Variables Names
      */
-    const INPUT_ARGUMENT_CUSTOMER = 'customer';
+    private const INPUT_ARGUMENT_CUSTOMER = 'customer';
     /**#@-*/
 
     /**
@@ -64,7 +64,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -81,7 +81,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->appState->setAreaCode(Area::AREA_GLOBAL);
         $oldValue = $this->registry->registry('isSecureArea');
diff --git a/Console/Command/ExportCommand.php b/Console/Command/ExportCommand.php
index 8f5cf32..d1f8190 100644
--- a/Console/Command/ExportCommand.php
+++ b/Console/Command/ExportCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -27,8 +27,8 @@ final class ExportCommand extends Command
     /**#@+
      * Input Variables Names
      */
-    const INPUT_ARGUMENT_CUSTOMER = 'customer';
-    const INPUT_OPTION_FILENAME = 'filename';
+    private const INPUT_ARGUMENT_CUSTOMER = 'customer';
+    private const INPUT_OPTION_FILENAME = 'filename';
     /**#@-*/
 
     /**
@@ -67,7 +67,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -91,7 +91,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->appState->setAreaCode(Area::AREA_GLOBAL);
 
diff --git a/Controller/AbstractPrivacy.php b/Controller/AbstractPrivacy.php
index 95b151d..29ea438 100644
--- a/Controller/AbstractPrivacy.php
+++ b/Controller/AbstractPrivacy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -8,14 +8,13 @@
 namespace Opengento\Gdpr\Controller;
 
 use Magento\Customer\Controller\AbstractAccount;
-use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 
 /**
  * Controller AbstractPrivacy
  */
-abstract class AbstractPrivacy extends AbstractAccount implements ActionInterface
+abstract class AbstractPrivacy extends AbstractAccount
 {
     /**
      * Create a result forward to 404
@@ -26,6 +25,7 @@ public function forwardNoRoute(): ResultInterface
     {
         /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
         $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
+
         return $resultForward->forward('no_route');
     }
 }
diff --git a/Controller/Privacy/Delete.php b/Controller/Privacy/Delete.php
index ca2e254..8235c19 100755
--- a/Controller/Privacy/Delete.php
+++ b/Controller/Privacy/Delete.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -9,7 +9,6 @@
 
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Phrase;
 use Opengento\Gdpr\Api\EraseCustomerManagementInterface;
@@ -18,7 +17,7 @@
 /**
  * Action Index Delete
  */
-class Delete extends AbstractPrivacy implements ActionInterface
+class Delete extends AbstractPrivacy
 {
     /**
      * @var \Magento\Customer\Model\Session
@@ -54,7 +53,9 @@ public function execute()
             $this->messageManager->addErrorMessage(new Phrase('Your account is already being removed.'));
             /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-            return $resultRedirect->setPath('customer/privacy/settings');
+            $resultRedirect->setRefererOrBaseUrl();
+
+            return $resultRedirect;
         }
 
         return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
diff --git a/Controller/Privacy/DeletePost.php b/Controller/Privacy/DeletePost.php
index 15c6787..d2d2abc 100755
--- a/Controller/Privacy/DeletePost.php
+++ b/Controller/Privacy/DeletePost.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -10,7 +10,6 @@
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\AlreadyExistsException;
@@ -19,12 +18,11 @@
 use Magento\Framework\Phrase;
 use Opengento\Gdpr\Api\EraseCustomerManagementInterface;
 use Opengento\Gdpr\Controller\AbstractPrivacy;
-use Opengento\Gdpr\Model\Config;
 
 /**
  * Action Delete Delete
  */
-class DeletePost extends AbstractPrivacy implements ActionInterface
+class DeletePost extends AbstractPrivacy
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
@@ -46,33 +44,25 @@ class DeletePost extends AbstractPrivacy implements ActionInterface
      */
     private $eraseCustomerManagement;
 
-    /**
-     * @var \Opengento\Gdpr\Model\Config
-     */
-    private $config;
-
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Customer\Model\AuthenticationInterface $authentication
      * @param \Magento\Customer\Model\Session $session
      * @param \Opengento\Gdpr\Api\EraseCustomerManagementInterface $eraseCustomerManagement
-     * @param \Opengento\Gdpr\Model\Config $config
      */
     public function __construct(
         Context $context,
         Validator $formKeyValidator,
         AuthenticationInterface $authentication,
         Session $session,
-        EraseCustomerManagementInterface $eraseCustomerManagement,
-        Config $config
+        EraseCustomerManagementInterface $eraseCustomerManagement
     ) {
         parent::__construct($context);
         $this->formKeyValidator = $formKeyValidator;
         $this->authentication = $authentication;
         $this->session = $session;
         $this->eraseCustomerManagement = $eraseCustomerManagement;
-        $this->config = $config;
     }
 
     /**
@@ -85,7 +75,7 @@ public function execute()
         $resultRedirect->setPath('customer/privacy/settings');
 
         if (!$this->getRequest()->getParams() || !$this->formKeyValidator->validate($this->getRequest())) {
-            return $resultRedirect->setPath('customer/privacy/delete');
+            return $resultRedirect->setRefererOrBaseUrl();
         }
 
         try {
@@ -95,7 +85,7 @@ public function execute()
             $this->messageManager->addWarningMessage(new Phrase('Your account is being removed.'));
         } catch (InvalidEmailOrPasswordException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
-            $resultRedirect->setPath('customer/privacy/delete');
+            $resultRedirect->setRefererOrBaseUrl();
         } catch (UserLockedException $e) {
             $this->session->logout();
             $this->session->start();
diff --git a/Controller/Privacy/Export.php b/Controller/Privacy/Export.php
index 86591d2..9e893d6 100755
--- a/Controller/Privacy/Export.php
+++ b/Controller/Privacy/Export.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -9,11 +9,10 @@
 
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\Archive\Zip;
+use Magento\Framework\Archive\ArchiveInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Filesystem;
@@ -26,7 +25,7 @@
 /**
  * Action Export Export
  */
-class Export extends AbstractPrivacy implements ActionInterface
+class Export extends AbstractPrivacy
 {
     /**
      * @var \Magento\Framework\App\Response\Http\FileFactory
@@ -34,9 +33,9 @@ class Export extends AbstractPrivacy implements ActionInterface
     private $fileFactory;
 
     /**
-     * @var \Magento\Framework\Archive\Zip
+     * @var \Magento\Framework\Archive\ArchiveInterface
      */
-    private $zip;
+    private $archive;
 
     /**
      * @var \Magento\Framework\Filesystem
@@ -66,7 +65,7 @@ class Export extends AbstractPrivacy implements ActionInterface
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @param \Magento\Framework\Archive\Zip $zip
+     * @param \Magento\Framework\Archive\ArchiveInterface $archive
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Opengento\Gdpr\Model\Config $config
      * @param \Opengento\Gdpr\Service\ExportManagement $exportManagement
@@ -76,7 +75,7 @@ class Export extends AbstractPrivacy implements ActionInterface
     public function __construct(
         Context $context,
         FileFactory $fileFactory,
-        Zip $zip,
+        ArchiveInterface $archive,
         Filesystem $filesystem,
         Config $config,
         ExportManagement $exportManagement,
@@ -84,7 +83,7 @@ public function __construct(
         Session $customerSession
     ) {
         $this->fileFactory = $fileFactory;
-        $this->zip = $zip;
+        $this->archive = $archive;
         $this->filesystem = $filesystem;
         $this->config = $config;
         $this->exportManagement = $exportManagement;
@@ -109,7 +108,9 @@ public function execute()
 
             /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-            return $resultRedirect->setPath('customer/privacy/settings');
+            $resultRedirect->setRefererOrBaseUrl();
+
+            return $resultRedirect;
         }
     }
 
@@ -156,9 +157,9 @@ private function prepareArchive(string $source, string $destination): string
             throw new NotFoundException(new Phrase('File "%1" not found.', [$source]));
         }
 
-        $zipFile = $this->zip->pack($source, $tmpWrite->getAbsolutePath($destination));
+        $archive = $this->archive->pack($source, $tmpWrite->getAbsolutePath($destination));
         $fileDriver->deleteFile($source);
 
-        return $zipFile;
+        return $archive;
     }
 }
diff --git a/Controller/Privacy/Settings.php b/Controller/Privacy/Settings.php
index 3bb88d5..8311c0b 100755
--- a/Controller/Privacy/Settings.php
+++ b/Controller/Privacy/Settings.php
@@ -1,20 +1,19 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
 
 namespace Opengento\Gdpr\Controller\Privacy;
 
-use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Opengento\Gdpr\Controller\AbstractPrivacy;
 
 /**
  * Action Index Settings
  */
-class Settings extends AbstractPrivacy implements ActionInterface
+class Settings extends AbstractPrivacy
 {
     /**
      * {@inheritdoc}
diff --git a/Controller/Privacy/UndoDelete.php b/Controller/Privacy/UndoDelete.php
index ee56631..96e1e93 100755
--- a/Controller/Privacy/UndoDelete.php
+++ b/Controller/Privacy/UndoDelete.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -9,7 +9,6 @@
 
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Phrase;
 use Opengento\Gdpr\Api\EraseCustomerManagementInterface;
@@ -18,7 +17,7 @@
 /**
  * Action Undo Delete
  */
-class UndoDelete extends AbstractPrivacy implements ActionInterface
+class UndoDelete extends AbstractPrivacy
 {
     /**
      * @var \Magento\Customer\Model\Session
diff --git a/Cron/Erasure.php b/Cron/Erasure.php
index 16f8a94..0a97516 100755
--- a/Cron/Erasure.php
+++ b/Cron/Erasure.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -11,6 +11,7 @@
 use Magento\Framework\Api\SearchResultsInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
+use Magento\Framework\Stdlib\DateTime\DateTime;
 use Opengento\Gdpr\Api\Data\EraseCustomerInterface;
 use Opengento\Gdpr\Api\EraseCustomerManagementInterface;
 use Opengento\Gdpr\Api\EraseCustomerRepositoryInterface;
@@ -18,7 +19,7 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Scheduler to clean accounts marked to be deleted or anonymized
+ * Scheduler to clean accounts marked to be deleted or anonymize
  */
 final class Erasure
 {
@@ -52,6 +53,11 @@ final class Erasure
      */
     private $searchCriteriaBuilder;
 
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime 
+     */
+    private $dateTime;
+
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Opengento\Gdpr\Model\Config $config
@@ -59,6 +65,7 @@ final class Erasure
      * @param \Opengento\Gdpr\Api\EraseCustomerManagementInterface $eraseCustomerManagement
      * @param \Opengento\Gdpr\Api\EraseCustomerRepositoryInterface $eraseCustomerRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      */
     public function __construct(
         LoggerInterface $logger,
@@ -66,7 +73,8 @@ public function __construct(
         Registry $registry,
         EraseCustomerManagementInterface $eraseCustomerManagement,
         EraseCustomerRepositoryInterface $eraseCustomerRepository,
-        SearchCriteriaBuilder $searchCriteriaBuilder
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        DateTime $dateTime
     ) {
         $this->logger = $logger;
         $this->config = $config;
@@ -74,6 +82,7 @@ public function __construct(
         $this->eraseCustomerManagement = $eraseCustomerManagement;
         $this->eraseCustomerRepository = $eraseCustomerRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->dateTime = $dateTime;
     }
 
     /**
@@ -81,7 +90,7 @@ public function __construct(
      *
      * @return void
      */
-    public function execute()
+    public function execute(): void
     {
         if ($this->config->isModuleEnabled() && $this->config->isErasureEnabled()) {
             $oldValue = $this->registry->registry('isSecureArea');
@@ -107,7 +116,11 @@ public function execute()
      */
     private function retrieveEraseCustomerList(): SearchResultsInterface
     {
-        $this->searchCriteriaBuilder->addFilter(EraseCustomerInterface::SCHEDULED_AT, new \DateTime(), 'lteq');
+        $this->searchCriteriaBuilder->addFilter(
+            EraseCustomerInterface::SCHEDULED_AT, 
+            $this->dateTime->date(), 
+            'lteq'
+        );
         $this->searchCriteriaBuilder->addFilter(
             EraseCustomerInterface::STATE,
             EraseCustomerInterface::STATE_COMPLETE,
diff --git a/LICENSE b/LICENSE
index 7afd127..4be3f9d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 OpenGento
+Copyright (c) OpenGento
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/Model/Archive/Zip.php b/Model/Archive/Zip.php
new file mode 100644
index 0000000..bb57500
--- /dev/null
+++ b/Model/Archive/Zip.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © OpenGento, All rights reserved.
+ * See LICENSE bundled with this library for license details.
+ */
+declare(strict_types=1);
+
+namespace Opengento\Gdpr\Model\Archive;
+
+use Magento\Framework\Archive\ArchiveInterface;
+use Magento\Framework\Archive\Zip as ArchiveZip;
+use Magento\Framework\Filesystem;
+
+/**
+ * Zip compressed file archive with local file name.
+ * @api
+ */
+class Zip implements ArchiveInterface
+{
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Framework\Archive\Zip
+     */
+    private $zip;
+
+    /**
+     * @param \Magento\Framework\Filesystem $filesystem
+     * @param \Magento\Framework\Archive\Zip $zip
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        ArchiveZip $zip
+    ) {
+        $this->filesystem = $filesystem;
+        $this->zip = $zip;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function pack($source, $destination): string
+    {
+        $directoryRead = $this->filesystem->getDirectoryReadByPath($source);
+
+        $zip = new \ZipArchive();
+        $zip->open($destination, \ZipArchive::CREATE);
+        $zip->addFile($source, $directoryRead->isDirectory($source) ? '' : \basename($source));
+        $zip->close();
+
+        return $destination;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unpack($source, $destination): string
+    {
+        return $this->zip->unpack($source, $destination);
+    }
+}
diff --git a/Model/Config.php b/Model/Config.php
index 5859692..3f579c8 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -18,23 +18,23 @@ final class Config
     /**#@+
      * Scope Config: Data Settings Paths
      */
-    const CONFIG_PATH_GENERAL_ENABLED = 'gdpr/general/enabled';
-    const CONFIG_PATH_GENERAL_INFORMATION_PAGE = 'gdpr/general/page_id';
-    const CONFIG_PATH_GENERAL_INFORMATION_BLOCK = 'gdpr/general/block_id';
-    const CONFIG_PATH_ERASURE_ENABLED = 'gdpr/erasure/enabled';
-    const CONFIG_PATH_ERASURE_STRATEGY = 'gdpr/erasure/strategy';
-    const CONFIG_PATH_ERASURE_TIME_LAPSE = 'gdpr/erasure/time_lapse';
-    const CONFIG_PATH_ERASURE_INFORMATION_BLOCK = 'gdpr/erasure/block_id';
-    const CONFIG_PATH_ERASURE_REMOVE_CUSTOMER = 'gdpr/erasure/remove_customer';
-    const CONFIG_PATH_ERASURE_STRATEGY_COMPONENTS = 'gdpr/erasure/components';
-    const CONFIG_PATH_ANONYMIZE_INFORMATION_BLOCK = 'gdpr/anonymize/block_id';
-    const CONFIG_PATH_EXPORT_ENABLED = 'gdpr/export/enabled';
-    const CONFIG_PATH_EXPORT_INFORMATION_BLOCK = 'gdpr/export/block_id';
-    const CONFIG_PATH_EXPORT_RENDERER = 'gdpr/export/renderer';
-    const CONFIG_PATH_EXPORT_CUSTOMER_ATTRIBUTES = 'gdpr/export/customer_attributes';
-    const CONFIG_PATH_EXPORT_CUSTOMER_ADDRESS_ATTRIBUTES = 'gdpr/export/customer_address_attributes';
-    const CONFIG_PATH_COOKIE_DISCLOSURE_ENABLED = 'gdpr/cookie/enabled';
-    const CONFIG_PATH_COOKIE_INFORMATION_BLOCK = 'gdpr/cookie/block_id';
+    public const CONFIG_PATH_GENERAL_ENABLED = 'gdpr/general/enabled';
+    public const CONFIG_PATH_GENERAL_INFORMATION_PAGE = 'gdpr/general/page_id';
+    public const CONFIG_PATH_GENERAL_INFORMATION_BLOCK = 'gdpr/general/block_id';
+    public const CONFIG_PATH_ERASURE_ENABLED = 'gdpr/erasure/enabled';
+    public const CONFIG_PATH_ERASURE_STRATEGY = 'gdpr/erasure/strategy';
+    public const CONFIG_PATH_ERASURE_TIME_LAPSE = 'gdpr/erasure/time_lapse';
+    public const CONFIG_PATH_ERASURE_INFORMATION_BLOCK = 'gdpr/erasure/block_id';
+    public const CONFIG_PATH_ERASURE_REMOVE_CUSTOMER = 'gdpr/erasure/remove_customer';
+    public const CONFIG_PATH_ERASURE_STRATEGY_COMPONENTS = 'gdpr/erasure/components';
+    public const CONFIG_PATH_ANONYMIZE_INFORMATION_BLOCK = 'gdpr/anonymize/block_id';
+    public const CONFIG_PATH_EXPORT_ENABLED = 'gdpr/export/enabled';
+    public const CONFIG_PATH_EXPORT_INFORMATION_BLOCK = 'gdpr/export/block_id';
+    public const CONFIG_PATH_EXPORT_RENDERER = 'gdpr/export/renderer';
+    public const CONFIG_PATH_EXPORT_CUSTOMER_ATTRIBUTES = 'gdpr/export/customer_attributes';
+    public const CONFIG_PATH_EXPORT_CUSTOMER_ADDRESS_ATTRIBUTES = 'gdpr/export/customer_address_attributes';
+    public const CONFIG_PATH_COOKIE_DISCLOSURE_ENABLED = 'gdpr/cookie/enabled';
+    public const CONFIG_PATH_COOKIE_INFORMATION_BLOCK = 'gdpr/cookie/block_id';
     /**#@-*/
 
     /**
diff --git a/Model/Config/ErasureComponentStrategy.php b/Model/Config/ErasureComponentStrategy.php
index 66baa9e..d915640 100644
--- a/Model/Config/ErasureComponentStrategy.php
+++ b/Model/Config/ErasureComponentStrategy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -55,7 +55,7 @@ public function __construct(
     public function getComponentStrategy(string $component): string
     {
         foreach ($this->componentsStrategies as $strategy => $componentsStrategy) {
-            if (\in_array($component, $componentsStrategy)) {
+            if (\in_array($component, $componentsStrategy, true)) {
                 return $strategy;
             }
         }
@@ -124,7 +124,7 @@ private function loadComponentsStrategies(): array
      * @param string[] $components
      * @return void
      */
-    private function initComponentsStrategies(array $components)
+    private function initComponentsStrategies(array $components): void
     {
         $this->componentsStrategies = [
             ErasureStrategy::STRATEGY_ANONYMIZE => [],
@@ -164,9 +164,9 @@ private function retrieveProcessorNames(string $processorPool): array
         $typePreference = $this->objectManagerConfig->getPreference($processorPool);
         $arguments = $this->objectManagerConfig->getArguments($typePreference);
 
+        // Workaround for compiled mode
         if (isset($arguments['array'])) {
-            // Workaround for compiled mode.
-            $processors = isset($arguments['array']['_v_']) ? $arguments['array']['_v_'] : $arguments['array'];
+            $processors = $arguments['array']['_v_'] ?? $arguments['array'];
         }
 
         return $processors;
diff --git a/Model/Config/Source/EraseStrategy.php b/Model/Config/Source/EraseStrategy.php
index fbb43ab..5508974 100644
--- a/Model/Config/Source/EraseStrategy.php
+++ b/Model/Config/Source/EraseStrategy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -19,7 +19,7 @@ class EraseStrategy implements OptionSourceInterface
     /**
      * {@inheritdoc}
      */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         return [
             [
diff --git a/Model/Config/Source/ErasureComponents.php b/Model/Config/Source/ErasureComponents.php
index 825e741..e8b9539 100644
--- a/Model/Config/Source/ErasureComponents.php
+++ b/Model/Config/Source/ErasureComponents.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -22,7 +22,7 @@ class ErasureComponents implements OptionSourceInterface
     private $componentStrategy;
 
     /**
-     * @var string[]
+     * @var array
      */
     private $options;
 
@@ -38,7 +38,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         if (!$this->options) {
             $componentNames = \array_intersect(
diff --git a/Model/Config/Source/ExportRenderer.php b/Model/Config/Source/ExportRenderer.php
index e6db9ba..05bc550 100644
--- a/Model/Config/Source/ExportRenderer.php
+++ b/Model/Config/Source/ExportRenderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -38,7 +38,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         if (!$this->options) {
             foreach ($this->retrieveRenderers() as $rendererName => $renderer) {
@@ -60,9 +60,9 @@ private function retrieveRenderers(): array
         $typePreference = $this->objectManagerConfig->getPreference('Opengento\Gdpr\Service\Export\RendererPool');
         $arguments = $this->objectManagerConfig->getArguments($typePreference);
 
+        // Workaround for compiled mode
         if (isset($arguments['array'])) {
-            // Workaround for compiled mode.
-            $processors = isset($arguments['array']['_v_']) ? $arguments['array']['_v_'] : $arguments['array'];
+            $processors = $arguments['array']['_v_'] ?? $arguments['array'];
         }
 
         return $processors;
diff --git a/Model/Config/Source/VirtualCustomerAttributes.php b/Model/Config/Source/VirtualCustomerAttributes.php
index 61645c6..b81cfc1 100644
--- a/Model/Config/Source/VirtualCustomerAttributes.php
+++ b/Model/Config/Source/VirtualCustomerAttributes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -41,7 +41,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function toOptionArray()
+    public function toOptionArray(): array
     {
         return $this->options;
     }
diff --git a/Model/EraseCustomer.php b/Model/EraseCustomer.php
index b57fc19..371ae79 100755
--- a/Model/EraseCustomer.php
+++ b/Model/EraseCustomer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -19,7 +19,7 @@ final class EraseCustomer extends AbstractExtensibleModel implements EraseCustom
     /**
      * {@inheritdoc}
      */
-    protected function _construct()
+    protected function _construct(): void
     {
         $this->_init(EraseCustomerResource::class);
     }
diff --git a/Model/EraseCustomerManagement.php b/Model/EraseCustomerManagement.php
index 1ea9299..3a0e173 100644
--- a/Model/EraseCustomerManagement.php
+++ b/Model/EraseCustomerManagement.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Model/EraseCustomerRepository.php b/Model/EraseCustomerRepository.php
index 2e7fed5..606b261 100644
--- a/Model/EraseCustomerRepository.php
+++ b/Model/EraseCustomerRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -26,13 +26,6 @@
  */
 final class EraseCustomerRepository implements EraseCustomerRepositoryInterface
 {
-    /**#@+
-     * Constants for register keys
-     */
-    const REGISTER_KEY = EraseCustomerInterface::class;
-    const REGISTER_KEY_MIRROR = EraseCustomerInterface::class . '_customer';
-    /**#@-*/
-
     /**
      * @var \Opengento\Gdpr\Model\ResourceModel\EraseCustomer
      */
@@ -96,11 +89,12 @@ public function save(EraseCustomerInterface $entity): EraseCustomerInterface
     {
         try {
             $this->eraseCustomerResource->save($entity);
+            $entity = $this->getById($entity->getEntityId(), true);
         } catch (\Exception $e) {
             throw new CouldNotSaveException(new Phrase('Could not save the entity.'), $e);
         }
 
-        return $this->getById($entity->getEntityId(), true);
+        return $entity;
     }
 
     /**
@@ -108,7 +102,7 @@ public function save(EraseCustomerInterface $entity): EraseCustomerInterface
      */
     public function getById(int $entityId, bool $forceReload = false): EraseCustomerInterface
     {
-        if (!isset($this->instances[$entityId]) || $forceReload) {
+        if ($forceReload || !isset($this->instances[$entityId])) {
             /** @var \Opengento\Gdpr\Api\Data\EraseCustomerInterface $entity */
             $entity = $this->eraseCustomerFactory->create();
             $this->eraseCustomerResource->load($entity, $entityId, EraseCustomerInterface::ID);
@@ -129,7 +123,7 @@ public function getById(int $entityId, bool $forceReload = false): EraseCustomer
      */
     public function getByCustomerId(int $entityId, bool $forceReload = false): EraseCustomerInterface
     {
-        if (!isset($this->instancesByCustomer[$entityId]) || $forceReload) {
+        if ($forceReload || !isset($this->instancesByCustomer[$entityId])) {
             /** @var \Opengento\Gdpr\Api\Data\EraseCustomerInterface $entity */
             $entity = $this->eraseCustomerFactory->create();
             $this->eraseCustomerResource->load($entity, $entityId, EraseCustomerInterface::CUSTOMER_ID);
diff --git a/Model/ResourceModel/EraseCustomer.php b/Model/ResourceModel/EraseCustomer.php
index 30380ee..ce26cde 100755
--- a/Model/ResourceModel/EraseCustomer.php
+++ b/Model/ResourceModel/EraseCustomer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -15,12 +15,12 @@
  */
 final class EraseCustomer extends AbstractDb
 {
-    const TABLE = 'opengento_gdpr_erase_customer';
+    public const TABLE = 'opengento_gdpr_erase_customer';
 
     /**
      * {@inheritdoc}
      */
-    protected function _construct()
+    protected function _construct(): void
     {
         $this->_init(self::TABLE, EraseCustomerInterface::ID);
     }
diff --git a/Model/ResourceModel/EraseCustomer/Collection.php b/Model/ResourceModel/EraseCustomer/Collection.php
index ebb25a1..295d282 100755
--- a/Model/ResourceModel/EraseCustomer/Collection.php
+++ b/Model/ResourceModel/EraseCustomer/Collection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -17,16 +17,12 @@
  */
 class Collection extends AbstractCollection
 {
-    /**
-     * @var string
-     */
-    protected $_idFieldName = EraseCustomerInterface::ID;
-
     /**
      * {@inheritdoc}
      */
-    protected function _construct()
+    protected function _construct(): void
     {
         $this->_init(EraseCustomer::class, EraseCustomerResourceModel::class);
+        $this->_setIdFieldName(EraseCustomerInterface::ID);
     }
 }
diff --git a/Plugin/Controller/DeleteActionPlugin.php b/Plugin/Controller/DeleteActionPlugin.php
index bbfbf39..59454a1 100644
--- a/Plugin/Controller/DeleteActionPlugin.php
+++ b/Plugin/Controller/DeleteActionPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Plugin/Controller/PrivacyActionPlugin.php b/Plugin/Controller/PrivacyActionPlugin.php
index 9016d48..e5cc872 100644
--- a/Plugin/Controller/PrivacyActionPlugin.php
+++ b/Plugin/Controller/PrivacyActionPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/README.md b/README.md
index 1703cef..06c67c2 100755
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ This extension allows customers to delete, anonymize, and export their personal
 
 Magento 2 Open Source or Commerce edition is required.
 
+The Version `3.x` is compliant with Magento `2.3.x`.  
 The Version `2.x` is compliant with Magento `2.2.x`.  
 The Version `1.x` is compliant with Magento `2.1.x`.
 
diff --git a/Service/Anonymize/AccountBlocker.php b/Service/Anonymize/AccountBlocker.php
index eb586c0..e441d97 100644
--- a/Service/Anonymize/AccountBlocker.php
+++ b/Service/Anonymize/AccountBlocker.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -15,7 +15,6 @@
 use Magento\Framework\Math\Random;
 use Magento\Framework\Session\Config;
 use Magento\Framework\Session\SaveHandlerInterface;
-use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Store\Model\ScopeInterface;
 
@@ -29,11 +28,6 @@ final class AccountBlocker
      */
     private $customerRegistry;
 
-    /**
-     * @var \Magento\Framework\Session\SessionManagerInterface
-     */
-    private $sessionManager;
-
     /**
      * @var \Magento\Framework\Session\SaveHandlerInterface
      */
@@ -67,7 +61,6 @@ final class AccountBlocker
     /**
      * @param \Magento\Customer\Model\CustomerRegistry $customerRegistry
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
-     * @param \Magento\Framework\Session\SessionManagerInterface $sessionManager
      * @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
      * @param \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory $visitorCollectionFactory
      * @param \Magento\Framework\Intl\DateTimeFactory $dateTimeFactory
@@ -77,7 +70,6 @@ final class AccountBlocker
     public function __construct(
         CustomerRegistry $customerRegistry,
         EncryptorInterface $encryptor,
-        SessionManagerInterface $sessionManager,
         SaveHandlerInterface $saveHandler,
         VisitorCollectionFactory $visitorCollectionFactory,
         DateTimeFactory $dateTimeFactory,
@@ -85,7 +77,6 @@ public function __construct(
         ScopeConfigInterface $scopeConfig
     ) {
         $this->customerRegistry = $customerRegistry;
-        $this->sessionManager = $sessionManager;
         $this->saveHandler = $saveHandler;
         $this->visitorCollectionFactory = $visitorCollectionFactory;
         $this->encryptor = $encryptor;
@@ -137,14 +128,12 @@ private function closeSessions(int $customerId): bool
 
         /** @var \Magento\Customer\Model\ResourceModel\Visitor\Collection $visitorCollection */
         $visitorCollection = $this->visitorCollectionFactory->create();
-        $visitorCollection->addFieldToFilter('customer_id', $customerId);
+        $visitorCollection->addFieldToFilter('customer_id', ['eq' => $customerId]);
         $visitorCollection->addFieldToFilter('last_visit_at', ['from' => $time->format(DateTime::DATETIME_PHP_FORMAT)]);
 
         /** @var \Magento\Customer\Model\Visitor $visitor */
         foreach ($visitorCollection->getItems() as $visitor) {
-            $this->sessionManager->start();
             $this->saveHandler->destroy($visitor->getData('session_id'));
-            $this->sessionManager->writeClose();
         }
 
         return true;
diff --git a/Service/Anonymize/AnonymizeTool.php b/Service/Anonymize/AnonymizeTool.php
index 26f13d9..8e325e4 100644
--- a/Service/Anonymize/AnonymizeTool.php
+++ b/Service/Anonymize/AnonymizeTool.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Anonymize/Processor/CustomerAddressDataProcessor.php b/Service/Anonymize/Processor/CustomerAddressDataProcessor.php
index 13b33fa..04eccc2 100644
--- a/Service/Anonymize/Processor/CustomerAddressDataProcessor.php
+++ b/Service/Anonymize/Processor/CustomerAddressDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Anonymize/Processor/CustomerDataProcessor.php b/Service/Anonymize/Processor/CustomerDataProcessor.php
index 8565707..18a3398 100644
--- a/Service/Anonymize/Processor/CustomerDataProcessor.php
+++ b/Service/Anonymize/Processor/CustomerDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -101,7 +101,7 @@ public function execute(int $customerId): bool
             $customer->setEmail(
                 $this->anonymizeTool->anonymousEmail((string) $customer->getStoreId(), (string) $customerId)
             );
-            $customer->setTaxvat(null);
+            $customer->setTaxvat('');
 
             $this->accountBlocker->invalid($customerId);
 
diff --git a/Service/Anonymize/Processor/OrderDataProcessor.php b/Service/Anonymize/Processor/OrderDataProcessor.php
index 3fa5640..def7059 100644
--- a/Service/Anonymize/Processor/OrderDataProcessor.php
+++ b/Service/Anonymize/Processor/OrderDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -60,7 +60,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute(int $customerId): bool
     {
diff --git a/Service/Anonymize/Processor/QuoteDataProcessor.php b/Service/Anonymize/Processor/QuoteDataProcessor.php
index 9ca9029..4feadff 100644
--- a/Service/Anonymize/Processor/QuoteDataProcessor.php
+++ b/Service/Anonymize/Processor/QuoteDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -78,19 +78,17 @@ public function execute(int $customerId): bool
 
             /** @var \Magento\Quote\Api\Data\AddressInterface $quoteAddress */
             foreach ([$quote->getBillingAddress(), $quote->getShippingAddress()] as $quoteAddress) {
-                if ($quoteAddress) {
-                    $quoteAddress->setFirstname($anonymousValue);
-                    $quoteAddress->setMiddlename($anonymousValue);
-                    $quoteAddress->setLastname($anonymousValue);
-                    $quoteAddress->setPostcode($this->anonymizeTool->randomValue(5, Random::CHARS_DIGITS));
-                    $quoteAddress->setCity($anonymousValue);
-                    $quoteAddress->setStreet([$anonymousValue]);
-                    $quoteAddress->setEmail($this->anonymizeTool->anonymousEmail());
-                    $quoteAddress->setTelephone($this->anonymizeTool->anonymousPhone());
+                $quoteAddress->setFirstname($anonymousValue);
+                $quoteAddress->setMiddlename($anonymousValue);
+                $quoteAddress->setLastname($anonymousValue);
+                $quoteAddress->setPostcode($this->anonymizeTool->randomValue(5, Random::CHARS_DIGITS));
+                $quoteAddress->setCity($anonymousValue);
+                $quoteAddress->setStreet([$anonymousValue]);
+                $quoteAddress->setEmail($this->anonymizeTool->anonymousEmail());
+                $quoteAddress->setTelephone($this->anonymizeTool->anonymousPhone());
 
-                    /** @var \Magento\Quote\Model\Quote\Address $quoteAddress */
-                    $this->quoteAddressResourceModel->save($quoteAddress);
-                }
+                /** @var \Magento\Quote\Model\Quote\Address $quoteAddress */
+                $this->quoteAddressResourceModel->save($quoteAddress);
             }
         }
 
diff --git a/Service/Anonymize/Processor/SubscriberDataProcessor.php b/Service/Anonymize/Processor/SubscriberDataProcessor.php
index e809111..1b20963 100644
--- a/Service/Anonymize/Processor/SubscriberDataProcessor.php
+++ b/Service/Anonymize/Processor/SubscriberDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -53,6 +53,7 @@ public function __construct(
      */
     public function execute(int $customerId): bool
     {
+        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
         $subscriber = $this->subscriberFactory->create();
         $subscriber->loadByCustomerId($customerId);
         $subscriber->setEmail($this->anonymizeTool->anonymousEmail());
diff --git a/Service/Anonymize/ProcessorInterface.php b/Service/Anonymize/ProcessorInterface.php
index a50d935..d1bd2ca 100644
--- a/Service/Anonymize/ProcessorInterface.php
+++ b/Service/Anonymize/ProcessorInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/Service/AnonymizeManagement.php b/Service/AnonymizeManagement.php
index 6fdab6e..20f2758 100644
--- a/Service/AnonymizeManagement.php
+++ b/Service/AnonymizeManagement.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Delete/Processor/CustomerAddressDataProcessor.php b/Service/Delete/Processor/CustomerAddressDataProcessor.php
index c48223d..6a6a5a5 100644
--- a/Service/Delete/Processor/CustomerAddressDataProcessor.php
+++ b/Service/Delete/Processor/CustomerAddressDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Delete/Processor/CustomerDataProcessor.php b/Service/Delete/Processor/CustomerDataProcessor.php
index 42b4fb7..737d239 100644
--- a/Service/Delete/Processor/CustomerDataProcessor.php
+++ b/Service/Delete/Processor/CustomerDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -9,7 +9,6 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Opengento\Gdpr\Model\Config;
 use Opengento\Gdpr\Service\Delete\ProcessorInterface;
 
 /**
@@ -22,21 +21,13 @@ final class CustomerDataProcessor implements ProcessorInterface
      */
     private $customerRepository;
 
-    /**
-     * @var \Opengento\Gdpr\Model\Config
-     */
-    private $config;
-
     /**
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-     * @param \Opengento\Gdpr\Model\Config $config
      */
     public function __construct(
-        CustomerRepositoryInterface $customerRepository,
-        Config $config
+        CustomerRepositoryInterface $customerRepository
     ) {
         $this->customerRepository = $customerRepository;
-        $this->config = $config;
     }
 
     /**
diff --git a/Service/Delete/Processor/OrderDataProcessor.php b/Service/Delete/Processor/OrderDataProcessor.php
index 4cc5fbe..6e41b87 100644
--- a/Service/Delete/Processor/OrderDataProcessor.php
+++ b/Service/Delete/Processor/OrderDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -9,7 +9,6 @@
 
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Model\Order\AddressRepository;
 use Magento\Sales\Model\OrderRepository;
 use Opengento\Gdpr\Service\Delete\ProcessorInterface;
 
@@ -23,11 +22,6 @@ final class OrderDataProcessor implements ProcessorInterface
      */
     private $orderRepository;
 
-    /**
-     * @var \Magento\Sales\Model\Order\AddressRepository
-     */
-    private $orderAddressRepository;
-
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
      */
@@ -35,16 +29,13 @@ final class OrderDataProcessor implements ProcessorInterface
 
     /**
      * @param \Magento\Sales\Model\OrderRepository $orderRepository
-     * @param \Magento\Sales\Model\Order\AddressRepository $orderAddressRepository
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      */
     public function __construct(
         OrderRepository $orderRepository,
-        AddressRepository $orderAddressRepository,
         SearchCriteriaBuilder $searchCriteriaBuilder
     ) {
         $this->orderRepository = $orderRepository;
-        $this->orderAddressRepository = $orderAddressRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
     }
 
diff --git a/Service/Delete/Processor/QuoteDataProcessor.php b/Service/Delete/Processor/QuoteDataProcessor.php
index 9e501d6..b0f07c4 100644
--- a/Service/Delete/Processor/QuoteDataProcessor.php
+++ b/Service/Delete/Processor/QuoteDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Delete/Processor/SubscriberDataProcessor.php b/Service/Delete/Processor/SubscriberDataProcessor.php
index eff7011..ff20375 100644
--- a/Service/Delete/Processor/SubscriberDataProcessor.php
+++ b/Service/Delete/Processor/SubscriberDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Delete/ProcessorInterface.php b/Service/Delete/ProcessorInterface.php
index d97bbfb..8a45da0 100644
--- a/Service/Delete/ProcessorInterface.php
+++ b/Service/Delete/ProcessorInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/Service/DeleteManagement.php b/Service/DeleteManagement.php
index c80abfb..ec604b9 100644
--- a/Service/DeleteManagement.php
+++ b/Service/DeleteManagement.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/ErasureStrategy.php b/Service/ErasureStrategy.php
index fbc69c5..2215f21 100644
--- a/Service/ErasureStrategy.php
+++ b/Service/ErasureStrategy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -18,8 +18,8 @@ final class ErasureStrategy
     /**#@+
      * Strategy Constant Values
      */
-    const STRATEGY_ANONYMIZE = 'anonymize';
-    const STRATEGY_DELETE = 'delete';
+    public const STRATEGY_ANONYMIZE = 'anonymize';
+    public const STRATEGY_DELETE = 'delete';
     /**#@-*/
 
     /**
diff --git a/Service/Export/AbstractRenderer.php b/Service/Export/AbstractRenderer.php
index f4bdeb3..fa14aeb 100644
--- a/Service/Export/AbstractRenderer.php
+++ b/Service/Export/AbstractRenderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -31,6 +31,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function saveData(string $fileName, array $data): string
     {
diff --git a/Service/Export/Processor/CustomerAddressDataProcessor.php b/Service/Export/Processor/CustomerAddressDataProcessor.php
index 52761d5..ef3853c 100644
--- a/Service/Export/Processor/CustomerAddressDataProcessor.php
+++ b/Service/Export/Processor/CustomerAddressDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -59,7 +59,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute(int $customerId, array $data): array
diff --git a/Service/Export/Processor/CustomerDataProcessor.php b/Service/Export/Processor/CustomerDataProcessor.php
index 8132306..a0f1bc8 100644
--- a/Service/Export/Processor/CustomerDataProcessor.php
+++ b/Service/Export/Processor/CustomerDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Export/Processor/OrderDataProcessor.php b/Service/Export/Processor/OrderDataProcessor.php
index 4b5324b..4ad9ca7 100644
--- a/Service/Export/Processor/OrderDataProcessor.php
+++ b/Service/Export/Processor/OrderDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Export/Processor/QuoteDataProcessor.php b/Service/Export/Processor/QuoteDataProcessor.php
index be97d51..9e3b8a4 100644
--- a/Service/Export/Processor/QuoteDataProcessor.php
+++ b/Service/Export/Processor/QuoteDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Export/Processor/SubscriberDataProcessor.php b/Service/Export/Processor/SubscriberDataProcessor.php
index c0c0a88..65d96fd 100644
--- a/Service/Export/Processor/SubscriberDataProcessor.php
+++ b/Service/Export/Processor/SubscriberDataProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/Export/ProcessorInterface.php b/Service/Export/ProcessorInterface.php
index 51a5baf..b028dbb 100644
--- a/Service/Export/ProcessorInterface.php
+++ b/Service/Export/ProcessorInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/Service/Export/Renderer/CsvRenderer.php b/Service/Export/Renderer/CsvRenderer.php
index 876f0d3..653ba4d 100644
--- a/Service/Export/Renderer/CsvRenderer.php
+++ b/Service/Export/Renderer/CsvRenderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -8,12 +8,11 @@
 namespace Opengento\Gdpr\Service\Export\Renderer;
 
 use Opengento\Gdpr\Service\Export\AbstractRenderer;
-use Opengento\Gdpr\Service\Export\RendererInterface;
 
 /**
  * Class CsvRenderer
  */
-final class CsvRenderer extends AbstractRenderer implements RendererInterface
+final class CsvRenderer extends AbstractRenderer
 {
     /**
      * {@inheritdoc}
diff --git a/Service/Export/Renderer/HtmlRenderer.php b/Service/Export/Renderer/HtmlRenderer.php
index 746a6ce..6fcf00c 100644
--- a/Service/Export/Renderer/HtmlRenderer.php
+++ b/Service/Export/Renderer/HtmlRenderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -12,12 +12,11 @@
 use Magento\Framework\View\Layout\BuilderFactory;
 use Magento\Framework\View\LayoutFactory;
 use Opengento\Gdpr\Service\Export\AbstractRenderer;
-use Opengento\Gdpr\Service\Export\RendererInterface;
 
 /**
  * Class HtmlRenderer
  */
-final class HtmlRenderer extends AbstractRenderer implements RendererInterface
+final class HtmlRenderer extends AbstractRenderer
 {
     /**
      * @var \Magento\Framework\View\LayoutFactory
diff --git a/Service/Export/Renderer/JsonRenderer.php b/Service/Export/Renderer/JsonRenderer.php
index e80f3e0..ea9021f 100644
--- a/Service/Export/Renderer/JsonRenderer.php
+++ b/Service/Export/Renderer/JsonRenderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -10,12 +10,11 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Serialize\Serializer\Json;
 use Opengento\Gdpr\Service\Export\AbstractRenderer;
-use Opengento\Gdpr\Service\Export\RendererInterface;
 
 /**
  * Class JsonRenderer
  */
-final class JsonRenderer extends AbstractRenderer implements RendererInterface
+final class JsonRenderer extends AbstractRenderer
 {
     /**
      * @var \Magento\Framework\Serialize\Serializer\Json
diff --git a/Service/Export/Renderer/PdfRenderer.php b/Service/Export/Renderer/PdfRenderer.php
index 2d5ded7..abaf67c 100644
--- a/Service/Export/Renderer/PdfRenderer.php
+++ b/Service/Export/Renderer/PdfRenderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -8,12 +8,11 @@
 namespace Opengento\Gdpr\Service\Export\Renderer;
 
 use Opengento\Gdpr\Service\Export\AbstractRenderer;
-use Opengento\Gdpr\Service\Export\RendererInterface;
 
 /**
  * Class PdfRenderer
  */
-final class PdfRenderer extends AbstractRenderer implements RendererInterface
+final class PdfRenderer extends AbstractRenderer
 {
     /**
      * {@inheritdoc}
diff --git a/Service/Export/Renderer/XmlRenderer.php b/Service/Export/Renderer/XmlRenderer.php
index c93425c..e11b29c 100644
--- a/Service/Export/Renderer/XmlRenderer.php
+++ b/Service/Export/Renderer/XmlRenderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -10,12 +10,11 @@
 use Magento\Framework\Convert\ConvertArray;
 use Magento\Framework\Filesystem;
 use Opengento\Gdpr\Service\Export\AbstractRenderer;
-use Opengento\Gdpr\Service\Export\RendererInterface;
 
 /**
  * Class XmlRenderer
  */
-final class XmlRenderer extends AbstractRenderer implements RendererInterface
+final class XmlRenderer extends AbstractRenderer
 {
     /**
      * @var \Magento\Framework\Convert\ConvertArray
@@ -36,6 +35,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function render(array $data): string
     {
diff --git a/Service/Export/RendererInterface.php b/Service/Export/RendererInterface.php
index 2c86fbe..75c4804 100644
--- a/Service/Export/RendererInterface.php
+++ b/Service/Export/RendererInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/Service/ExportManagement.php b/Service/ExportManagement.php
index f489a86..a6adfec 100644
--- a/Service/ExportManagement.php
+++ b/Service/ExportManagement.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Service/ExportStrategy.php b/Service/ExportStrategy.php
index fe26c8f..a2247a0 100644
--- a/Service/ExportStrategy.php
+++ b/Service/ExportStrategy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
index 72d0683..f2350b8 100755
--- a/Setup/InstallSchema.php
+++ b/Setup/InstallSchema.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -22,8 +22,9 @@ final class InstallSchema implements InstallSchemaInterface
 {
     /**
      * {@inheritdoc}
+     * @throws \Zend_Db_Exception
      */
-    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    public function install(SchemaSetupInterface $setup, ModuleContextInterface $context): void
     {
         $setup->startSetup();
 
diff --git a/Setup/Uninstall.php b/Setup/Uninstall.php
index e78c8c9..38732b6 100644
--- a/Setup/Uninstall.php
+++ b/Setup/Uninstall.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -21,7 +21,7 @@ final class Uninstall implements UninstallInterface
     /**
      * {@inheritdoc}
      */
-    public function uninstall(SchemaSetupInterface $setup, ModuleContextInterface $context)
+    public function uninstall(SchemaSetupInterface $setup, ModuleContextInterface $context): void
     {
         $setup->startSetup();
 
diff --git a/ViewModel/Privacy/ErasureDataProvider.php b/ViewModel/Privacy/ErasureDataProvider.php
index ae4a49b..66fc6af 100644
--- a/ViewModel/Privacy/ErasureDataProvider.php
+++ b/ViewModel/Privacy/ErasureDataProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/ViewModel/Privacy/ExportDataProvider.php b/ViewModel/Privacy/ExportDataProvider.php
index f653d51..78667b1 100644
--- a/ViewModel/Privacy/ExportDataProvider.php
+++ b/ViewModel/Privacy/ExportDataProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/ViewModel/Privacy/SettingsDataProvider.php b/ViewModel/Privacy/SettingsDataProvider.php
index 7f546c8..6b39008 100644
--- a/ViewModel/Privacy/SettingsDataProvider.php
+++ b/ViewModel/Privacy/SettingsDataProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
diff --git a/ViewModel/UrlsDataProvider.php b/ViewModel/UrlsDataProvider.php
index 5cbd61d..c445c7a 100644
--- a/ViewModel/UrlsDataProvider.php
+++ b/ViewModel/UrlsDataProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -20,11 +20,11 @@ final class UrlsDataProvider implements ArgumentInterface
     /**#@+
      * Routes Path Data
      */
-    const ROUTE_PATH_SETTINGS = 'customer/privacy/settings';
-    const ROUTE_PATH_DELETE = 'customer/privacy/delete';
-    const ROUTE_PATH_DELETE_POST = 'customer/privacy/deletepost';
-    const ROUTE_PATH_UNDO_DELETE = 'customer/privacy/undodelete';
-    const ROUTE_PATH_EXPORT = 'customer/privacy/export';
+    public const ROUTE_PATH_SETTINGS = 'customer/privacy/settings';
+    public const ROUTE_PATH_DELETE = 'customer/privacy/delete';
+    public const ROUTE_PATH_DELETE_POST = 'customer/privacy/deletepost';
+    public const ROUTE_PATH_UNDO_DELETE = 'customer/privacy/undodelete';
+    public const ROUTE_PATH_EXPORT = 'customer/privacy/export';
     /**#@-*/
 
     /**
diff --git a/composer.json b/composer.json
index 7e6ec63..cd909e5 100755
--- a/composer.json
+++ b/composer.json
@@ -9,17 +9,17 @@
         "rgpd"
     ],
     "require": {
-        "magento/framework": "^101.0.7",
-        "magento/module-backend": "^100.2.7",
-        "magento/module-config": "^101.0.7",
-        "magento/module-customer": "^101.0.7",
-        "magento/module-quote": "^101.0.6",
-        "magento/module-sales": "^101.0.6",
-        "magento/module-review": "^100.2.7",
-        "magento/module-email": "^100.2.5",
-        "magento/module-newsletter": "^100.2.6",
-        "magento/module-cms": "^102.0.7",
-        "magento/module-theme": "^100.2.7"
+        "magento/framework": "^102.0.0",
+        "magento/module-backend": "^101.0.0",
+        "magento/module-config": "^101.1.0",
+        "magento/module-customer": "^102.0.0",
+        "magento/module-quote": "^101.1.0",
+        "magento/module-sales": "^102.0.0",
+        "magento/module-review": "^100.3.0",
+        "magento/module-email": "^101.0.0",
+        "magento/module-newsletter": "^100.3.0",
+        "magento/module-cms": "^103.0.0",
+        "magento/module-theme": "^101.0.0"
     },
     "require-dev": {
         "magento/marketplace-eqp": "^1.0.0",
diff --git a/etc/acl.xml b/etc/acl.xml
index de6a55a..c5ccc37 100755
--- a/etc/acl.xml
+++ b/etc/acl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 74a8ab5..17b31db 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/adminhtml/system/cookie.xml b/etc/adminhtml/system/cookie.xml
index 2fde728..226ba10 100644
--- a/etc/adminhtml/system/cookie.xml
+++ b/etc/adminhtml/system/cookie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/adminhtml/system/erasure.xml b/etc/adminhtml/system/erasure.xml
index d2b3fc1..1bcabdb 100644
--- a/etc/adminhtml/system/erasure.xml
+++ b/etc/adminhtml/system/erasure.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/adminhtml/system/export.xml b/etc/adminhtml/system/export.xml
index 42b5ff0..1046392 100644
--- a/etc/adminhtml/system/export.xml
+++ b/etc/adminhtml/system/export.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/adminhtml/system/general.xml b/etc/adminhtml/system/general.xml
index 071aab3..fd91bfe 100644
--- a/etc/adminhtml/system/general.xml
+++ b/etc/adminhtml/system/general.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/config.xml b/etc/config.xml
index ec25c09..a49ecba 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/cron_groups.xml b/etc/cron_groups.xml
index 0597758..195e600 100644
--- a/etc/cron_groups.xml
+++ b/etc/cron_groups.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/crontab.xml b/etc/crontab.xml
index 5f4d53f..a216b10 100755
--- a/etc/crontab.xml
+++ b/etc/crontab.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/di.xml b/etc/di.xml
index c5c58ec..46e4416 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index c68fcb4..b43fc66 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
@@ -19,4 +19,9 @@
     <type name="Opengento\Gdpr\Controller\Privacy\UndoDelete">
         <plugin name="check_is_undo_allowed" type="Opengento\Gdpr\Plugin\Controller\DeleteActionPlugin" sortOrder="0" />
     </type>
+    <type name="Opengento\Gdpr\Controller\Privacy\Export">
+        <arguments>
+            <argument name="archive" xsi:type="object">Opengento\Gdpr\Model\Archive\Zip</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml
index d21d66b..0c67ff9 100755
--- a/etc/frontend/routes.xml
+++ b/etc/frontend/routes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/etc/module.xml b/etc/module.xml
index 13f55fb..b817e5a 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/registration.php b/registration.php
index 98c2036..709d362 100755
--- a/registration.php
+++ b/registration.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/view/base/layout/customer_privacy_export_personal_data.xml b/view/base/layout/customer_privacy_export_personal_data.xml
index 5a0b2fe..62bfe7a 100644
--- a/view/base/layout/customer_privacy_export_personal_data.xml
+++ b/view/base/layout/customer_privacy_export_personal_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/view/base/templates/export/result.phtml b/view/base/templates/export/result.phtml
index 4cae2a9..2465f45 100644
--- a/view/base/templates/export/result.phtml
+++ b/view/base/templates/export/result.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/view/frontend/layout/customer_account.xml b/view/frontend/layout/customer_account.xml
index ad08775..d57b0c1 100755
--- a/view/frontend/layout/customer_account.xml
+++ b/view/frontend/layout/customer_account.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/view/frontend/layout/customer_privacy_delete.xml b/view/frontend/layout/customer_privacy_delete.xml
index 0ede5fd..6dfd002 100755
--- a/view/frontend/layout/customer_privacy_delete.xml
+++ b/view/frontend/layout/customer_privacy_delete.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
  -->
diff --git a/view/frontend/layout/customer_privacy_settings.xml b/view/frontend/layout/customer_privacy_settings.xml
index 2538a79..6efea1a 100755
--- a/view/frontend/layout/customer_privacy_settings.xml
+++ b/view/frontend/layout/customer_privacy_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
  -->
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 834fec3..ff65e66 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->
diff --git a/view/frontend/templates/account/delete.phtml b/view/frontend/templates/account/delete.phtml
index 043c4cf..2c443de 100755
--- a/view/frontend/templates/account/delete.phtml
+++ b/view/frontend/templates/account/delete.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
@@ -24,7 +24,7 @@ $urlsDataProvider = $block->getData('urlsDataProvider');
             <span><?= $block->escapeHtml(__('Required Fields')) ?></span>
         </legend>
         <div class="field password current required">
-            <label class="label" for="current-password">
+            <label class="label" for="password">
                 <span><?= $block->escapeHtml(__('Password')) ?></span>
             </label>
             <div class="control">
diff --git a/view/frontend/templates/account/privacy/erasure.phtml b/view/frontend/templates/account/privacy/erasure.phtml
index bc3bc6d..c989bda 100755
--- a/view/frontend/templates/account/privacy/erasure.phtml
+++ b/view/frontend/templates/account/privacy/erasure.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/view/frontend/templates/account/privacy/export.phtml b/view/frontend/templates/account/privacy/export.phtml
index 8dbbb96..22b2c28 100755
--- a/view/frontend/templates/account/privacy/export.phtml
+++ b/view/frontend/templates/account/privacy/export.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/view/frontend/templates/account/settings.phtml b/view/frontend/templates/account/settings.phtml
index 23a6779..ba9c5dd 100755
--- a/view/frontend/templates/account/settings.phtml
+++ b/view/frontend/templates/account/settings.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
diff --git a/view/frontend/templates/messages/popup.phtml b/view/frontend/templates/messages/popup.phtml
index 73140df..4947e5e 100644
--- a/view/frontend/templates/messages/popup.phtml
+++ b/view/frontend/templates/messages/popup.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 /** @var \Opengento\Gdpr\Block\Messages\PrivacyMessagePopup $block */