diff --git a/Block/Adminhtml/Config/Form/Field/AttributesAnonymizers.php b/Block/Adminhtml/Config/Form/Field/AttributesAnonymizers.php
index 6e98899..380419f 100644
--- a/Block/Adminhtml/Config/Form/Field/AttributesAnonymizers.php
+++ b/Block/Adminhtml/Config/Form/Field/AttributesAnonymizers.php
@@ -33,7 +33,7 @@ public function getAnonymizersSelectRenderer(): Select
             );
         }
 
-        return $this->getData('anonymizers_select_renderer');
+        return $this->_getData('anonymizers_select_renderer');
     }
 
     /**
@@ -53,6 +53,7 @@ protected function _prepareToRender(): void
             'anonymizer',
             [
                 'label' => new Phrase('Anonymizer'),
+                'class' => 'required-entry',
                 'renderer' => $this->getAnonymizersSelectRenderer(),
             ]
         );
diff --git a/Controller/Adminhtml/Guest/Erase.php b/Controller/Adminhtml/Guest/Erase.php
index 856fa8d..99e373b 100644
--- a/Controller/Adminhtml/Guest/Erase.php
+++ b/Controller/Adminhtml/Guest/Erase.php
@@ -8,44 +8,42 @@
 namespace Opengento\Gdpr\Controller\Adminhtml\Guest;
 
 use Exception;
-use Magento\Backend\Model\View\Result\RedirectFactory;
-use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Framework\App\RequestInterface;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Phrase;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Opengento\Gdpr\Api\Data\EraseEntityInterface;
 use Opengento\Gdpr\Api\EraseEntityManagementInterface;
 use Opengento\Gdpr\Api\EraseEntityRepositoryInterface;
 use Opengento\Gdpr\Model\Config;
 
-class Erase implements HttpPostActionInterface
+class Erase extends Action
 {
     public const ADMIN_RESOURCE = 'Opengento_Gdpr::order_erase';
 
     public function __construct(
-        private RequestInterface $request,
-        private ManagerInterface $messageManager,
+        Context $context,
         private StoreManagerInterface $storeManager,
         private OrderRepositoryInterface $orderRepository,
         private EraseEntityManagementInterface $eraseEntityManagement,
         private EraseEntityRepositoryInterface $eraseEntityRepository,
-        private Config $config,
-        private RedirectFactory $redirectFactory,
-    ) {}
+        private Config $config
+    ) {
+        parent::__construct($context);
+    }
 
     public function execute(): ResultInterface|ResponseInterface
     {
         try {
-            $orderId = (int)$this->request->getParam('id');
+            $orderId = (int)$this->getRequest()->getParam('id');
             if ($this->isOrderErasureEnabled($orderId)) {
-                $this->eraseEntityManagement->process(
-                    $this->eraseEntityRepository->getByEntity($orderId, 'order')
-                );
+                $this->eraseEntityManagement->process($this->fetchEntity($orderId));
                 $this->messageManager->addSuccessMessage(new Phrase('You erased the order.'));
             }
         } catch (LocalizedException $e) {
@@ -54,7 +52,7 @@ public function execute(): ResultInterface|ResponseInterface
             $this->messageManager->addExceptionMessage($e, new Phrase('An error occurred on the server.'));
         }
 
-        return $this->redirectFactory->create()->setPath('sales/order/index');
+        return $this->resultRedirectFactory->create()->setPath('sales/order/index');
     }
 
     /**
@@ -66,4 +64,17 @@ private function isOrderErasureEnabled(int $orderId): bool
             $this->storeManager->getStore($this->orderRepository->get($orderId)->getStoreId())->getWebsiteId()
         );
     }
+
+    /**
+     * @throws CouldNotSaveException
+     * @throws LocalizedException
+     */
+    private function fetchEntity(int $orderId): EraseEntityInterface
+    {
+        try {
+            return $this->eraseEntityRepository->getByEntity($orderId, 'order');
+        } catch (NoSuchEntityException) {
+            return $this->eraseEntityManagement->create($orderId, 'order');
+        }
+    }
 }
diff --git a/Controller/Adminhtml/Guest/Export.php b/Controller/Adminhtml/Guest/Export.php
index e141606..37e07fc 100644
--- a/Controller/Adminhtml/Guest/Export.php
+++ b/Controller/Adminhtml/Guest/Export.php
@@ -8,47 +8,46 @@
 namespace Opengento\Gdpr\Controller\Adminhtml\Guest;
 
 use Exception;
-use Magento\Backend\Model\View\Result\RedirectFactory;
-use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Phrase;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Opengento\Gdpr\Api\Data\ExportEntityInterface;
 use Opengento\Gdpr\Api\ExportEntityManagementInterface;
 use Opengento\Gdpr\Api\ExportEntityRepositoryInterface;
 use Opengento\Gdpr\Model\Config;
 
-class Export implements HttpGetActionInterface
+class Export extends Action
 {
     public const ADMIN_RESOURCE = 'Opengento_Gdpr::order_export';
 
     public function __construct(
-        private RequestInterface $request,
-        private ManagerInterface $messageManager,
+        Context $context,
         private StoreManagerInterface $storeManager,
         private OrderRepositoryInterface $orderRepository,
         private ExportEntityManagementInterface $exportEntityManagement,
         private ExportEntityRepositoryInterface $exportEntityRepository,
         private Config $config,
-        private RedirectFactory $redirectFactory,
         private FileFactory $fileFactory
-    ) {}
+    ) {
+        parent::__construct($context);
+    }
 
     public function execute(): ResultInterface|ResponseInterface
     {
         try {
-            $orderId = (int)$this->request->getParam('id');
+            $orderId = (int)$this->getRequest()->getParam('id');
             if ($this->isOrderExportEnabled($orderId)) {
-                $exportEntity = $this->exportEntityManagement->export(
-                    $this->exportEntityRepository->getByEntity($orderId, 'order')
-                );
+                $exportEntity = $this->exportEntityManagement->export($this->fetchEntity($orderId));
 
                 return $this->fileFactory->create(
                     'guest_privacy_data_' . $exportEntity->getEntityId() . '.zip',
@@ -65,7 +64,7 @@ public function execute(): ResultInterface|ResponseInterface
             $this->messageManager->addExceptionMessage($e, new Phrase('An error occurred on the server.'));
         }
 
-        return $this->redirectFactory->create()->setRefererOrBaseUrl();
+        return $this->resultRedirectFactory->create()->setRefererOrBaseUrl();
     }
 
     /**
@@ -77,4 +76,18 @@ private function isOrderExportEnabled(int $orderId): bool
             $this->storeManager->getStore($this->orderRepository->get($orderId)->getStoreId())->getWebsiteId()
         );
     }
+
+    /**
+     * @throws AlreadyExistsException
+     * @throws CouldNotSaveException
+     * @throws LocalizedException
+     */
+    private function fetchEntity(int $orderId): ExportEntityInterface
+    {
+        try {
+            return $this->exportEntityRepository->getByEntity($orderId, 'order');
+        } catch (NoSuchEntityException) {
+            return $this->exportEntityManagement->create($orderId, 'order');
+        }
+    }
 }
diff --git a/Controller/Adminhtml/Privacy/Erase.php b/Controller/Adminhtml/Privacy/Erase.php
index 2b0bed0..e0a8d97 100644
--- a/Controller/Adminhtml/Privacy/Erase.php
+++ b/Controller/Adminhtml/Privacy/Erase.php
@@ -8,41 +8,40 @@
 namespace Opengento\Gdpr\Controller\Adminhtml\Privacy;
 
 use Exception;
-use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Phrase;
+use Opengento\Gdpr\Api\Data\EraseEntityInterface;
 use Opengento\Gdpr\Api\EraseEntityManagementInterface;
 use Opengento\Gdpr\Api\EraseEntityRepositoryInterface;
 use Opengento\Gdpr\Model\Config;
 
-class Erase implements HttpPostActionInterface
+class Erase extends Action
 {
     public const ADMIN_RESOURCE = 'Opengento_Gdpr::customer_erase';
 
     public function __construct(
-        private RequestInterface $request,
-        private ManagerInterface $messageManager,
+        Context $context,
         private CustomerRepositoryInterface $customerRepository,
         private EraseEntityManagementInterface $eraseEntityManagement,
         private EraseEntityRepositoryInterface $eraseEntityRepository,
-        private RedirectFactory $redirectFactory,
         private Config $config
-    ) {}
+    ) {
+        parent::__construct($context);
+    }
 
     public function execute(): ResultInterface|ResponseInterface
     {
         try {
-            $customerId = (int)$this->request->getParam('id');
+            $customerId = (int)$this->getRequest()->getParam('id');
             if ($this->config->isErasureEnabled($this->customerRepository->getById($customerId)->getWebsiteId())) {
-                $this->eraseEntityManagement->process(
-                    $this->eraseEntityRepository->getByEntity($customerId, 'customer')
-                );
+                $this->eraseEntityManagement->process($this->fetchEntity($customerId));
                 $this->messageManager->addSuccessMessage(new Phrase('You erased the customer.'));
             }
         } catch (LocalizedException $e) {
@@ -51,6 +50,19 @@ public function execute(): ResultInterface|ResponseInterface
             $this->messageManager->addExceptionMessage($e, new Phrase('An error occurred on the server.'));
         }
 
-        return $this->redirectFactory->create()->setPath('customer/index');
+        return $this->resultRedirectFactory->create()->setPath('customer/index');
+    }
+
+    /**
+     * @throws CouldNotSaveException
+     * @throws LocalizedException
+     */
+    private function fetchEntity(int $customerId): EraseEntityInterface
+    {
+        try {
+            return $this->eraseEntityRepository->getByEntity($customerId, 'customer');
+        } catch (NoSuchEntityException) {
+            return $this->eraseEntityManagement->create($customerId, 'customer');
+        }
     }
 }
diff --git a/Controller/Adminhtml/Privacy/Export.php b/Controller/Adminhtml/Privacy/Export.php
index 79e842a..e028091 100644
--- a/Controller/Adminhtml/Privacy/Export.php
+++ b/Controller/Adminhtml/Privacy/Export.php
@@ -8,44 +8,44 @@
 namespace Opengento\Gdpr\Controller\Adminhtml\Privacy;
 
 use Exception;
-use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Phrase;
+use Opengento\Gdpr\Api\Data\ExportEntityInterface;
 use Opengento\Gdpr\Api\ExportEntityManagementInterface;
 use Opengento\Gdpr\Api\ExportEntityRepositoryInterface;
 use Opengento\Gdpr\Model\Config;
 
-class Export implements HttpGetActionInterface
+class Export extends Action
 {
     public const ADMIN_RESOURCE = 'Opengento_Gdpr::customer_export';
 
     public function __construct(
-        private RequestInterface $request,
-        private ManagerInterface $messageManager,
+        Context $context,
         private CustomerRepositoryInterface $customerRepository,
         private ExportEntityManagementInterface $exportEntityManagement,
         private ExportEntityRepositoryInterface $exportEntityRepository,
-        private RedirectFactory $redirectFactory,
         private Config $config,
         private FileFactory $fileFactory
-    ) {}
+    ) {
+        parent::__construct($context);
+    }
 
     public function execute(): ResultInterface|ResponseInterface
     {
         try {
-            $customerId = (int)$this->request->getParam('id');
+            $customerId = (int)$this->getRequest()->getParam('id');
             if ($this->config->isExportEnabled($this->customerRepository->getById($customerId)->getWebsiteId())) {
-                $exportEntity = $this->exportEntityManagement->export(
-                    $this->exportEntityRepository->getByEntity($customerId, 'customer')
-                );
+                $exportEntity = $this->exportEntityManagement->export($this->fetchEntity($customerId));
 
                 return $this->fileFactory->create(
                     'customer_privacy_data_' . $exportEntity->getEntityId() . '.zip',
@@ -62,6 +62,20 @@ public function execute(): ResultInterface|ResponseInterface
             $this->messageManager->addExceptionMessage($e, new Phrase('An error occurred on the server.'));
         }
 
-        return $this->redirectFactory->create()->setRefererOrBaseUrl();
+        return $this->resultRedirectFactory->create()->setRefererOrBaseUrl();
+    }
+
+    /**
+     * @throws AlreadyExistsException
+     * @throws CouldNotSaveException
+     * @throws LocalizedException
+     */
+    private function fetchEntity(int $customerId): ExportEntityInterface
+    {
+        try {
+            return $this->exportEntityRepository->getByEntity($customerId, 'customer');
+        } catch (NoSuchEntityException) {
+            return $this->exportEntityManagement->create($customerId, 'customer');
+        }
     }
 }
diff --git a/Model/Config/Source/VirtualEntityAttributes.php b/Model/Config/Source/VirtualEntityAttributes.php
deleted file mode 100644
index 22fbfe6..0000000
--- a/Model/Config/Source/VirtualEntityAttributes.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright © OpenGento, All rights reserved.
- * See LICENSE bundled with this library for license details.
- */
-declare(strict_types=1);
-
-namespace Opengento\Gdpr\Model\Config\Source;
-
-use Magento\Framework\Data\OptionSourceInterface;
-use Magento\Framework\Model\EntitySnapshot\AttributeProviderInterface;
-
-use function array_keys;
-use function array_map;
-
-/**
- * Class VirtualEntityAttributes
- *
- * Use this virtual type only for registered entities in the metadata pool
- */
-class VirtualEntityAttributes implements OptionSourceInterface
-{
-    private ?array $options = null;
-
-    public function __construct(
-        private AttributeProviderInterface $attributeProvider,
-        private string $entityType
-    ) {}
-
-    public function toOptionArray(): array
-    {
-        return $this->options ??= array_map(
-            static fn (string $attribute): array => ['value' => $attribute, 'label' => $attribute],
-            array_keys($this->attributeProvider->getAttributes($this->entityType))
-        );
-    }
-}
diff --git a/Model/Erase/NotifyEraseEntityManagement.php b/Model/Erase/NotifyEraseEntityManagement.php
index be4d959..448ac41 100644
--- a/Model/Erase/NotifyEraseEntityManagement.php
+++ b/Model/Erase/NotifyEraseEntityManagement.php
@@ -29,9 +29,10 @@ public function create(int $entityId, string $entityType): EraseEntityInterface
 
     public function cancel(int $entityId, string $entityType): bool
     {
+        $eraseEntity = $this->eraseRepository->getByEntity($entityId, $entityType);
         $canceled = $this->eraseManagement->cancel($entityId, $entityType);
         if ($canceled) {
-            $this->notifierRepository->get($entityType, 'cancel')->notify($this->eraseRepository->getByEntity($entityId, $entityType));
+            $this->notifierRepository->get($entityType, 'cancel')->notify($eraseEntity);
         }
 
         return $canceled;
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
index 6f51b26..7b57f68 100644
--- a/etc/adminhtml/di.xml
+++ b/etc/adminhtml/di.xml
@@ -7,11 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <!-- Config Settings -->
-    <virtualType name="Opengento\Gdpr\Model\Config\Source\EntityAttributes" type="Opengento\Gdpr\Model\Config\Source\VirtualEntityAttributes">
-        <arguments>
-            <argument name="attributeProvider" xsi:type="object">Magento\Framework\Model\EntitySnapshot\AttributeProvider</argument>
-        </arguments>
-    </virtualType>
     <virtualType name="Opengento\Gdpr\Model\Config\Source\CustomerAttributes" type="Opengento\Gdpr\Model\Config\Source\VirtualCustomerAttributes">
         <arguments>
             <argument name="metadata" xsi:type="object">Magento\Customer\Api\CustomerMetadataInterface</argument>
diff --git a/etc/adminhtml/system/export.xml b/etc/adminhtml/system/export.xml
index 94d9361..7fca75c 100644
--- a/etc/adminhtml/system/export.xml
+++ b/etc/adminhtml/system/export.xml
@@ -74,6 +74,9 @@
             </field>
             <group id="customer" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
                 <label>Customer</label>
+                <depends>
+                    <field id="opengento_gdpr_export/export/enabled">1</field>
+                </depends>
                 <field id="customer_attributes" type="multiselect" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="10" canRestore="1">
                     <label>Customer Attributes</label>
                     <comment>This attributes list will be exported when processed.</comment>
@@ -108,6 +111,9 @@
             </group>
             <group id="customer_address" translate="1" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
                 <label>Customer Address</label>
+                <depends>
+                    <field id="opengento_gdpr_export/export/enabled">1</field>
+                </depends>
                 <field id="customer_address_attributes" type="multiselect" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="10" canRestore="1">
                     <label>Customer Address Attributes</label>
                     <comment>This attributes list will be exported when processed.</comment>
@@ -142,6 +148,9 @@
             </group>
             <group id="quote" translate="1" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                 <label>Quote</label>
+                <depends>
+                    <field id="opengento_gdpr_export/export/enabled">1</field>
+                </depends>
                 <field id="quote_attributes" type="text" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="10" canRestore="1">
                     <label>Quote Attributes</label>
                     <comment>Comma-separated</comment>
@@ -175,6 +184,9 @@
             </group>
             <group id="quote_address" translate="1" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
                 <label>Quote Address</label>
+                <depends>
+                    <field id="opengento_gdpr_export/export/enabled">1</field>
+                </depends>
                 <field id="quote_address_attributes" type="text" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="10" canRestore="1">
                     <label>Quote Address Attributes</label>
                     <comment>Comma-separated</comment>
@@ -208,6 +220,9 @@
             </group>
             <group id="order" translate="1" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
                 <label>Order</label>
+                <depends>
+                    <field id="opengento_gdpr_export/export/enabled">1</field>
+                </depends>
                 <field id="order_attributes" type="text" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="10" canRestore="1">
                     <label>Order Attributes</label>
                     <comment>Comma-separated</comment>
@@ -241,6 +256,9 @@
             </group>
             <group id="order_address" translate="1" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="130">
                 <label>Order Address</label>
+                <depends>
+                    <field id="opengento_gdpr_export/export/enabled">1</field>
+                </depends>
                 <field id="order_address_attributes" type="text" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="10" canRestore="1">
                     <label>Order Address Attributes</label>
                     <comment>Comma-separated</comment>
@@ -274,6 +292,9 @@
             </group>
             <group id="subscriber" translate="1" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="140">
                 <label>Subscriber</label>
+                <depends>
+                    <field id="opengento_gdpr_export/export/enabled">1</field>
+                </depends>
                 <field id="subscriber_attributes" type="text" translate="label comment" showInDefault="1" showInWebsite="0" showInStore="0" sortOrder="10" canRestore="1">
                     <label>Subscriber Attributes</label>
                     <comment>Comma-separated</comment>