From 6930423dff3802f35c53db7db9ace6bb625c87e0 Mon Sep 17 00:00:00 2001
From: Marvin Besselsen <marvin@magmodules.eu>
Date: Tue, 22 Aug 2023 11:29:58 +0200
Subject: [PATCH 1/4] Refactor content flow

---
 Api/Config/System/ContentInterface.php        |   7 +
 Api/Content/DataInterface.php                 |  53 ++--
 Api/Content/RepositoryInterface.php           |  30 +-
 Console/Command/ContentAdd.php                |  47 +--
 Console/Command/ContentInvalidate.php         |  58 ++--
 Console/Command/ContentUpdate.php             |  30 +-
 Console/CommandOptions/ContentAdd.php         |   6 +-
 Console/CommandOptions/ContentInvalidate.php  |   6 +-
 Console/CommandOptions/ContentUpdate.php      |   6 +-
 Controller/Adminhtml/Content/Add.php          |  11 +-
 Controller/Adminhtml/Content/Invalidate.php   |   9 +-
 Controller/Adminhtml/Content/Update.php       |  26 +-
 Controller/Adminhtml/Product/MassQueue.php    |  72 -----
 Model/Command/ContentAdd.php                  | 209 ++++++++-----
 Model/Command/ContentInvalidate.php           |  42 +--
 Model/Command/ContentUpdate.php               | 286 +++++++-----------
 Model/Config/Repository.php                   |   2 +-
 Model/Config/System/ContentRepository.php     |  57 ++--
 Model/Content/Data.php                        |  37 +--
 Model/Content/Repository.php                  | 179 ++---------
 Model/Content/ResourceModel.php               |  24 +-
 Model/Cron/ContentMaintenance.php             | 212 ++-----------
 Model/Cron/ContentUpdate.php                  |  89 ++----
 Model/ProductData/Repository.php              |  33 +-
 Observer/InvalidateProduct.php                |  32 +-
 .../Data/AttributeMapper.php                  | 221 ++++++++------
 .../AttributeCollector/Data/Category.php      |  91 +++---
 .../Data/ConfigurableKey.php                  |  22 +-
 .../AttributeCollector/Data/Image.php         |  34 ++-
 .../AttributeCollector/Data/Parents.php       |   3 +-
 .../AttributeCollector/Data/Price.php         |  58 ++--
 .../AttributeCollector/Data/Stock.php         | 158 +++++-----
 .../AttributeCollector/Data/Url.php           |  53 +++-
 Service/ProductData/Data.php                  |  78 +++--
 Service/ProductData/Filter.php                | 141 ++++++---
 Service/ProductData/Type.php                  |  40 +--
 etc/crontab.xml                               |  12 +-
 etc/db_schema.xml                             | 111 ++-----
 etc/db_schema_whitelist.json                  |  13 +-
 etc/di.xml                                    |  11 +-
 view/adminhtml/layout/default.xml             |  11 -
 .../ui_component/product_listing.xml          |  19 --
 42 files changed, 1100 insertions(+), 1539 deletions(-)
 delete mode 100755 Controller/Adminhtml/Product/MassQueue.php
 delete mode 100755 view/adminhtml/layout/default.xml
 delete mode 100755 view/adminhtml/ui_component/product_listing.xml

diff --git a/Api/Config/System/ContentInterface.php b/Api/Config/System/ContentInterface.php
index 9d68868..ead1c2a 100755
--- a/Api/Config/System/ContentInterface.php
+++ b/Api/Config/System/ContentInterface.php
@@ -69,6 +69,13 @@ interface ContentInterface extends RepositoryInterface
      */
     public function isEnabled(int $storeId = null): bool;
 
+    /**
+     * Get all enabled store Ids for content update
+     **
+     * @return array
+     */
+    public function getContentEnabledStoreIds(): array;
+
     /**
      * Returns array of attributes
      *
diff --git a/Api/Content/DataInterface.php b/Api/Content/DataInterface.php
index 06a22c0..d3db217 100755
--- a/Api/Content/DataInterface.php
+++ b/Api/Content/DataInterface.php
@@ -16,63 +16,50 @@
 interface DataInterface extends ExtensibleDataInterface
 {
 
-    /**#@+
+    /**
      * Constants for keys of data array. Identical to the name of the getter in snake case
      */
     public const ENTITY_ID = 'entity_id';
     public const STORE_ID = 'store_id';
-    public const CONTENT_ID = 'content_id';
+    public const PRODUCT_ID = 'product_id';
     public const PARENT_ID = 'parent_id';
-    public const CREATED_AT = 'created_at';
     public const UPDATED_AT = 'updated_at';
     public const UPDATE_MSG = 'update_msg';
     public const UPDATE_ATTEMPTS = 'update_attempts';
     public const STATUS = 'status';
-    /**#@-*/
 
     /**
-     * @return string
+     * @return int
      */
-    public function getContentId() : string;
+    public function getProductId(): int;
 
     /**
-     * @param string $contentId
+     * @param int $productId
      * @return $this
      */
-    public function setContentId(string $contentId) : self;
+    public function setProductId(int $productId): self;
 
     /**
-     * @return string
+     * @return ?int
      */
-    public function getParentId() : string;
+    public function getParentId(): ?int;
 
     /**
-     * @param string $parentId
+     * @param ?int $parentId
      * @return $this
      */
-    public function setParentId(string $parentId) : self;
+    public function setParentId(?int $parentId): self;
 
     /**
      * @return int
      */
-    public function getStoreId() : int;
+    public function getStoreId(): int;
 
     /**
      * @param int $storeId
      * @return $this
      */
-    public function setStoreId(int $storeId) : self;
-
-    /**
-     * @return string
-     */
-    public function getCreatedAt() : string;
-
-    /**
-     * @param string $createdAt
-     * @return $this
-     */
-    public function setCreatedAt(string $createdAt) : self;
+    public function setStoreId(int $storeId): self;
 
     /**
      * @return string
@@ -83,38 +70,38 @@ public function getUpdatedAt(): string;
      * @param string $updatedAt
      * @return $this
      */
-    public function setUpdatedAt(string $updatedAt) : self;
+    public function setUpdatedAt(string $updatedAt): self;
 
     /**
      * @return string
      */
-    public function getUpdateMsg() : string;
+    public function getUpdateMsg(): string;
 
     /**
      * @param string $updateMsg
      * @return $this
      */
-    public function setUpdateMsg(string $updateMsg) : self;
+    public function setUpdateMsg(string $updateMsg): self;
 
     /**
-     * @return string
+     * @return int
      */
-    public function getUpdateAttempts() : string;
+    public function getUpdateAttempts(): int;
 
     /**
      * @param int $updateAttempts
      * @return $this
      */
-    public function setUpdateAttempts(int $updateAttempts) : self;
+    public function setUpdateAttempts(int $updateAttempts): self;
 
     /**
      * @return string
      */
-    public function getStatus() : string;
+    public function getStatus(): string;
 
     /**
      * @param string $status
      * @return $this
      */
-    public function setStatus(string $status) : self;
+    public function setStatus(string $status): self;
 }
diff --git a/Api/Content/RepositoryInterface.php b/Api/Content/RepositoryInterface.php
index 0464b80..4b7540c 100755
--- a/Api/Content/RepositoryInterface.php
+++ b/Api/Content/RepositoryInterface.php
@@ -7,13 +7,10 @@
 
 namespace Datatrics\Connect\Api\Content;
 
+use Datatrics\Connect\Api\Content\DataInterface as ContentData;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Datatrics\Connect\Api\Content\DataInterface
-    as ContentData;
-use Datatrics\Connect\Api\Content\SearchResultsInterface;
-use Magento\Customer\Model\Customer;
 
 /**
  * Interface Repository
@@ -43,12 +40,13 @@ interface RepositoryInterface
     public const COULD_NOT_SAVE_EXCEPTION = 'Could not save the entity: %1';
 
     /**
-     *
+     * Content status key-pair
      */
     public const STATUS = [
         'queued' => 'Queued for Update',
         'synced' => 'Synced',
         'error' => 'Error',
+        'skipped' => 'Skipped',
         'failed' => 'Failed'
     ];
 
@@ -60,24 +58,24 @@ interface RepositoryInterface
      * @return ContentData
      * @throws LocalizedException
      */
-    public function get(int $entityId) : ContentData;
+    public function get(int $entityId): ContentData;
 
     /**
      * Return Content object
      *
      * @return ContentData
      */
-    public function create();
+    public function create(): DataInterface;
 
     /**
-     * Retrieves an Content matching the specified criteria.
+     * Retrieves a Content matching the specified criteria.
      *
      * @param SearchCriteriaInterface $searchCriteria
      *
      * @return SearchResultsInterface
      * @throws LocalizedException
      */
-    public function getList(SearchCriteriaInterface $searchCriteria) : SearchResultsInterface;
+    public function getList(SearchCriteriaInterface $searchCriteria): SearchResultsInterface;
 
     /**
      * Register entity to delete
@@ -87,18 +85,18 @@ public function getList(SearchCriteriaInterface $searchCriteria) : SearchResults
      * @return bool true on success
      * @throws LocalizedException
      */
-    public function delete(ContentData $entity) : bool;
+    public function delete(ContentData $entity): bool;
 
     /**
      * Deletes a Content entity by ID
      *
-     * @param int $entity
+     * @param int $entityId
      *
      * @return bool true on success
      * @throws NoSuchEntityException
      * @throws LocalizedException
      */
-    public function deleteById(int $entity) : bool;
+    public function deleteById(int $entityId): bool;
 
     /**
      * Perform persist operations for one entity
@@ -108,11 +106,5 @@ public function deleteById(int $entity) : bool;
      * @return ContentData
      * @throws LocalizedException
      */
-    public function save(ContentData $entity) : ContentData;
-
-    /**
-     * @param array $productIds
-     * @return mixed
-     */
-    public function prepareContentData(array $productIds);
+    public function save(ContentData $entity): ContentData;
 }
diff --git a/Console/Command/ContentAdd.php b/Console/Command/ContentAdd.php
index df105f6..d3a584e 100755
--- a/Console/Command/ContentAdd.php
+++ b/Console/Command/ContentAdd.php
@@ -7,12 +7,14 @@
 
 namespace Datatrics\Connect\Console\Command;
 
+use Datatrics\Connect\Api\Config\System\ContentInterface as ConfigProvider;
+use Datatrics\Connect\Console\CommandOptions\ContentAdd as ContentAddOptions;
+use Datatrics\Connect\Console\CommandOptions\OptionKeys;
+use Datatrics\Connect\Model\Command\ContentAdd as ContentAddProcessing;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputInterface;
-use Datatrics\Connect\Model\Command\ContentAdd as ContentAddProcessing;
-use Datatrics\Connect\Console\CommandOptions\ContentAdd as ContentAddOptions;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class ContentAdd
@@ -31,57 +33,51 @@ class ContentAdd extends Command
      * @var ContentAddOptions
      */
     private $options;
-
     /**
      * @var ContentAddProcessing
      */
     private $contentAddProcessing;
-
     /**
-     * @var InputValidator
+     * @var ConfigProvider
      */
-    private $inputValidator;
+    private $configProvider;
 
     /**
      * SalesUpdate constructor.
+     * @param ConfigProvider $configProvider
      * @param ContentAddOptions $options
      * @param ContentAddProcessing $contentAddProcessing
-     * @param InputValidator $inputValidator
      */
     public function __construct(
+        ConfigProvider $configProvider,
         ContentAddOptions $options,
-        ContentAddProcessing $contentAddProcessing,
-        InputValidator $inputValidator
+        ContentAddProcessing $contentAddProcessing
     ) {
         $this->options = $options;
         $this->contentAddProcessing = $contentAddProcessing;
-        $this->inputValidator = $inputValidator;
+        $this->configProvider = $configProvider;
         parent::__construct();
     }
 
     /**
-     *  {@inheritdoc}
+     * @inheritdoc
      */
     public function configure()
     {
         $this->setName(self::COMMAND_NAME);
         $this->setDescription('Collect content to tables');
         $this->setDefinition($this->options->getOptionsList());
-        $this->setHelp(
-            <<<HELP
-Collect content to tables
-HELP
-        );
         parent::configure();
     }
 
     /**
-     *  {@inheritdoc}
+     * @inheritdoc
      */
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         try {
-            $this->contentAddProcessing->run($input, $output);
+            $storeIds = $this->getStoreIds($input);
+            $this->contentAddProcessing->run($storeIds, $output);
             $output->writeln('<info>Done</info>');
         } catch (\InvalidArgumentException $exception) {
             $output->writeln('<error>' . $exception->getMessage() . '</error>');
@@ -93,4 +89,15 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         return Cli::RETURN_SUCCESS;
     }
+
+    /**
+     * @param InputInterface $input
+     * @return array
+     */
+    private function getStoreIds(InputInterface $input): array
+    {
+        return $input->getOption(OptionKeys::STORE_ID)
+            ? [(int)$input->getOption(OptionKeys::STORE_ID)]
+            : $this->configProvider->getContentEnabledStoreIds();
+    }
 }
diff --git a/Console/Command/ContentInvalidate.php b/Console/Command/ContentInvalidate.php
index 9d18872..7c256e2 100755
--- a/Console/Command/ContentInvalidate.php
+++ b/Console/Command/ContentInvalidate.php
@@ -7,12 +7,14 @@
 
 namespace Datatrics\Connect\Console\Command;
 
+use Datatrics\Connect\Api\Config\System\ContentInterface as ConfigProvider;
+use Datatrics\Connect\Console\CommandOptions\ContentInvalidate as ContentInvalidateOptions;
+use Datatrics\Connect\Console\CommandOptions\OptionKeys;
+use Datatrics\Connect\Model\Command\ContentInvalidate as ContentInvalidateProcessing;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputInterface;
-use Datatrics\Connect\Model\Command\ContentInvalidate as ContentInvalidateProcessing;
-use Datatrics\Connect\Console\CommandOptions\ContentInvalidate as ContentInvalidateOptions;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class ContentInvalidate
@@ -31,58 +33,54 @@ class ContentInvalidate extends Command
      * @var ContentInvalidateOptions
      */
     private $options;
-
     /**
      * @var ContentInvalidateProcessing
      */
     private $contentInvalidateProcessing;
-
     /**
-     * @var InputValidator
+     * @var ConfigProvider
      */
-    private $inputValidator;
+    private $configProvider;
 
     /**
-     * SalesUpdate constructor.
      * @param ContentInvalidateOptions $options
      * @param ContentInvalidateProcessing $contentInvalidateProcessing
-     * @param InputValidator $inputValidator
+     * @param ConfigProvider $configProvider
      */
     public function __construct(
         ContentInvalidateOptions $options,
         ContentInvalidateProcessing $contentInvalidateProcessing,
-        InputValidator $inputValidator
+        ConfigProvider $configProvider
     ) {
         $this->options = $options;
         $this->contentInvalidateProcessing = $contentInvalidateProcessing;
-        $this->inputValidator = $inputValidator;
+        $this->configProvider = $configProvider;
         parent::__construct();
     }
 
     /**
-     *  {@inheritdoc}
+     * @inheritdoc
      */
     public function configure()
     {
         $this->setName(self::COMMAND_NAME);
         $this->setDescription('Invalidate content');
         $this->setDefinition($this->options->getOptionsList());
-        $this->setHelp(
-            <<<HELP
-Collect content to tables
-HELP
-        );
         parent::configure();
     }
 
     /**
-     *  {@inheritdoc}
+     * @inheritdoc
      */
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         try {
             $timeStart = microtime(true);
-            $invalidated = $this->contentInvalidateProcessing->run($input, $output);
+            $invalidated = $this->contentInvalidateProcessing->run(
+                $this->getStoreIds($input),
+                $this->getProductIds($input)
+            );
+
             if (!$invalidated) {
                 $output->writeln('<info>No items to invalidate</info>');
             } else {
@@ -105,4 +103,24 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         return Cli::RETURN_SUCCESS;
     }
+
+    /**
+     * @param InputInterface $input
+     * @return array
+     */
+    private function getStoreIds(InputInterface $input): array
+    {
+        return $input->getOption(OptionKeys::STORE_ID)
+            ? [(int)$input->getOption(OptionKeys::STORE_ID)]
+            : $this->configProvider->getContentEnabledStoreIds();
+    }
+
+    /**
+     * @param InputInterface $input
+     * @return array|null
+     */
+    private function getProductIds(InputInterface $input): ?array
+    {
+        return $input->getArguments()[OptionKeys::PRODUCT_ID] ?? null;
+    }
 }
diff --git a/Console/Command/ContentUpdate.php b/Console/Command/ContentUpdate.php
index f1b7365..eef966a 100755
--- a/Console/Command/ContentUpdate.php
+++ b/Console/Command/ContentUpdate.php
@@ -7,12 +7,12 @@
 
 namespace Datatrics\Connect\Console\Command;
 
+use Datatrics\Connect\Console\CommandOptions\ContentUpdate as ContentUpdateOptions;
+use Datatrics\Connect\Model\Command\ContentUpdate as ContentUpdateProcessing;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputInterface;
-use Datatrics\Connect\Model\Command\ContentUpdate as ContentUpdateProcessing;
-use Datatrics\Connect\Console\CommandOptions\ContentUpdate as ContentUpdateOptions;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class ContentUpdate
@@ -31,54 +31,40 @@ class ContentUpdate extends Command
      * @var ContentUpdateOptions
      */
     private $options;
-
     /**
      * @var ContentUpdateProcessing
      */
     private $contentUpdateProcessing;
 
     /**
-     * @var InputValidator
-     */
-    private $inputValidator;
-
-    /**
-     * SalesUpdate constructor.
+     * ContentUpdate constructor.
      * @param ContentUpdateOptions $options
      * @param ContentUpdateProcessing $contentUpdateProcessing
-     * @param InputValidator $inputValidator
      */
     public function __construct(
         ContentUpdateOptions $options,
-        ContentUpdateProcessing $contentUpdateProcessing,
-        InputValidator $inputValidator
+        ContentUpdateProcessing $contentUpdateProcessing
     ) {
         $this->options = $options;
         $this->contentUpdateProcessing = $contentUpdateProcessing;
-        $this->inputValidator = $inputValidator;
         parent::__construct();
     }
 
     /**
-     *  {@inheritdoc}
+     * @inheritdoc
      */
     public function configure()
     {
         $this->setName(self::COMMAND_NAME);
         $this->setDescription('Push content to platform');
         $this->setDefinition($this->options->getOptionsList());
-        $this->setHelp(
-            <<<HELP
-Push content to platform
-HELP
-        );
         parent::configure();
     }
 
     /**
-     *  {@inheritdoc}
+     * @inheritdoc
      */
-    public function execute(InputInterface $input, OutputInterface $output)
+    public function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('store-id') === null) {
             throw new \InvalidArgumentException(
diff --git a/Console/CommandOptions/ContentAdd.php b/Console/CommandOptions/ContentAdd.php
index 2088be2..a2104fd 100755
--- a/Console/CommandOptions/ContentAdd.php
+++ b/Console/CommandOptions/ContentAdd.php
@@ -23,7 +23,7 @@ class ContentAdd extends OptionKeys
      *
      * @return array
      */
-    public function getOptionsList()
+    public function getOptionsList(): array
     {
         return array_merge(
             $this->getBasicOptions(),
@@ -37,7 +37,7 @@ public function getOptionsList()
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    private function getBasicOptions()
+    private function getBasicOptions(): array
     {
         return [
             new InputOption(
@@ -54,7 +54,7 @@ private function getBasicOptions()
      *
      * @return array
      */
-    private function getSkipOptions()
+    private function getSkipOptions(): array
     {
         return [];
     }
diff --git a/Console/CommandOptions/ContentInvalidate.php b/Console/CommandOptions/ContentInvalidate.php
index 9cfe097..822affd 100755
--- a/Console/CommandOptions/ContentInvalidate.php
+++ b/Console/CommandOptions/ContentInvalidate.php
@@ -24,7 +24,7 @@ class ContentInvalidate extends OptionKeys
      *
      * @return array
      */
-    public function getOptionsList()
+    public function getOptionsList(): array
     {
         return array_merge(
             $this->getBasicOptions(),
@@ -38,7 +38,7 @@ public function getOptionsList()
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    private function getBasicOptions()
+    private function getBasicOptions(): array
     {
         return [
             new InputOption(
@@ -60,7 +60,7 @@ private function getBasicOptions()
      *
      * @return array
      */
-    private function getSkipOptions()
+    private function getSkipOptions(): array
     {
         return [];
     }
diff --git a/Console/CommandOptions/ContentUpdate.php b/Console/CommandOptions/ContentUpdate.php
index 306d52c..460db8f 100755
--- a/Console/CommandOptions/ContentUpdate.php
+++ b/Console/CommandOptions/ContentUpdate.php
@@ -24,7 +24,7 @@ class ContentUpdate extends OptionKeys
      *
      * @return array
      */
-    public function getOptionsList()
+    public function getOptionsList(): array
     {
         return array_merge(
             $this->getBasicOptions(),
@@ -38,7 +38,7 @@ public function getOptionsList()
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    private function getBasicOptions()
+    private function getBasicOptions(): array
     {
         return [
             new InputOption(
@@ -78,7 +78,7 @@ private function getBasicOptions()
      *
      * @return array
      */
-    private function getSkipOptions()
+    private function getSkipOptions(): array
     {
         return [];
     }
diff --git a/Controller/Adminhtml/Content/Add.php b/Controller/Adminhtml/Content/Add.php
index 3880e54..9b238eb 100755
--- a/Controller/Adminhtml/Content/Add.php
+++ b/Controller/Adminhtml/Content/Add.php
@@ -9,13 +9,11 @@
 
 use Datatrics\Connect\Api\Config\System\ContentInterface as ContentConfigRepository;
 use Datatrics\Connect\Model\Command\ContentAdd;
-use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Class Add
@@ -40,10 +38,6 @@ class Add extends Action
      */
     public const SUCCESS_MSG = '%1 product(s) were added to content table.';
 
-    /**
-     * @var ContentResource
-     */
-    private $contentResource;
     /**
      * @var ContentAdd
      */
@@ -61,19 +55,17 @@ class Add extends Action
      * Check constructor.
      *
      * @param Action\Context $context
-     * @param ContentResource $contentResource
      * @param ContentAdd $contentAdd
      * @param ContentConfigRepository $contentConfigRepository
+     * @param RedirectInterface $redirect
      */
     public function __construct(
         Action\Context $context,
-        ContentResource $contentResource,
         ContentAdd $contentAdd,
         ContentConfigRepository $contentConfigRepository,
         RedirectInterface $redirect
     ) {
         $this->messageManager = $context->getMessageManager();
-        $this->contentResource = $contentResource;
         $this->contentAdd = $contentAdd;
         $this->contentConfigRepository = $contentConfigRepository;
         $this->redirect = $redirect;
@@ -82,7 +74,6 @@ public function __construct(
 
     /**
      * @return ResponseInterface|ResultInterface
-     * @throws LocalizedException
      */
     public function execute()
     {
diff --git a/Controller/Adminhtml/Content/Invalidate.php b/Controller/Adminhtml/Content/Invalidate.php
index f9e9117..4017ca7 100755
--- a/Controller/Adminhtml/Content/Invalidate.php
+++ b/Controller/Adminhtml/Content/Invalidate.php
@@ -8,6 +8,7 @@
 namespace Datatrics\Connect\Controller\Adminhtml\Content;
 
 use Datatrics\Connect\Api\Config\System\ContentInterface as ContentConfigRepository;
+use Datatrics\Connect\Api\Content\RepositoryInterface as ContentRepository;
 use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Response\RedirectInterface;
@@ -57,6 +58,7 @@ class Invalidate extends Action
      * @param Action\Context $context
      * @param ContentResource $contentResource
      * @param ContentConfigRepository $contentConfigRepository
+     * @param RedirectInterface $redirect
      */
     public function __construct(
         Action\Context $context,
@@ -88,13 +90,10 @@ public function execute()
         }
 
         $connection = $this->contentResource->getConnection();
-        $where = [
-            'store_id = ?' => $storeId
-        ];
         $count = $connection->update(
             $this->contentResource->getTable('datatrics_content_store'),
-            ['status' => 'Queued for Update'],
-            $where
+            ['status' => ContentRepository::STATUS['queued']],
+            ['store_id = ?' => $storeId]
         );
 
         if ($count > 0) {
diff --git a/Controller/Adminhtml/Content/Update.php b/Controller/Adminhtml/Content/Update.php
index 5d9746b..f089186 100755
--- a/Controller/Adminhtml/Content/Update.php
+++ b/Controller/Adminhtml/Content/Update.php
@@ -9,7 +9,6 @@
 
 use Datatrics\Connect\Api\Config\System\ContentInterface as ContentConfigRepository;
 use Datatrics\Connect\Model\Command\ContentUpdate;
-use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
 use Datatrics\Connect\Service\API\ConnectionTest;
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Response\RedirectInterface;
@@ -40,10 +39,6 @@ class Update extends Action
      */
     public const SUCCESS_MSG = '%1 product(s) were updated. ';
 
-    /**
-     * @var ContentResource
-     */
-    private $contentResource;
     /**
      * @var ContentUpdate
      */
@@ -64,21 +59,19 @@ class Update extends Action
     /**
      * Update constructor.
      * @param Action\Context $context
-     * @param ContentResource $contentResource
      * @param ContentUpdate $contentUpdate
      * @param ContentConfigRepository $contentConfigRepository
      * @param ConnectionTest $connectionTest
+     * @param RedirectInterface $redirect
      */
     public function __construct(
         Action\Context $context,
-        ContentResource $contentResource,
         ContentUpdate $contentUpdate,
         ContentConfigRepository $contentConfigRepository,
         ConnectionTest $connectionTest,
         RedirectInterface $redirect
     ) {
         $this->messageManager = $context->getMessageManager();
-        $this->contentResource = $contentResource;
         $this->contentUpdate = $contentUpdate;
         $this->contentConfigRepository = $contentConfigRepository;
         $this->connectionTest = $connectionTest;
@@ -93,6 +86,7 @@ public function execute()
     {
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $storeId = (int)$this->getRequest()->getParam('store_id');
+        $dryRun = (bool)$this->getRequest()->getParam('dry');
 
         if (!$this->contentConfigRepository->isEnabled($storeId)) {
             $msg = self::ERROR_MSG_ENABLED;
@@ -104,20 +98,8 @@ public function execute()
 
         try {
             $this->connectionTest->executeByStoreId($storeId);
-            $connection = $this->contentResource->getConnection();
-            $selectProductIds = $connection->select()->from(
-                $this->contentResource->getTable('datatrics_content_store'),
-                'product_id'
-            )->where('status = :status')
-                ->where('store_id = :store_id')
-                ->limit($this->contentConfigRepository->getProcessingLimit($storeId));
-            $bind = [
-                ':status' => 'Queued for Update',
-                ':store_id' => $storeId
-            ];
-            $productIds = $connection->fetchCol($selectProductIds, $bind);
-            $count = $productIds ? $this->contentUpdate->prepareData($productIds, $storeId) : 0;
-
+            $productIds = $this->contentUpdate->getProductIds($storeId);
+            $count = $productIds ? $this->contentUpdate->prepareData($productIds, $storeId, $dryRun) : 0;
             if ($count > 0) {
                 $msg = self::SUCCESS_MSG;
                 $this->messageManager->addSuccessMessage(__($msg, $count));
diff --git a/Controller/Adminhtml/Product/MassQueue.php b/Controller/Adminhtml/Product/MassQueue.php
deleted file mode 100755
index 47d7b6c..0000000
--- a/Controller/Adminhtml/Product/MassQueue.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright © Magmodules.eu. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Datatrics\Connect\Controller\Adminhtml\Product;
-
-use Datatrics\Connect\Api\Content\RepositoryInterface as ContentRepository;
-use Magento\Backend\App\Action;
-use Magento\Backend\App\Action\Context;
-use Magento\Backend\Model\View\Result\Redirect;
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Catalog\Model\ResourceModel\Product\Collection
-    as ProductCollection;
-
-/**
- * Mass add products to datatrics queue
- */
-class MassQueue extends Action
-{
-
-    /**
-     * @var ContentRepository
-     */
-    private $contentRepository;
-
-    /**
-     * @var ProductCollection
-     */
-    private $productCollection;
-
-    /**
-     * @param Context $context
-     * @param ContentRepository $contentRepository
-     * @param ProductCollection $productCollection
-     */
-    public function __construct(
-        Context $context,
-        ContentRepository $contentRepository,
-        ProductCollection $productCollection
-    ) {
-        $this->contentRepository = $contentRepository;
-        $this->productCollection = $productCollection;
-        parent::__construct($context);
-    }
-
-    /**
-     * @return Redirect
-     */
-    public function execute()
-    {
-        /** @var Redirect $resultRedirect */
-        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-
-        $products = $this->getRequest()->getParam('selected');
-        if (!$products) {
-            $products = $this->productCollection->getColumnValues('entity_id');
-        }
-        $result = $this->contentRepository->prepareContentData($products);
-        $this->messageManager->addSuccessMessage(
-            __(
-                '%1 product(s) added, %2 entity(s) skipped. %3 entity(s) invalidated',
-                $result['added'],
-                $result['skipped'],
-                $result['invalidated']
-            )
-        );
-        return $resultRedirect->setPath('catalog/product');
-    }
-}
diff --git a/Model/Command/ContentAdd.php b/Model/Command/ContentAdd.php
index 32a0a2f..fe92eb2 100755
--- a/Model/Command/ContentAdd.php
+++ b/Model/Command/ContentAdd.php
@@ -8,10 +8,13 @@
 namespace Datatrics\Connect\Model\Command;
 
 use Datatrics\Connect\Api\Content\RepositoryInterface as ContentRepository;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputInterface;
-use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
 use Datatrics\Connect\Model\Config\System\ContentRepository as ConfigContentRepository;
+use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
+use Datatrics\Connect\Model\ProductData\Repository as ProductDataRepository;
+use Exception;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class ContentAdd
@@ -22,93 +25,75 @@ class ContentAdd
 {
 
     /**
-     * @var ContentRepository
+     * @var ConfigContentRepository
      */
-    private $contentRepository;
-
+    private $configRepository;
     /**
      * @var ContentResource
      */
     private $contentResource;
     /**
-     * @var ConfigContentRepository
+     * @var ProductDataRepository
+     */
+    private $productDataRepository;
+    /**
+     * @var string
      */
-    private $configContentRepository;
+    private $entityId;
 
     /**
      * ContentAdd constructor.
-     * @param ContentRepository $contentRepository
+     * @param ConfigContentRepository $configRepository
+     * @param ProductDataRepository $productDataRepository
      * @param ContentResource $contentResource
-     * @param ConfigContentRepository $configContentRepository
+     * @param MetadataPool $metadataPool
+     * @throws Exception
      */
     public function __construct(
-        ContentRepository $contentRepository,
+        ConfigContentRepository $configRepository,
+        ProductDataRepository $productDataRepository,
         ContentResource $contentResource,
-        ConfigContentRepository $configContentRepository
+        MetadataPool $metadataPool
     ) {
-        $this->contentRepository = $contentRepository;
+        $this->configRepository = $configRepository;
+        $this->productDataRepository = $productDataRepository;
         $this->contentResource = $contentResource;
-        $this->configContentRepository = $configContentRepository;
+        $this->entityId = $metadataPool->getMetadata(ProductInterface::class)->getLinkField();
     }
 
     /**
-     * @param InputInterface $input
+     * @param array $storeIds
      * @param OutputInterface $output
      * @return int
      */
-    public function run(InputInterface $input, OutputInterface $output)
+    public function run(array $storeIds, OutputInterface $output): int
     {
-        return $this->addProducts(null, $output);
+        $updates = 0;
+        foreach ($storeIds as $storeId) {
+            $updates += $this->addProducts($storeId, $output);
+        }
+
+        return $updates;
     }
 
     /**
-     * @param null|int $storeId
-     * @param null|OutputInterface $output
+     * @param int|null $storeId
+     * @param OutputInterface|null $output
      * @return int
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function addProducts($storeId = null, $output = null)
+    public function addProducts(int $storeId, ?OutputInterface $output = null): int
     {
-        $connection = $this->contentResource->getConnection();
-        $stores = [];
-        if (!$storeId) {
-            $selectStores = $connection->select()->from(
-                $this->contentResource->getTable('store'),
-                'store_id'
-            );
-            foreach ($connection->fetchAll($selectStores) as $store) {
-                $stores[] = $store['store_id'];
-            }
-        } else {
-            $stores[] = $storeId;
-        }
-        $selectContent = $connection->select()->from(
-            $this->contentResource->getTable('datatrics_content'),
-            'content_id'
-        );
-        if ($storeId) {
-            $selectContent->joinLeft(
-                ['datatrics_content_store' => $this->contentResource->getTable('datatrics_content_store')],
-                'content_id = product_id',
-                []
-            )->where('datatrics_content_store.store_id = ?', $storeId);
+        if (!$this->configRepository->isEnabled($storeId)) {
+            return 0;
         }
-        $limit = $this->configContentRepository->getProcessingLimitAdd();
-        $select = $connection->select()->from(
-            $this->contentResource->getTable('catalog_product_entity'),
-            'entity_id'
-        )->joinLeft(
-            ['super_link' => $this->contentResource->getTable('catalog_product_super_link')],
-            'super_link.product_id =' . $this->contentResource->getTable('catalog_product_entity') . '.entity_id',
-            [
-                'parent_id' => 'GROUP_CONCAT(parent_id)'
-            ]
-        )->where('entity_id not in (?)', $selectContent)
-            ->group('entity_id')->limit($limit);
-        $result = $connection->fetchAll($select);
+
+        $productIds = $this->getAllProductIds();
+        $productData = $this->productDataRepository->getProductData($storeId, $productIds);
+        $currentStoreData = $this->getCurrentStoreData($storeId);
+        $this->cleanupTables($storeId, array_keys($productData));
 
         if ($output) {
-            $progressBar = new \Symfony\Component\Console\Helper\ProgressBar($output, count($result));
+            $progressBar = new \Symfony\Component\Console\Helper\ProgressBar($output, count($productData));
             $progressBar->setMessage('0', 'product');
             $progressBar->setFormat(
                 '<info>Content</info> %current%/%max% [%bar%] %percent:3s%% %elapsed% %memory:6s%
@@ -118,16 +103,24 @@ public function addProducts($storeId = null, $output = null)
             $progressBar->start();
             $progressBar->display();
         }
+
         $count = 0;
-        $this->contentResource->beginTransaction();
         $pool = 0;
-        $data = [];
-        foreach ($result as $entity) {
-            $count++;
+        $storeData = [];
+
+        foreach ($productData as $productId => $data) {
             $pool++;
-            $content = $this->contentRepository->create();
-            $content->setContentId($entity['entity_id'])
-                ->setParentId((string)$entity['parent_id']);
+
+            if (!isset($currentStoreData[$productId])) {
+                $storeData[] = [
+                    (int)$productId,
+                    $data['parent_id'] ?? null,
+                    (int)$storeId,
+                    ContentRepository::STATUS['queued']
+                ];
+                $count++;
+            }
+
             if ($pool == 1000) {
                 $pool = 0;
                 if ($output) {
@@ -137,32 +130,84 @@ public function addProducts($storeId = null, $output = null)
                     $progressBar->advance(1000);
                 }
             }
-            foreach ($stores as $store) {
-                $data[] = [
-                    $entity['entity_id'],
-                    $store,
-                    'Queued for Update'
-                ];
-            }
-            $this->contentRepository->save($content);
         }
+
         if ($output) {
             /** @phpstan-ignore-next-line */
             $progressBar->setMessage((string)$count, 'product');
         }
-        if ($data) {
-            $connection->insertArray(
-                $this->contentResource->getTable('datatrics_content_store'),
-                ['product_id', 'store_id', 'status'],
-                $data
-            );
-        }
-        $this->contentResource->commit();
+
+        $this->updateStoreTable($storeData);
+
         if ($output) {
             /** @phpstan-ignore-next-line */
             $progressBar->finish();
             $output->writeln('');
         }
-        return $count;
+
+        return count($storeData);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAllProductIds(): array
+    {
+        $connection = $this->contentResource->getConnection();
+        $table = $this->contentResource->getTable('catalog_product_entity');
+        $productIds = $connection->select()
+            ->from($table, $this->entityId);
+
+        return array_flip($connection->fetchCol($productIds));
+    }
+
+    /**
+     * @param $storeId
+     * @return array
+     */
+    private function getCurrentStoreData($storeId): array
+    {
+        $connection = $this->contentResource->getConnection();
+        $table = $this->contentResource->getTable('datatrics_content_store');
+        $productIds = $connection->select()
+            ->from($table, 'product_id')
+            ->where('store_id = ?', $storeId);
+
+        return array_flip($connection->fetchCol($productIds));
+    }
+
+    /**
+     * @param int $storeId
+     * @param array $productIds
+     * @return void
+     */
+    private function cleanupTables(int $storeId, array $productIds): void
+    {
+        $connection = $this->contentResource->getConnection();
+        $connection->delete(
+            $this->contentResource->getTable('datatrics_content_store'),
+            [
+                'store_id = ?' => $storeId,
+                'product_id NOT IN (?)' => $productIds
+            ]
+        );
+    }
+
+    /**
+     * @param array $storeData
+     * @return void
+     */
+    private function updateStoreTable(array $storeData)
+    {
+        if (empty($storeData)) {
+            return;
+        }
+
+        $connection = $this->contentResource->getConnection();
+        $connection->insertArray(
+            $this->contentResource->getTable('datatrics_content_store'),
+            ['product_id', 'parent_id', 'store_id', 'status'],
+            $storeData
+        );
     }
 }
diff --git a/Model/Command/ContentInvalidate.php b/Model/Command/ContentInvalidate.php
index 8768135..9723273 100755
--- a/Model/Command/ContentInvalidate.php
+++ b/Model/Command/ContentInvalidate.php
@@ -7,9 +7,6 @@
 
 namespace Datatrics\Connect\Model\Command;
 
-use Datatrics\Connect\Api\Content\RepositoryInterface as ContentRepository;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputInterface;
 use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
 
 /**
@@ -20,57 +17,34 @@
 class ContentInvalidate
 {
 
-    /**
-     * @var ContentRepository
-     */
-    private $contentRepository;
-
     /**
      * @var ContentResource
      */
     private $contentResource;
 
     /**
-     * SalesUpdate constructor.
-     * @param ContentRepository $contentRepository
+     * ContentInvalidate constructor.
      * @param ContentResource $contentResource
      */
     public function __construct(
-        ContentRepository $contentRepository,
         ContentResource $contentResource
     ) {
-        $this->contentRepository = $contentRepository;
         $this->contentResource = $contentResource;
     }
 
     /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
+     * @param array $storeIds
+     * @param array|null $productIds
      * @return int
      */
-    public function run(InputInterface $input, OutputInterface $output)
+    public function run(array $storeIds, ?array $productIds = []): int
     {
-        $connection = $this->contentResource->getConnection();
-        if ($storeId = $input->getOption('store-id')) {
-            $stores = [$storeId];
-        } else {
-            $selectStores = $connection->select()->from(
-                $this->contentResource->getTable('store'),
-                'store_id'
-            );
-            $stores = [];
-            foreach ($connection->fetchAll($selectStores) as $store) {
-                $stores[] = $store['store_id'];
-            }
+        $where = ['store_id IN (?)' => $storeIds];
+        if (!empty($productIds)) {
+            $where['product_id IN (?)'] = $productIds;
         }
 
-        $where = [
-            'store_id IN (?)' => $stores
-        ];
-
-        if (!empty($input->getArguments()['product-id'])) {
-            $where['product_id IN (?)'] = [$input->getArguments()['product-id']];
-        }
+        $connection = $this->contentResource->getConnection();
         return $connection->update(
             $this->contentResource->getTable('datatrics_content_store'),
             ['status' => 'Queued for Update'],
diff --git a/Model/Command/ContentUpdate.php b/Model/Command/ContentUpdate.php
index 2fd633a..7fa2043 100755
--- a/Model/Command/ContentUpdate.php
+++ b/Model/Command/ContentUpdate.php
@@ -7,19 +7,17 @@
 
 namespace Datatrics\Connect\Model\Command;
 
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputInterface;
 use Datatrics\Connect\Api\API\AdapterInterface as ApiAdapter;
 use Datatrics\Connect\Api\Config\System\ContentInterface as ContentConfigRepository;
-use Magento\Framework\Serialize\Serializer\Json;
-use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
-use Datatrics\Connect\Service\Product\Data\AttributeMapper;
+use Datatrics\Connect\Api\Content\RepositoryInterface as ContentRepository;
+use Datatrics\Connect\Api\Log\RepositoryInterface as LogRepository;
 use Datatrics\Connect\Api\ProductData\RepositoryInterface as ProductDataRepository;
-use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Datatrics\Connect\Model\Content\CollectionFactory as ContentCollectionFactory;
+use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
+use Magento\Framework\Serialize\Serializer\Json;
 use Symfony\Component\Console\Helper\ProgressBar;
-use Datatrics\Connect\Service\Product\Hub;
-use Datatrics\Connect\Model\Config\System\ContentRepository as ConfigContentRepository;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class ContentUpdate
@@ -33,135 +31,71 @@ class ContentUpdate
      * @var ContentResource
      */
     private $contentResource;
-
     /**
      * @var ApiAdapter
      */
     private $apiAdapter;
-
     /**
      * @var ContentConfigRepository
      */
     private $contentConfigRepository;
-
     /**
      * @var Json
      */
     private $json;
-
-    /**
-     * @var AttributeMapper
-     */
-    private $attributeMapper;
-
-    /**
-     * @var StoreRepositoryInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var ProductCollection
-     */
-    private $productCollection;
-
     /**
      * @var bool
      */
     private $isDry = false;
-
-    /**
-     * @var Hub
-     */
-    private $collector;
-
     /**
      * @var ProgressBar|null
      */
     private $progressBar = null;
-
     /**
-     * @var array
-     */
-    private $mediaUrl;
-
-    /**
-     * @var array
-     */
-    private $filters;
-
-    /**
-     * @var array
-     */
-    private $parents;
-
-    /**
-     * @var array
-     */
-    private $types;
-
-    /**
-     * @var array
-     */
-    private $behaviour;
-
-    /**
-     * @var array
+     * @var ProductDataRepository
      */
-    private $childOf;
-
+    private $productDataRepository;
     /**
-     * @var array
+     * @var LogRepository
      */
-    private $extraAttributes = [];
-
+    private $logRepository;
     /**
-     * @var array
+     * @var ContentCollectionFactory
      */
-    private $categoryNames = [];
-
+    private $contentCollectionFactory;
     /**
-     * @var array
+     * @var ContentRepository
      */
-    private $storeUrl = [];
+    private $contentRepository;
 
     /**
-     * @var ProductDataRepository
-     */
-    private $productDataRepository;
-    /**
-     * @var ConfigContentRepository
-     */
-    private $configContentRepository;
-
-    /**
-     * ContentUpdate constructor.
      * @param ContentResource $contentResource
      * @param ApiAdapter $apiAdapter
+     * @param ContentRepository $contentRepository
      * @param ContentConfigRepository $contentConfigRepository
+     * @param ContentCollectionFactory $contentCollectionFactory
      * @param Json $json
-     * @param StoreRepositoryInterface $storeManager
-     * @param ProductCollection $productCollection
      * @param ProductDataRepository $productDataRepository
-     * @param ConfigContentRepository $configContentRepository
+     * @param LogRepository $logRepository
      */
     public function __construct(
         ContentResource $contentResource,
         ApiAdapter $apiAdapter,
+        ContentRepository $contentRepository,
         ContentConfigRepository $contentConfigRepository,
+        ContentCollectionFactory $contentCollectionFactory,
         Json $json,
-        StoreRepositoryInterface $storeManager,
-        ProductCollection $productCollection,
         ProductDataRepository $productDataRepository,
-        ConfigContentRepository $configContentRepository
+        LogRepository $logRepository
     ) {
         $this->contentResource = $contentResource;
         $this->apiAdapter = $apiAdapter;
+        $this->contentRepository = $contentRepository;
         $this->contentConfigRepository = $contentConfigRepository;
+        $this->contentCollectionFactory = $contentCollectionFactory;
         $this->json = $json;
-        $this->storeManager = $storeManager;
-        $this->productCollection = $productCollection;
         $this->productDataRepository = $productDataRepository;
-        $this->configContentRepository = $configContentRepository;
+        $this->logRepository = $logRepository;
     }
 
     /**
@@ -169,57 +103,43 @@ public function __construct(
      * @param OutputInterface $output
      * @return int
      */
-    public function run(InputInterface $input, OutputInterface $output)
+    public function run(InputInterface $input, OutputInterface $output): int
     {
         $storeId = (int)$input->getOption('store-id');
         if (!$this->contentConfigRepository->isEnabled($storeId)) {
-            $output->writeln('Product syncronisation disabled');
+            $output->writeln('Product synchronisation disabled');
             return 0;
         }
+
         $this->isDry = (bool)$input->getOption('dry');
+        $setProductIds = $input->getArgument('product-id');
+        $productIds = $this->getProductIds($storeId, $setProductIds);
 
-        $connection = $this->contentResource->getConnection();
-        $select = $connection->select()->from(
-            $this->contentResource->getTable('datatrics_content_store'),
-            [
-                'product_id',
-                'update_attempts'
-            ]
-        )->where('store_id = ?', $storeId);
-        if (!$input->getOption('force')) {
-            $select->where('status <> ?', 'Synced');
-        }
-        if ($limit = $this->configContentRepository->getProcessingLimit($storeId)) {
-            $select->limit($limit);
-        }
-        if ($productIds = $input->getArgument('product-id')) {
-            $select->where('product_id in (?)', $productIds);
-        }
-        if (!$connection->fetchOne($select)) {
-            return 0;
-        }
-        $productIds = $connection->fetchCol($select);
         $count = $productIds ? $this->prepareData($productIds, $storeId) : 0;
         $this->initProgressBar($output, $count);
         return 0;
     }
 
     /**
-     * @param OutputInterface $output
-     * @param string|int $size
+     * @param int $storeId
+     * @param array|null $setProductIds
+     * @return array
      */
-    private function initProgressBar($output, $size)
+    public function getProductIds(int $storeId, ?array $setProductIds = null): array
     {
-        /* init progress bar */
-        $this->progressBar = new \Symfony\Component\Console\Helper\ProgressBar(
-            $output,
-            $size
-        );
-        $this->progressBar->setMessage('0', 'content');
-        $this->progressBar->setFormat(
-            '<info>Content</info> %current%/%max% [%bar%] %percent:3s%% %elapsed% %memory:6s%
-    <info>⏺ Pushed:    </info>%content%'
-        );
+        $connection = $this->contentResource->getConnection();
+        $selectProductIds = $connection->select()
+            ->from($this->contentResource->getTable('datatrics_content_store'), 'product_id')
+            ->where('status != (?)', ContentRepository::STATUS['synced'])
+            ->where('store_id = ?', $storeId)
+            ->limit($this->contentConfigRepository->getProcessingLimit($storeId))
+            ->order('updated_at ASC');
+
+        if ($setProductIds) {
+            $selectProductIds->where('product_id in (?)', $setProductIds);
+        }
+
+        return $connection->fetchCol($selectProductIds);
     }
 
     /**
@@ -227,15 +147,14 @@ private function initProgressBar($output, $size)
      *
      * @param array $productIds
      * @param int $storeId
+     * @param bool $dryRun
      * @return int
      */
-    public function prepareData(array $productIds, int $storeId)
+    public function prepareData(array $productIds, int $storeId, bool $dryRun = false): int
     {
-        $connection = $this->contentResource->getConnection();
         $count = 0;
-        $items = [
-            'items' => []
-        ];
+        $items = ['items' => []];
+
         $data = $this->productDataRepository->getProductData($storeId, $productIds);
         foreach ($data as $id => $product) {
             $preparedData = [
@@ -244,63 +163,54 @@ public function prepareData(array $productIds, int $storeId)
                 "item" => $product
             ];
             try {
-                $serializedData = $this->json->serialize($preparedData);
+                $this->json->serialize($preparedData);
             } catch (\Exception $e) {
                 continue;
             }
             $items['items'][] = $preparedData;
         }
-        if ($this->isDry) {
-            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            print_r($items);
+
+        if ($this->isDry || $dryRun) {
+            echo '<pre>'; // phpcs:ignore
+            print_r($items); // phpcs:ignore
             return $count;
         }
+
         if (!$items['items']) {
             $this->updateSkipped($productIds, $storeId);
             return $count;
         }
-        //bulk update
+
         $response = $this->apiAdapter->execute(
             ApiAdapter::BULK_CREATE_CONTENT,
             null,
             $this->json->serialize($items)
         );
+
         if (!$response['success'] || !isset($response['data']['total_elements'])) {
             return $count;
-        }
-        if ($response['success'] == true) {
-            $count += $response['data']['total_elements'];
         } else {
-            return $count;
+            $count += $response['data']['total_elements'];
         }
+
         $updatedProductIds = [];
         foreach ($response['data']['items'] as $item) {
             $updatedProductIds[] = $item['id'];
         }
-        $where = [
-            'product_id IN (?)' => $updatedProductIds,
-            'store_id = ?' => $storeId
-        ];
-        if ($response['success'] == true) {
-            $connection->update(
-                $this->contentResource->getTable('datatrics_content_store'),
-                [
-                    'status' => 'Synced',
-                    'update_msg' => '',
-                    'update_attempts' => 0
-                ],
-                $where
-            );
-        } else {
-            $connection->update(
-                $this->contentResource->getTable('datatrics_content_store'),
-                [
-                    'status' => 'Error',
-                    'update_msg' => ''
-                ],
-                $where
-            );
-        }
+
+        $connection = $this->contentResource->getConnection();
+        $connection->update(
+            $this->contentResource->getTable('datatrics_content_store'),
+            [
+                'status' => 'Synced',
+                'update_msg' => '',
+                'update_attempts' => 0
+            ],
+            [
+                'product_id IN (?)' => $updatedProductIds,
+                'store_id = ?' => $storeId
+            ]
+        );
 
         $skippedProducts = array_diff($productIds, $updatedProductIds);
         if (!empty($skippedProducts)) {
@@ -311,6 +221,7 @@ public function prepareData(array $productIds, int $storeId)
             $this->progressBar->setMessage((string)$count, 'content');
             $this->progressBar->advance($count);
         }
+
         return $count;
     }
 
@@ -320,17 +231,42 @@ public function prepareData(array $productIds, int $storeId)
      */
     private function updateSkipped(array $productIds, int $storeId)
     {
-        $connection = $this->contentResource->getConnection();
-        $connection->update(
-            $this->contentResource->getTable('datatrics_content_store'),
-            [
-                'status' => 'Skipped',
-                'update_msg' => ''
-            ],
-            [
-                'product_id IN (?)' => $productIds,
-                'store_id = ?' => $storeId
-            ]
+        $this->logRepository->addDebugLog('Skipped Products', implode(',', $productIds));
+
+        $collection = $this->contentCollectionFactory->create()
+            ->addFieldToFilter('product_id', ['in' => $productIds])
+            ->addFieldToFilter('store_id', $storeId);
+
+        foreach ($collection as $content) {
+            try {
+                if ($content->getUpdateAttempts() < 2) {
+                    $content->setStatus(ContentRepository::STATUS['skipped'])
+                        ->setUpdateAttempts($content->getUpdateAttempts() + 1);
+                    $this->contentRepository->save($content);
+                } else {
+                    $this->contentRepository->delete($content);
+                }
+            } catch (\Exception $exception) {
+                $this->logRepository->addErrorLog('updateSkipped', $exception->getMessage());
+            }
+        }
+    }
+
+    /**
+     * @param OutputInterface $output
+     * @param string|int $size
+     */
+    private function initProgressBar(OutputInterface $output, $size)
+    {
+        /* init progress bar */
+        $this->progressBar = new \Symfony\Component\Console\Helper\ProgressBar(
+            $output,
+            $size
+        );
+        $this->progressBar->setMessage('0', 'content');
+        $this->progressBar->setFormat(
+            '<info>Content</info> %current%/%max% [%bar%] %percent:3s%% %elapsed% %memory:6s%
+    <info>⏺ Pushed:    </info>%content%'
         );
     }
 }
diff --git a/Model/Config/Repository.php b/Model/Config/Repository.php
index 99b6d46..c375d50 100755
--- a/Model/Config/Repository.php
+++ b/Model/Config/Repository.php
@@ -25,7 +25,7 @@ class Repository implements ConfigRepositoryInterface
     /**
      * @var StoreManagerInterface
      */
-    private $storeManager;
+    public $storeManager;
     /**
      * @var ScopeConfigInterface
      */
diff --git a/Model/Config/System/ContentRepository.php b/Model/Config/System/ContentRepository.php
index a21dac3..efa8b44 100755
--- a/Model/Config/System/ContentRepository.php
+++ b/Model/Config/System/ContentRepository.php
@@ -16,6 +16,23 @@
 class ContentRepository extends ConfigRepository implements ContentInterface
 {
 
+    /**
+     * @inheritDoc
+     */
+    public function getContentEnabledStoreIds(): array
+    {
+        $storeIds = [];
+        $stores = $this->storeManager->getStores();
+        foreach ($stores as $store) {
+            if (!$this->isEnabled((int)$store->getId())) {
+                continue;
+            }
+            $storeIds[] = (int)$store->getId();
+        }
+
+        return $storeIds;
+    }
+
     /**
      * @inheritDoc
      */
@@ -53,22 +70,6 @@ private function getSkuAttribute(int $storeId): string
         return $this->getStoreValue(self::XML_PATH_SKU, $storeId);
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function getProcessingLimit(int $storeId): int
-    {
-        return (int)$this->getStoreValue(self::XML_PATH_LIMIT, $storeId);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getProcessingLimitAdd(): int
-    {
-        return (int)$this->getStoreValue(self::XML_PATH_LIMIT_ADD);
-    }
-
     /**
      * Get selected attribute for 'name'
      *
@@ -123,6 +124,22 @@ public function getImageAttributes(int $storeId): array
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getProcessingLimit(int $storeId): int
+    {
+        return (int)$this->getStoreValue(self::XML_PATH_LIMIT, $storeId);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getProcessingLimitAdd(): int
+    {
+        return (int)$this->getStoreValue(self::XML_PATH_LIMIT_ADD);
+    }
+
     /**
      * @inheritDoc
      */
@@ -274,7 +291,7 @@ private function bundleParentAttributes(int $storeId): array
     }
 
     /**
-     * Flag to only use fallback to parent 'bundle' attributes on non visible parents
+     * Flag to only use fallback to parent 'bundle' attributes on non-visible parents
      *
      * @param int $storeId
      *
@@ -369,7 +386,7 @@ public function getFilters(int $storeId): array
     {
         return [
             'add_disabled_products' => $this->addDisableProducts($storeId),
-            'filter_by_visibility' => $this->restricProductFeedByVisibility($storeId),
+            'filter_by_visibility' => $this->restrictProductFeedByVisibility($storeId),
             'visibility' => $this->productFeedVisibilityRestrictions($storeId),
             'restrict_by_category' => $this->restrictProductFeedByCategory($storeId),
             'category_restriction_behaviour' => $this->categoryRestrictionsFilterType($storeId),
@@ -390,7 +407,7 @@ private function addDisableProducts(int $storeId): bool
      *
      * @return bool
      */
-    private function restricProductFeedByVisibility(int $storeId): bool
+    private function restrictProductFeedByVisibility(int $storeId): bool
     {
         return $this->isSetFlag(self::XML_PATH_FILTER_BY_VISIBILITY, $storeId);
     }
@@ -447,7 +464,7 @@ private function getCategoryIds(int $storeId): array
     }
 
     /**
-     * Exclude of of stock products
+     * Exclude out of stock products
      *
      * @param int $storeId
      *
diff --git a/Model/Content/Data.php b/Model/Content/Data.php
index 833e1c1..d64bd05 100755
--- a/Model/Content/Data.php
+++ b/Model/Content/Data.php
@@ -7,13 +7,12 @@
 
 namespace Datatrics\Connect\Model\Content;
 
+use Datatrics\Connect\Api\Content\DataInterface as ContentData;
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Model\AbstractModel;
-use Datatrics\Connect\Api\Content\DataInterface as ContentData;
 
 /**
  * Datatrics Content data class
- *
  */
 class Data extends AbstractModel implements ExtensibleDataInterface, ContentData
 {
@@ -29,31 +28,31 @@ public function _construct()
     /**
      * @inheritDoc
      */
-    public function getContentId(): string
+    public function getProductId(): int
     {
-        return $this->getData(self::CONTENT_ID);
+        return $this->getData(self::PRODUCT_ID);
     }
 
     /**
      * @inheritDoc
      */
-    public function setContentId(string $contentId): ContentData
+    public function setProductId(int $productId): ContentData
     {
-        return $this->setData(self::CONTENT_ID, $contentId);
+        return $this->setData(self::PRODUCT_ID, $productId);
     }
 
     /**
      * @inheritDoc
      */
-    public function getParentId(): string
+    public function getParentId(): ?int
     {
-        return $this->getData(self::PARENT_ID);
+        return $this->getData(self::PARENT_ID) ? (int)$this->getData(self::PARENT_ID) : null;
     }
 
     /**
      * @inheritDoc
      */
-    public function setParentId(string $parentId): ContentData
+    public function setParentId(?int $parentId): ContentData
     {
         return $this->setData(self::PARENT_ID, $parentId);
     }
@@ -74,22 +73,6 @@ public function setStoreId(int $storeId): ContentData
         return $this->setData(self::STORE_ID, $storeId);
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function getCreatedAt(): string
-    {
-        return $this->getData(self::CREATED_AT);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setCreatedAt(string $createdAt): ContentData
-    {
-        return $this->setData(self::CREATED_AT, $createdAt);
-    }
-
     /**
      * @inheritDoc
      */
@@ -125,9 +108,9 @@ public function setUpdateMsg(string $updateMsg): ContentData
     /**
      * @inheritDoc
      */
-    public function getUpdateAttempts(): string
+    public function getUpdateAttempts(): int
     {
-        return $this->getData(self::UPDATE_ATTEMPTS);
+        return (int)$this->getData(self::UPDATE_ATTEMPTS);
     }
 
     /**
diff --git a/Model/Content/Repository.php b/Model/Content/Repository.php
index 35d321b..dec84d1 100755
--- a/Model/Content/Repository.php
+++ b/Model/Content/Repository.php
@@ -7,23 +7,17 @@
 
 namespace Datatrics\Connect\Model\Content;
 
+use Datatrics\Connect\Api\Content\DataInterface as ContentData;
+use Datatrics\Connect\Api\Content\RepositoryInterface as ContentRepository;
 use Datatrics\Connect\Api\Content\SearchResultsInterface;
-use Exception;
-use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Datatrics\Connect\Api\Content\SearchResultsInterfaceFactory as SearchResultsFactory;
+use Datatrics\Connect\Api\Log\RepositoryInterface as LogRepository;
+use Datatrics\Connect\Model\Content\DataFactory as DataFactory;
 use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Datatrics\Connect\Api\Log\RepositoryInterface as LogRepository;
-use Datatrics\Connect\Api\Content\DataInterface as ContentData;
-use Datatrics\Connect\Model\Content\DataFactory as DataFactory;
-use Datatrics\Connect\Api\Content\RepositoryInterface as ContentRepository;
-use Datatrics\Connect\Api\Content\SearchResultsInterfaceFactory as SearchResultsFactory;
-use Magento\Framework\Encryption\Encryptor;
-use Datatrics\Connect\Api\Config\RepositoryInterface as ConfigRepository;
 
 /**
  * Datatrics content repository class
@@ -40,88 +34,42 @@ class Repository implements ContentRepository
      * @var SearchResultsFactory
      */
     private $searchResultsFactory;
-
     /**
      * @var CollectionFactory
      */
     private $collectionFactory;
-
     /**
      * @var ResourceModel
      */
     private $resource;
-
     /**
      * @var DataFactory
      */
     private $dataFactory;
-
-    /**
-     * @var JoinProcessorInterface
-     */
-    private $extensionAttributesJoinProcessor;
-
-    /**
-     * @var CollectionProcessorInterface|null
-     */
-    private $collectionProcessor;
-
     /**
      * @var LogRepository
      */
     private $logRepository;
 
     /**
-     * @var Encryptor
-     */
-    private $encryptor;
-
-    /**
-     * @var ConfigRepository
-     */
-    private $configRepository;
-
-    /**
-     * Repository constructor.
      * @param SearchResultsFactory $searchResultsFactory
      * @param CollectionFactory $collectionFactory
-     * @param JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param ResourceModel $resource
      * @param DataFactory $dataFactory
      * @param LogRepository $logRepository
-     * @param Encryptor $encryptor
-     * @param ConfigRepository $configRepository
-     * @param CollectionProcessorInterface|null $collectionProcessor
      */
     public function __construct(
         SearchResultsFactory $searchResultsFactory,
         CollectionFactory $collectionFactory,
-        JoinProcessorInterface $extensionAttributesJoinProcessor,
         ResourceModel $resource,
         DataFactory $dataFactory,
-        LogRepository $logRepository,
-        Encryptor $encryptor,
-        ConfigRepository $configRepository,
-        CollectionProcessorInterface $collectionProcessor = null
+        LogRepository $logRepository
     ) {
         $this->searchResultsFactory = $searchResultsFactory;
         $this->collectionFactory = $collectionFactory;
-        $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
         $this->resource = $resource;
         $this->dataFactory = $dataFactory;
         $this->logRepository = $logRepository;
-        $this->encryptor = $encryptor;
-        $this->configRepository = $configRepository;
-        $this->collectionProcessor = $collectionProcessor ?: ObjectManager::getInstance()
-            ->get(CollectionProcessorInterface::class);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function create()
-    {
-        return $this->dataFactory->create();
     }
 
     /**
@@ -136,6 +84,14 @@ public function getList(SearchCriteriaInterface $searchCriteria): SearchResultsI
             ->setTotalCount($collection->getSize());
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function create(): ContentData
+    {
+        return $this->dataFactory->create();
+    }
+
     /**
      * @inheritDoc
      */
@@ -168,7 +124,7 @@ public function delete(ContentData $entity): bool
     {
         try {
             $this->resource->delete($entity);
-        } catch (Exception $exception) {
+        } catch (\Exception $exception) {
             $this->logRepository->addErrorLog('Delete content', $exception->getMessage());
             $exceptionMsg = self::COULD_NOT_DELETE_EXCEPTION;
             throw new CouldNotDeleteException(__(
@@ -182,12 +138,11 @@ public function delete(ContentData $entity): bool
     /**
      * @inheritDoc
      */
-    public function save(
-        ContentData $entity
-    ): ContentData {
+    public function save(ContentData $entity): ContentData
+    {
         try {
             $this->resource->save($entity);
-        } catch (Exception $exception) {
+        } catch (\Exception $exception) {
             $this->logRepository->addErrorLog('Save content', $exception->getMessage());
             $exceptionMsg = self::COULD_NOT_SAVE_EXCEPTION;
             throw new CouldNotSaveException(__(
@@ -197,102 +152,4 @@ public function save(
         }
         return $entity;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function prepareContentData(array $productIds)
-    {
-        $connection = $this->resource->getConnection();
-        $selectContent = $connection->select()->from(
-            $this->resource->getTable('datatrics_content_store'),
-            [
-                'product_id',
-                'store_id',
-                'status'
-            ]
-        )->where('product_id in (?)', $productIds);
-        $contents = $connection->fetchAll($selectContent);
-        $toInvalidate = [];
-        $skip = 0;
-        $toAdd = array_diff($productIds, $connection->fetchCol($selectContent));
-        foreach ($contents as $content) {
-            if ($content['status'] != 0) {
-                $toInvalidate[] = $content['product_id'];
-            } else {
-                $skip++;
-            }
-        }
-        // invalidating
-        $invalidated = $connection->update(
-            $this->resource->getTable('datatrics_content_store'),
-            ['status' => 0],
-            ['product_id in (?)' => $toInvalidate]
-        );
-
-        //adding
-        $added = $this->addContent($toAdd);
-        return [
-            'added' => $added,
-            'invalidated' => $invalidated,
-            'skipped' => $skip
-        ];
-    }
-
-    /**
-     * Collect products and add to tables
-     *
-     * @param array $productIds
-     * @return int
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    private function addContent($productIds)
-    {
-        $connection = $this->resource->getConnection();
-        $selectStores = $connection->select()->from(
-            $this->resource->getTable('store'),
-            'store_id'
-        );
-        $stores = [];
-        foreach ($connection->fetchAll($selectStores) as $store) {
-            $stores[] = $store['store_id'];
-        }
-        $select = $connection->select()->from(
-            $this->resource->getTable('catalog_product_entity'),
-            'entity_id'
-        )->joinLeft(
-            ['super_link' => $this->resource->getTable('catalog_product_super_link')],
-            'super_link.product_id =' . $this->resource->getTable('catalog_product_entity') . '.entity_id',
-            [
-                'parent_id' => 'GROUP_CONCAT(parent_id)'
-            ]
-        )->where('entity_id in (?)', $productIds)
-            ->group('entity_id')->limit(self::LIMIT);
-        $result = $connection->fetchAll($select);
-        $count = 0;
-        $this->resource->beginTransaction();
-        $data = [];
-        foreach ($result as $entity) {
-            $count++;
-            $content = $this->create();
-            $content->setContentId($entity['entity_id'])
-                ->setParentId((string)$entity['parent_id']);
-            foreach ($stores as $store) {
-                $data[] = [
-                    $entity['entity_id'],
-                    $store
-                ];
-            }
-            $this->save($content);
-        }
-        if ($data) {
-            $connection->insertArray(
-                $this->resource->getTable('datatrics_content_store'),
-                ['product_id', 'store_id'],
-                $data
-            );
-        }
-        $this->resource->commit();
-        return $count;
-    }
 }
diff --git a/Model/Content/ResourceModel.php b/Model/Content/ResourceModel.php
index 28a779d..822e059 100755
--- a/Model/Content/ResourceModel.php
+++ b/Model/Content/ResourceModel.php
@@ -16,7 +16,7 @@
 class ResourceModel extends AbstractDb
 {
 
-    public const ENTITY_TABLE = 'datatrics_content';
+    public const ENTITY_TABLE = 'datatrics_content_store';
     public const PRIMARY = 'entity_id';
 
     /**
@@ -31,10 +31,10 @@ public function _construct()
      * Check is entity exists
      *
      * @param int $entityId
-     * @param string $field
+     * @param string|null $field
      * @return bool
      */
-    public function isExists($entityId, $field = 'entity_id')
+    public function isExists(int $entityId, ?string $field = 'entity_id'): bool
     {
         $connection = $this->getConnection();
         $select = $connection->select()->from(
@@ -45,22 +45,4 @@ public function isExists($entityId, $field = 'entity_id')
         $bind = [':' . $field => $entityId];
         return (bool)$connection->fetchOne($select, $bind);
     }
-
-    /**
-     * Check is entity exists
-     *
-     * @param int $contentId
-     * @return int
-     */
-    public function getIdByContent($contentId)
-    {
-        $connection = $this->getConnection();
-        $select = $connection->select()->from(
-            $this->getTable(self::ENTITY_TABLE),
-            self::PRIMARY
-        );
-        $select->where('content_id = :content_id');
-        $bind = [':content_id' => $contentId];
-        return (int)$connection->fetchOne($select, $bind);
-    }
 }
diff --git a/Model/Cron/ContentMaintenance.php b/Model/Cron/ContentMaintenance.php
index a347688..76662d3 100755
--- a/Model/Cron/ContentMaintenance.php
+++ b/Model/Cron/ContentMaintenance.php
@@ -7,13 +7,8 @@
 
 namespace Datatrics\Connect\Model\Cron;
 
-use Datatrics\Connect\Api\API\AdapterInterface as ApiAdapter;
-use Datatrics\Connect\Api\Content\RepositoryInterface as ContentRepository;
-use Datatrics\Connect\Api\Config\RepositoryInterface as ConfigRepository;
-use Datatrics\Connect\Api\Config\System\ContentInterface as ContentConfigRepository;
-use Magento\Framework\Serialize\Serializer\Json;
-use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
-use Magento\Store\Api\StoreRepositoryInterface;
+use Datatrics\Connect\Api\Config\System\ContentInterface as ConfigProvider;
+use Datatrics\Connect\Model\Command\ContentAdd;
 
 /**
  * Class ContentMaintenance
@@ -23,204 +18,57 @@
 class ContentMaintenance
 {
 
-    /**
-     * @var ContentRepository
-     */
-    private $contentRepository;
-
-    /**
-     * @var ContentResource
-     */
-    private $contentResource;
+    public $storeIds = [];
 
     /**
-     * @var ConfigRepository
+     * @var ConfigProvider
      */
-    private $configRepository;
-
+    private $configProvider;
     /**
-     * @var Json
+     * @var ContentAdd
      */
-    private $json;
+    private $contentAdd;
 
     /**
-     * @var StoreRepositoryInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var ApiAdapter
-     */
-    private $apiAdapter;
-
-    /**
-     * @var ContentConfigRepository
-     */
-    private $contentConfigRepository;
-
-    /**
-     * ContentMaintenance constructor.
-     * @param ContentResource $contentResource
-     * @param ConfigRepository $configRepository
-     * @param Json $json
-     * @param StoreRepositoryInterface $storeManager
-     * @param ContentRepository $contentRepository
-     * @param ApiAdapter $apiAdapter
-     * @param ContentConfigRepository $contentConfigRepository
+     * @param ConfigProvider $configProvider
+     * @param ContentAdd $contentAdd
      */
     public function __construct(
-        ContentResource $contentResource,
-        ConfigRepository $configRepository,
-        Json $json,
-        StoreRepositoryInterface $storeManager,
-        ContentRepository $contentRepository,
-        ApiAdapter $apiAdapter,
-        ContentConfigRepository $contentConfigRepository
+        ConfigProvider $configProvider,
+        ContentAdd $contentAdd
     ) {
-        $this->contentResource = $contentResource;
-        $this->configRepository = $configRepository;
-        $this->json = $json;
-        $this->storeManager = $storeManager;
-        $this->contentRepository = $contentRepository;
-        $this->apiAdapter = $apiAdapter;
-        $this->contentConfigRepository = $contentConfigRepository;
-    }
-
-    /**
-     * Collect products which should be scheduled to delete from platform
-     */
-    private function collectProductsToDelete()
-    {
-        $connection = $this->contentResource->getConnection();
-        $selectMagentoProducts = $connection->select()->from(
-            $this->contentResource->getTable('catalog_product_entity'),
-            [
-                'entity_id'
-            ]
-        );
-        $magentoProductIds = $connection->fetchCol($selectMagentoProducts);
-        $selectDatatricsProducts = $connection->select()->from(
-            $this->contentResource->getTable('datatrics_content'),
-            [
-                'content_id'
-            ]
-        );
-        $datatricsProductIds = $connection->fetchCol($selectDatatricsProducts);
-        $toDelete = array_diff($datatricsProductIds, $magentoProductIds);
-        $connection->update(
-            $this->contentResource->getTable('datatrics_content_store'),
-            ['status' => 'Queued for Delete'],
-            ['product_id IN (?)' => $toDelete]
-        );
-        foreach ($toDelete as $itemId) {
-            $data = [
-                "source" => "Magento 2",
-                "type" => "item"
-            ];
-            $this->apiAdapter->execute(
-                ApiAdapter::DELETE_CONTENT,
-                $itemId,
-                $data
-            );
-        }
+        $this->configProvider = $configProvider;
+        $this->contentAdd = $contentAdd;
     }
 
     /**
-     * Collect product IDs which should be scheduled to add to platform
-     *
-     * @return array
-     */
-    private function collectProductsToAdd()
-    {
-        $connection = $this->contentResource->getConnection();
-        $selectMagentoProducts = $connection->select()->from(
-            $this->contentResource->getTable('catalog_product_entity'),
-            [
-                'entity_id'
-            ]
-        );
-        $magentoProductIds = $connection->fetchCol($selectMagentoProducts);
-        $selectDatatricsProducts = $connection->select()->from(
-            $this->contentResource->getTable('datatrics_content_store'),
-            [
-                'product_id'
-            ]
-        );
-        $datatricsProductIds = $connection->fetchCol($selectDatatricsProducts);
-        $toAdd = array_diff($magentoProductIds, $datatricsProductIds);
-        return $toAdd;
-    }
-
-    /**
-     * Schedule products to add to platform
+     * Schedule products to delete and add
      *
-     * @param array $productIds
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return $this
      */
-    private function addProducts($productIds)
+    public function execute(): ContentMaintenance
     {
-        $connection = $this->contentResource->getConnection();
-        $selectStores = $connection->select()->from(
-            $this->contentResource->getTable('store'),
-            'store_id'
-        );
-        $stores = [];
-        foreach ($connection->fetchAll($selectStores) as $store) {
-            $stores[] = $store['store_id'];
-        }
-        $select = $connection->select()->from(
-            $this->contentResource->getTable('catalog_product_entity'),
-            'entity_id'
-        )->joinLeft(
-            ['super_link' => $this->contentResource->getTable('catalog_product_super_link')],
-            'super_link.product_id =' . $this->contentResource->getTable('catalog_product_entity') . '.entity_id',
-            [
-                'parent_id' => 'GROUP_CONCAT(parent_id)'
-            ]
-        )->where('entity_id in (?)', $productIds)
-            ->group('entity_id')->limit(
-                $this->contentConfigRepository->getProcessingLimitAdd()
-            );
-        $result = $connection->fetchAll($select);
-        $this->contentResource->beginTransaction();
-        $data = [];
-        foreach ($result as $entity) {
-            $content = $this->contentRepository->create();
-            $content->setContentId($entity['entity_id'])
-                ->setParentId((string)$entity['parent_id']);
-            foreach ($stores as $store) {
-                $data[] = [
-                    $entity['entity_id'],
-                    $store,
-                    'Queued for Update'
-                ];
-            }
-            $this->contentRepository->save($content);
+        if (!$this->configProvider->isEnabled()) {
+            return $this;
         }
-        if ($data) {
-            $connection->insertArray(
-                $this->contentResource->getTable('datatrics_content_store'),
-                ['product_id', 'store_id', 'status'],
-                $data
-            );
+
+        $storeIds = $this->getStoreIds();
+        foreach ($storeIds as $storeId) {
+            $this->contentAdd->addProducts($storeId);
         }
-        $this->contentResource->commit();
+
+        return $this;
     }
 
     /**
-     * Schedule products to delete and add
-     *
-     * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return array
      */
-    public function execute()
+    private function getStoreIds(): array
     {
-        if (!$this->configRepository->isEnabled()) {
-            return $this;
+        if (!$this->storeIds) {
+            $this->storeIds = $this->configProvider->getContentEnabledStoreIds();
         }
-        $this->collectProductsToDelete();
-        $idsToAdd = $this->collectProductsToAdd();
-        $this->addProducts($idsToAdd);
-        return $this;
+
+        return $this->storeIds;
     }
 }
diff --git a/Model/Cron/ContentUpdate.php b/Model/Cron/ContentUpdate.php
index 97a8e15..f761904 100755
--- a/Model/Cron/ContentUpdate.php
+++ b/Model/Cron/ContentUpdate.php
@@ -7,14 +7,10 @@
 
 namespace Datatrics\Connect\Model\Cron;
 
-use Datatrics\Connect\Api\API\AdapterInterface as ApiAdapter;
 use Datatrics\Connect\Api\Config\System\ContentInterface as ContentConfigRepository;
-use Datatrics\Connect\Api\ProductData\RepositoryInterface as ProductDataRepository;
-use Magento\Framework\Serialize\Serializer\Json;
+use Datatrics\Connect\Model\Command\ContentUpdate as CommandContentUpdate;
 use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-use Datatrics\Connect\Model\Command\ContentUpdate as CommandContentUpdate;
 
 /**
  * Class ContentUpdate
@@ -28,37 +24,14 @@ class ContentUpdate
      * @var ContentResource
      */
     private $contentResource;
-
-    /**
-     * @var ApiAdapter
-     */
-    private $apiAdapter;
-
     /**
      * @var ContentConfigRepository
      */
     private $contentConfigRepository;
-
-    /**
-     * @var Json
-     */
-    private $json;
-
     /**
      * @var StoreRepositoryInterface
      */
     private $storeManager;
-
-    /**
-     * @var ProductCollection
-     */
-    private $productCollection;
-
-    /**
-     * @var ProductDataRepository
-     */
-    private $productDataRepository;
-
     /**
      * @var CommandContentUpdate
      */
@@ -67,77 +40,59 @@ class ContentUpdate
     /**
      * ContentUpdate constructor.
      * @param ContentResource $contentResource
-     * @param ApiAdapter $apiAdapter
      * @param ContentConfigRepository $contentConfigRepository
-     * @param Json $json
      * @param StoreRepositoryInterface $storeManager
-     * @param ProductCollection $productCollection
-     * @param ProductDataRepository $productDataRepository
      * @param CommandContentUpdate $commandContentUpdate
      */
     public function __construct(
         ContentResource $contentResource,
-        ApiAdapter $apiAdapter,
         ContentConfigRepository $contentConfigRepository,
-        Json $json,
         StoreRepositoryInterface $storeManager,
-        ProductCollection $productCollection,
-        ProductDataRepository $productDataRepository,
         CommandContentUpdate $commandContentUpdate
     ) {
         $this->contentResource = $contentResource;
-        $this->apiAdapter = $apiAdapter;
         $this->contentConfigRepository = $contentConfigRepository;
-        $this->json = $json;
         $this->storeManager = $storeManager;
-        $this->productCollection = $productCollection;
-        $this->productDataRepository = $productDataRepository;
         $this->commandContentUpdate = $commandContentUpdate;
     }
 
-    /**
-     * Delete products data
-     */
-    private function deleteProducts()
-    {
-        $connection = $this->contentResource->getConnection();
-        $select = $connection->select()->from(
-            $this->contentResource->getTable('datatrics_content_store'),
-            [
-                'product_id'
-            ]
-        )->where('status = ?', 'Queued for Delete');
-        $productIds = $connection->fetchCol($select);
-        $where = [
-            'product_id in (?)' => $productIds
-        ];
-        $connection->delete($this->contentResource->getTable('datatrics_content_store'), $where);
-        $where = [
-            'content_id in (?)' => $productIds
-        ];
-        $connection->delete($this->contentResource->getTable('datatrics_content'), $where);
-    }
-
     /**
      * Delete and update products data
      * @return $this
      */
-    public function execute()
+    public function execute(): ContentUpdate
     {
         $this->deleteProducts();
+
         foreach ($this->storeManager->getList() as $store) {
             if (!$this->contentConfigRepository->isEnabled((int)$store->getId()) || $store->getId() == 0) {
                 continue;
             }
-            if ($store->getIsActive()
-                && $this->contentConfigRepository->isEnabled((int)$store->getId())
-            ) {
+            if ($store->getIsActive() && $this->contentConfigRepository->isEnabled((int)$store->getId())) {
                 $this->processStoreData((int)$store->getId());
             }
         }
         return $this;
     }
 
+    /**
+     * Delete products data
+     */
+    private function deleteProducts()
+    {
+        $connection = $this->contentResource->getConnection();
+        $select = $connection->select()->from(
+            $this->contentResource->getTable('datatrics_content_store'),
+            ['product_id']
+        )->where('status = ?', 'Queued for Delete');
+        $productIds = $connection->fetchCol($select);
+
+        $connection->delete(
+            $this->contentResource->getTable('datatrics_content_store'),
+            ['product_id in (?)' => $productIds]
+        );
+    }
+
     /**
      * @param int $storeId
      */
diff --git a/Model/ProductData/Repository.php b/Model/ProductData/Repository.php
index d2423d5..451673c 100755
--- a/Model/ProductData/Repository.php
+++ b/Model/ProductData/Repository.php
@@ -12,6 +12,7 @@
 use Datatrics\Connect\Service\ProductData\AttributeCollector\Data\Image;
 use Datatrics\Connect\Service\ProductData\Filter;
 use Datatrics\Connect\Service\ProductData\Type;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * ProductData repository class
@@ -27,6 +28,7 @@ class Repository implements ProductData
      * @var array
      */
     private $attributeMap = [
+        'product_id' => 'entity_id',
         'type_id' => 'type_id',
         'created_at' => 'created_at',
         'updated_at' => 'updated_at',
@@ -118,14 +120,17 @@ public function getProductData(int $storeId = 0, array $entityIds = []): array
 
         $result = [];
         foreach ($this->collectProductData($storeId) as $entityId => $productData) {
-            $this->addImageData($storeId, $entityId, $productData);
-            if (isset($productData['category'])) {
-                $this->addCategoryData($productData);
+            if (empty($productData['product_id'])) {
+                continue;
             }
+            $productId = (int)$productData['product_id'];
+            $this->addImageData($storeId, $entityId, $productData);
+            $this->addCategoryData($productData);
+            $result[$productId]['row_id'] = $entityId;
             foreach ($this->resultMap as $index => $attr) {
-                $result[$entityId][$index] = $productData[$attr] ?? '';
-                if (!$result[$entityId][$index]) {
-                    $result[$entityId][$index] = $productData[$index] ?? '';
+                $result[$productId][$index] = $productData[$attr] ?? '';
+                if (!$result[$productId][$index]) {
+                    $result[$productId][$index] = $productData[$index] ?? '';
                 }
             }
         }
@@ -149,7 +154,7 @@ private function collectIds(int $storeId, array $entityIds = []): void
     }
 
     /**
-     * Attritbute collector
+     * Attribute collector
      *
      * @param int $storeId
      */
@@ -246,12 +251,14 @@ private function addImageData(int $storeId, int $entityId, array &$item)
      */
     private function addCategoryData(array &$productData): void
     {
-        foreach ($productData['category'] as &$category) {
-            $category['name'] = $category['path'];
-            $category['categoryid'] = $category['category_id'];
-            unset($category['path']);
-            unset($category['level']);
-            unset($category['category_id']);
+        if (isset($productData['category'])) {
+            foreach ($productData['category'] as &$category) {
+                $category['name'] = $category['path'];
+                $category['categoryid'] = $category['category_id'];
+                unset($category['path']);
+                unset($category['level']);
+                unset($category['category_id']);
+            }
         }
     }
 }
diff --git a/Observer/InvalidateProduct.php b/Observer/InvalidateProduct.php
index 3c6c223..ee6c037 100755
--- a/Observer/InvalidateProduct.php
+++ b/Observer/InvalidateProduct.php
@@ -7,10 +7,10 @@
 
 namespace Datatrics\Connect\Observer;
 
+use Datatrics\Connect\Api\Log\RepositoryInterface as LogRepository;
 use Datatrics\Connect\Model\Content\ResourceModel as ContentResource;
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
-use Datatrics\Connect\Api\Log\RepositoryInterface as LogRepository;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Class InvalidateProduct
@@ -22,8 +22,7 @@ class InvalidateProduct implements ObserverInterface
     /**
      * @var ContentResource
      */
-    protected $contentResource;
-
+    private $contentResource;
     /**
      * @var LogRepository
      */
@@ -49,13 +48,22 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        $connection = $this->contentResource->getConnection();
-        $product = $observer->getEvent()->getProduct();
-        $this->logRepository->addDebugLog('Product', 'ID ' . $product->getId() . ' invalidated');
-        $connection->update(
-            $this->contentResource->getTable('datatrics_content_store'),
-            ['status' => 'Queued for Update'],
-            ['product_id = ?' => $product->getId()]
-        );
+        try {
+            $connection = $this->contentResource->getConnection();
+            $product = $observer->getEvent()->getProduct();
+            $this->logRepository->addDebugLog('Product', 'ID ' . $product->getId() . ' invalidated');
+            $connection->update(
+                $this->contentResource->getTable('datatrics_content_store'),
+                ['status' => 'Queued for Update'],
+                ['product_id = ?' => $product->getId()]
+            );
+            $connection->update(
+                $this->contentResource->getTable('datatrics_content_store'),
+                ['status' => 'Queued for Update'],
+                ['parent_id = ?' => $product->getId()]
+            );
+        } catch (\Exception $exception) {
+            $this->logRepository->addErrorLog('InvalidateProduct Observer', $exception->getMessage());
+        }
     }
 }
diff --git a/Service/ProductData/AttributeCollector/Data/AttributeMapper.php b/Service/ProductData/AttributeCollector/Data/AttributeMapper.php
index 38aad0e..681a88c 100755
--- a/Service/ProductData/AttributeCollector/Data/AttributeMapper.php
+++ b/Service/ProductData/AttributeCollector/Data/AttributeMapper.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -159,49 +160,35 @@ public function execute(
     }
 
     /**
-     * Collect data not related to attributes
+     * Attribute options collector
+     *
+     * @return array
      */
-    private function collectExtraData()
+    private function collectAttributeOptions(): array
     {
-        $fields = ['entity_id', 'type_id', 'created_at', 'updated_at'];
-        $select = $this->resource->getConnection()->select()
+        $attrOptions = [];
+
+        $select = $this->resource->getConnection()
+            ->select()
             ->from(
-                ['catalog_product_entity' => $this->resource->getTableName('catalog_product_entity')],
-                $fields
-            )->where('entity_id IN (?)', $this->entityIds);
-        $items = $this->resource->getConnection()->fetchAll($select);
-        foreach ($items as $item) {
-            foreach ($fields as $field) {
-                $this->result[$field][$item['entity_id']] = $item[$field];
-            }
-        }
-    }
+                ['eav_attribute_option' => $this->resource->getTableName('eav_attribute_option')],
+                ['attribute_id']
+            )->joinLeft(
+                ['eav_attribute_option_value' => $this->resource->getTableName('eav_attribute_option_value')],
+                'eav_attribute_option_value.option_id = eav_attribute_option.option_id',
+                [
+                    'option_id',
+                    'store_id',
+                    'value'
+                ]
+            );
 
-    /**
-     * @param string $type
-     */
-    public function resetData($type = 'all'): void
-    {
-        if ($type == 'all') {
-            unset($this->entityIds);
-            unset($this->map);
-            unset($this->entityTypeCode);
-            unset($this->storeId);
-        }
-        switch ($type) {
-            case 'store_id':
-                unset($this->storeId);
-                break;
-            case 'entity_ids':
-                unset($this->entityIds);
-                break;
-            case 'map':
-                unset($this->map);
-                break;
-            case 'entity_type_code':
-                unset($this->entityTypeCode);
-                break;
+        $options = $this->resource->getConnection()->fetchAll($select);
+        foreach ($options as $option) {
+            $attrOptions[$option['attribute_id']][$option['option_id']][$option['store_id']] = $option['value'];
         }
+
+        return $attrOptions;
     }
 
     /**
@@ -230,11 +217,30 @@ public function setData($type, $data): void
     }
 
     /**
-     * @return array
+     * Fetch attributes data from eav_attribute table according provided map
+     *
+     * @return array[] 'attribute_id', 'entity_type_id', 'attribute_code' and 'backend_type'
      */
-    public function getRequiredParameters(): array
+    private function getAttributes(): array
     {
-        return self::REQUIRE;
+        $select = $this->resource->getConnection()
+            ->select()
+            ->from(
+                ['eav_attribute' => $this->resource->getTableName('eav_attribute')],
+                self::EAV_ATTRIBUTES_DATA_SET
+            )->joinLeft(
+                ['eav_entity_type' => $this->resource->getTableName('eav_entity_type')],
+                'eav_attribute.entity_type_id = eav_entity_type.entity_type_id',
+                ['entity_table']
+            )->where(
+                'eav_entity_type.entity_type_code = ?',
+                $this->entityTypeCode
+            )->where(
+                'eav_attribute.attribute_code IN (?)',
+                $this->map
+            );
+
+        return $this->resource->getConnection()->fetchAll($select);
     }
 
     /**
@@ -247,7 +253,7 @@ private function collectAttributeValues(array $attributes): void
     {
         $tablesNonStatic = [];
         $attributeIdsNonStatic = [];
-        $attributeStaticCode = ['entity_id', 'type_id'];
+        $attributeStaticCode = array_unique(['entity_id', 'type_id', $this->linkField]);
         $relations = [];
         $withUrl = [];
 
@@ -268,14 +274,22 @@ private function collectAttributeValues(array $attributes): void
 
         foreach ($tablesNonStatic as $table) {
             $fields = ['attribute_id', 'store_id', 'value', 'entity_id' => $this->linkField];
-            $select = $this->resource->getConnection()->select()
+            $select = $this->resource->getConnection()
+                ->select()
                 ->from(
                     [$table => $this->resource->getTableName($table)],
                     $fields
+                )->where(
+                    "{$this->linkField} IN (?)",
+                    $this->entityIds
+                )->where(
+                    'attribute_id in (?)',
+                    $attributeIdsNonStatic
+                )->where(
+                    'store_id in (?)',
+                    $this->storeId
                 );
-            $select->where("{$this->linkField} IN (?)", $this->entityIds);
-            $select->where('attribute_id in (?)', $attributeIdsNonStatic);
-            $select->where('store_id in (?)', $this->storeId);
+
             $result = $this->resource->getConnection()->fetchAll($select);
             foreach ($result as $item) {
                 if (array_key_exists($item['attribute_id'], $this->attrOptions)) {
@@ -287,7 +301,7 @@ private function collectAttributeValues(array $attributes): void
                             $item['value'][] = $this->attrOptions[$attributeId]
                             [$attrValue]
                             [$item['store_id']];
-                        } catch (\Exception $exception) {
+                        } catch (Exception $exception) {
                             continue;
                         }
                     }
@@ -304,6 +318,7 @@ private function collectAttributeValues(array $attributes): void
                     str_replace(["\r", "\n"], '', (string)$item['value']);
             }
         }
+
         $this->adjustTaxClassLabels();
         $select = $this->resource->getConnection()
             ->select()
@@ -313,16 +328,34 @@ private function collectAttributeValues(array $attributes): void
             );
         $select->where("{$this->linkField} IN (?)", $this->entityIds);
         $result = $this->resource->getConnection()->fetchAll($select);
+
         foreach ($result as $item) {
             foreach ($attributeStaticCode as $static) {
                 if ($static == 'entity_id') {
                     continue;
                 }
-                $this->result[$static][$item['entity_id']] = $item[$static];
+                $this->result[$static][$item[$this->linkField]] = $item[$static];
             }
         }
     }
 
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function getMediaUrl($path): string
+    {
+        if ($this->mediaUrl == null) {
+            try {
+                $this->mediaUrl = $this->storeManager->getStore()
+                    ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA);
+            } catch (Exception $exception) {
+                $this->mediaUrl = '';
+            }
+        }
+        return $this->mediaUrl . $path;
+    }
+
     private function adjustTaxClassLabels()
     {
         if (!array_key_exists('tax_class_id', $this->result)) {
@@ -340,72 +373,60 @@ private function adjustTaxClassLabels()
     }
 
     /**
-     * @param string $path
-     * @return string
+     * Collect data not related to attributes
      */
-    private function getMediaUrl($path): string
+    private function collectExtraData()
     {
-        if ($this->mediaUrl == null) {
-            try {
-                $this->mediaUrl = $this->storeManager->getStore()
-                    ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
-            } catch (\Exception $exception) {
-                $this->mediaUrl = '';
+        $fields = array_unique([$this->linkField, 'type_id', 'created_at', 'updated_at', 'entity_id']);
+        $select = $this->resource->getConnection()->select()
+            ->from(
+                ['catalog_product_entity' => $this->resource->getTableName('catalog_product_entity')],
+                $fields
+            )->where(
+                $this->linkField . ' IN (?)',
+                $this->entityIds
+            );
+
+        $items = $this->resource->getConnection()->fetchAll($select);
+        foreach ($items as $item) {
+            foreach ($fields as $field) {
+                $this->result[$field][$item[$this->linkField]] = $item[$field];
             }
         }
-        return $this->mediaUrl . $path;
     }
 
     /**
-     * Fetch attributes data from eav_attribute table according provided map
-     *
-     * @return array[] 'attribute_id', 'entity_type_id', 'attribute_code' and 'backend_type'
+     * @param string $type
      */
-    private function getAttributes(): array
+    public function resetData($type = 'all'): void
     {
-        $select = $this->resource->getConnection()
-            ->select()
-            ->from(
-                ['eav_attribute' => $this->resource->getTableName('eav_attribute')],
-                self::EAV_ATTRIBUTES_DATA_SET
-            )->joinLeft(
-                ['eav_entity_type' => $this->resource->getTableName('eav_entity_type')],
-                'eav_attribute.entity_type_id = eav_entity_type.entity_type_id',
-                ['entity_table']
-            )->where('eav_entity_type.entity_type_code = ?', $this->entityTypeCode)
-            ->where('eav_attribute.attribute_code IN (?)', $this->map);
-        return $this->resource->getConnection()->fetchAll($select);
+        if ($type == 'all') {
+            unset($this->entityIds);
+            unset($this->map);
+            unset($this->entityTypeCode);
+            unset($this->storeId);
+        }
+        switch ($type) {
+            case 'store_id':
+                unset($this->storeId);
+                break;
+            case 'entity_ids':
+                unset($this->entityIds);
+                break;
+            case 'map':
+                unset($this->map);
+                break;
+            case 'entity_type_code':
+                unset($this->entityTypeCode);
+                break;
+        }
     }
 
     /**
-     * Attribute options collector
-     *
      * @return array
      */
-    private function collectAttributeOptions(): array
+    public function getRequiredParameters(): array
     {
-        $attrOptions = [];
-
-        $select = $this->resource->getConnection()
-            ->select()
-            ->from(
-                ['eav_attribute_option' => $this->resource->getTableName('eav_attribute_option')],
-                ['attribute_id']
-            )->joinLeft(
-                ['eav_attribute_option_value' => $this->resource->getTableName('eav_attribute_option_value')],
-                'eav_attribute_option_value.option_id = eav_attribute_option.option_id',
-                [
-                    'option_id',
-                    'store_id',
-                    'value'
-                ]
-            );
-
-        $options = $this->resource->getConnection()->fetchAll($select);
-        foreach ($options as $option) {
-            $attrOptions[$option['attribute_id']][$option['option_id']][$option['store_id']] = $option['value'];
-        }
-
-        return $attrOptions;
+        return self::REQUIRE;
     }
 }
diff --git a/Service/ProductData/AttributeCollector/Data/Category.php b/Service/ProductData/AttributeCollector/Data/Category.php
index a1a200f..3a6a569 100755
--- a/Service/ProductData/AttributeCollector/Data/Category.php
+++ b/Service/ProductData/AttributeCollector/Data/Category.php
@@ -8,10 +8,9 @@
 namespace Datatrics\Connect\Service\ProductData\AttributeCollector\Data;
 
 use Exception;
-use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
@@ -48,22 +47,18 @@ class Category
      * @var array
      */
     private $categoryNames = [];
-
     /**
      * @var array
      */
     private $excluded = [];
-
     /**
      * @var array
      */
     private $exclude = [];
-
     /**
      * @var string
      */
     private $linkField;
-
     /**
      * @var string
      */
@@ -88,7 +83,7 @@ public function __construct(
     ) {
         $this->resource = $resource;
         $this->storeRepository = $storeRepository;
-        $this->linkField = $metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $this->linkField = $metadataPool->getMetadata(CategoryInterface::class)->getLinkField();
     }
 
     /**
@@ -102,7 +97,6 @@ public function __construct(
      * @param string $format
      * @param array $extraParameters
      * @return array[]
-     * @throws NoSuchEntityException
      */
     public function execute(
         $entityIds = [],
@@ -128,6 +122,7 @@ public function execute(
         if (isset($extraParameters['category']['add_url'])) {
             return $this->mergeUrl($data);
         }
+
         return $data;
     }
 
@@ -161,14 +156,10 @@ public function setData($type, $data): void
 
     /**
      * Collect categories name according store IDs
+     * @return void
      */
     private function collectCategoryNames(): void
     {
-        $fields = [
-            'entity_id' => $this->linkField,
-            'value',
-            'store_id'
-        ];
         $connection = $this->resource->getConnection();
         $select = $connection->select()->from(
             ['eav_attribute' => $this->resource->getTableName('eav_attribute')],
@@ -176,8 +167,12 @@ private function collectCategoryNames(): void
         )->joinLeft(
             ['catalog_category_entity_varchar' => $this->resource->getTableName('catalog_category_entity_varchar')],
             'catalog_category_entity_varchar.attribute_id = eav_attribute.attribute_id',
-            $fields
-        )->where('eav_attribute.attribute_code = ?', 'name');
+            ['entity_id' => $this->linkField, 'value', 'store_id']
+        )->where(
+            'eav_attribute.attribute_code = ?',
+            'name'
+        );
+
         if ($this->replaceName) {
             $select->orWhere('eav_attribute.attribute_code = ?', $this->replaceName);
         }
@@ -198,15 +193,11 @@ private function collectCategoryNames(): void
     }
 
     /**
-     *
+     * Collect excluded categories
+     * @return void
      */
     private function collectExcluded(): void
     {
-        $fields = [
-            'entity_id' => $this->linkField,
-            'value',
-            'store_id'
-        ];
         $connection = $this->resource->getConnection();
         $select = $connection->select()->from(
             ['eav_attribute' => $this->resource->getTableName('eav_attribute')],
@@ -214,9 +205,15 @@ private function collectExcluded(): void
         )->joinLeft(
             ['catalog_category_entity_varchar' => $this->resource->getTableName('catalog_category_entity_int')],
             'catalog_category_entity_varchar.attribute_id = eav_attribute.attribute_id',
-            $fields
-        )->where('eav_attribute.attribute_code = ?', $this->exclude['code'])
-            ->where('catalog_category_entity_varchar.store_id IN (?)', [0, $this->storeId]);
+            ['entity_id' => $this->linkField, 'value', 'store_id']
+        )->where(
+            'eav_attribute.attribute_code = ?',
+            $this->exclude['code']
+        )->where(
+            'catalog_category_entity_varchar.store_id IN (?)',
+            [0, $this->storeId]
+        );
+
         foreach ($connection->fetchAll($select) as $item) {
             if ($item['value'] == $this->exclude['value']) {
                 $this->excluded[$item['store_id']][] = $item['entity_id'];
@@ -241,7 +238,10 @@ private function collectCategories(): array
                 ['catalog_category_entity' => $this->resource->getTableName('catalog_category_entity')],
                 "catalog_category_entity.{$this->linkField} = catalog_category_product.category_id",
                 ['path']
-            )->where('product_id IN (?)', $this->entityIds);
+            )->where(
+                'product_id IN (?)',
+                $this->entityIds
+            );
         if ($this->excluded) {
             $select->where('catalog_category_entity.' . $this->linkField . ' NOT IN (?)', $this->excluded);
         }
@@ -261,9 +261,9 @@ private function mergeNames(array $data): array
         $result = [];
         $realId = 0;
         $rootCategoryId = $this->getRootCategoryId();
-        foreach ($data as $entityId => $categoryPathes) {
+        foreach ($data as $entityId => $categoryPaths) {
             $usedPath = [];
-            foreach ($categoryPathes as $categoryPath) {
+            foreach ($categoryPaths as $categoryPath) {
                 if (!$categoryPath) {
                     continue;
                 }
@@ -317,11 +317,11 @@ private function mergeNames(array $data): array
     /**
      * @return int|null
      */
-    private function getRootCategoryId()
+    private function getRootCategoryId(): ?int
     {
         try {
-            return $this->storeRepository->getById($this->storeId)->getRootCategoryId();
-        } catch (\Exception $exception) {
+            return (int)$this->storeRepository->getById($this->storeId)->getRootCategoryId();
+        } catch (Exception $exception) {
             return null;
         }
     }
@@ -329,26 +329,41 @@ private function getRootCategoryId()
     /**
      * @param array $data
      * @return array
-     * @throws NoSuchEntityException
      */
     private function mergeUrl(array $data): array
     {
-        $baseUrl = $this->storeRepository->getById((int)$this->storeId)->getBaseUrl();
+        try {
+            $baseUrl = $this->storeRepository->getById((int)$this->storeId)->getBaseUrl();
+        } catch (Exception $exception) {
+            $baseUrl = '';
+        }
+
         $select = $this->resource->getConnection()
             ->select()
             ->from(
+                ['catalog_category_entity' => $this->resource->getTableName('catalog_category_entity')],
+                [$this->linkField]
+            )->join(
                 ['url_rewrite' => $this->resource->getTableName('url_rewrite')],
-                ['entity_id', 'request_path']
-            )->where('entity_id IN (?)', $this->categoryIds)
-            ->where('entity_type = ?', 'category');
-        $url = $this->resource->getConnection()->fetchPairs($select);
+                'catalog_category_entity.entity_id = url_rewrite.entity_id',
+            )->where(
+                "catalog_category_entity.{$this->linkField} in (?)",
+                $this->categoryIds,
+            )->where(
+                'entity_type = ?',
+                'category'
+            );
+
+        $urls = $this->resource->getConnection()->fetchAll($select);
         foreach ($data as &$datum) {
             foreach ($datum as &$item) {
-                if (array_key_exists($item['category_id'], $url)) {
-                    $item['url'] = $baseUrl . $url[$item['category_id']];
+                $key = array_search($item['category_id'], array_column($urls, 'entity_id'));
+                if ($key !== false && isset($urls[$key]['request_path'])) {
+                    $item['url'] = $baseUrl . $urls[$key]['request_path'];
                 }
             }
         }
+
         return $data;
     }
 
diff --git a/Service/ProductData/AttributeCollector/Data/ConfigurableKey.php b/Service/ProductData/AttributeCollector/Data/ConfigurableKey.php
index 107b544..d5cfe05 100755
--- a/Service/ProductData/AttributeCollector/Data/ConfigurableKey.php
+++ b/Service/ProductData/AttributeCollector/Data/ConfigurableKey.php
@@ -7,6 +7,7 @@
 
 namespace Datatrics\Connect\Service\ProductData\AttributeCollector\Data;
 
+use Exception;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -40,7 +41,7 @@ class ConfigurableKey
      *
      * @param ResourceConnection $resource
      * @param MetadataPool $metadataPool
-     * @throws \Exception
+     * @throws Exception
      */
     public function __construct(
         ResourceConnection $resource,
@@ -75,10 +76,8 @@ public function setData($type, $data): void
         if (!$data) {
             return;
         }
-        switch ($type) {
-            case 'entity_ids':
-                $this->entityIds = $data;
-                break;
+        if ($type == 'entity_ids') {
+            $this->entityIds = $data;
         }
     }
 
@@ -92,6 +91,7 @@ private function collectKeys(): array
         $result = [];
         $condition = 'catalog_product_entity_int.attribute_id = catalog_product_super_attribute.attribute_id
 and catalog_product_entity_int.' . $this->linkField . ' = catalog_product_relation.child_id';
+
         $select = $this->resource->getConnection()
             ->select()->from(
                 ['catalog_product_relation' => $this->resource->getTableName('catalog_product_relation')]
@@ -103,7 +103,11 @@ private function collectKeys(): array
                 ['catalog_product_entity_int' => $this->resource->getTableName('catalog_product_entity_int')],
                 $condition,
                 ['value', 'store_id']
-            )->where('child_id IN (?)', $this->entityIds);
+            )->where(
+                'child_id IN (?)',
+                $this->entityIds
+            );
+
         $keysData = $this->resource->getConnection()->fetchAll($select);
         foreach ($keysData as $item) {
             if (!$item['value']) {
@@ -141,10 +145,8 @@ public function resetData($type = 'all'): void
             unset($this->entityIds);
             unset($this->type);
         }
-        switch ($type) {
-            case 'entity_ids':
-                unset($this->entityIds);
-                break;
+        if ($type == 'entity_ids') {
+            unset($this->entityIds);
         }
     }
 }
diff --git a/Service/ProductData/AttributeCollector/Data/Image.php b/Service/ProductData/AttributeCollector/Data/Image.php
index 57bb1ce..e370d53 100755
--- a/Service/ProductData/AttributeCollector/Data/Image.php
+++ b/Service/ProductData/AttributeCollector/Data/Image.php
@@ -7,6 +7,7 @@
 
 namespace Datatrics\Connect\Service\ProductData\AttributeCollector\Data;
 
+use Exception;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -59,7 +60,7 @@ class Image
      * @param ResourceConnection $resource
      * @param StoreRepositoryInterface $storeRepository
      * @param MetadataPool $metadataPool
-     * @throws \Exception
+     * @throws Exception
      */
     public function __construct(
         ResourceConnection $resource,
@@ -121,6 +122,7 @@ private function collectImages(): array
     {
         $mediaGalleryTable = $this->resource->getTableName('catalog_product_entity_media_gallery');
         $mediaGalleryValueTable = $this->resource->getTableName('catalog_product_entity_media_gallery_value');
+
         $select = $this->resource->getConnection()
             ->select()->from(
                 ['catalog_product_entity_media_gallery' => $mediaGalleryTable],
@@ -129,12 +131,18 @@ private function collectImages(): array
                 ['catalog_product_entity_media_gallery_value' => $mediaGalleryValueTable],
                 'catalog_product_entity_media_gallery.value_id = catalog_product_entity_media_gallery_value.value_id',
                 ['entity_id' => $this->linkField, 'store_id', 'position']
-            )->where('catalog_product_entity_media_gallery_value.store_id IN (?)', [0, $this->storeId])
-            ->where('catalog_product_entity_media_gallery_value.' . $this->linkField . ' IN (?)', $this->entityIds);
+            )->where(
+                'catalog_product_entity_media_gallery_value.store_id IN (?)',
+                [0, $this->storeId]
+            )->where(
+                'catalog_product_entity_media_gallery_value.' . $this->linkField . ' IN (?)',
+                $this->entityIds
+            );
 
         if (!$this->includeHidden) {
             $select->where('catalog_product_entity_media_gallery_value.disabled = 0', $this->includeHidden);
         }
+
         return $this->resource->getConnection()->fetchAll($select);
     }
 
@@ -154,9 +162,17 @@ private function collectTypes(): array
                 ['catalog_product_entity_varchar' => $this->resource->getTableName('catalog_product_entity_varchar')],
                 'catalog_product_entity_varchar.attribute_id = eav_attribute.attribute_id',
                 $fields
-            )->where('eav_attribute.frontend_input = ?', 'media_image')
-            ->where('catalog_product_entity_varchar.store_id IN (?)', [0, $this->storeId])
-            ->where('catalog_product_entity_varchar.' . $this->linkField . ' IN (?)', $this->entityIds);
+            )->where(
+                'eav_attribute.frontend_input = ?',
+                'media_image'
+            )->where(
+                'catalog_product_entity_varchar.store_id IN (?)',
+                [0, $this->storeId]
+            )->where(
+                'catalog_product_entity_varchar.' . $this->linkField . ' IN (?)',
+                $this->entityIds
+            );
+
         foreach ($this->resource->getConnection()->fetchAll($select) as $item) {
             $data[$item['entity_id']][$item['value']][] = $item['attribute_code'];
         }
@@ -173,7 +189,7 @@ private function combineData(array $imagesData, array $typesData): array
         $result = [];
         foreach ($imagesData as $imageData) {
             $result[$imageData['entity_id']][$imageData['store_id']][$imageData['position']] = [
-                'file' => $this->getMediaurl('catalog/product' . $imageData['value']),
+                'file' => $this->getMediaUrl('catalog/product' . $imageData['value']),
                 'position' => $imageData['position'],
                 'types' => (isset($typesData[$imageData['entity_id']][$imageData['value']]))
                     ? $typesData[$imageData['entity_id']][$imageData['value']]
@@ -187,14 +203,14 @@ private function combineData(array $imagesData, array $typesData): array
      * @param string $path
      * @return string
      */
-    private function getMediaurl(string $path): string
+    private function getMediaUrl(string $path): string
     {
         if ($this->mediaUrl == null) {
             try {
                 $this->mediaUrl = $this->storeRepository
                     ->getById((int)$this->storeId)
                     ->getBaseUrl(UrlInterface::URL_TYPE_MEDIA);
-            } catch (\Exception $exception) {
+            } catch (Exception $exception) {
                 $this->mediaUrl = '';
             }
         }
diff --git a/Service/ProductData/AttributeCollector/Data/Parents.php b/Service/ProductData/AttributeCollector/Data/Parents.php
index 98e3dbf..50caf42 100755
--- a/Service/ProductData/AttributeCollector/Data/Parents.php
+++ b/Service/ProductData/AttributeCollector/Data/Parents.php
@@ -7,6 +7,7 @@
 
 namespace Datatrics\Connect\Service\ProductData\AttributeCollector\Data;
 
+use Exception;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -31,7 +32,7 @@ class Parents
      *
      * @param ResourceConnection $resource
      * @param MetadataPool $metadataPool
-     * @throws \Exception
+     * @throws Exception
      */
     public function __construct(
         ResourceConnection $resource,
diff --git a/Service/ProductData/AttributeCollector/Data/Price.php b/Service/ProductData/AttributeCollector/Data/Price.php
index 9ed560b..7396e4e 100755
--- a/Service/ProductData/AttributeCollector/Data/Price.php
+++ b/Service/ProductData/AttributeCollector/Data/Price.php
@@ -7,6 +7,7 @@
 
 namespace Datatrics\Connect\Service\ProductData\AttributeCollector\Data;
 
+use Exception;
 use Magento\Catalog\Helper\Data as CatalogHelper;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\CatalogPrice;
@@ -70,13 +71,13 @@ class Price
     private $products = null;
 
     /**
-     * Price constructor.
      * @param CatalogPrice $commonPriceModel
      * @param RuleFactory $resourceRuleFactory
      * @param CatalogHelper $catalogHelper
      * @param StoreManagerInterface $storeManager
      * @param TimezoneInterface $localeDate
      * @param CollectionFactory $collectionFactory
+     * @throws Exception
      */
     public function __construct(
         CatalogPrice $commonPriceModel,
@@ -98,7 +99,7 @@ public function __construct(
      * @param array $productIds
      *
      * @param string $groupedPriceType options: min, max, total
-     * @param string $bundlePriceType optins: min, max, total
+     * @param string $bundlePriceType options: min, max, total
      * @param int $storeId
      * @return array
      */
@@ -112,12 +113,13 @@ public function execute(
         $this->setData('products', $this->getProductData($productIds));
         $this->setData('grouped_price_type', $groupedPriceType);
         $this->setData('bundle_price_type', $bundlePriceType);
+
         foreach ($this->products as $product) {
             $this->setPrices($product, $this->groupedPriceType, $this->bundlePriceType);
             if (array_key_exists($product->getTaxClassId(), $this->taxClasses)) {
                 $percent = $this->taxClasses[$product->getTaxClassId()];
             } else {
-                $priceInclTax = $this->processPrice($product, $this->price, true);
+                $priceInclTax = $this->processPrice($product, (float)$this->price);
                 if ($this->price == 0) {
                     $percent = 1;
                 } else {
@@ -140,6 +142,7 @@ public function execute(
                 'tax' => abs(1 - $percent) * 100
             ];
         }
+
         return $result ?? [];
     }
 
@@ -147,11 +150,11 @@ public function execute(
      * @param int $storeId
      * @return int
      */
-    private function getWebsiteId($storeId = 0): int
+    private function getWebsiteId(int $storeId = 0): int
     {
         try {
             return (int)$this->storeManager->getStore($storeId)->getWebsiteId();
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             return 0;
         }
     }
@@ -206,10 +209,10 @@ private function getProductData(array $productIds = [])
 
     /**
      * @param Product $product
-     * @param string $groupedPriceType
-     * @param string $bundlePriceType
+     * @param string|null $groupedPriceType
+     * @param string|null $bundlePriceType
      */
-    private function setPrices($product, $groupedPriceType, $bundlePriceType): void
+    private function setPrices(Product $product, ?string $groupedPriceType, ?string $bundlePriceType): void
     {
         switch ($product->getTypeId()) {
             case 'configurable':
@@ -257,7 +260,7 @@ private function setPrices($product, $groupedPriceType, $bundlePriceType): void
     /**
      * @param Product $product
      */
-    private function setConfigurablePrices($product): void
+    private function setConfigurablePrices(Product $product): void
     {
         /**
          * Check if config has a final_price (data catalog_product_index_price)
@@ -276,9 +279,9 @@ private function setConfigurablePrices($product): void
 
     /**
      * @param Product $product
-     * @param string $groupedPriceType
+     * @param string|null $groupedPriceType
      */
-    private function setGroupedPrices($product, $groupedPriceType)
+    private function setGroupedPrices(Product $product, ?string $groupedPriceType)
     {
         $minPrice = null;
         $maxPrice = null;
@@ -333,9 +336,9 @@ private function setGroupedPrices($product, $groupedPriceType)
 
     /**
      * @param Product $product
-     * @param string $bundlePriceType
+     * @param string|null $bundlePriceType
      */
-    private function setBundlePrices($product, $bundlePriceType): void
+    private function setBundlePrices(Product $product, ?string $bundlePriceType): void
     {
         $this->setSimplePrices($product);
 
@@ -353,10 +356,10 @@ private function setBundlePrices($product, $bundlePriceType): void
     /**
      * @param Product $product
      */
-    private function setSimplePrices($product)
+    private function setSimplePrices(Product $product)
     {
-        $this->price = $product->getData('price') !== (float)0 ? $product->getData('price') : null;
-        $this->finalPrice = $product->getData('final_price') !== (float)0
+        $this->price = $product->getData('price') !== 0.0 ? $product->getData('price') : null;
+        $this->finalPrice = $product->getData('final_price') !== 0.0
             ? $product->getData('final_price') : null;
         $this->specialPrice = $product->getData('special_price')
             ? $product->getData('special_price') : 0;
@@ -371,7 +374,7 @@ private function setSimplePrices($product)
      *
      * @return float
      */
-    private function getRulePrice($product): float
+    private function getRulePrice(Product $product): float
     {
         try {
             $this->rulePrice = $this->resourceRuleFactory->create()->getRulePrice(
@@ -380,8 +383,8 @@ private function getRulePrice($product): float
                 '',
                 $product->getId()
             );
-        } catch (\Exception $exception) {
-            return (float)0;
+        } catch (Exception $exception) {
+            return 0.0;
         }
 
         if ($this->rulePrice !== null && $this->rulePrice !== false) {
@@ -396,13 +399,12 @@ private function getRulePrice($product): float
      *
      * @param Product $product
      * @param float $price inputted product price
-     * @param bool $addTax return price include tax flag
      *
      * @return float
      */
-    private function processPrice($product, $price, $addTax = true): float
+    private function processPrice(Product $product, float $price): float
     {
-        return (float)$this->catalogHelper->getTaxPrice($product, $price, $addTax);
+        return (float)$this->catalogHelper->getTaxPrice($product, $price, true);
     }
 
     /**
@@ -412,7 +414,7 @@ private function processPrice($product, $price, $addTax = true): float
      *
      * @return string
      */
-    private function getSpecialPriceDateRang($product)
+    private function getSpecialPriceDateRang(Product $product): string
     {
         if ($this->specialPrice === null) {
             return '';
@@ -423,15 +425,11 @@ private function getSpecialPriceDateRang($product)
         }
 
         if ($product->getSpecialFromDate() && $product->getSpecialToDate()) {
-
-            /**
-             * Todo use Magento date function
-             */
             $from = date('Y-m-d', strtotime($product->getSpecialFromDate()));
             $to = date('Y-m-d', strtotime($product->getSpecialToDate()));
-
             return $from . '/' . $to;
         }
+
         return '';
     }
 
@@ -440,7 +438,7 @@ private function getSpecialPriceDateRang($product)
      *
      * @return string
      */
-    private function getDiscountPercentage()
+    private function getDiscountPercentage(): string
     {
         if ($this->price > 0 && $this->salesPrice > 0) {
             $discount = ($this->salesPrice - $this->price) / $this->price;
@@ -463,7 +461,7 @@ public function getRequiredParameters(): array
     /**
      * @param string $type
      */
-    public function resetData($type = 'all')
+    public function resetData(string $type = 'all')
     {
         if ($type == 'all') {
             unset($this->products);
diff --git a/Service/ProductData/AttributeCollector/Data/Stock.php b/Service/ProductData/AttributeCollector/Data/Stock.php
index e276a97..cdd32a2 100755
--- a/Service/ProductData/AttributeCollector/Data/Stock.php
+++ b/Service/ProductData/AttributeCollector/Data/Stock.php
@@ -7,16 +7,19 @@
 
 namespace Datatrics\Connect\Service\ProductData\AttributeCollector\Data;
 
+use Exception;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Module\Manager as ModuleManager;
+use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
  * Service class for stock data
  */
 class Stock
 {
+
     public const REQUIRE = [
         'entity_ids'
     ];
@@ -37,34 +40,41 @@ class Stock
      * @var string
      */
     private $linkField;
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
 
     /**
      * Price constructor.
      *
      * @param ResourceConnection $resource
      * @param ModuleManager $moduleManager
+     * @param StoreRepositoryInterface $storeRepository
      * @param MetadataPool $metadataPool
-     * @throws \Exception
+     * @throws Exception
      */
     public function __construct(
         ResourceConnection $resource,
         ModuleManager $moduleManager,
+        StoreRepositoryInterface $storeRepository,
         MetadataPool $metadataPool
     ) {
         $this->resource = $resource;
         $this->moduleManager = $moduleManager;
+        $this->storeRepository = $storeRepository;
         $this->linkField = $metadataPool->getMetadata(ProductInterface::class)->getLinkField();
     }
 
     /**
      * Get stock data
      *
-     * @param array[] $entityIds
+     * @param array $productIds
      * @return array[]
      */
-    public function execute(array $entityIds = []): array
+    public function execute(array $productIds = []): array
     {
-        $this->setData('entity_ids', $entityIds);
+        $this->setData('entity_ids', $productIds);
         return ($this->isMsiEnabled())
             ? $this->getMsiStock()
             : $this->getNoMsiStock();
@@ -74,15 +84,13 @@ public function execute(array $entityIds = []): array
      * @param string $type
      * @param mixed $data
      */
-    public function setData($type, $data)
+    public function setData(string $type, $data)
     {
         if (!$data) {
             return;
         }
-        switch ($type) {
-            case 'entity_ids':
-                $this->entityIds = $data;
-                break;
+        if ($type == 'entity_ids') {
+            $this->entityIds = $data;
         }
     }
 
@@ -106,8 +114,10 @@ private function isMsiEnabled(): bool
      *      reserved
      *      salable_qty
      *      ["msi"]=> [
-     *          website_id => [
+     *          channel => [
      *              qty
+     *              availability
+     *              is_salable
      *              salable_qty
      *          ]
      *      ]
@@ -120,22 +130,26 @@ private function getMsiStock(): array
         $channels = $this->getChannels();
         $stockData = $this->collectMsi($channels);
         $result = $this->getNoMsiStock(true);
+
         foreach ($stockData as $value) {
             foreach ($channels as $channel) {
                 if (!array_key_exists($value['product_id'], $result)) {
                     continue;
                 }
-                $qty = $result[$value['product_id']]['qty'];
+
+                $qty = $value[sprintf('quantity_%s', (int)$channel)];
                 $reserved = $result[$value['product_id']]['reserved'] * -1;
                 $salableQty = max($qty, $qty - $reserved);
-                $result[$value['product_id']]
-                ['msi']
-                [$value['website_id']] = [
-                    'qty' => $value[sprintf('quantity_%s', $channel)],
-                    'salable_qty' => $salableQty
+
+                $result[$value['product_id']]['msi'][$channel] = [
+                    'qty' => $value[sprintf('quantity_%s', (int)$channel)] ?? 0,
+                    'is_salable' => $value[sprintf('is_salable_%s', (int)$channel)] ?? 0,
+                    'availability' => $value[sprintf('is_salable_%s', (int)$channel)] ?? 0,
+                    'salable_qty' => $salableQty ?? 0
                 ];
             }
         }
+
         return $result;
     }
 
@@ -146,19 +160,10 @@ private function getMsiStock(): array
      */
     private function getChannels(): array
     {
-        $selectChannels = $this->resource->getConnection()
-            ->select()
-            ->from(
-                $this->resource->getTableName('inventory_stock_sales_channel'),
-                [
-                    'stock_id'
-                ]
-            )->where('type = ?', 'website');
-        $channels = array_unique($this->resource->getConnection()->fetchCol($selectChannels));
-        if (count($channels) == 1 && reset($channels) != 1) {
-            $channels = [1];
-        }
-        return $channels;
+        $select = $this->resource->getConnection()->select()
+            ->from($this->resource->getTableName('inventory_stock_sales_channel'), ['stock_id'])
+            ->where('type = ?', 'website');
+        return array_unique($this->resource->getConnection()->fetchCol($select));
     }
 
     /**
@@ -169,49 +174,28 @@ private function getChannels(): array
      */
     private function collectMsi(array $channels): array
     {
-        $channel = min($channels);
-        $channels = array_flip($channels);
-        unset($channels[$channel]);
-        $channels = array_flip($channels);
-
-        $stockTablePrimary = $this->resource->getTableName(sprintf('inventory_stock_%s', $channel));
-        if (!$this->resource->getConnection()->isTableExists($stockTablePrimary)) {
-            return [];
-        }
-
-        $selectStock = $this->resource->getConnection()
-            ->select()
+        $select = $this->resource->getConnection()->select()
             ->from(
-                $stockTablePrimary,
+                ['cpe' => $this->resource->getTableName('catalog_product_entity')],
+                ['product_id' => 'entity_id', $this->linkField]
+            )->where(
+                'cpe.entity_id IN (?)',
+                $this->entityIds
+            );
+
+        foreach ($channels as $channel) {
+            $table = sprintf('inventory_stock_%s', (int)$channel);
+            $select->joinLeft(
+                [$table => $this->resource->getTableName($table)],
+                "cpe.sku = {$table}.sku",
                 [
-                    'product_id',
-                    'website_id',
-                    sprintf('quantity_%s', $channel) => 'quantity'
+                    sprintf('quantity_%s', (int)$channel) => "{$table}.quantity",
+                    sprintf('is_salable_%s', (int)$channel) => "{$table}.is_salable"
                 ]
             );
-        foreach ($channels as $channel) {
-            $stockTable = $this->resource->getTableName(sprintf('inventory_stock_%s', $channel));
-            if (!$this->resource->getConnection()->tableColumnExists($stockTable, 'website_id')) {
-                $selectStock->joinLeft(
-                    $stockTable,
-                    "{$stockTable}.sku = {$stockTablePrimary}.sku",
-                    [
-                        sprintf('quantity_%s', $channel) => 'quantity'
-                    ]
-                );
-            } else {
-                $selectStock->joinLeft(
-                    $stockTable,
-                    "{$stockTable}.website_id = {$stockTablePrimary}.website_id and
-                 {$stockTable}.product_id = {$stockTablePrimary}.product_id",
-                    [
-                        sprintf('quantity_%s', $channel) => 'quantity'
-                    ]
-                );
-            }
         }
-        $selectStock->where("{$stockTablePrimary}.product_id IN (?)", $this->entityIds);
-        return $this->resource->getConnection()->fetchAll($selectStock);
+
+        return $this->resource->getConnection()->fetchAll($select);
     }
 
     /**
@@ -231,7 +215,7 @@ private function collectMsi(array $channels): array
      * @param bool $addMsi
      * @return array[]
      */
-    private function getNoMsiStock($addMsi = false): array
+    private function getNoMsiStock(bool $addMsi = false): array
     {
         $result = [];
         $select = $this->resource->getConnection()
@@ -248,7 +232,7 @@ private function getNoMsiStock($addMsi = false): array
                 ]
             )->joinLeft(
                 ['catalog_product_entity' => $this->resource->getTableName('catalog_product_entity')],
-                "catalog_product_entity.{$this->linkField} = cataloginventory_stock_item.product_id",
+                "catalog_product_entity.entity_id = cataloginventory_stock_item.product_id",
                 ['sku']
             );
         if ($addMsi) {
@@ -266,6 +250,7 @@ private function getNoMsiStock($addMsi = false): array
                 [
                     'qty' => (int)$value['qty'],
                     'is_in_stock' => (int)$value['is_in_stock'],
+                    'availability' => (int)$value['is_in_stock'],
                     'manage_stock' => (int)$value['manage_stock'],
                     'qty_increments' => (int)$value['qty_increments'],
                     'min_sale_qty' => (int)$value['min_sale_qty']
@@ -280,6 +265,33 @@ private function getNoMsiStock($addMsi = false): array
         return $result;
     }
 
+    /**
+     * @param int $storeId
+     * @return string|null
+     */
+    public function getChannelByStoreId(int $storeId): ?string
+    {
+        if (!$this->isMsiEnabled()) {
+            return null;
+        }
+
+        $salesChannelsTable = $this->resource->getTableName('inventory_stock_sales_channel');
+        if (!$this->resource->getConnection()->isTableExists($salesChannelsTable)) {
+            return null;
+        }
+
+        try {
+            $code = $this->storeRepository->getById($storeId)->getWebsite()->getCode();
+            $select = $this->resource->getConnection()->select()
+                ->from($salesChannelsTable, ['stock_id'])
+                ->where('code = ?', $code);
+
+            return $this->resource->getConnection()->fetchOne($select);
+        } catch (Exception $exception) {
+            return null;
+        }
+    }
+
     /**
      * @return string[]
      */
@@ -291,15 +303,13 @@ public function getRequiredParameters(): array
     /**
      * @param string $type
      */
-    public function resetData($type = 'all')
+    public function resetData(string $type = 'all')
     {
         if ($type == 'all') {
             unset($this->entityIds);
         }
-        switch ($type) {
-            case 'entity_ids':
-                unset($this->entityIds);
-                break;
+        if ($type == 'entity_ids') {
+            unset($this->entityIds);
         }
     }
 }
diff --git a/Service/ProductData/AttributeCollector/Data/Url.php b/Service/ProductData/AttributeCollector/Data/Url.php
index cbe3356..66e2434 100755
--- a/Service/ProductData/AttributeCollector/Data/Url.php
+++ b/Service/ProductData/AttributeCollector/Data/Url.php
@@ -7,7 +7,10 @@
 
 namespace Datatrics\Connect\Service\ProductData\AttributeCollector\Data;
 
+use Exception;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
@@ -29,7 +32,7 @@ class Url
     public const URL_PATTERN = '%s%s';
 
     /**
-     * URL pattern for no-rewrite items
+     * URL patterns for no-rewrite items
      */
     public const URL_PATTERN_EXTRA = [
         'product' => '%scatalog/product/view/id/%s',
@@ -57,19 +60,25 @@ class Url
      * @var StoreRepositoryInterface
      */
     private $storeRepository;
+    /**
+     * @var string
+     */
+    private $linkField;
 
     /**
-     * Price constructor.
-     *
      * @param ResourceConnection $resource
      * @param StoreRepositoryInterface $storeRepository
+     * @param MetadataPool $metadataPool
+     * @throws Exception
      */
     public function __construct(
         ResourceConnection $resource,
-        StoreRepositoryInterface $storeRepository
+        StoreRepositoryInterface $storeRepository,
+        MetadataPool $metadataPool
     ) {
         $this->resource = $resource;
         $this->storeRepository = $storeRepository;
+        $this->linkField = $metadataPool->getMetadata(ProductInterface::class)->getLinkField();
     }
 
     /**
@@ -126,17 +135,31 @@ private function collectUrl(): array
         $select = $this->resource->getConnection()
             ->select()
             ->from(
-                $this->resource->getTableName('url_rewrite'),
-                ['entity_id', 'request_path']
-            )->where('entity_id IN (?)', $this->entityIds)
-            ->where('redirect_type = ?', 0)
-            ->where('metadata IS NULL')
-            ->where('store_id = ?', $this->storeId)
-            ->where('entity_type = ?', $this->type);
+                ['catalog_product_entity' => $this->resource->getTableName('catalog_product_entity')],
+                [$this->linkField]
+            )->join(
+                ['url_rewrite' => $this->resource->getTableName('url_rewrite')],
+                'catalog_product_entity.entity_id = url_rewrite.entity_id',
+            )->where(
+                "catalog_product_entity.{$this->linkField} in (?)",
+                $this->entityIds
+            )->where(
+                'url_rewrite.redirect_type = ?',
+                0
+            )->where(
+                'url_rewrite.metadata IS NULL'
+            )->where(
+                'url_rewrite.store_id = ?',
+                $this->storeId
+            )->where(
+                'url_rewrite.entity_type = ?',
+                $this->type
+            );
+
         $values = $this->resource->getConnection()->fetchAll($select);
         $storeUrl = $this->getStoreUrl();
         foreach ($values as $value) {
-            $result[$value['entity_id']] = sprintf(
+            $result[$value[$this->linkField]] = sprintf(
                 self::URL_PATTERN,
                 $storeUrl,
                 $value['request_path']
@@ -144,7 +167,7 @@ private function collectUrl(): array
         }
         foreach ($this->entityIds as $entityId) {
             if (!array_key_exists($entityId, $result)) {
-                $result[$entityId] = sprintf(
+                $result[$this->linkField] = sprintf(
                     self::URL_PATTERN_EXTRA[$this->type],
                     $storeUrl,
                     $entityId
@@ -161,7 +184,7 @@ private function getStoreUrl(): string
     {
         try {
             return $this->storeRepository->getById($this->storeId)->getBaseUrl();
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             return '';
         }
     }
@@ -169,7 +192,7 @@ private function getStoreUrl(): string
     /**
      * @return string[]
      */
-    public function getRequiredParameters()
+    public function getRequiredParameters(): array
     {
         return self::REQUIRE;
     }
diff --git a/Service/ProductData/Data.php b/Service/ProductData/Data.php
index 4b44fb0..d1c036c 100755
--- a/Service/ProductData/Data.php
+++ b/Service/ProductData/Data.php
@@ -7,7 +7,10 @@
 
 namespace Datatrics\Connect\Service\ProductData;
 
-use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+use Exception;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Data class
@@ -17,10 +20,6 @@
 class Data
 {
 
-    /**
-     * @var JsonSerializer
-     */
-    private $json;
     /**
      * @var AttributeCollector\Data\AttributeMapper
      */
@@ -41,30 +40,41 @@ class Data
      * @var AttributeCollector\Data\Price
      */
     private $price;
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+    /**
+     * @var string
+     */
+    private $linkField;
 
     /**
-     * Data constructor.
-     * @param JsonSerializer $json
      * @param AttributeCollector\Data\AttributeMapper $attributeMapper
      * @param AttributeCollector\Data\Url $url
      * @param AttributeCollector\Data\Category $category
      * @param AttributeCollector\Data\Stock $stock
      * @param AttributeCollector\Data\Price $price
+     * @param ResourceConnection $resourceConnection
+     * @param MetadataPool $metadataPool
+     * @throws Exception
      */
     public function __construct(
-        JsonSerializer $json,
         AttributeCollector\Data\AttributeMapper $attributeMapper,
         AttributeCollector\Data\Url $url,
         AttributeCollector\Data\Category $category,
         AttributeCollector\Data\Stock $stock,
-        AttributeCollector\Data\Price $price
+        AttributeCollector\Data\Price $price,
+        ResourceConnection $resourceConnection,
+        MetadataPool $metadataPool
     ) {
-        $this->json = $json;
         $this->attributeMapper = $attributeMapper;
         $this->url = $url;
         $this->category = $category;
         $this->stock = $stock;
         $this->price = $price;
+        $this->resourceConnection = $resourceConnection;
+        $this->linkField = $metadataPool->getMetadata(CategoryInterface::class)->getLinkField();
     }
 
     /**
@@ -74,8 +84,11 @@ public function __construct(
      * @param int $storeId
      * @return array
      */
-    public function execute(array $entityIds, array $attributeMap, array $extraParameters, int $storeId = 0)
+    public function execute(array $entityIds, array $attributeMap, array $extraParameters, int $storeId = 0): array
     {
+        $rowIds = $this->getRowsIds($entityIds);
+        $productIds = array_flip($rowIds);
+
         $result = $this->attributeMapper->execute(
             $entityIds,
             $attributeMap,
@@ -98,43 +111,60 @@ public function execute(array $entityIds, array $attributeMap, array $extraParam
             'product',
             $storeId
         );
+
         foreach ($result as $urlEntityId => $url) {
             $data[$urlEntityId]['url'] = $url;
         }
 
         $result = $this->category->execute(
-            $entityIds,
+            $productIds,
             $storeId,
             'raw',
             $extraParameters
         );
-        foreach ($result as $entityId => $categoryData) {
-            $data[$entityId]['category'] = $categoryData;
+
+        foreach ($result as $productId => $categoryData) {
+            $data[$rowIds[$productId]]['category'] = $categoryData;
         }
 
         if ($extraParameters['stock']['inventory']) {
-            $result = $this->stock->execute(
-                $entityIds
-            );
-
+            $result = $this->stock->execute($productIds);
             $inventoryFields = array_merge(
                 $extraParameters['stock']['inventory_fields'],
-                ['msi', 'salable_qty', 'reserved', 'is_in_stock']
+                ['qty', 'msi', 'salable_qty', 'reserved', 'is_in_stock']
             );
-            foreach ($result as $entityId => $stockData) {
-                $data[$entityId] += array_intersect_key($stockData, array_flip($inventoryFields));
+
+            foreach ($result as $productId => $stockData) {
+                $data[$rowIds[$productId]] += array_intersect_key($stockData, array_flip($inventoryFields));
             }
         }
 
         $result = $this->price->execute(
-            $entityIds,
+            $productIds,
             $extraParameters['behaviour']['grouped']['price_logic'] ?? 'max',
             $extraParameters['behaviour']['bundle']['price_logic'] ?? 'min',
             $storeId
         );
-        foreach ($result as $entityId => $priceData) {
-            $data[$entityId] += $priceData;
+
+        foreach ($result as $productId => $priceData) {
+            $data[$rowIds[$productId]] += $priceData;
         }
+
         return $data;
     }
+
+    /**
+     * @param array $entityIds
+     * @return int[]|string[]
+     */
+    private function getRowsIds(array $entityIds): array
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $table = $this->resourceConnection->getTableName('catalog_product_entity');
+        $select = $connection->select()
+            ->from($table, ['entity_id', $this->linkField])
+            ->where("{$this->linkField} IN (?)", $entityIds);
+
+        return $connection->fetchPairs($select);
+    }
 }
diff --git a/Service/ProductData/Filter.php b/Service/ProductData/Filter.php
index 03cd580..3ed66c8 100755
--- a/Service/ProductData/Filter.php
+++ b/Service/ProductData/Filter.php
@@ -9,9 +9,11 @@
 
 use Exception;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Filter class
@@ -27,23 +29,30 @@ class Filter
      * @var string
      */
     private $entityId;
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
 
     /**
      * Data constructor.
      * @param ResourceConnection $resourceConnection
+     * @param StoreManagerInterface $storeManager
      * @param MetadataPool $metadataPool
      * @throws Exception
      */
     public function __construct(
         ResourceConnection $resourceConnection,
+        StoreManagerInterface $storeManager,
         MetadataPool $metadataPool
     ) {
         $this->resourceConnection = $resourceConnection;
+        $this->storeManager = $storeManager;
         $this->entityId = $metadataPool->getMetadata(ProductInterface::class)->getLinkField();
     }
 
     /**
-     * Execute filters and return producty entity ids
+     * Execute filters and return product entity ids
      *
      * @param array $filter
      * @param int $storeId
@@ -51,20 +60,13 @@ public function __construct(
      */
     public function execute(array $filter, int $storeId = 0): array
     {
-        if ($filter['filter_by_visibility']) {
-            $visibility = is_array($filter['visibility']) ? $filter['visibility'] : explode(',', $filter['visibility']);
-        } else {
-            $visibility = [
-                Visibility::VISIBILITY_NOT_VISIBLE,
-                Visibility::VISIBILITY_IN_CATALOG,
-                Visibility::VISIBILITY_IN_SEARCH,
-                Visibility::VISIBILITY_BOTH,
-            ];
-        }
-        $entityIds = $this->filterVisibility($visibility);
+        $entityIds = $this->filterVisibility($filter);
+
         if ($storeId) {
-            $entityIds = $this->filterWebsite($entityIds, $storeId);
+            $websiteId = $this->getWebsiteId($storeId);
+            $entityIds = $this->filterWebsite($entityIds, $websiteId);
         }
+
         if (!$filter['add_disabled_products']) {
             $entityIds = $this->filterEnabledStatus($entityIds);
         }
@@ -76,17 +78,31 @@ public function execute(array $filter, int $storeId = 0): array
                 $filter['category']
             );
         }
+
         return $entityIds;
     }
 
     /**
      * Filter entity ids to exclude products based on visibility
      *
-     * @param array $visibility
+     * @param array $filter
      * @return array
      */
-    private function filterVisibility(array $visibility): array
+    private function filterVisibility(array $filter): array
     {
+        if ($filter['filter_by_visibility']) {
+            $visibility = is_array($filter['visibility'])
+                ? $filter['visibility']
+                : explode(',', $filter['visibility']);
+        } else {
+            $visibility = [
+                Visibility::VISIBILITY_NOT_VISIBLE,
+                Visibility::VISIBILITY_IN_CATALOG,
+                Visibility::VISIBILITY_IN_SEARCH,
+                Visibility::VISIBILITY_BOTH,
+            ];
+        }
+
         $connection = $this->resourceConnection->getConnection();
         $select = $connection->select()->distinct()->from(
             ['catalog_product_entity_int' => $this->resourceConnection->getTableName('catalog_product_entity_int')],
@@ -95,31 +111,57 @@ private function filterVisibility(array $visibility): array
             ['eav_attribute' => $this->resourceConnection->getTableName('eav_attribute')],
             'eav_attribute.attribute_id = catalog_product_entity_int.attribute_id',
             []
-        )->where('value IN (?)', $visibility)
-            ->where('attribute_code = ?', 'visibility')
-            ->where('store_id IN (?)', [0]);
+        )->where(
+            'value IN (?)',
+            $visibility
+        )->where(
+            'attribute_code = ?',
+            'visibility'
+        )->where(
+            'store_id IN (?)',
+            [0]
+        );
+
         return $connection->fetchCol($select);
     }
 
+    /**
+     * @param int $storeId
+     * @return int
+     */
+    private function getWebsiteId(int $storeId = 0): int
+    {
+        try {
+            return (int)$this->storeManager->getStore($storeId)->getWebsiteId();
+        } catch (Exception $exception) {
+            return 0;
+        }
+    }
+
     /**
      * Filter entity ids to exclude products by website
      *
      * @param array $entityIds
-     * @param int $storeId
+     * @param int $websiteId
      * @return array
      */
-    private function filterWebsite(array $entityIds, int $storeId): array
+    private function filterWebsite(array $entityIds, int $websiteId): array
     {
         $connection = $this->resourceConnection->getConnection();
         $select = $connection->select()->from(
-            ['store' => $this->resourceConnection->getTableName('store')],
-            []
-        )->joinLeft(
+            ['catalog_product_entity' => $this->resourceConnection->getTableName('catalog_product_entity')],
+            [$this->entityId]
+        )->join(
             ['catalog_product_website' => $this->resourceConnection->getTableName('catalog_product_website')],
-            'catalog_product_website.website_id = store.website_id',
-            ['product_id']
-        )->where('store.store_id = ?', $storeId)
-            ->where('catalog_product_website.product_id in (?)', $entityIds);
+            'catalog_product_entity.entity_id = catalog_product_website.product_id',
+        )->where(
+            'catalog_product_website.website_id = ?',
+            $websiteId
+        )->where(
+            "catalog_product_entity.{$this->entityId} in (?)",
+            $entityIds
+        );
+
         return $connection->fetchCol($select);
     }
 
@@ -135,14 +177,24 @@ private function filterEnabledStatus(array $entityIds): array
         $select = $connection->select()->distinct()->from(
             ['catalog_product_entity_int' => $this->resourceConnection->getTableName('catalog_product_entity_int')],
             [$this->entityId]
-        )->joinLeft(
+        )->join(
             ['eav_attribute' => $this->resourceConnection->getTableName('eav_attribute')],
             'eav_attribute.attribute_id = catalog_product_entity_int.attribute_id',
             []
-        )->where('value = ?', 1)
-            ->where('attribute_code = ?', 'status')
-            ->where('store_id IN (?)', [0])
-            ->where($this->entityId . ' IN (?)', $entityIds);
+        )->where(
+            'value = ?',
+            Status::STATUS_ENABLED
+        )->where(
+            'attribute_code = ?',
+            'status'
+        )->where(
+            'store_id IN (?)',
+            [0]
+        )->where(
+            $this->entityId . ' IN (?)',
+            $entityIds
+        );
+
         return $connection->fetchCol($select);
     }
 
@@ -154,21 +206,26 @@ private function filterEnabledStatus(array $entityIds): array
      * @param array $categoryIds
      * @return array
      */
-    private function filterByCategories(
-        array $entityIds,
-        string $behaviour,
-        array $categoryIds
-    ): array {
+    private function filterByCategories(array $entityIds, string $behaviour, array $categoryIds): array
+    {
         $connection = $this->resourceConnection->getConnection();
-        $select = $connection->select()->distinct()->from(
+        $select = $connection->select()->from(
+            ['catalog_product_entity' => $this->resourceConnection->getTableName('catalog_product_entity')],
+            [$this->entityId]
+        )->join(
             ['catalog_category_product' => $this->resourceConnection->getTableName('catalog_category_product')],
-            'product_id'
-        )->where('product_id in (?)', $entityIds);
+            'catalog_product_entity.entity_id = catalog_category_product.product_id',
+        )->where(
+            "catalog_product_entity.{$this->entityId} in (?)",
+            $entityIds
+        )->group($this->entityId);
+
         if ($behaviour == 'in') {
-            $select->where('category_id in (?)', $categoryIds);
+            $select->where('catalog_category_product.category_id in (?)', $categoryIds);
         } else {
-            $select->where('category_id not in (?)', $categoryIds);
+            $select->where('catalog_category_product.category_id not in (?)', $categoryIds);
         }
+
         return $connection->fetchCol($select);
     }
 }
diff --git a/Service/ProductData/Type.php b/Service/ProductData/Type.php
index e5c737d..0ed4c27 100755
--- a/Service/ProductData/Type.php
+++ b/Service/ProductData/Type.php
@@ -7,9 +7,6 @@
 
 namespace Datatrics\Connect\Service\ProductData;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
-use Datatrics\Connect\Service\ProductData\AttributeCollector\Data\AttributeMapper;
 use Datatrics\Connect\Service\ProductData\AttributeCollector\Data\ConfigurableKey;
 use Datatrics\Connect\Service\ProductData\AttributeCollector\Data\Parents;
 
@@ -19,18 +16,6 @@
 class Type
 {
 
-    /**
-     * @var JsonSerializer
-     */
-    private $json;
-    /**
-     * @var AttributeMapper
-     */
-    private $attributeMapper;
-    /**
-     * @var ResourceConnection
-     */
-    private $resourceConnection;
     /**
      * @var ConfigurableKey
      */
@@ -39,7 +24,6 @@ class Type
      * @var Data
      */
     private $data;
-
     /**
      * @var Parents
      */
@@ -47,24 +31,15 @@ class Type
 
     /**
      * Data constructor.
-     * @param JsonSerializer $json
-     * @param AttributeMapper $attributeMapper
-     * @param ResourceConnection $resourceConnection
      * @param Data $data
      * @param ConfigurableKey $configurableKey
      * @param Parents $parents
      */
     public function __construct(
-        JsonSerializer $json,
-        AttributeMapper $attributeMapper,
-        ResourceConnection $resourceConnection,
         Data $data,
         ConfigurableKey $configurableKey,
         Parents $parents
     ) {
-        $this->json = $json;
-        $this->attributeMapper = $attributeMapper;
-        $this->resourceConnection = $resourceConnection;
         $this->data = $data;
         $this->configurableKey = $configurableKey;
         $this->parents = $parents;
@@ -75,27 +50,18 @@ public function __construct(
      * @param array $attributeMap
      * @param array $extraParameters
      * @param int $storeId
-     * @param int $limit
-     * @param int $page
      * @return array
      */
     public function execute(
         array $entityIds,
         array $attributeMap,
         array $extraParameters,
-        int $storeId = 0,
-        int $limit = 10000,
-        int $page = 1
+        int $storeId = 0
     ): array {
         if (empty($entityIds)) {
             return [];
         }
-        $entityIds = array_chunk($entityIds, (int)$limit);
-        if (isset($entityIds[$page - 1])) {
-            $entityIds = $entityIds[$page - 1];
-        } else {
-            $entityIds = $entityIds[0];
-        }
+
         $parents = $this->parents->execute();
         $toUnset = [];
         $parentAttributeToUse = [];
@@ -124,6 +90,7 @@ public function execute(
             $parentAttributes['bundle'][] = 'image';
         }
         $parentType = false;
+
         foreach ($entityIds as $entityId) {
             if (!array_key_exists($entityId, $parents)) {
                 continue;
@@ -206,6 +173,7 @@ public function execute(
                 $data[$entityId]['image_logic'] = 0;
             }
         }
+
         return array_diff_key($data, array_flip($toUnset));
     }
 
diff --git a/etc/crontab.xml b/etc/crontab.xml
index 548f4ed..757f499 100755
--- a/etc/crontab.xml
+++ b/etc/crontab.xml
@@ -5,20 +5,16 @@
   -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
     <group id="default">
-        <job instance="Datatrics\Connect\Model\Cron\SalesUpdate"
-             method="execute" name="datatrics_sales_update">
+        <job instance="Datatrics\Connect\Model\Cron\SalesUpdate" method="execute" name="datatrics_sales_update">
             <config_path>datatrics_connect_order/order_sync/cron</config_path>
         </job>
-        <job instance="Datatrics\Connect\Model\Cron\ProfileUpdate"
-             method="execute" name="datatrics_profile_update">
+        <job instance="Datatrics\Connect\Model\Cron\ProfileUpdate" method="execute" name="datatrics_profile_update">
             <config_path>datatrics_connect_customer/customer_sync/cron</config_path>
         </job>
-        <job instance="Datatrics\Connect\Model\Cron\ContentUpdate"
-             method="execute" name="datatrics_content_update">
+        <job instance="Datatrics\Connect\Model\Cron\ContentUpdate" method="execute" name="datatrics_content_update">
             <config_path>datatrics_connect_product/product_sync/cron</config_path>
         </job>
-        <job instance="Datatrics\Connect\Model\Cron\ContentMaintenance"
-             method="execute" name="datatrics_content_maintenance">
+        <job instance="Datatrics\Connect\Model\Cron\ContentMaintenance" method="execute" name="datatrics_content_maintenance">
             <schedule>0 2 * * *</schedule>
         </job>
     </group>
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
index 7ddc821..b47762b 100755
--- a/etc/db_schema.xml
+++ b/etc/db_schema.xml
@@ -6,97 +6,34 @@
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
 
-    <table name="datatrics_content" engine="innodb" resource="default" comment="Datatrics Content Table">
-        <column name="entity_id"
-                xsi:type="int"
-                padding="10"
-                identity="true"
-                nullable="false"
-                unsigned="true"
-                comment="Review Form ID"/>
-        <column name="content_id"
-                xsi:type="int"
-                padding="10"
-                nullable="false"
-                identity="false"
-                unsigned="true"
-                comment="Product ID"/>
-        <column name="parent_id"
-                xsi:type="varchar"
-                length="255"
-                nullable="true"
-                comment="Parent ID"/>
-        <column name="created_at"
-                xsi:type="timestamp"
-                on_update="false"
-                default="CURRENT_TIMESTAMP"
-                comment="Created At"/>
-        <column name="updated_at"
-                xsi:type="timestamp"
-                on_update="true"
-                default="CURRENT_TIMESTAMP"
-                comment="Updated At"/>
-        <constraint referenceId="PRIMARY" xsi:type="primary">
-            <column name="entity_id"/>
-        </constraint>
-        <constraint
-            xsi:type="foreign"
-            referenceId="DATATRICS_CONTENT_PRODUCT_ID_CATALOG_PRODUCT_ENTITY_ENTITY_ID"
-            table="datatrics_profile"
-            column="content_id"
-            referenceTable="catalog_product_entity"
-            referenceColumn="entity_id"
-            onDelete="CASCADE"
-        />
-    </table>
-
+    <!-- Declaration Schema of Datatrics Content Store Table-->
     <table name="datatrics_content_store" engine="innodb" resource="default" comment="Datatrics Content Store Table">
-        <column name="entity_id"
-                xsi:type="int"
-                padding="10"
-                identity="true"
-                nullable="false"
-                unsigned="true"
-                comment="Entity ID"/>
-        <column name="product_id"
-                xsi:type="int"
-                padding="10"
-                nullable="false"
-                unsigned="true"
-                comment="Product ID"/>
-        <column name="store_id"
-                xsi:type="smallint"
-                padding="5"
-                unsigned="true"
-                nullable="false"
-                identity="false"
-                comment="Store ID"/>
-        <column name="update_msg"
-                xsi:type="text"
-                nullable="true"
-                comment="Update Message"/>
-        <column name="update_attempts"
-                xsi:type="smallint"
-                padding="5"
-                unsigned="true"
-                nullable="false"
-                identity="false"
-                comment="Number of Update Attempts"/>
-        <column name="status"
-                xsi:type="varchar"
-                length="50"
-                nullable="true"
-                comment="Status"/>
+        <column name="entity_id" xsi:type="int" padding="10" identity="true" nullable="false" unsigned="true" comment="Entity ID"/>
+        <column name="product_id" xsi:type="int" padding="10" nullable="false" unsigned="true" comment="Product ID"/>
+        <column name="parent_id" xsi:type="int" padding="10" nullable="true" unsigned="true" comment="Parent ID"/>
+        <column name="store_id" xsi:type="smallint" padding="5" unsigned="true" nullable="false" identity="false" comment="Store ID"/>
+        <column name="update_msg" xsi:type="text" nullable="true" comment="Update Message"/>
+        <column name="update_attempts" xsi:type="smallint" padding="5" unsigned="true" nullable="false" identity="false" comment="Number of Update Attempts"/>
+        <column name="status" xsi:type="varchar" length="50" nullable="true" comment="Status"/>
+        <column name="updated_at" xsi:type="timestamp" on_update="true" default="CURRENT_TIMESTAMP" comment="Updated At"/>
         <constraint referenceId="PRIMARY" xsi:type="primary">
             <column name="entity_id"/>
         </constraint>
-        <constraint
-            xsi:type="foreign"
-            referenceId="DATATRICS_CONTENT_STORE_ID_STORE_STORE_ID"
-            table="datatrics_content"
-            column="store_id"
-            referenceTable="store"
-            referenceColumn="store_id"
+        <index referenceId="DATATRICS_CONTENT_STORE_PRODUCT_ID" indexType="btree">
+            <column name="product_id"/>
+        </index>
+        <index referenceId="DATATRICS_CONTENT_STORE_PARENT_ID" indexType="btree">
+            <column name="parent_id"/>
+        </index>
+        <index referenceId="DATATRICS_CONTENT_STORE_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
+        <index referenceId="DATATRICS_CONTENT_STORE_STATUS" indexType="btree">
+            <column name="status"/>
+        </index>
+        <constraint xsi:type="foreign" referenceId="DATATRICS_CONTENT_STORE_ID_STORE_STORE_ID"
+            table="datatrics_content_store" column="store_id"
+            referenceTable="store" referenceColumn="store_id"
             onDelete="CASCADE"
         />
     </table>
diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
index c1d920e..42bf8b9 100755
--- a/etc/db_schema_whitelist.json
+++ b/etc/db_schema_whitelist.json
@@ -19,11 +19,20 @@
             "store_id": true,
             "update_msg": true,
             "update_attempts": true,
-            "status": true
+            "status": true,
+            "updated_at": true,
+            "parent_id": true
         },
         "constraint": {
             "PRIMARY": true,
-            "DATATRICS_CONTENT_STORE_STORE_ID_STORE_STORE_ID": true
+            "DATATRICS_CONTENT_STORE_STORE_ID_STORE_STORE_ID": true,
+            "DATATRICS_CONTENT_STORE_PRODUCT_ID_STORE_ID": true
+        },
+        "index": {
+            "DATATRICS_CONTENT_STORE_PRODUCT_ID": true,
+            "DATATRICS_CONTENT_STORE_STORE_ID": true,
+            "DATATRICS_CONTENT_STORE_STATUS": true,
+            "DATATRICS_CONTENT_STORE_PARENT_ID": true
         }
     },
     "datatrics_sales": {
diff --git a/etc/di.xml b/etc/di.xml
index 11960ec..c2b1fb4 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -171,20 +171,19 @@
     </type>
     <type name="Datatrics\Connect\Console\Command\ContentUpdate">
         <arguments>
-            <argument name="contentUpdateProcessing"
-                      xsi:type="object">Datatrics\Connect\Model\Command\ContentUpdate\Proxy</argument>
+            <argument name="contentUpdateProcessing" xsi:type="object">Datatrics\Connect\Model\Command\ContentUpdate\Proxy</argument>
         </arguments>
     </type>
     <type name="Datatrics\Connect\Console\Command\ContentAdd">
         <arguments>
-            <argument name="contentAddProcessing"
-                      xsi:type="object">Datatrics\Connect\Model\Command\ContentAdd\Proxy</argument>
+            <argument name="contentAddProcessing" xsi:type="object">Datatrics\Connect\Model\Command\ContentAdd\Proxy</argument>
+            <argument name="configProvider" xsi:type="object">Datatrics\Connect\Api\Config\System\ContentInterface\Proxy</argument>
         </arguments>
     </type>
     <type name="Datatrics\Connect\Console\Command\ContentInvalidate">
         <arguments>
-            <argument name="contentInvalidateProcessing"
-                      xsi:type="object">Datatrics\Connect\Model\Command\ContentInvalidate\Proxy</argument>
+            <argument name="contentInvalidateProcessing" xsi:type="object">Datatrics\Connect\Model\Command\ContentInvalidate\Proxy</argument>
+            <argument name="configProvider" xsi:type="object">Datatrics\Connect\Api\Config\System\ContentInterface\Proxy</argument>
         </arguments>
     </type>
     <!-- Command line block end -->
diff --git a/view/adminhtml/layout/default.xml b/view/adminhtml/layout/default.xml
deleted file mode 100755
index 7a6f26b..0000000
--- a/view/adminhtml/layout/default.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magmodules.eu. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column"
-      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head />
-</page>
diff --git a/view/adminhtml/ui_component/product_listing.xml b/view/adminhtml/ui_component/product_listing.xml
deleted file mode 100755
index 8081019..0000000
--- a/view/adminhtml/ui_component/product_listing.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright © Magmodules.eu. All rights reserved.
-  ~ See COPYING.txt for license details.
-  -->
-<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
-    <listingToolbar name="listing_top">
-        <massaction name="listing_massaction">
-            <action name="add_to_queue">
-                <settings>
-                    <url path="datatrics/product/massqueue"/>
-                    <type>add_to_queue</type>
-                    <label translate="true">Add to Datatrics Sync Queue</label>
-                </settings>
-            </action>
-        </massaction>
-    </listingToolbar>
-</listing>

From 753ba55af6f07ead2215eeeafbdf1ae3bdc3e8be Mon Sep 17 00:00:00 2001
From: Marvin Besselsen <marvin@magmodules.eu>
Date: Tue, 22 Aug 2023 11:30:28 +0200
Subject: [PATCH 2/4] Load pixel block in last order

---
 view/frontend/layout/default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 3ce2f26..946f627 100755
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -12,7 +12,7 @@
             <block name="datatrics.pixel.base"
                    ifconfig="datatrics_connect_tracking/tracking/enable"
                    class="Magento\Framework\View\Element\Template"
-                   before="-"
+                   after="-"
                    template="Datatrics_Connect::pixel.phtml">
                 <arguments>
                     <argument name="view_model" xsi:type="object">

From cd886a3523aad65c9cc4f0f5a7705419155cb017 Mon Sep 17 00:00:00 2001
From: Marvin Besselsen <marvin@magmodules.eu>
Date: Tue, 22 Aug 2023 11:57:04 +0200
Subject: [PATCH 3/4] Implemented new admin UI

---
 Block/Adminhtml/Datatrics/Heading.php         |   4 +-
 .../System/Config/Button/DebugCheck.php       |  54 +--
 .../System/Config/Button/ErrorCheck.php       |  54 +--
 .../System/Config/Button/VersionCheck.php     |   2 +-
 Controller/Adminhtml/Log/Debug.php            | 143 ------
 Controller/Adminhtml/Log/Error.php            | 143 ------
 Controller/Adminhtml/Log/Stream.php           | 169 +++++++
 Logger/DebugLogger.php                        |   8 +-
 Logger/ErrorLogger.php                        |  10 +-
 Logger/Handler/Debug.php                      |   2 +-
 Logger/Handler/Error.php                      |   2 +-
 view/adminhtml/requirejs-config.js            |   1 +
 .../system/config/button/credentials.phtml    |  14 +-
 .../system/config/button/debug.phtml          |   5 +-
 .../system/config/button/error.phtml          |   5 +-
 .../system/config/button/integration.phtml    |  14 +-
 .../system/config/button/selftest.phtml       |   5 +-
 .../system/config/button/tracking_test.phtml  |  14 +-
 .../system/config/button/version.phtml        |  19 +-
 .../system/config/fieldset/header.phtml       |  35 +-
 view/adminhtml/web/css/source/_icons.less     |  51 ---
 .../adminhtml/web/css/source/_mm-buttons.less | 103 -----
 view/adminhtml/web/css/source/_module.less    | 413 ++----------------
 .../web/css/source/extend/_credentials.less   |  32 ++
 .../web/css/source/extend/_table.less         |  49 +++
 .../web/css/source/module/_debug.less         |  80 ++++
 .../web/css/source/module/_header.less        |  34 ++
 view/adminhtml/web/css/source/module/_ui.less |   6 +
 .../web/css/source/module/_version.less       |  92 ++++
 .../web/css/source/module/ui/_button.less     | 111 +++++
 .../web/css/source/module/ui/_modal.less      | 129 ++++++
 .../web/css/source/variables/_colors.less     |  21 +
 .../web/css/source/variables/_icons.less      |  28 --
 .../web/css/source/variables/_mm-colors.less  |  20 -
 .../fonts/datatrics-icons/datatrics-icons.eot | Bin 10768 -> 0 bytes
 .../fonts/datatrics-icons/datatrics-icons.svg |  46 --
 .../fonts/datatrics-icons/datatrics-icons.ttf | Bin 10568 -> 0 bytes
 .../datatrics-icons/datatrics-icons.woff      | Bin 6452 -> 0 bytes
 .../datatrics-icons/datatrics-icons.woff2     | Bin 5444 -> 0 bytes
 view/adminhtml/web/js/button-functions.js     | 357 ++++++---------
 view/adminhtml/web/js/show-more.js            |  41 ++
 41 files changed, 1036 insertions(+), 1280 deletions(-)
 delete mode 100755 Controller/Adminhtml/Log/Debug.php
 delete mode 100755 Controller/Adminhtml/Log/Error.php
 create mode 100644 Controller/Adminhtml/Log/Stream.php
 delete mode 100755 view/adminhtml/web/css/source/_icons.less
 delete mode 100755 view/adminhtml/web/css/source/_mm-buttons.less
 create mode 100755 view/adminhtml/web/css/source/extend/_credentials.less
 create mode 100644 view/adminhtml/web/css/source/extend/_table.less
 create mode 100644 view/adminhtml/web/css/source/module/_debug.less
 create mode 100644 view/adminhtml/web/css/source/module/_header.less
 create mode 100644 view/adminhtml/web/css/source/module/_ui.less
 create mode 100644 view/adminhtml/web/css/source/module/_version.less
 create mode 100644 view/adminhtml/web/css/source/module/ui/_button.less
 create mode 100644 view/adminhtml/web/css/source/module/ui/_modal.less
 create mode 100755 view/adminhtml/web/css/source/variables/_colors.less
 delete mode 100755 view/adminhtml/web/css/source/variables/_icons.less
 delete mode 100755 view/adminhtml/web/css/source/variables/_mm-colors.less
 delete mode 100755 view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.eot
 delete mode 100755 view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.svg
 delete mode 100755 view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.ttf
 delete mode 100755 view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.woff
 delete mode 100755 view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.woff2
 create mode 100755 view/adminhtml/web/js/show-more.js

diff --git a/Block/Adminhtml/Datatrics/Heading.php b/Block/Adminhtml/Datatrics/Heading.php
index 2a15bab..9213e05 100755
--- a/Block/Adminhtml/Datatrics/Heading.php
+++ b/Block/Adminhtml/Datatrics/Heading.php
@@ -26,8 +26,8 @@ public function render(AbstractElement $element): string
         $html = '<tr id="row_' . $element->getHtmlId() . '">';
         $html .= '  <td class="label"></td>';
         $html .= '  <td class="value">';
-        $html .= '     <div class="mm-heading-block">' . $element->getData('label') . '</div>';
-        $html .= '     <div class="mm-heading-comment">' . $element->getData('comment') . '</div>';
+        $html .= '     <div class="mm-datatrics-heading-block">' . $element->getData('label') . '</div>';
+        $html .= '     <div class="mm-datatrics-heading-comment">' . $element->getData('comment') . '</div>';
         $html .= '  </td>';
         $html .= '  <td></td>';
         $html .= '</tr>';
diff --git a/Block/Adminhtml/System/Config/Button/DebugCheck.php b/Block/Adminhtml/System/Config/Button/DebugCheck.php
index 4b6d3db..600b8d3 100755
--- a/Block/Adminhtml/System/Config/Button/DebugCheck.php
+++ b/Block/Adminhtml/System/Config/Button/DebugCheck.php
@@ -7,7 +7,7 @@
 
 namespace Datatrics\Connect\Block\Adminhtml\System\Config\Button;
 
-use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget\Button;
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
@@ -23,41 +23,18 @@ class DebugCheck extends Field
     protected $_template = 'Datatrics_Connect::system/config/button/debug.phtml';
 
     /**
-     * @var \Magento\Framework\App\RequestInterface
+     * @inheritDoc
      */
-    private $request;
-
-    /**
-     * Credentials constructor.
-     *
-     * @param Context $context
-     * @param array   $data
-     */
-    public function __construct(
-        Context $context,
-        array $data = []
-    ) {
-        $this->request = $context->getRequest();
-        parent::__construct($context, $data);
-    }
-
-    /**
-     * @param AbstractElement $element
-     *
-     * @return string
-     */
-    public function render(AbstractElement $element)
+    public function render(AbstractElement $element): string
     {
         $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
         return parent::render($element);
     }
 
     /**
-     * @param AbstractElement $element
-     *
-     * @return string
+     * @inheritDoc
      */
-    public function _getElementHtml(AbstractElement $element)
+    public function _getElementHtml(AbstractElement $element): string
     {
         return $this->_toHtml();
     }
@@ -65,24 +42,25 @@ public function _getElementHtml(AbstractElement $element)
     /**
      * @return string
      */
-    public function getDebugCheckUrl()
+    public function getDebugCheckUrl(): string
     {
-        return $this->getUrl('datatrics/log/debug');
+        return $this->getUrl('datatrics/log/stream', ['type' => 'debug']);
     }
 
     /**
-     * @return mixed
+     * @return string
      */
-    public function getButtonHtml()
+    public function getButtonHtml(): string
     {
-        $buttonData = ['id' => 'mm-button_debug', 'label' => __('Check last 100 debug log records')];
         try {
-            $button = $this->getLayout()->createBlock(
-                \Magento\Backend\Block\Widget\Button::class
-            )->setData($buttonData);
-            return $button->toHtml();
+            return $this->getLayout()
+                ->createBlock(Button::class)
+                ->setData([
+                    'id' => 'mm-datatrics-button_debug',
+                    'label' => __('Check last 50 debug log records')
+                ])->toHtml();
         } catch (\Exception $e) {
-            return false;
+            return '';
         }
     }
 }
diff --git a/Block/Adminhtml/System/Config/Button/ErrorCheck.php b/Block/Adminhtml/System/Config/Button/ErrorCheck.php
index 31ebf42..389b026 100755
--- a/Block/Adminhtml/System/Config/Button/ErrorCheck.php
+++ b/Block/Adminhtml/System/Config/Button/ErrorCheck.php
@@ -7,7 +7,7 @@
 
 namespace Datatrics\Connect\Block\Adminhtml\System\Config\Button;
 
-use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget\Button;
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
@@ -23,41 +23,18 @@ class ErrorCheck extends Field
     protected $_template = 'Datatrics_Connect::system/config/button/error.phtml';
 
     /**
-     * @var \Magento\Framework\App\RequestInterface
+     * @inheritDoc
      */
-    private $request;
-
-    /**
-     * Credentials constructor.
-     *
-     * @param Context $context
-     * @param array   $data
-     */
-    public function __construct(
-        Context $context,
-        array $data = []
-    ) {
-        $this->request = $context->getRequest();
-        parent::__construct($context, $data);
-    }
-
-    /**
-     * @param AbstractElement $element
-     *
-     * @return string
-     */
-    public function render(AbstractElement $element)
+    public function render(AbstractElement $element): string
     {
         $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
         return parent::render($element);
     }
 
     /**
-     * @param AbstractElement $element
-     *
-     * @return string
+     * @inheritDoc
      */
-    public function _getElementHtml(AbstractElement $element)
+    public function _getElementHtml(AbstractElement $element): string
     {
         return $this->_toHtml();
     }
@@ -65,24 +42,25 @@ public function _getElementHtml(AbstractElement $element)
     /**
      * @return string
      */
-    public function getErrorCheckUrl()
+    public function getErrorCheckUrl(): string
     {
-        return $this->getUrl('datatrics/log/error');
+        return $this->getUrl('datatrics/log/stream', ['type' => 'error']);
     }
 
     /**
-     * @return mixed
+     * @return string
      */
-    public function getButtonHtml()
+    public function getButtonHtml(): string
     {
-        $buttonData = ['id' => 'mm-button_error', 'label' => __('Check last 100 error log records')];
         try {
-            $button = $this->getLayout()->createBlock(
-                \Magento\Backend\Block\Widget\Button::class
-            )->setData($buttonData);
-            return $button->toHtml();
+            return $this->getLayout()
+                ->createBlock(Button::class)
+                ->setData([
+                    'id' => 'mm-datatrics-button_error',
+                    'label' => __('Check last 50 error log records')
+                ])->toHtml();
         } catch (\Exception $e) {
-            return false;
+            return '';
         }
     }
 }
diff --git a/Block/Adminhtml/System/Config/Button/VersionCheck.php b/Block/Adminhtml/System/Config/Button/VersionCheck.php
index a2af007..0eca814 100755
--- a/Block/Adminhtml/System/Config/Button/VersionCheck.php
+++ b/Block/Adminhtml/System/Config/Button/VersionCheck.php
@@ -99,7 +99,7 @@ public function getChangeLogUrl()
      */
     public function getButtonHtml()
     {
-        $buttonData = ['id' => 'mm-button_version', 'label' => __('Check for latest versions')];
+        $buttonData = ['id' => 'mm-datatrics-button_version', 'label' => __('Check for latest versions')];
         try {
             $button = $this->getLayout()->createBlock(
                 \Magento\Backend\Block\Widget\Button::class
diff --git a/Controller/Adminhtml/Log/Debug.php b/Controller/Adminhtml/Log/Debug.php
deleted file mode 100755
index 2cfc91f..0000000
--- a/Controller/Adminhtml/Log/Debug.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Copyright © Magmodules.eu. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Datatrics\Connect\Controller\Adminhtml\Log;
-
-use Magento\Backend\App\Action;
-use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Framework\Controller\Result\Json;
-use Datatrics\Connect\Api\Config\RepositoryInterface
-    as ConfigRepository;
-use Magento\Framework\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Driver\File;
-use Magento\Framework\Serialize\Serializer\Json as SerializerJson;
-
-/**
- * Class debug
- *
- * AJAX controller to check debug log
- */
-class Debug extends Action
-{
-
-    /**
-     * Debug log file path pattern
-     */
-    public const DEBUG_LOG_FILE = '%s/log/datatrics/debug.log';
-
-    /**
-     * @var JsonFactory
-     */
-    private $resultJsonFactory;
-
-    /**
-     * @var ConfigRepository
-     */
-    private $configRepository;
-
-    /**
-     * @var DirectoryList
-     */
-    private $dir;
-
-    /**
-     * @var File
-     */
-    private $file;
-
-    /**
-     * @var SerializerJson
-     */
-    private $serializerJson;
-
-    /**
-     * Check constructor.
-     *
-     * @param Action\Context $context
-     * @param JsonFactory $resultJsonFactory
-     * @param ConfigRepository $configRepository
-     * @param DirectoryList $dir
-     * @param File $file
-     * @param SerializerJson $serializerJson
-     */
-    public function __construct(
-        Action\Context $context,
-        JsonFactory $resultJsonFactory,
-        ConfigRepository $configRepository,
-        DirectoryList $dir,
-        File $file,
-        SerializerJson $serializerJson
-    ) {
-        $this->resultJsonFactory = $resultJsonFactory;
-        $this->configRepository = $configRepository;
-        $this->dir = $dir;
-        $this->file = $file;
-        $this->serializerJson = $serializerJson;
-        parent::__construct($context);
-    }
-
-    /**
-     * @return \Magento\Framework\App\ResponseInterface|Json|\Magento\Framework\Controller\ResultInterface
-     * @throws \Magento\Framework\Exception\FileSystemException
-     */
-    public function execute()
-    {
-        $resultJson = $this->resultJsonFactory->create();
-        if ($this->isLogExists(self::DEBUG_LOG_FILE)) {
-            $result = $this->prepareLogText(self::DEBUG_LOG_FILE);
-        } else {
-            $result = [];
-        }
-        return $resultJson->setData(['result' => $result]);
-    }
-
-    /**
-     * Prepare encoded log text
-     *
-     * @param string $file
-     *
-     * @return array
-     * @throws \Magento\Framework\Exception\FileSystemException
-     */
-    private function prepareLogText(string $file) : array
-    {
-        $logFile = sprintf($file, $this->dir->getPath('var'));
-        $fileContent = explode(PHP_EOL, $this->file->fileGetContents($logFile));
-        if (count($fileContent) > 100) {
-            $fileContent = array_slice($fileContent, -100, 100, true);
-        }
-        $result = [];
-        foreach ($fileContent as $line) {
-            $data = explode('] ', $line);
-            $date = ltrim(array_shift($data), '[');
-            $data = implode('] ', $data);
-            $data = explode(': ', $data);
-            array_shift($data);
-            $result[] = [
-                'date' => $date,
-                'msg' => implode(': ', $data)
-            ];
-        }
-        return $result;
-    }
-
-    /**
-     * Check is log file exists
-     * @param string $file
-     *
-     * @return bool
-     */
-    private function isLogExists(string $file) : bool
-    {
-        try {
-            $logFile = sprintf($file, $this->dir->getPath('var'));
-            return $this->file->isExists($logFile);
-        } catch (\Exception $e) {
-            return false;
-        }
-    }
-}
diff --git a/Controller/Adminhtml/Log/Error.php b/Controller/Adminhtml/Log/Error.php
deleted file mode 100755
index 0ec42ab..0000000
--- a/Controller/Adminhtml/Log/Error.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Copyright © Magmodules.eu. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Datatrics\Connect\Controller\Adminhtml\Log;
-
-use Magento\Backend\App\Action;
-use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Framework\Controller\Result\Json;
-use Datatrics\Connect\Api\Config\RepositoryInterface
-    as ConfigRepository;
-use Magento\Framework\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Driver\File;
-use Magento\Framework\Serialize\Serializer\Json as SerializerJson;
-
-/**
- * Class error
- *
- * AJAX controller to check error log
- */
-class Error extends Action
-{
-
-    /**
-     * Error log file path pattern
-     */
-    public const ERROR_LOG_FILE = '%s/log/datatrics/error.log';
-
-    /**
-     * @var JsonFactory
-     */
-    private $resultJsonFactory;
-
-    /**
-     * @var ConfigRepository
-     */
-    private $configRepository;
-
-    /**
-     * @var DirectoryList
-     */
-    private $dir;
-
-    /**
-     * @var File
-     */
-    private $file;
-
-    /**
-     * @var SerializerJson
-     */
-    private $serializerJson;
-
-    /**
-     * Check constructor.
-     *
-     * @param Action\Context $context
-     * @param JsonFactory $resultJsonFactory
-     * @param ConfigRepository $configRepository
-     * @param DirectoryList $dir
-     * @param File $file
-     * @param SerializerJson $serializerJson
-     */
-    public function __construct(
-        Action\Context $context,
-        JsonFactory $resultJsonFactory,
-        ConfigRepository $configRepository,
-        DirectoryList $dir,
-        File $file,
-        SerializerJson $serializerJson
-    ) {
-        $this->resultJsonFactory = $resultJsonFactory;
-        $this->configRepository = $configRepository;
-        $this->dir = $dir;
-        $this->file = $file;
-        $this->serializerJson = $serializerJson;
-        parent::__construct($context);
-    }
-
-    /**
-     * @return \Magento\Framework\App\ResponseInterface|Json|\Magento\Framework\Controller\ResultInterface
-     * @throws \Magento\Framework\Exception\FileSystemException
-     */
-    public function execute()
-    {
-        $resultJson = $this->resultJsonFactory->create();
-        if ($this->isLogExists(self::ERROR_LOG_FILE)) {
-            $result = $this->prepareLogText(self::ERROR_LOG_FILE);
-        } else {
-            $result = [];
-        }
-        return $resultJson->setData(['result' => $result]);
-    }
-
-    /**
-     * Prepare encoded log text
-     *
-     * @param string $file
-     *
-     * @return array
-     * @throws \Magento\Framework\Exception\FileSystemException
-     */
-    private function prepareLogText(string $file) : array
-    {
-        $logFile = sprintf($file, $this->dir->getPath('var'));
-        $fileContent = explode(PHP_EOL, $this->file->fileGetContents($logFile));
-        if (count($fileContent) > 100) {
-            $fileContent = array_slice($fileContent, -100, 100, true);
-        }
-        $result = [];
-        foreach ($fileContent as $line) {
-            $data = explode('] ', $line);
-            $date = ltrim(array_shift($data), '[');
-            $data = implode('] ', $data);
-            $data = explode(': ', $data);
-            array_shift($data);
-            $result[] = [
-                'date' => $date,
-                'msg' => implode(': ', $data)
-            ];
-        }
-        return $result;
-    }
-
-    /**
-     * Check is log file exists
-     * @param string $file
-     *
-     * @return bool
-     */
-    private function isLogExists(string $file) : bool
-    {
-        try {
-            $logFile = sprintf($file, $this->dir->getPath('var'));
-            return $this->file->isExists($logFile);
-        } catch (\Exception $e) {
-            return false;
-        }
-    }
-}
diff --git a/Controller/Adminhtml/Log/Stream.php b/Controller/Adminhtml/Log/Stream.php
new file mode 100644
index 0000000..d9606bb
--- /dev/null
+++ b/Controller/Adminhtml/Log/Stream.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magmodules.eu. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Datatrics\Connect\Controller\Adminhtml\Log;
+
+use Exception;
+use Magento\Backend\App\Action;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+
+/**
+ * AJAX controller to check logs
+ */
+class Stream extends Action
+{
+
+    /**
+     * Error log file path pattern
+     */
+    public const LOG_FILE = '%s/log/datatrics-%s.log';
+    /**
+     * Limit stream size to 50 lines
+     */
+    public const MAX_LINES = 50;
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+    /**
+     * @var DirectoryList
+     */
+    private $dir;
+    /**
+     * @var File
+     */
+    private $file;
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+    /**
+     * @var DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @param Action\Context $context
+     * @param JsonFactory $resultJsonFactory
+     * @param DirectoryList $dir
+     * @param File $file
+     * @param DateTime $dateTime
+     */
+    public function __construct(
+        Action\Context $context,
+        JsonFactory $resultJsonFactory,
+        DirectoryList $dir,
+        File $file,
+        DateTime $dateTime
+    ) {
+        $this->resultJsonFactory = $resultJsonFactory;
+        $this->request = $context->getRequest();
+        $this->dir = $dir;
+        $this->file = $file;
+        $this->dateTime = $dateTime;
+        parent::__construct($context);
+    }
+
+    /**
+     * @return Json
+     * @throws FileSystemException
+     */
+    public function execute(): Json
+    {
+        $resultJson = $this->resultJsonFactory->create();
+        $logFilePath = $this->getLogFilePath();
+
+        if ($logFilePath && $this->isLogExists($logFilePath)) {
+            $result = ['result' => $this->prepareLogText($logFilePath)];
+        } else {
+            $result = __('Log is empty');
+        }
+
+        return $resultJson->setData($result);
+    }
+
+    /**
+     * @return string
+     */
+    private function getLogFilePath(): ?string
+    {
+        try {
+            $type = $this->request->getParam('type') == 'error' ? 'error' : 'debug';
+            return sprintf(self::LOG_FILE, $this->dir->getPath('var'), $type);
+        } catch (\Exception $exception) {
+            return null;
+        }
+    }
+
+    /**
+     * Check is log file exists
+     *
+     * @param $logFilePath
+     * @return bool
+     */
+    private function isLogExists($logFilePath): bool
+    {
+        try {
+            return $this->file->isExists($logFilePath);
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param $logFilePath
+     * @return array
+     * @throws FileSystemException
+     */
+    private function prepareLogText($logFilePath): array
+    {
+        $stream = $this->file->fileOpen($logFilePath, 'r');
+
+        $this->file->fileSeek($stream, 0, SEEK_END);
+        $pos = $this->file->fileTell($stream);
+        $numberOfLines = self::MAX_LINES;
+        while ($pos >= 0 && $numberOfLines > 0) {
+            $this->file->fileSeek($stream, $pos);
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $char = fgetc($stream);
+            if ($char === "\n") {
+                $numberOfLines--;
+            }
+            $pos--;
+        }
+
+        $result = [];
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        while (!feof($stream) && $numberOfLines < self::MAX_LINES) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            if ($line = fgets($stream)) {
+                $data = explode('] ', $line);
+                $date = ltrim(array_shift($data), '[');
+                $data = implode('] ', $data);
+                $data = explode(': ', $data);
+                unset($data[0]);
+                $type = $data[1] ?? '--';
+                array_shift($data);
+
+                $result[] = [
+                    'date' => $this->dateTime->date('Y-m-d H:i:s', $date) . ' - ' . $type,
+                    'msg' => implode(': ', $data)
+                ];
+            }
+        }
+
+        $this->file->fileClose($stream);
+        return array_reverse($result);
+    }
+}
diff --git a/Logger/DebugLogger.php b/Logger/DebugLogger.php
index 6048d9a..e71262d 100755
--- a/Logger/DebugLogger.php
+++ b/Logger/DebugLogger.php
@@ -24,10 +24,10 @@ class DebugLogger extends Logger
     /**
      * DebugLogger constructor.
      *
-     * @param Json   $json
+     * @param Json $json
      * @param string $name
-     * @param array  $handlers
-     * @param array  $processors
+     * @param array $handlers
+     * @param array $processors
      */
     public function __construct(
         Json $json,
@@ -43,7 +43,7 @@ public function __construct(
      * Add debug data to Datatrics Log
      *
      * @param string $type
-     * @param mixed  $data
+     * @param mixed $data
      */
     public function addLog(string $type, $data)
     {
diff --git a/Logger/ErrorLogger.php b/Logger/ErrorLogger.php
index 2329cb8..f8761b6 100755
--- a/Logger/ErrorLogger.php
+++ b/Logger/ErrorLogger.php
@@ -24,10 +24,10 @@ class ErrorLogger extends Logger
     /**
      * ErrorLogger constructor.
      *
-     * @param Json   $json
+     * @param Json $json
      * @param string $name
-     * @param array  $handlers
-     * @param array  $processors
+     * @param array $handlers
+     * @param array $processors
      */
     public function __construct(
         Json $json,
@@ -43,9 +43,9 @@ public function __construct(
      * Add error data to Datatrics Log
      *
      * @param string $type
-     * @param mixed  $data
+     * @param mixed $data
      */
-    public function addLog($type, $data)
+    public function addLog(string $type, $data)
     {
         if (is_array($data) || is_object($data)) {
             $this->addRecord(static::ERROR, $type . ': ' . $this->json->serialize($data));
diff --git a/Logger/Handler/Debug.php b/Logger/Handler/Debug.php
index c4cd3ba..5b0ee3e 100755
--- a/Logger/Handler/Debug.php
+++ b/Logger/Handler/Debug.php
@@ -24,5 +24,5 @@ class Debug extends Base
     /**
      * @var string
      */
-    protected $fileName = '/var/log/datatrics/debug.log';
+    protected $fileName = '/var/log/datatrics-debug.log';
 }
diff --git a/Logger/Handler/Error.php b/Logger/Handler/Error.php
index c31b9b5..0661266 100755
--- a/Logger/Handler/Error.php
+++ b/Logger/Handler/Error.php
@@ -24,5 +24,5 @@ class Error extends Base
     /**
      * @var string
      */
-    protected $fileName = '/var/log/datatrics/error.log';
+    protected $fileName = '/var/log/datatrics-error.log';
 }
diff --git a/view/adminhtml/requirejs-config.js b/view/adminhtml/requirejs-config.js
index f4eb79c..b2320e9 100755
--- a/view/adminhtml/requirejs-config.js
+++ b/view/adminhtml/requirejs-config.js
@@ -1,5 +1,6 @@
 var config = {
     deps: [
         'Datatrics_Connect/js/button-functions',
+        'Datatrics_Connect/js/show-more',
     ]
 };
diff --git a/view/adminhtml/templates/system/config/button/credentials.phtml b/view/adminhtml/templates/system/config/button/credentials.phtml
index ecc9e9f..879f405 100755
--- a/view/adminhtml/templates/system/config/button/credentials.phtml
+++ b/view/adminhtml/templates/system/config/button/credentials.phtml
@@ -14,9 +14,8 @@ use Datatrics\Connect\Block\Adminhtml\System\Config\Button\Credentials;
 <script>
     require([
         'jquery',
-        'prototype'
     ], function (jQuery) {
-        var resultSpan = jQuery('#result_api');
+        var resultSpan = jQuery('.check-credentials-wrapper > #result_api');
         jQuery('#button_credentials').click(function () {
             var params = {
                 "api_key": jQuery("input[name='groups[general][fields][api_key][value]']").val(),
@@ -49,8 +48,11 @@ use Datatrics\Connect\Block\Adminhtml\System\Config\Button\Credentials;
         });
     });
 </script>
-<?= $block->getButtonHtml() ?>
-<div id="result_api">
-    <span class="connecting" style="display: none;">Connecting...</span>
-    <span class="result"></span>
+
+<div class="check-credentials-wrapper">
+    <?= $block->getButtonHtml() ?>
+    <div id="result_api">
+        <span class="connecting" style="display: none;">Connecting...</span>
+        <span class="result"></span>
+    </div>
 </div>
diff --git a/view/adminhtml/templates/system/config/button/debug.phtml b/view/adminhtml/templates/system/config/button/debug.phtml
index 2a5289a..b473065 100755
--- a/view/adminhtml/templates/system/config/button/debug.phtml
+++ b/view/adminhtml/templates/system/config/button/debug.phtml
@@ -10,8 +10,9 @@
  */
 ?>
 
-<div id="mm-result_debug-modal" data-mm-endpoind-url="<?= $block->escapeUrl($block->getDebugCheckUrl()) ?>">
-    <div id="mm-result_debug">
+<div id="mm-datatrics-result_debug-modal" 
+     data-mm-datatrics-endpoind-url="<?= $block->escapeUrl($block->getDebugCheckUrl()) ?>">
+    <div id="mm-datatrics-result_debug">
         <div class="result"></div>
     </div>
 </div>
diff --git a/view/adminhtml/templates/system/config/button/error.phtml b/view/adminhtml/templates/system/config/button/error.phtml
index 5520a89..669fbb3 100755
--- a/view/adminhtml/templates/system/config/button/error.phtml
+++ b/view/adminhtml/templates/system/config/button/error.phtml
@@ -10,8 +10,9 @@
  */
 ?>
 
-<div id="mm-result_error-modal" data-mm-endpoind-url="<?= $block->escapeUrl($block->getErrorCheckUrl()) ?>">
-    <div id="mm-result_error">
+<div id="mm-datatrics-result_error-modal" 
+     data-mm-datatrics-endpoind-url="<?= $block->escapeUrl($block->getErrorCheckUrl()) ?>">
+    <div id="mm-datatrics-result_error">
         <div class="result"></div>
     </div>
 </div>
diff --git a/view/adminhtml/templates/system/config/button/integration.phtml b/view/adminhtml/templates/system/config/button/integration.phtml
index e7b8ce9..e64c7e3 100755
--- a/view/adminhtml/templates/system/config/button/integration.phtml
+++ b/view/adminhtml/templates/system/config/button/integration.phtml
@@ -14,7 +14,6 @@ use Datatrics\Connect\Block\Adminhtml\System\Config\Button\Integration;
 <script>
     require([
         'jquery',
-        'prototype'
     ], function (jQuery) {
         var resultSpan = jQuery('#result_integration');
         jQuery('#button_integration').click(function () {
@@ -48,8 +47,11 @@ use Datatrics\Connect\Block\Adminhtml\System\Config\Button\Integration;
         });
     });
 </script>
-<?= $block->getButtonHtml() ?>
-<div id="result_integration">
-    <span class="connecting" style="display: none;">Creating...</span>
-    <span class="result"></span>
-</div>
+
+<div class="check-credentials-wrapper">
+    <?= $block->getButtonHtml() ?>
+    <div id="result_integration">
+        <span class="connecting" style="display: none;">Creating...</span>
+        <span class="result"></span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/view/adminhtml/templates/system/config/button/selftest.phtml b/view/adminhtml/templates/system/config/button/selftest.phtml
index 3f6a62d..1405a53 100755
--- a/view/adminhtml/templates/system/config/button/selftest.phtml
+++ b/view/adminhtml/templates/system/config/button/selftest.phtml
@@ -9,8 +9,9 @@
  * @var \Datatrics\Connect\Block\Adminhtml\System\Config\Button\Credentials $block
  */
 ?>
-<div id="mm-result_test-modal" data-mm-endpoind-url="<?= $block->escapeUrl($block->getSelftestUrl()) ?>">
-    <div id="mm-result_test">
+<div id="mm-datatrics-result_test-modal" 
+     data-mm-datatrics-endpoind-url="<?= $block->escapeUrl($block->getSelftestUrl()) ?>">
+    <div id="mm-datatrics-result_test">
         <ul class="result"></ul>
     </div>
 </div>
diff --git a/view/adminhtml/templates/system/config/button/tracking_test.phtml b/view/adminhtml/templates/system/config/button/tracking_test.phtml
index 2ee57c4..01fce46 100755
--- a/view/adminhtml/templates/system/config/button/tracking_test.phtml
+++ b/view/adminhtml/templates/system/config/button/tracking_test.phtml
@@ -14,7 +14,6 @@ use Datatrics\Connect\Block\Adminhtml\System\Config\Button\Credentials;
 <script>
     require([
         'jquery',
-        'prototype'
     ], function (jQuery) {
         var resultSpan = jQuery('#result_api');
         jQuery('#connection_test').click(function () {
@@ -44,8 +43,11 @@ use Datatrics\Connect\Block\Adminhtml\System\Config\Button\Credentials;
         });
     });
 </script>
-<?= $block->getButtonHtml() ?>
-<div id="result_api">
-    <span class="connecting" style="display: none;">Connecting...</span>
-    <span class="result"></span>
-</div>
+
+<div class="check-credentials-wrapper">
+    <?= $block->getButtonHtml() ?>
+    <div id="result_api">
+        <span class="connecting" style="display: none;">Connecting...</span>
+        <span class="result"></span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/view/adminhtml/templates/system/config/button/version.phtml b/view/adminhtml/templates/system/config/button/version.phtml
index 8ccd027..38c5e43 100755
--- a/view/adminhtml/templates/system/config/button/version.phtml
+++ b/view/adminhtml/templates/system/config/button/version.phtml
@@ -11,12 +11,21 @@
 
 ?>
 
-<div class="mm-result_version-wrapper" data-mm-endpoind-url="<?= $block->escapeUrl($block->getVersionCheckUrl()) ?>">
+<div class="mm-datatrics-result_version-wrapper"
+     data-mm-datatrics-endpoind-url="<?= $block->escapeUrl($block->getVersionCheckUrl()) ?>">
     <span><?= $block->escapeHtml($block->getVersion()); ?></span>
-    <?= $block->getButtonHtml() ?>
-    <div id="mm-result_version"></div>
-    <div id="mm-result_changelog-modal" data-mm-endpoind-url="<?= $block->escapeUrl($block->getChangeLogUrl()) ?>">
-        <div id="mm-result_changelog">
+
+    <div class="button-wrapper">
+        <?= $block->getButtonHtml() ?>
+        <svg version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+            <path fill="#fff" d="m950.27 145.92v256c0 10.24-2.048 18.432-10.24 25.6-8.192 8.192-16.384 10.24-25.6 10.24h-256c-16.384 0-26.624-6.144-34.816-21.504-5.12-14.336-3.072-28.672 8.192-39.936l79.872-78.848c-55.296-51.2-123.9-77.824-199.68-77.824-39.936 0-77.824 8.192-113.66 22.528-35.84 15.36-66.56 35.84-92.16 63.488-27.648 26.624-48.128 56.32-64.512 92.16-13.312 35.84-21.504 73.728-21.504 113.66 0 40.96 8.192 78.848 21.504 114.69 16.384 35.84 36.864 65.536 64.512 92.16 25.6 27.648 56.32 47.104 92.16 63.488 35.84 14.336 73.728 22.528 113.66 22.528 46.08 0 88.064-10.24 128-30.72 39.936-17.408 75.776-46.08 102.4-83.968 4.096-2.048 7.168-6.144 13.312-6.144s10.24 2.048 14.336 6.144l77.824 77.824c4.096 4.096 6.144 6.144 6.144 12.288 0 4.096-2.048 8.192-4.096 12.288-41.984 50.176-92.16 90.112-151.55 117.76-58.368 28.672-119.81 39.936-186.37 39.936-60.416 0-115.71-9.216-169.98-33.792-54.272-23.552-102.4-54.272-140.29-94.208-39.936-37.888-69.632-86.016-93.184-140.29-24.576-53.248-34.816-109.57-34.816-169.98 0-59.392 10.24-115.71 34.816-169.98 23.552-53.248 53.248-101.38 93.184-139.26 37.888-39.936 86.016-70.656 140.29-94.208 54.272-24.576 109.57-33.792 169.98-33.792 56.32 0 109.57 9.216 161.79 29.696 52.224 21.504 100.35 52.224 140.29 90.112l73.728-73.728c12.288-12.288 24.576-14.336 39.936-8.192 16.384 8.192 22.528 17.408 22.528 33.792z"/> <?php // phpcs:ignore ?>
+        </svg>
+    </div>
+
+    <div id="mm-datatrics-result_version"></div>
+    <div id="mm-datatrics-result_changelog-modal"
+         data-mm-datatrics-endpoind-url="<?= $block->escapeUrl($block->getChangeLogUrl()) ?>">
+        <div id="mm-datatrics-result_changelog">
             <ul class="result"></ul>
         </div>
     </div>
diff --git a/view/adminhtml/templates/system/config/fieldset/header.phtml b/view/adminhtml/templates/system/config/fieldset/header.phtml
index 31cab6d..fe76546 100755
--- a/view/adminhtml/templates/system/config/fieldset/header.phtml
+++ b/view/adminhtml/templates/system/config/fieldset/header.phtml
@@ -6,23 +6,32 @@
  */
 ?>
 <div class="mm-datatrics-header" style="background-image: url(<?= $block->escapeUrl($block->getImage()); ?>)">
-    <div class="">
-        <p class="mm-datatrics-header-text">
-            <strong>Developed by Magmodules.</strong><br>
-            A Magento only eCommerce Agency located in the Netherlands.
-        </p>
+    <div class="mm-datatrics-header-text">
+        <strong>
+            <?= $block->escapeHTML(__('Developed by Magmodules.')); ?>
+        </strong>
+        <div>
+            <?= $block->escapeHTML(__('A Magento only eCommerce Agency located in the Netherlands.')); ?>
+        </div>
     </div>
     <div class="mm-datatrics-header-actions">
-        <a id="mm-button_help"
-           class="helpbutton"
-           href="<?= $block->escapeUrl($block->getSupportLink()); ?>"
+        <a id="mm-datatrics-button_help" class="helpbutton" href="<?= $block->escapeUrl($block->getSupportLink()); ?>"
            target="_blank">
-            <i class="mm-icon__question-circled"></i>
-            <span>Manual & Support</span>
+            <i class="mm-datatrics-icon__question-circled">
+                <svg version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+                    <path fill="#fff" d="m512 1000.5c-268.41 0-488.02-217.66-488.02-489 0-268.41 219.61-488.02 488.02-488.02s488.02 219.61 488.02 488.02c0 271.34-219.61 489-488.02 489zm0-917.48c-236.2 0-428.48 192.28-428.48 428.48 0 237.18 192.28 429.46 428.48 429.46s429.46-192.28 429.46-429.46c0-236.2-193.26-428.48-429.46-428.48zm122.01 436.29-28.306 23.424c-17.568 12.688-27.329 26.352-32.214 43.923-3.904 10.736-5.856 22.448-5.856 44.899h-114.2c0.976-46.851 4.88-76.131 12.688-92.723 7.808-19.52 27.329-40.019 57.587-63.443l30.26-24.4c9.76-7.808 17.568-15.616 22.448-24.4 11.712-15.616 17.568-33.191 17.568-49.779 0-21.472-5.856-41.971-18.544-59.539-11.712-16.592-35.139-26.352-67.347-26.352s-54.659 11.712-68.323 32.214c-15.616 22.448-21.472 41.971-21.472 64.419h-122.01c3.904-80.035 33.191-132.74 83.939-164.95 32.214-23.424 74.179-33.191 122.01-33.191 63.443 0 116.15 15.616 158.12 45.875s65.395 91.746 65.395 150.31c0 37.091-11.712 49.779-30.26 75.155-9.76 14.64-31.237 36.115-61.491 58.563zm-60.515 295.74h-122.01v-122.01h122.01z"/> <?php // phpcs:ignore ?>
+                </svg>
+            </i>
+            <span><?= $block->escapeHTML(__('Manual & Support')); ?></span>
         </a>
-        <button id="mm-button_test" title="Perform Testing" type="button" class="action-default scalable">
-            <i class="mm-icon__list-unordered-four"></i>
-            <span>Perform Testing</span>
+        <button id="mm-datatrics-button_test" title="<?= $block->escapeUrl(__('Run Self-test')); ?>"
+                type="button" class="action-default scalable">
+            <i class="mm-datatrics-icon__list-unordered-four">
+                <svg version="1.1" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+                    <path fill="#fff" d="m146.43 785.92v109.57c0 6.144-2.048 10.24-6.144 14.336-2.048 4.096-8.192 4.096-12.288 4.096h-109.57c-4.096 0-8.192 0-12.288-4.096s-6.144-8.192-6.144-14.336v-109.57c0-4.096 2.048-8.192 6.144-12.288s8.192-6.144 12.288-6.144h109.57c4.096 0 10.24 2.048 12.288 6.144 4.096 4.096 6.144 8.192 6.144 12.288zm0-218.11v109.57c0 4.096-2.048 8.192-6.144 12.288-2.048 4.096-8.192 6.144-12.288 6.144h-109.57c-4.096 0-8.192-2.048-12.288-6.144s-6.144-8.192-6.144-12.288v-109.57c0-6.144 2.048-10.24 6.144-14.336s8.192-4.096 12.288-4.096h109.57c4.096 0 10.24 0 12.288 4.096 4.096 4.096 6.144 8.192 6.144 14.336zm0-220.16v109.57c0 4.096-2.048 8.192-6.144 12.288-2.048 4.096-8.192 6.144-12.288 6.144h-109.57c-4.096 0-8.192-2.048-12.288-6.144s-6.144-8.192-6.144-12.288v-109.57c0-4.096 2.048-10.24 6.144-12.288 4.096-4.096 8.192-6.144 12.288-6.144h109.57c4.096 0 10.24 2.048 12.288 6.144 4.096 2.048 6.144 8.192 6.144 12.288zm877.57 438.27v109.57c0 6.144-2.048 10.24-6.144 14.336s-8.192 4.096-12.288 4.096h-768c-5.12 0-9.216 0-13.312-4.096-2.048-4.096-4.096-8.192-4.096-14.336v-109.57c0-4.096 2.048-8.192 4.096-12.288 4.096-4.096 8.192-6.144 13.312-6.144h768c4.096 0 8.192 2.048 12.288 6.144s6.144 8.192 6.144 12.288zm-877.57-658.43v110.59c0 5.12-2.048 9.216-6.144 13.312-2.048 2.048-8.192 4.096-12.288 4.096h-109.57c-4.096 0-8.192-2.048-12.288-4.096-4.096-4.096-6.144-8.192-6.144-13.312v-110.59c0-4.096 2.048-8.192 6.144-12.288s8.192-5.12 12.288-5.12h109.57c4.096 0 10.24 1.024 12.288 5.12 4.096 4.096 6.144 8.192 6.144 12.288zm877.57 440.32v109.57c0 4.096-2.048 8.192-6.144 12.288s-8.192 6.144-12.288 6.144h-768c-5.12 0-9.216-2.048-13.312-6.144-2.048-4.096-4.096-8.192-4.096-12.288v-109.57c0-6.144 2.048-10.24 4.096-14.336 4.096-4.096 8.192-4.096 13.312-4.096h768c4.096 0 8.192 0 12.288 4.096s6.144 8.192 6.144 14.336zm0-220.16v109.57c0 4.096-2.048 8.192-6.144 12.288s-8.192 6.144-12.288 6.144h-768c-5.12 0-9.216-2.048-13.312-6.144-2.048-4.096-4.096-8.192-4.096-12.288v-109.57c0-4.096 2.048-10.24 4.096-12.288 4.096-4.096 8.192-6.144 13.312-6.144h768c4.096 0 8.192 2.048 12.288 6.144 4.096 2.048 6.144 8.192 6.144 12.288zm0-220.16v110.59c0 5.12-2.048 9.216-6.144 13.312-4.096 2.048-8.192 4.096-12.288 4.096h-768c-5.12 0-9.216-2.048-13.312-4.096-2.048-4.096-4.096-8.192-4.096-13.312v-110.59c0-4.096 2.048-8.192 4.096-12.288 4.096-4.096 8.192-5.12 13.312-5.12h768c4.096 0 8.192 1.024 12.288 5.12s6.144 8.192 6.144 12.288z"/> <?php // phpcs:ignore ?>
+                </svg>
+            </i>
+            <span><?= $block->escapeUrl(__('Run Self-test')); ?></span>
         </button>
     </div>
 </div>
diff --git a/view/adminhtml/web/css/source/_icons.less b/view/adminhtml/web/css/source/_icons.less
deleted file mode 100755
index e09e25b..0000000
--- a/view/adminhtml/web/css/source/_icons.less
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-  * Copyright © Magmodules.eu. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-
-@import "variables/_icons.less";
-
-.lib-font-face(
-    @family-name: @icons-datatrics__font-name,
-    @font-path: @icons-datatrics__font-name-path,
-    @font-weight: normal,
-    @font-style: normal
-);
-
-[class^="mm-"]:before,
-[class*=" mm-"]:before {
-    font-family: @icons-datatrics__font-name;
-    font-style: normal;
-    font-weight: normal;
-    speak: never;
-    display: inline-block;
-    text-decoration: inherit;
-    width: 2.5rem;
-    margin-right: 0.5rem;
-    text-align: center;
-    font-variant: normal;
-    text-transform: none;
-    line-height: 2.5rem;
-    margin-left: 0.5rem;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-.mm-icon__download-alt:before { content: @mm-icon__download-alt; }
-.mm-icon__list:before { content: @mm-icon__list; }
-.mm-icon__datatrics:before { content: @mm-icon__datatrics; }
-.mm-icon__list-unordered:before { content: @mm-icon__list-unordered; }
-.mm-icon__help-rounded:before { content: @mm-icon__help-rounded; }
-.mm-icon__thumbs-down:before { content: @mm-icon__thumbs-down; }
-.mm-icon__thumbs-up:before { content: @mm-icon__thumbs-up; }
-.mm-icon__font-icons:before { content: @mm-icon__font-icons; }
-.mm-icon__info-rounded1:before { content: @mm-icon__info-rounded1; }
-.mm-icon__download:before { content: @mm-icon__download; }
-.mm-icon__external-link:before { content: @mm-icon__external-link; }
-.mm-icon__notification-rounded:before { content: @mm-icon__notification-rounded; }
-.mm-icon__envelop:before { content: @mm-icon__envelop; }
-.mm-icon__list-unordered-four:before { content: @mm-icon__list-unordered-four; }
-.mm-icon__question-circled:before { content: @mm-icon__question-circled; }
-.mm-icon__list-thumbnails:before { content: @mm-icon__list-thumbnails; }
-.mm-icon__repeat:before { content: @mm-icon__repeat; }
-.mm-icon__info-rounded0:before { content: @mm-icon__info-rounded0; }
diff --git a/view/adminhtml/web/css/source/_mm-buttons.less b/view/adminhtml/web/css/source/_mm-buttons.less
deleted file mode 100755
index 1463745..0000000
--- a/view/adminhtml/web/css/source/_mm-buttons.less
+++ /dev/null
@@ -1,103 +0,0 @@
-#mm-button {
-
-    &_test,
-    &_help {
-        color: @color-white;
-        font-weight: 700;
-        font-size: 1.4rem;
-        padding: 1.9rem 3rem 1.5rem 1.5rem;
-        border: none;
-        text-shadow: 0px 1px 1px @mm-color__3;
-        display: inline-block;
-        min-width:180px;
-        vertical-align: top;
-    }
-
-    &_help {
-        background: @mm-color__1;
-
-        &:hover {
-            color: @color-white;
-            text-decoration: none;
-        }
-    }
-
-    &_test {
-        background: @mm-bg__blue;
-    }
-
-    &_version {
-        background: transparent;
-        padding-left: 0.85rem;
-        margin: -0.8rem 0 -1rem 2rem;
-        white-space: nowrap;
-        color: @mm-version-btn-border;
-        border: 1px solid @color-gray_light;
-        transition: 0.3s color, 0.3s border;
-
-        &:before {
-            content: @mm-icon__repeat;
-            font-family: @icons-datatrics__font-name;
-            background-color: @mm-version-btn-icon-bg;
-            color: @color-white;
-            border-radius: 50%;
-            width: 2.2rem;
-            height: 2.2rem;
-            display: inline-block;
-            line-height: 2.4rem;
-            font-size: 1.20rem;
-            transition: 0.3s background-color;
-            margin-right:10px;
-        }
-
-        &:hover {
-            color: @mm-color__2;
-
-            &::before {
-                background-color: @mm-color__2;
-            }
-        }
-    }
-
-    &_error,
-    &_debug {
-        border: none;
-        background: none;
-        padding: 0;
-        font-weight: 500;
-        font-size: 1.2rem;
-        color: @mm-color__dark-gray;
-
-        span {
-            text-decoration: underline;
-        }
-
-        &:before {
-            content: @mm-icon__external-link;
-            font-family: @icons-datatrics__font-name;
-            font-size: 1.5rem;
-            line-height: 1.5rem;
-            display: inline-block;
-            vertical-align: middle;
-            margin-right: 0.6rem;
-        }
-    }
-
-    &_changelog {
-        background: transparent;
-        border: none;
-        text-decoration: underline;
-        padding: 0;
-        display: inline;
-    }
-}
-
-.mm-button__download:before {
-    margin-right: 0.6rem;
-    line-height: 1rem;
-}
-
-.mm-disabled {
-    position: absolute;
-    top: 0;
-}
diff --git a/view/adminhtml/web/css/source/_module.less b/view/adminhtml/web/css/source/_module.less
index b23cd47..27b0b2e 100755
--- a/view/adminhtml/web/css/source/_module.less
+++ b/view/adminhtml/web/css/source/_module.less
@@ -1,400 +1,43 @@
-/**
-  * Copyright © Magmodules.eu. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+//
+//  Imports
+//  ---------------------------------------------
 
-@import '_icons.less';
-@import '_mm-buttons';
-@import './variables/_mm-colors.less';
+@import './variables/_colors.less';
+@import './module/_ui.less';
+@import './module/_header.less';
+@import './module/_version.less';
+@import './module/_debug.less';
 
-.admin__menu .item-menu.parent.level-0 > a:before {
-  content: @mm-icon__datatrics;
-  font-family: @icons-datatrics__font-name;
-  font-size: 2rem;
-  padding-top: .2rem;
-}
-
-.datatrics-extensions .title:before {
-  width: 20px;
-  height: 20px;
-  content: " ";
-  background-image: url(https://assets.datatrics.com/img/logo/icon.png);
-  background-size: cover;
-  display: inline-block;
-  float: left;
-  margin-right: 5px;
-}
+@import './extend/_credentials.less';
+@import './extend/_table.less';
 
-[data-ui-id="menu-datatrics-core-menu"] strong:before {
-  display: none;
-}
 
-ul[role="menu"] [data-ui-id^="menu-datatrics"] strong:before {
-  content: @mm-icon__datatrics;
-  font-family: @icons-datatrics__font-name;
-  font-size: 1.5rem;
-  margin-right: .8rem;
-}
+//
+//  Common styles
+//  ---------------------------------------------
 
-.mm-datatrics-header,
-.mm-heading-block {
-  border: 0.1rem solid @color-gray90;
-  border-left: 3px solid @bordercolor;
-  font-size: 1.3rem;
-  display: flex;
-  text-align: left;
-}
-
-.mm-heading-block {
-  background: @color-white-fog;
-  padding: 1rem;
-  text-align: left;
-}
-
-.mm-heading-comment {
-  padding: 1rem 0rem 0rem 1rem;
-  font-size: 1.2rem;
-  line-height: 2.5rem;
-  border-left: 4px solid @color-white-fog;
-}
-
-.mm-heading-recommend {
-  color: @bordercolor;
-  font-weight: 600;
-  display: block;
-  padding: 3px 0px 3px 0px;
-}
-
-.mm-datatrics-header {
-  background: @color-white-fog no-repeat left 0.8rem center / 6rem;
-  padding: 1.8rem 1.8rem 1.8rem 8.8rem;
-
-  &-text {
-    margin-top: 0.7rem;
-    line-height: 2.2rem;
-  }
-
-  &-links {
-    i,
-    a {
-      color: @mm-color__3;
-      display: inline-block;
-    }
-
-    a {
-      margin-right: 2rem;
-    }
-
-    i {
-      font-size: 1.75rem;
-      vertical-align: middle;
-      line-height: 1.5rem;
-    }
-  }
-
-  &-actions {
-    margin-left: auto;
-    max-width: 50%;
-    text-align: center;
-
-    i {
-      font-size: 2.5rem;
-      vertical-align: middle;
-      line-height: 1.5rem;
-    }
-  }
+.admin__menu .item-menu.parent.level-0 > a:before {
+    font-size: 2rem;
+    padding-top: .2rem;
 }
 
-#row_datatrics_connect_debug {
-
-  &_debug_button {
-
-    .value {
-      padding-top: 1rem;
-    }
-  }
-
-  &_error_button {
-
-    .value {
-      padding-top: 0.5rem;
-    }
-  }
+.magmodules-extensions .title:before {
+    font-size: 1.3rem;
+    padding-top: .2rem;
 }
 
-#row_datatrics_connect_debug_selftest_heading {
-
-  .mm-heading-block {
+[data-ui-id="menu-magmodules-core-menu"] strong:before {
     display: none;
-  }
-}
-
-.mm-result_version-wrapper {
-  align-items: center;
-  display: flex;
-  position: relative;
-  margin-top: -0.3rem;
-  margin-bottom: -0.3rem;
-
-  .loading-mask,
-  .popup-loading {
-    position: absolute;
-    padding: 0;
-    height: 100%;
-    top: 0;
-    left: 0;
-    width: 100%;
-    margin: 0;
-  }
-
-  .loading-mask {
-    height: 200%;
-    top: -50%;
-  }
-
-  .popup-loading:after {
-    margin: 0;
-    left: 0;
-    top: 0;
-    height: 100%;
-    width: 100%;
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: contain;
-  }
-}
-
-.mm-datatrics-version {
-  border: 0 solid @color-gray68;
-  margin-left: 1rem;
-  padding: .6rem 1em .6rem 0.4rem;
-  white-space: nowrap;
-  font-weight: 600;
-
-  a {
-    color: inherit;
-    text-decoration: underline;
-  }
-
-  span {
-    font-weight: 500;
-  }
-
-  &:before {
-    border-radius: 50%;
-    color: @color-white;
-    width: 2.4rem;
-    height: 2.4rem;
-    line-height: 2.6rem;
-    font-size: 1.2rem;
-    margin-right: .5rem;
-  }
-
-  &.mm-icon__thumbs-up:before {
-    background-color: @mm-color__green-dark;
-    line-height: 2rem;
-  }
-
-  &.mm-icon__thumbs-down:before {
-    background-color: @mm-color__yellow;
-  }
-}
-
-.mm-result {
-
-  &_error-item,
-  &_debug-item {
-    flex-wrap: wrap;
-    display: flex;
-    padding: 1.5rem 1rem;
-    background: @color-white;
-
-    &:nth-child(odd) {
-      background: @mm-bg__odd;
-    }
-
-    strong {
-      margin-bottom: 0.7rem;
-      margin-right: 20px;
-    }
-  }
-
-  &_test-item {
-    display: flex;
-    border-bottom: 0.1rem solid @color-white;
-    padding: 1.5rem 0 1.5rem 1rem;
-    min-height: 75px;
-
-    &:nth-child(odd) {
-      background: @mm-bg__odd;
-    }
-
-    &:before {
-      margin-right: 2rem;
-      font-size: 2.5rem;
-      font-family: @icons-datatrics__font-name;
-    }
-
-    &.success:before {
-      content: @mm-icon__notification-rounded;
-      color: @mm-color__green-light;
-    }
-
-    &.success {
-      color: @mm-color__green-light;
-    }
-
-    &.failed {
-
-      &:before {
-        content: @mm-icon__info-rounded0;
-        color: @mm-color__red;
-      }
-
-      em {
-        color: @mm-color__orange;
-      }
-    }
-
-    strong {
-      flex-basis: 10%;
-      font-weight: 600;
-    }
-
-    span {
-      flex-basis: 60%;
-    }
-
-    .mm-icon__help-rounded {
-      color: @mm-color__red;
-      font-size: 2rem;
-      margin-left: auto;
-
-      &:hover {
-        text-decoration: none;
-      }
-    }
-  }
-}
-
-#mm-result_changelog .result {
-  list-style-type: none;
-  padding: 0;
-  margin: 1rem 0 0;
-}
-
-.mm-result_changelog-item {
-  padding: 0.8rem 1.6rem 1.6rem;
-
-
-  &:nth-child(odd) {
-    background: #F6F8FA;
-  }
-
-  &:nth-child(even) {
-    background: #EDEFF1;
-  }
-
-  & > div {
-    margin-top: 1rem;
-  }
-
-  .mm-divider {
-    display: inline-block;
-    padding: 0 0.4rem;
-    font-size: 1.8rem;
-    opacity: 0.5;
-  }
-}
-
-.modal-content .popup-loading {
-  padding: 50px 0 10px;
 }
 
-.modal-slide .modal-header .action-close {
-  padding: 2.1rem 2.6rem;
+ul[role="menu"] [data-ui-id^="menu-magmodules"] strong:before {
+    font-size: 1.5rem;
+    margin-right: .8rem;
 }
 
-#result_api .connecting {
-  padding: 10px;
-  display: none;
-  background: #504944;
-  margin-top: 10px;
-  border: 1px solid #504944;
-  font-weight: bold;
-  color: #ffffff;
-  float: left;
-}
-
-
-#result_api .result {
-  padding: 10px;
-  display: none;
-  background: #007dbd;
-  margin-top: 10px;
-  border: 1px solid #007dbd;
-  font-weight: bold;
-  color: #ffffff;
-  float: left;
+.mm-datatrics-recommend {
+    color: @mm-datatrics-color11;
+    font-weight: 600;
+    display: block;
+    padding: 3px 0px 3px 0px;
 }
-
-.mm-block-datatrics-table {
-  border-top: 1px solid #dfdedd;
-  width: auto;
-  color: #666;
-  text-align: left;
-  border-right: 1px solid #dfdedd;
-  border-bottom: 1px solid #dfdedd;
-  border-left: 2px solid #EA4C00;
-  font-size: 14px;
-  margin: 20px 0 0;
-  padding: 20px;
-  background: #F8F8F8;
-}
-
-.mm-block-datatrics-table thead {
-  border-bottom: 1px solid #dfdedd;
-}
-
-.mm-block-datatrics-table thead th {
-  padding: 20px;
-}
-
-.mm-block-datatrics-content-table tr td {
-  border-bottom: 1px solid #dddddd;
-}
-
-.mm-block-datatrics-table tr td {
-  padding: 20px;
-  width: 250px;
-  vertical-align: top;
-}
-
-.mm-block-datatrics-table tr a {
-  color: #ec5302;
-}
-
-.mm-block-datatrics-table tr a:before {
-  content: '\e610';
-  font-family: 'Admin Icons';
-  margin-right: 10px;
-  margin-top: 5px;
-  /* margin-bottom: 30px; */
-  font-size: 10px;
-  float: left;
-  color: #ec5302;
-}
-
-.mm-datatrics-table .title {
-  clear: both;
-  color: #0A0A0A;
-  cursor: pointer;
-  display: block;
-  font-size: 1.7rem;
-  font-weight: 600;
-  letter-spacing: .025em;
-  padding: 1.9rem 2.8rem 1.9rem 0;
-  position: relative;
-  text-decoration: none;
-  transition: color .15s linear;
-}
\ No newline at end of file
diff --git a/view/adminhtml/web/css/source/extend/_credentials.less b/view/adminhtml/web/css/source/extend/_credentials.less
new file mode 100755
index 0000000..a18e318
--- /dev/null
+++ b/view/adminhtml/web/css/source/extend/_credentials.less
@@ -0,0 +1,32 @@
+.check-credentials-wrapper {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    gap: 10px;
+
+    #result_api,
+    #result_integration {
+        position: absolute;
+        right: 0;
+        transform: translateX(~'calc(100% + 15px)');
+        min-width:300px;
+    }
+
+    .connecting {
+        color: @mm-datatrics-color6; 
+    }
+
+    .result {
+        color: @mm-datatrics-color18;
+    }
+
+    .result .success {
+        color: @mm-datatrics-color15;
+    }
+
+    button {
+        .button_base(@color: @mm-datatrics-color9);
+        padding: .7rem 1.2rem;
+        border: 1px solid @mm-datatrics-color5;
+    }
+}
diff --git a/view/adminhtml/web/css/source/extend/_table.less b/view/adminhtml/web/css/source/extend/_table.less
new file mode 100644
index 0000000..194f96d
--- /dev/null
+++ b/view/adminhtml/web/css/source/extend/_table.less
@@ -0,0 +1,49 @@
+.mm-datatrics-table .title {
+    &:extend(.section-config > .admin__collapsible-block > a);
+}
+
+.mm-block-datatrics-table {
+    &:extend(.mm-datatrics-heading-block);
+
+    display: table;
+    width: 100%;
+    margin-top: 16px;
+    border-top: 1px solid fade(@mm-datatrics-color5, 50%);
+    border-right: 1px solid fade(@mm-datatrics-color5, 50%);
+    border-bottom: 1px solid fade(@mm-datatrics-color5, 50%);
+
+    th, td {
+        padding: 16px 12px;
+        vertical-align: top;
+    }
+
+    td {
+        opacity: .8;
+    }
+
+    th {
+        border-bottom: 1px solid fade(@mm-datatrics-color5, 50%);
+    }
+
+    a {
+        &:extend(.mm-datatrics-show-more-actions a);
+
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        
+        font-weight: 600;
+        text-decoration: none;
+
+        &::before {
+            content: @icon-checkmark;
+            font-family: @icons-admin__font-name;
+            font-size: 10px;
+        }
+
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+}
+
diff --git a/view/adminhtml/web/css/source/module/_debug.less b/view/adminhtml/web/css/source/module/_debug.less
new file mode 100644
index 0000000..06be59d
--- /dev/null
+++ b/view/adminhtml/web/css/source/module/_debug.less
@@ -0,0 +1,80 @@
+//
+//  [ Debug ]: Heading
+//  ---------------------------------------------
+
+.mm-datatrics-heading-block {
+    display: flex;
+    padding: 1rem;
+
+    border-left: 3px solid @mm-datatrics-color18;
+    background-color: @mm-datatrics-color2;
+
+    color: @mm-datatrics-color8;
+    font-size: 1.3rem;
+    text-align: left;
+}
+
+.mm-datatrics-heading-comment {
+    padding: 1.2rem 0 0 1rem;
+    font-size: 1.2rem;
+    line-height: 2rem;
+    border-left: 3px solid @mm-datatrics-color2;
+}
+
+
+//
+//  [ Debug ]: Show more/less
+//  ---------------------------------------------
+.mm-datatrics-show-more-actions {
+    margin: 8px 0 0 12px;
+
+    a {
+        color: @mm-datatrics-color18;
+        font-size: 1.2rem;
+        text-decoration: underline;
+        transition: .3s;
+
+        &:hover {
+            opacity: .75;
+        }
+    }
+}
+
+.mm-datatrics-heading-comment {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+
+    &.show {
+        -webkit-line-clamp: initial;
+    }
+
+    span {
+        display: block;
+
+        & + span {
+            margin-top: 10px;
+        }
+    }
+}
+
+//
+//  [ Debug ]: Actions
+//  ---------------------------------------------
+
+#mm-datatrics-button_debug {
+    margin-top: 8px;
+}
+
+#row_datatrics_connect_general_debug_debug_button .value {
+    padding-top: 1rem;
+}
+
+#row_datatrics_connect_general_debug_error_button .value {
+    padding-top: .5rem;
+}
+
+#row_datatrics_connect_general_debug_selftest_button .mm-datatrics-heading-block {
+    display: none;
+}
diff --git a/view/adminhtml/web/css/source/module/_header.less b/view/adminhtml/web/css/source/module/_header.less
new file mode 100644
index 0000000..c01d58b
--- /dev/null
+++ b/view/adminhtml/web/css/source/module/_header.less
@@ -0,0 +1,34 @@
+//
+//  [ datatrics ]: Header
+//  ---------------------------------------------
+
+.mm-datatrics-header {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    gap: 25px;
+    margin-bottom: 25px;
+    padding: 1.8rem 1.8rem 1.8rem 8.8rem;
+
+    border-left: 3px solid @mm-datatrics-color18;
+    background: ~'@{mm-datatrics-color2} no-repeat .8rem 1.5rem / 6rem';
+
+    font-size: 1.3rem;
+    text-align: left;
+}
+
+.mm-datatrics-header-text {
+    display: grid;
+    grid-gap: 4px;
+    margin-top: 4px;
+
+    strong {
+        font-size: 1.4rem;
+    }
+}
+
+.mm-datatrics-header-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px;
+}
diff --git a/view/adminhtml/web/css/source/module/_ui.less b/view/adminhtml/web/css/source/module/_ui.less
new file mode 100644
index 0000000..f4528da
--- /dev/null
+++ b/view/adminhtml/web/css/source/module/_ui.less
@@ -0,0 +1,6 @@
+//
+//  Imports UI elements
+//  ---------------------------------------------
+
+@import './ui/_button.less';
+@import './ui/_modal.less';
diff --git a/view/adminhtml/web/css/source/module/_version.less b/view/adminhtml/web/css/source/module/_version.less
new file mode 100644
index 0000000..8071a08
--- /dev/null
+++ b/view/adminhtml/web/css/source/module/_version.less
@@ -0,0 +1,92 @@
+//
+//  [ datatrics ]: Version block
+//  ---------------------------------------------
+
+.mm-datatrics-result_version-wrapper {
+    position: relative;
+    display: flex;
+    align-items: center;
+    margin-top: -1.3rem;
+    margin-bottom: -.3rem;
+
+    .loading-mask {
+        & ~ .button-wrapper {
+            display: none;
+        }
+
+        & ~ span {
+            margin-top: 1rem;
+        }
+
+        & ~ #mm-datatrics-result_version {
+            position: relative;
+            top: 5px;
+        }
+    }
+
+    .button-wrapper {
+        position: relative;
+        margin-left: 15px;
+
+        #mm-datatrics-button_version {
+            padding: 1.2rem 1.6rem 1.2rem 42px;
+
+            &:hover ~ svg {
+                background-color: @mm-datatrics-color9;
+            }
+        }
+
+        svg {
+            position: absolute;
+            top: 9px;
+            left: 10px;
+
+            width: 13px;
+            height: 13px;
+            padding: 7px;
+
+            background-color: @mm-datatrics-color7;
+            border-radius: 50%;
+            pointer-events: none;
+            transition: .3s;
+        }
+    }
+
+    .loading-mask,
+    .popup-loading {
+        position: absolute;
+        padding: 0;
+        height: 100%;
+        top: 0;
+        left: 0;
+        width: 100%;
+        margin: 0;
+    }
+
+    .loading-mask {
+        height: 200%;
+        top: -50%;
+    }
+
+    .popup-loading:after {
+        margin: 0;
+        left: 0;
+        top: 0;
+        height: 100%;
+        width: 100%;
+        background-repeat: no-repeat;
+        background-position: center;
+        background-size: contain;
+    }
+}
+
+.mm-datatrics-version {
+    margin-left: 1rem;
+    padding: .6rem 1em .6rem .4rem;
+    white-space: nowrap;
+    font-weight: @font-weight__semibold;
+
+    span {
+        color: @mm-datatrics-color16;
+    }
+}
diff --git a/view/adminhtml/web/css/source/module/ui/_button.less b/view/adminhtml/web/css/source/module/ui/_button.less
new file mode 100644
index 0000000..ec0cec9
--- /dev/null
+++ b/view/adminhtml/web/css/source/module/ui/_button.less
@@ -0,0 +1,111 @@
+//
+//  [ Buttons ]: Mixin
+//  ---------------------------------------------
+
+.button_base(
+    @bg: none, 
+    @bg-hover: none,
+    @border: none,
+    @color: @mm-datatrics-color1, 
+    @color-hover: @color,
+    @icon-width: 25px,
+    @icon-color: @color,
+    @icon-color-hover: @color-hover,
+) {
+    & when not (@bg = none) { background-color: @bg; }
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 10px;
+    min-width: 180px;
+    padding: 1.2rem 1.6rem;
+
+    border: @border;
+    color: @color;
+    font: @font-weight__bold 1.4rem @font-family__base;
+    text-decoration: none;
+    transition: .3s;
+
+    &:hover {
+        & when not (@bg-hover = none) { background-color: @bg-hover; }
+        color: @color-hover;
+
+        i[class*="icon"] {
+            & when not (@icon-color = none) { fill: @icon-color-hover; }
+        }
+    }
+
+    i[class*="icon"] {
+        & when not (@icon-width = none) { width: @icon-width; height: @icon-width; }
+        & when not (@icon-color = none) { fill: @icon-color; }
+        transition: .3s;
+    }
+}
+
+.button-as-link(@color: @mm-datatrics-color18) {
+    display: inline;
+    padding: 0;
+    border: none;
+    background: transparent;
+    color: @color;
+    text-decoration: underline;
+}
+
+//
+//  [ Buttons ]
+//  ---------------------------------------------
+
+button.action.primary-new {
+    .button_base(@color: @mm-datatrics-color9);
+
+    box-shadow: none;
+    text-shadow: none;
+    text-transform: uppercase;
+    padding: 1rem 1.4rem;
+}
+
+
+.mm-datatrics-button__download,
+#mm-datatrics-button_help {
+    .button_base(@bg: @mm-datatrics-color8, @bg-hover: @mm-datatrics-color10);
+    padding: 1.2rem 1.6rem;
+}
+
+#mm-datatrics-button_test {
+    .button_base(@bg: @mm-datatrics-color13, @bg-hover: @mm-datatrics-color14);
+}
+
+#mm-datatrics-button_version {
+    .button_base(@bg: transparent, @border: 1px solid @mm-datatrics-color5, @color: @mm-datatrics-color6, @color-hover: @mm-datatrics-color9);
+}
+
+#mm-datatrics-button_changelog {
+    .button-as-link();
+}
+
+#mm-datatrics-button_debug,
+#mm-datatrics-button_error {
+    .button-as-link(@color: @mm-datatrics-color8);
+
+    display: flex;
+    align-items: center;
+    gap: 6px;
+
+    font: @font-weight__regular 1.3rem @font-family__base;
+    text-decoration: none;
+    transition: .3s;
+
+    &:hover {
+        color: @mm-datatrics-color18;
+    }
+
+    &::before {
+        content: @icon-info__content;
+        font: 1.5rem @icons-admin__font-name;
+    }
+
+    span {
+        text-decoration: underline;
+    }
+}
diff --git a/view/adminhtml/web/css/source/module/ui/_modal.less b/view/adminhtml/web/css/source/module/ui/_modal.less
new file mode 100644
index 0000000..6a6a964
--- /dev/null
+++ b/view/adminhtml/web/css/source/module/ui/_modal.less
@@ -0,0 +1,129 @@
+//
+//  [ Modal popup ]
+//  ---------------------------------------------
+
+.mm-datatrics-modal {
+    .popup-loading {
+        padding: 50px 0 10px;
+    }
+
+    .modal-header {
+        padding-bottom: 0;
+
+        .modal-title {
+            padding: 0 5.7rem 12px 0;
+            margin-right: 0;
+            border-bottom: 1px solid @mm-datatrics-color3;
+        }
+
+        .action-close {
+            padding: 2.1rem 2.6rem;
+        }
+    }
+
+    .modal-content {
+        padding-bottom: 0;
+
+        > div {
+            padding: 12px 0;
+        }
+
+        ul {
+            display: grid;
+            grid-gap: 6px;
+            margin: 0;
+            list-style: none;
+
+            > li {
+                padding: 10px 15px;
+
+                &:nth-child(even) {
+                    background: @mm-datatrics-color4;
+                }
+
+                & > div {
+                    margin-top: 1rem;
+                }
+            }
+
+            .mm-datatrics-divider {
+                display: inline-block;
+                padding: 0 0.4rem;
+                font-size: 1.8rem;
+                opacity: .5;
+            }
+        }
+
+        .mm-datatrics-result_test-item  {
+            position: relative;
+
+            strong {
+                display: flex;
+                align-items: center;
+                font-size: 1.5rem;
+                font-weight: @font-weight__semibold;
+
+                &::before {
+                    display: inline-flex;
+                    align-items: center;
+                    width: 20px;
+                    height: 20px;
+                    margin-right: 6px;
+                    font: 1.1rem @icons-admin__font-name;
+                }
+            }
+
+            div {
+                margin-top: 4px;
+                padding-left: 25px;
+                font-size: 1.3rem;
+            }
+
+            em {
+                color: @mm-datatrics-color18;
+            }
+
+            .mm-datatrics-icon__help-rounded {
+                display: inline-block;
+                margin: 10px 0 0 25px;
+                font-size: 1.3rem;
+                text-decoration: underline;
+                transition: .3s;
+
+                &:hover {
+                    opacity: .75;
+                }
+            }
+
+            &.success strong {
+                color: @mm-datatrics-color15;
+
+                &::before {
+                    content: @icon-check-mage__content;
+                    padding: 2px 2px 2px 3px;
+                    border: 1px solid @mm-datatrics-color15;
+                    border-radius: 50%;
+                }
+            }
+
+            &.failed strong {
+                color: @mm-datatrics-color19;
+
+                &::before {
+                    content: @icon-help__content;
+                    font-size: 1.8rem;
+
+                }
+            }
+        }
+    }
+
+    .modal-footer {
+        display: flex;
+        justify-content: flex-end;
+        gap: 6px;
+        margin: 0 30px;
+        padding: 25px 0;
+        border-top: 1px solid @mm-datatrics-color3;
+    }
+}
diff --git a/view/adminhtml/web/css/source/variables/_colors.less b/view/adminhtml/web/css/source/variables/_colors.less
new file mode 100755
index 0000000..f489292
--- /dev/null
+++ b/view/adminhtml/web/css/source/variables/_colors.less
@@ -0,0 +1,21 @@
+// New colors
+@mm-datatrics-color1: #fff;
+@mm-datatrics-color2: #f8f8f8;
+@mm-datatrics-color3: #edeff1;  // even 
+@mm-datatrics-color4: #f6f8fa;  // odd 
+@mm-datatrics-color5: #b4b4b4;  // gray light 
+@mm-datatrics-color6: #948f8b;
+@mm-datatrics-color7: #96928e;
+@mm-datatrics-color8: #504944;
+@mm-datatrics-color9: #514943;
+
+@mm-datatrics-color10: #41362f;
+@mm-datatrics-color11: #4f4943;
+@mm-datatrics-color12: #626262;  // gray dark
+@mm-datatrics-color13: #007dbd;  // blue
+@mm-datatrics-color14: #0470a8;
+@mm-datatrics-color15: #79a12d;  // green light
+@mm-datatrics-color16: #2e701e;  // green dark
+@mm-datatrics-color17: #d3b83a;  // yellow
+@mm-datatrics-color18: #d85321;  // orange
+@mm-datatrics-color19: #ce2525;  // red
diff --git a/view/adminhtml/web/css/source/variables/_icons.less b/view/adminhtml/web/css/source/variables/_icons.less
deleted file mode 100755
index e0d4e9f..0000000
--- a/view/adminhtml/web/css/source/variables/_icons.less
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
-  * Copyright © Magmodules.eu. All rights reserved.
-  * See COPYING.txt for license details.
-  */
-
-@icons-datatrics__font-name: 'datatrics-icons';
-@icons-datatrics__file-name: 'datatrics-icons';
-@icons-datatrics__font-name-path: '@{baseDir}Datatrics_Connect/fonts/@{icons-datatrics__file-name}/@{icons-datatrics__file-name}';
-
-@mm-icon__download-alt: '\e800';
-@mm-icon__list: '\e801';
-@mm-icon__datatrics: '\e802';
-@mm-icon__list-unordered: '\e803';
-@mm-icon__help-rounded: '\e804';
-@mm-icon__thumbs-down: '\e805';
-@mm-icon__thumbs-up: '\e806';
-@mm-icon__font-icons: '\e807';
-@mm-icon__info-rounded1: '\e808';
-@mm-icon__download: '\e809';
-@mm-icon__external-link: '\e80a';
-@mm-icon__notification-rounded: '\e80b';
-@mm-icon__envelop: '\e80c';
-@mm-icon__list-unordered-four: '\e80d';
-@mm-icon__question-circled: '\e80e';
-@mm-icon__list-thumbnails: '\e80f';
-@mm-icon__repeat: '\e810';
-@mm-icon__info-rounded0: '\e811';
-
diff --git a/view/adminhtml/web/css/source/variables/_mm-colors.less b/view/adminhtml/web/css/source/variables/_mm-colors.less
deleted file mode 100755
index 17e572b..0000000
--- a/view/adminhtml/web/css/source/variables/_mm-colors.less
+++ /dev/null
@@ -1,20 +0,0 @@
-
-@mm-color__orange: #d85321;
-@mm-bg__blue: #007dbd;
-@mm-color__green-light: #79a12d;
-@mm-color__red: #ce2525;
-@mm-color__green-dark: #2e701e;
-@mm-color__yellow: #d3b83a;
-@mm-border-color: #4f4943;
-@mm-color__dark-gray: #626262;
-@mm-bg__even: #edeff1;
-@mm-bg__odd: #f6f8fa;
-@mm-version-btn-border: #948f8b;
-@mm-version-btn-icon-bg: #96928e;
-
-@mm-color__1: #504944;
-@mm-color__2: #514943;
-@mm-color__3: #41362f;
-
-//
-@bordercolor: @mm-color__orange;
diff --git a/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.eot b/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.eot
deleted file mode 100755
index 8ad52ba7cfdb9f25b9a690cbb5e3a966acc71104..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10768
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

diff --git a/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.svg b/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.svg
deleted file mode 100755
index 59bb859..0000000
--- a/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2020 by original authors @ fontello.com</metadata>
-<defs>
-<font id="datatrics-icons" horiz-adv-x="1000" >
-<font-face font-family="datatrics-icons" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
-<missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="download-alt" unicode="&#xe800;" d="M0-150l0 135 1000 0 0-135-1000 0z m88 586l228 0 0 414 370 0 0-414 228 0-414-385z" horiz-adv-x="1000" />
-
-<glyph glyph-name="list" unicode="&#xe801;" d="M0-13l0 180 180 0 0-180-180 0z m0 273l0 180 180 0 0-180-180 0z m0 274l0 180 180 0 0-180-180 0z m266-547l0 180 734 0 0-180-734 0z m0 273l0 180 734 0 0-180-734 0z m0 274l0 180 734 0 0-180-734 0z" horiz-adv-x="1000" />
-
-<glyph glyph-name="datatrics" unicode="&#xe802;" d="M437 717l316-182a4 4 0 0 0 2-4l0-76a2 2 0 0 1 2-2h108a2 2 0 0 1 2 2l0 143a4 4 0 0 1-2 3l-432 249m1-999c0-1 0-1 1-1l430 249a4 4 0 0 1 2 3l-1 143a2 2 0 0 1-2 2h-107a2 2 0 0 1-2-2l0-76a4 4 0 0 0-2-4l-314-181a4 4 0 0 1-2-4z m-432 249c-1 0-1-1 0-2l430-248c1 0 2 0 2 1l3 129a4 4 0 0 1-1 4l-315 181a4 4 0 0 1-4 0z m0 498a1 1 0 0 1-2-1l1-496c0-1 0-2 2-1l115 65a4 4 0 0 1 2 3l0 363a4 4 0 0 1-2 3z m117-65l316 183a4 4 0 0 1 2 3l-4 129a1 1 0 0 1-2 1l-431-250m295-333a1 1 0 0 1 0-1l138-80c1 0 1 0 1 1v159a1 1 0 0 1-1 1l-137 80c-1 0-1 0-1 0z m283 0a1 1 0 0 0 0-1l-142-81a0 0 90 0 0-1 0v164a1 1 0 0 0 1 1l141 82c1 0 1 0 1-1z m-142 243a1 1 0 0 0 2 0l142-81c0 0 0-1 0-1l-141-83a1 1 0 0 0-2 0l-142 81c0 0 0 0 0 1z" horiz-adv-x="867" />
-
-<glyph glyph-name="list-unordered" unicode="&#xe803;" d="M125 350l125 0 0 125-125 0z m0 250l125 0 0 125-125 0z m0-500l125 0 0 125-125 0z m250 250l500 0 0 125-500 0z m0 250l500 0 0 125-500 0z m0-500l500 0 0 125-500 0z" horiz-adv-x="1000" />
-
-<glyph glyph-name="help-rounded" unicode="&#xe804;" d="M494 873c127 0 235-42 326-130 90-88 137-196 141-323 0-127-43-236-133-326-88-92-195-139-322-142-127 0-236 42-326 132-92 88-139 196-141 323-2 127 41 236 131 326 90 92 197 139 324 140m-2-740c20 0 37 6 49 18 12 14 20 29 20 47 0 21-4 37-18 50-12 12-29 18-49 18 0 0-2 0-2 0-19 0-35-6-47-18-13-11-19-27-21-46 0-20 6-36 19-49 12-12 28-20 47-20 0 0 2 0 2 0m166 328c18 22 26 47 26 79 0 50-18 89-53 115-35 25-80 37-135 37-43 0-78-8-103-26-47-27-71-76-73-146 0 0 0-4 0-4 0 0 110 0 110 0 0 0 0 4 0 4 0 18 6 35 15 55 12 15 30 23 55 23 27 0 45-6 53-19 10-14 15-28 15-45 0-12-5-26-15-39-6-8-14-16-22-20 0 0-6-4-6-4-3-4-7-8-15-12-6-3-14-9-20-15-8-4-13-10-21-16-8-6-14-12-18-17-8-14-13-39-17-79 0 0 0-7 0-7 0 0 109 0 109 0 0 0 0 4 0 4 0 7 0 17 4 27 4 14 12 25 27 37 0 0 28 18 28 18 31 23 48 39 56 50" horiz-adv-x="1000" />
-
-<glyph glyph-name="thumbs-down" unicode="&#xe805;" d="M178 590c0-9-2-17-10-23-8-8-16-12-25-12-10 0-18 4-26 12-6 6-10 14-10 23 0 12 4 20 10 26 8 7 16 11 26 11 9 0 17-4 25-11 8-6 10-14 10-26z m90-285l0 358c0 9-4 17-10 25-8 6-16 10-26 10l-160 0c-9 0-19-4-25-10-8-8-12-16-12-25l0-358c0-10 4-17 12-25 6-6 16-10 25-10l160 0c10 0 18 4 26 10 6 8 10 15 10 25z m630 84c20-23 30-51 30-84 0-29-10-55-31-74-22-22-47-33-75-33l-156 0c2-4 4-10 6-14 0-2 4-8 6-12 2-4 4-7 6-9 6-14 11-24 13-32 4-8 8-19 12-33 4-14 6-29 6-43 0-8 0-15 0-21-2-6-2-14-4-26-2-12-4-19-6-27-4-8-8-16-14-26-5-9-13-17-23-23-8-6-20-10-33-14-14-4-29-6-45-6-10 0-20 4-25 10-8 8-14 18-20 30-6 9-8 19-10 29-2 8-6 19-8 33-4 16-5 27-7 33-2 8-4 16-10 28-4 11-10 19-18 27-11 12-31 35-56 66-18 24-38 47-55 69-20 21-35 31-43 33-10 0-18 4-23 10-8 8-12 15-12 25l0 358c0 9 4 17 12 25 5 6 15 10 25 10 12 0 41 9 88 25 29 10 51 18 66 22 18 5 39 9 69 15 29 6 56 10 80 10l72 0c49-2 86-16 109-43 22-27 32-61 28-102 15-13 25-31 31-52 6-24 6-45 0-65 15-23 25-49 23-78 0-12-2-25-8-41z" horiz-adv-x="1000" />
-
-<glyph glyph-name="thumbs-up" unicode="&#xe806;" d="M178 163c0 9-2 17-10 25-8 6-16 10-25 10-10 0-18-4-26-10-6-8-10-16-10-25 0-10 4-18 10-26 8-8 16-10 26-10 9 0 17 2 25 10 8 8 10 16 10 26z m90 285l0-358c0-9-4-17-10-23-8-8-16-12-26-12l-160 0c-9 0-19 4-25 12-8 6-12 14-12 23l0 358c0 9 4 19 12 25 6 8 16 12 25 12l160 0c10 0 18-4 26-12 6-6 10-16 10-25z m660 0c0-32-10-59-30-82 6-18 8-32 8-43 2-28-8-55-23-76 6-22 6-43 0-67-6-19-16-37-31-51 4-43-6-76-28-101-23-30-60-43-109-43l-72 0c-24 0-51 2-80 8-30 5-51 11-69 15-15 6-37 14-66 24-47 15-76 23-88 23-10 0-20 4-25 12-8 6-12 14-12 23l0 360c0 7 4 15 12 23 5 8 13 10 23 12 8 0 23 12 43 33 17 22 37 43 55 66 25 34 45 55 56 69 8 6 14 15 18 25 6 12 8 22 10 28 2 7 3 17 7 33 2 15 6 27 8 35 2 8 4 17 10 29 6 10 12 20 20 28 5 7 15 9 25 9 16 0 31-2 45-6 13-3 25-7 33-13 10-6 18-14 23-24 6-7 10-17 14-23 2-8 4-18 6-29 2-10 2-20 4-26 0-4 0-12 0-21 0-14-2-28-6-41-4-16-8-26-10-35-4-8-9-18-15-32-2-2-4-4-6-9-2-4-6-8-6-12-2-4-4-8-6-14l156 0c28 0 53-10 75-31 21-22 31-47 31-76z" horiz-adv-x="1000" />
-
-<glyph glyph-name="font-icons" unicode="&#xe807;" d="M1000 508l0-443c0-25-8-47-25-65-18-17-39-25-65-25l-820 0c-25 0-47 8-65 25-17 18-25 40-25 65l0 443c16-19 35-35 57-49 134-91 226-156 277-193 22-16 39-27 51-37 13-8 31-18 53-25 23-10 43-14 62-14l0 0c20 0 39 4 63 14 21 7 39 17 52 25 12 10 30 21 51 37 65 47 156 109 277 193 22 14 41 30 57 49z m0 164c0-29-10-58-27-86-18-25-41-48-69-68-138-96-226-156-261-182-2-2-12-7-24-15-12-10-21-16-29-22-8-6-18-11-29-17-12-8-22-12-32-16-11-4-19-6-29-6l0 0c-10 0-18 2-29 6-10 4-20 8-31 16-12 6-22 11-30 17-8 6-17 12-29 22-12 8-22 13-24 15-35 26-84 59-146 104-64 43-102 70-115 78-24 16-45 37-65 64-21 28-31 53-31 77 0 29 8 54 23 72 16 19 38 29 67 29l820 0c26 0 45-8 63-25 17-18 27-39 27-63z" horiz-adv-x="1000" />
-
-<glyph glyph-name="info-rounded1" unicode="&#xe808;" d="M500 788c-207 0-375-168-375-375 0-207 168-375 375-375 207 0 375 168 375 375 0 207-168 375-375 375z m39-584c0-6-6-12-14-12l-50 0c-8 0-14 6-14 12l0 242c0 8 6 13 14 13l50 0c8 0 14-5 14-13z m-39 310c-25 0-45 20-45 45 0 25 20 45 45 45 25 0 45-20 45-45 0-25-20-45-45-45z" horiz-adv-x="1000" />
-
-<glyph glyph-name="download" unicode="&#xe809;" d="M807 459l-289-291c-10-7-26-7-34 0l-289 291c-9 10-9 24 0 34l37 37c10 10 26 10 34 0l183-190 0 487c0 13 10 23 24 23l54 0c14 0 24-10 24-23l0-487 183 190c8 10 24 10 34 0l37-37c10-10 10-24 2-34z m45-382l-704 0c-13 0-23-10-23-24l0-55c0-13 10-23 23-23l704 0c13 0 23 10 23 23l0 55c0 14-10 24-23 24z" horiz-adv-x="1000" />
-
-<glyph glyph-name="external-link" unicode="&#xe80a;" d="M973 913l-321 0c-15 0-27-14-27-30l0-64c0-8 4-14 8-20 6-6 14-8 21-8l143 4 4-4-543-543c-6-5-8-11-8-17 0-6 2-12 8-16l45-45c4-5 10-7 15-7 6 0 12 2 18 7l543 543 4-4-4-142c0-8 2-16 8-22 6-4 11-7 19-7l65 0c15 0 29 11 29 27l0 320c0 16-12 28-27 28z m-129-563l-31 0c-18 0-32-14-32-31l0-301c0-6-6-12-11-12l-664 0c-6 0-12 6-12 12l0 664c0 6 6 12 12 12l300 0c18 0 32 13 32 31l0 31c0 18-14 32-32 32l-312 0c-53 0-94-41-94-94l0-688c0-53 41-94 94-94l687 0c53 0 94 41 94 94l0 313c0 17-14 31-31 31z" horiz-adv-x="1000" />
-
-<glyph glyph-name="notification-rounded" unicode="&#xe80b;" d="M500 913c-275 0-500-225-500-500 0-276 225-501 500-501 275 0 500 225 500 501 0 275-225 500-500 500z m207-403l-252-252c-8-8-17-11-29-11-10 0-20 3-28 11l-105 106c-16 15-16 41 0 56 8 8 18 12 27 12 12 0 22-4 30-12l76-76 224 223c8 8 18 12 30 12 10 0 19-4 27-12 8-8 12-18 12-27 0-12-4-22-12-30z" horiz-adv-x="1000" />
-
-<glyph glyph-name="envelop" unicode="&#xe80c;" d="M500 420l432 305c-4 0-10 2-16 2l-832 0c-6 0-12-2-16-2z m2-117l-2 4-2-4-498 352c0-4 0-8 0-10l0-523c0-47 37-84 84-84l832 0c47 0 84 37 84 84l0 523c0 2 0 6 0 10z" horiz-adv-x="1000" />
-
-<glyph glyph-name="list-unordered-four" unicode="&#xe80d;" d="M143 172l0-107c0-6-2-10-6-14-2-4-8-4-12-4l-107 0c-4 0-8 0-12 4-4 4-6 8-6 14l0 107c0 4 2 8 6 12 4 4 8 6 12 6l107 0c4 0 10-2 12-6 4-4 6-8 6-12z m0 213l0-107c0-4-2-8-6-12-2-4-8-6-12-6l-107 0c-4 0-8 2-12 6-4 4-6 8-6 12l0 107c0 6 2 10 6 14 4 4 8 4 12 4l107 0c4 0 10 0 12-4 4-4 6-8 6-14z m0 215l0-107c0-4-2-8-6-12-2-4-8-6-12-6l-107 0c-4 0-8 2-12 6-4 4-6 8-6 12l0 107c0 4 2 10 6 12 4 4 8 6 12 6l107 0c4 0 10-2 12-6 4-2 6-8 6-12z m857-428l0-107c0-6-2-10-6-14-4-4-8-4-12-4l-750 0c-5 0-9 0-13 4-2 4-4 8-4 14l0 107c0 4 2 8 4 12 4 4 8 6 13 6l750 0c4 0 8-2 12-6 4-4 6-8 6-12z m-857 643l0-108c0-5-2-9-6-13-2-2-8-4-12-4l-107 0c-4 0-8 2-12 4-4 4-6 8-6 13l0 108c0 4 2 8 6 12 4 4 8 5 12 5l107 0c4 0 10-1 12-5 4-4 6-8 6-12z m857-430l0-107c0-4-2-8-6-12-4-4-8-6-12-6l-750 0c-5 0-9 2-13 6-2 4-4 8-4 12l0 107c0 6 2 10 4 14 4 4 8 4 13 4l750 0c4 0 8 0 12-4 4-4 6-8 6-14z m0 215l0-107c0-4-2-8-6-12-4-4-8-6-12-6l-750 0c-5 0-9 2-13 6-2 4-4 8-4 12l0 107c0 4 2 10 4 12 4 4 8 6 13 6l750 0c4 0 8-2 12-6 4-2 6-8 6-12z m0 215l0-108c0-5-2-9-6-13-4-2-8-4-12-4l-750 0c-5 0-9 2-13 4-2 4-4 8-4 13l0 108c0 4 2 8 4 12 4 4 8 5 13 5l750 0c4 0 8-1 12-5 4-4 6-8 6-12z" horiz-adv-x="1000" />
-
-<glyph glyph-name="question-circled" unicode="&#xe80e;" d="M500-90c-275 0-500 223-500 501 0 275 225 500 500 500 275 0 500-225 500-500 0-278-225-501-500-501z m0 940c-242 0-439-197-439-439 0-243 197-440 439-440 242 0 440 197 440 440 0 242-198 439-440 439z m125-447l-29-24c-18-13-28-27-33-45-4-11-6-23-6-46l-117 0c1 48 5 78 13 95 8 20 28 41 59 65l31 25c10 8 18 16 23 25 12 16 18 34 18 51 0 22-6 43-19 61-12 17-36 27-69 27-33 0-56-12-70-33-16-23-22-43-22-66l-125 0c4 82 34 136 86 169 33 24 76 34 125 34 65 0 119-16 162-47 43-31 67-94 67-154 0-38-12-51-31-77-10-15-32-37-63-60z m-62-303l-125 0 0 125 125 0z" horiz-adv-x="1000" />
-
-<glyph glyph-name="list-thumbnails" unicode="&#xe80f;" d="M803 239l-356 0 0 0c0 0 0 0 0 0-11 0-21-12-21-24 0 0 0 0 0-2l0-103 0 0c0-12 10-22 21-22l0 0 356 0 0 0c12 0 21 10 21 22l0 103c0 2 0 2 0 2 0 12-9 24-21 24z m-500 0l-106 0c-11 0-21-12-21-24l0-105c0-12 10-22 21-22l106 0c12 0 23 10 23 22l0 105c0 12-11 24-23 24z m500 250l-356 0 0 0c0 0 0 0 0 0-11 0-21-12-21-24 0 0 0 0 0-2l0-103 0 0c0-12 10-22 21-22l0 0 356 0 0 0c12 0 21 10 21 22l0 103c0 2 0 2 0 2 0 12-9 24-21 24z m-500 0l-106 0c-11 0-21-12-21-24l0-105c0-12 10-22 21-22l106 0c12 0 23 10 23 22l0 105c0 12-11 24-23 24z m123 121l0 0c0-12 10-24 21-24l0 0 356 0 0 0c12 0 21 12 21 24l0 103c0 0 0 0 0 2 0 12-9 22-21 22l0 0-356 0 0 0c0 0 0 0 0 0-11 0-21-10-21-22 0-2 0-2 0-2l0-103z m-123 127l-106 0c-11 0-21-10-21-22l0-105c0-12 10-24 21-24l106 0c12 0 23 12 23 24l0 105c0 12-11 22-23 22z" horiz-adv-x="1000" />
-
-<glyph glyph-name="repeat" unicode="&#xe810;" d="M928 770l0-250c0-10-2-18-10-25-8-8-16-10-25-10l-250 0c-16 0-26 6-34 21-5 14-3 28 8 39l78 77c-54 50-121 76-195 76-39 0-76-8-111-22-35-15-65-35-90-62-27-26-47-55-63-90-13-35-21-72-21-111 0-40 8-77 21-112 16-35 36-64 63-90 25-27 55-46 90-62 35-14 72-22 111-22 45 0 86 10 125 30 39 17 74 45 100 82 4 2 7 6 13 6 6 0 10-2 14-6l76-76c4-4 6-6 6-12 0-4-2-8-4-12-41-49-90-88-148-115-57-28-117-39-182-39-59 0-113 9-166 33-53 23-100 53-137 92-39 37-68 84-91 137-24 52-34 107-34 166 0 58 10 113 34 166 23 52 52 99 91 136 37 39 84 69 137 92 53 24 107 33 166 33 55 0 107-9 158-29 51-21 98-51 137-88l72 72c12 12 24 14 39 8 16-8 22-17 22-33z" horiz-adv-x="1000" />
-
-<glyph glyph-name="info-rounded0" unicode="&#xe811;" d="M500 913c-275 0-500-225-500-500 0-276 225-501 500-501 275 0 500 225 500 501 0 275-225 500-500 500z m-47-268c0 6 2 10 6 14 4 4 8 6 14 6l54 0c6 0 10-2 14-6 4-4 6-8 6-14l0-320c0-4-2-10-6-14-4-4-8-6-14-6l-54 0c-6 0-10 2-14 6-4 4-6 10-6 14z m98-465c0-6-2-10-6-14-4-3-8-5-14-5l-62 0c-6 0-10 2-14 5-4 4-6 8-6 14l0 63c0 5 2 9 6 13 4 4 8 6 14 6l62 0c6 0 10-2 14-6 4-4 6-8 6-13z" horiz-adv-x="1000" />
-</font>
-</defs>
-</svg>
diff --git a/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.ttf b/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.ttf
deleted file mode 100755
index f2ce08a530972fec6197ec68f21fbed98f3aba0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10568
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

diff --git a/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.woff b/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.woff
deleted file mode 100755
index f8e2faab215fe0c3c499942caf0f5e01be8dfac3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6452
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
V?eYLBoypOo5CSkgY2eBK{{Rt;_U-@x

diff --git a/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.woff2 b/view/adminhtml/web/fonts/datatrics-icons/datatrics-icons.woff2
deleted file mode 100755
index 92a0265a73cf0e11f282e1a7972341ef5657c4dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5444
zcmV-K6}#$pPew8T0RR9102M?44*&oF04YcS02Jx~0RR9100000000000000000000
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

diff --git a/view/adminhtml/web/js/button-functions.js b/view/adminhtml/web/js/button-functions.js
index d93839d..bfdb1af 100755
--- a/view/adminhtml/web/js/button-functions.js
+++ b/view/adminhtml/web/js/button-functions.js
@@ -1,268 +1,171 @@
 require([
     'jquery',
     'Magento_Ui/js/modal/modal',
-    'prototype',
     'loader'
 ], function ($, modal) {
 
     /**
-     * @param{String} modalSelector - modal css selector.
+     * @param{String} type - type of modal css selector.
      * @param{Object} options - modal options.
      */
-    function initModal(modalSelector, options) {
-        var $resultModal = $(modalSelector);
+    function initModal(type, options) {
+        const modalId = `#mm-datatrics-result_${type}-modal`;
+        if (!$(modalId).length) return;
+        
+        let defaultOptions = {
+            modalClass: 'mm-datatrics-modal',
+            type: 'popup',
+            responsive: true,
+            innerScroll: true,
+            title: options.title || '',
+            buttons: [
+                {
+                    text: $.mage.__('ok'),
+                    class: 'action primary-new',
+                    click: function () {
+                        this.closeModal();
+                    },
+                }
+            ]
+        };
+
+        // Additional buttons for downloading
+        if (options.buttons) {
+            let additionalButtons = {
+                text: $.mage.__('download as .txt file'),
+                class: 'mm-datatrics-button__download mm-datatrics-icon__download-alt',
+                click: () => {
+                    let elText = document.getElementById(`mm-datatrics-result_${options.buttons}`).innerText || '',
+                        link = document.createElement('a');
+
+                    link.setAttribute('download', `${options.buttons}-log.txt`);
+                    link.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(elText));
+                    link.click();
+                },
+            };
 
-        if (!$resultModal.length) return;
+            defaultOptions.buttons.unshift(additionalButtons);
+        }
 
-        var popup = modal(options, $resultModal);
-        $resultModal.loader({texts: ''});
+        modal(defaultOptions, $(modalId));
+        $(modalId).loader({texts: ''});
     }
 
     var successHandlers = {
         /**
-         * @param{Object[]} result - Ajax request response data.
+         * @param{Object[]} obj - Ajax request response data.
          * @param{Object} $container - jQuery container element.
+         * @param{String} type - debug || error || test.
          */
-        debug: function (result, $container) {
-
-            if (Array.isArray(result)) {
-
-                var lisHtml = result.map(function (err) {
-                    return '<li class="mm-result_debug-item"><strong>' + err.date + '</strong><p>' + err.msg + '</p></li>';
-                }).join('');
-
-                $container.find('.result').empty().append('<ul>' + lisHtml + '</ul>');
-            } else {
+        logs(response, $container, type) {
+            if (Array.isArray(response.result)) {
+                if (type === 'debug' || type === 'error') {
+                    response = `<ul>${response.result.map((data) => this.tmpLogs(type, data)).join('')}</ul>`;                              
+                }
 
-                $container.find('.result').empty().append(result);
+                if (type === 'test') {
+                    response = `${response.result.map((data) => this.tmpTest(type, data)).join('')}`; 
+                }
             }
-        },
-
-        /**
-         * @param{Object[]} result - Ajax request response data.
-         * @param{Object} $container - jQuery container element.
-         */
-        error: function (result, $container) {
-
-            if (Array.isArray(result)) {
 
-                var lisHtml = result.map(function (err) {
-                    return '<li class="mm-result_error-item"><strong>' + err.date + '</strong><p>' + err.msg + '</p></li>';
-                }).join('');
-
-                $container.find('.result').empty().append('<ul>' + lisHtml + '</ul>');
-            } else {
-
-                $container.find('.result').empty().append(result);
-            }
+            $container.find('.result').empty().append(response);
         },
 
-        /**
-         * @param{Object[]} result - Ajax request response data.
-         * @param{Object} $container - jQuery container element.
-         */
-        test: function (result, $container) {
-
-            var lisHtml = result.map(function (test) {
-
-                var supportLinkHtml = test.support_link ?
-                    '<a target="_blank" href="' + test.support_link + '" class="mm-icon__help-rounded"></a>' : '';
-                var resultText = test.result_code === 'success' ?
-                    $.mage.__('Passed') : $.mage.__('Failed');
-                var resultMsg = test.result_code === 'failed' ? test.result_msg : '';
+        tmpLogs(type, data) {
+            return `<li class="mm-datatrics-result_${type}-item">
+                        <strong>${data.date}</strong>
+                        <p>${data.msg}</p>
+                    </li>`;
+        },
 
-                return '<li class="mm-result_test-item ' + test.result_code
-                    + '"><strong>' + resultText + '</strong>'
-                    + '<div><p>' + test.test + '</p><p><em>' + resultMsg + '</em></p></div>'
-                    + supportLinkHtml + '</li>';
-            }).join('');
+        tmpTest(type, data) {
+            let supportLinkHtml = '';
+                resultMsg = data.result_code === 'failed' ? data.result_msg : '';
+                resultText = data.result_code === 'success' 
+                                ? $.mage.__('Passed') 
+                                : $.mage.__('Failed');
+
+            if (data.support_link) {
+                supportLinkHtml = `<a target="_blank" href="${data.support_link}"
+                                      class="mm-datatrics-icon__help-rounded">
+                                        ${$.mage.__('More information')}
+                                    </a>`;
+            }
 
-            $container.find('.result').empty().append(lisHtml);
+            return `<li class="mm-datatrics-result_${type}-item ${data.result_code}">
+                        <strong>${resultText}</strong>
+                        <div>
+                            <p>${data.test}</p>
+                            <p><em>${resultMsg}</em></p>
+                        </div>
+                        ${supportLinkHtml}
+                    </li>`;
         },
 
         /**
          * @param{Object[]} result - Ajax request response data.
          * @param{Object} $container - jQuery container element.
          */
-        version: function (result, $container) {
-
-            var resultHtml = '';
-            var currentVersion = result.current_verion.replace(/v|version/gi, '');
-            var latestVersion = result.last_version.replace(/v|version/gi, '');
-            if (this.compare(latestVersion, currentVersion) <= 0) {
-                resultHtml = '<strong class="mm-datatrics-version mm-icon__thumbs-up">'
-                    + $.mage.__('Great, you are using the latest version.')
-                    + '</strong>';
-            } else {
-
-                var translatedResult = $.mage.__('There is a new version available <span>(%1)</span> see <button type="button" id="mm-button_changelog">changelog</button>.')
+        version(response, $container) {
+            let resultHTML = '';
+                resultText = $.mage.__('Great, you are using the latest version.');
+                resultClass = 'up';
+                currentVersion = response.result.current_verion.replace(/v|version/gi, '');
+                latestVersion = response.result.last_version.replace(/v|version/gi, '');
+
+            if (currentVersion !== latestVersion) {
+                resultClass = 'down';
+                resultText = $.mage.__('There is a new version available <span>(%1)</span> see <button type="button" id="mm-datatrics-button_changelog">changelog</button>.')
                     .replace('%1', latestVersion);
-
-                resultHtml = '<strong class="mm-datatrics-version mm-icon__thumbs-down">'
-                    + translatedResult
-                    + '</strong>';
             }
 
-            $container.html(resultHtml);
-        },
-
-        compare: function(a, b) {
-            if (a === b) {
-                return 0;
-            }
-            var a_components = a.split(".");
-            var b_components = b.split(".");
-            var len = Math.min(a_components.length, b_components.length);
-            for (var i = 0; i < len; i++) {
-                if (parseInt(a_components[i]) > parseInt(b_components[i])) {
-                    return 1;
-                }
+            resultHTML = `<strong class="mm-datatrics-version mm-datatrics-icon__thumbs-${resultClass}">
+                            ${resultText}
+                         </strong>`;
 
-                if (parseInt(a_components[i]) < parseInt(b_components[i])) {
-                    return -1;
-                }
-            }
-            if (a_components.length > b_components.length) {
-                return 1;
-            }
-            if (a_components.length < b_components.length) {
-                return -1;
-            }
-            return 0;
+            $container.html(resultHTML);
         },
 
         /**
          * @param{Object[]} result - Ajax request response data.
          * @param{Object} $container - jQuery container element.
          */
-        changelog: function (result, $container) {
-
-            var lisHtml = Object.keys(result).map(function (key) {
-
-                var version = key;
-                var date = result[key].date;
-                var resultHtml = result[key].changelog;
-
-                return '<li class="mm-result_changelog-item"><b>'
-                    + version + '</b><span class="mm-divider">|</span><b>'
-                    + date + '</b><div>'
-                    + resultHtml + '</div></li>';
-            }).join('');
-
-            $container.find('.result').empty().append(lisHtml);
+        changelog(response, $container) {
+            var listHTML = Object.keys(response).map((version) => {
+                return `<li class="mm-datatrics-result_changelog-item">
+                            <b>${version}</b>
+                            <span class="mm-datatrics-divider">|</span>
+                            <b>${response[version].date}</b>
+                            <div>${response[version].changelog}</div>
+                        </li>`;
+            });
+
+            $container.find('.result').empty().append(listHTML.join(''));
         },
     }
 
-    // init debug modal
+    // init modals
     $(() => {
-        initModal('#mm-result_debug-modal', {
-            type: 'popup',
-            responsive: true,
-            innerScroll: true,
-            title: $.mage.__('last 100 debug log lines'),
-            buttons: [
-                {
-                    text: $.mage.__('download as .txt file'),
-                    class: 'mm-button__download mm-icon__download-alt',
-                    click: function () {
-
-                        var elText = document.getElementById('mm-result_debug').innerText || '';
-                        var link = document.createElement('a');
-
-                        link.setAttribute('download', 'debug-log.txt');
-                        link.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(elText));
-                        link.click();
-                    },
-                },
-                {
-                    text: $.mage.__('ok'),
-                    class: '',
-                    click: function () {
-                        this.closeModal();
-                    },
-                }
-            ]
-        });
-
-        // init error modal
-        initModal('#mm-result_error-modal', {
-            type: 'popup',
-            responsive: true,
-            innerScroll: true,
-            title: $.mage.__('last 100 error log records'),
-            buttons: [
-                {
-                    text: $.mage.__('download as .txt file'),
-                    class: 'mm-button__download mm-icon__download-alt',
-                    click: function () {
-
-                        var elText = document.getElementById('mm-result_error').innerText || '';
-                        var link = document.createElement('a');
-
-                        link.setAttribute('download', 'error-log.txt');
-                        link.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(elText));
-                        link.click();
-                    },
-                },
-                {
-                    text: $.mage.__('ok'),
-                    class: '',
-                    click: function () {
-                        this.closeModal();
-                    },
-                }
-            ]
-        });
-
-        // init selftest modal
-        initModal('#mm-result_test-modal', {
-            type: 'popup',
-            responsive: true,
-            innerScroll: true,
-            title: $.mage.__('Self-test'),
-            buttons: [
-                {
-                    text: $.mage.__('ok'),
-                    class: '',
-                    click: function () {
-                        this.closeModal();
-                    },
-                }
-            ]
-        });
-
-        // init changelog modal
-        initModal('#mm-result_changelog-modal', {
-            type: 'popup',
-            responsive: true,
-            innerScroll: true,
-            title: 'Changelog',
-            buttons: [
-                {
-                    text: $.mage.__('ok'),
-                    class: '',
-                    click: function () {
-                        this.closeModal();
-                    },
-                }
-            ]
-        });
+        initModal('debug',      { title: $.mage.__('last 100 debug log records'), buttons: 'debug' });
+        initModal('error',      { title: $.mage.__('last 100 error log records'), buttons: 'error' });
+        initModal('test',       { title: $.mage.__('Self-test') });
+        initModal('changelog',  { title: $.mage.__('Changelog') });
     });
 
     // init loader on the Check Version block
-    $('.mm-result_version-wrapper').loader({texts: ''});
+    $('.mm-datatrics-result_version-wrapper').loader({texts: ''});
 
     /**
      * Ajax request event
      */
-    $(document).on('click', '[id^=mm-button]', function () {
-        var actionName = this.id.split('_')[1];
-        var $modal = $('#mm-result_' + actionName + '-modal');
-        var $result = $('#mm-result_' + actionName);
-
-        if (actionName === 'version') {
-            $(this).fadeOut(300).addClass('mm-disabled');
-            $modal = $('.mm-result_' + actionName + '-wrapper');
+    $(document).on('click', '[id^=mm-datatrics-button]', function () {
+        let action = this.id.split('_')[1],
+            $modal = $(`#mm-datatrics-result_${action}-modal`),
+            $result = $(`#mm-datatrics-result_${action}`);
+
+        if (action === 'version') {
+            $(this).fadeOut(300).addClass('mm-datatrics-disabled');
+            $modal = $(`.mm-datatrics-result_${action}-wrapper`);
             $modal.loader('show');
         } else {
             $modal.modal('openModal').loader('show');
@@ -270,20 +173,16 @@ require([
 
         $result.hide();
 
-        new Ajax.Request($modal.data('mm-endpoind-url'), {
-            loaderArea: false,
-            asynchronous: true,
-            onSuccess: function (response) {
-
-                if (response.status > 200) {
-                    var result = response.statusText;
-                } else {
-                    successHandlers[actionName](response.responseJSON.result || response.responseJSON, $result);
-
-                    $result.fadeIn();
-                    $modal.loader('hide');
-                }
-            }
-        });
+        fetch($modal.attr('data-mm-datatrics-endpoind-url'))
+            .then((res) => res.clone().json().catch(() => res.text()))
+            .then((data) => {
+                const func = action === 'debug' || 
+                             action === 'error' || 
+                             action === 'test' ? 'logs' : action;
+
+                successHandlers[func](data, $result, action);
+                $result.fadeIn();
+                $modal.loader('hide');
+            });
     });
 });
diff --git a/view/adminhtml/web/js/show-more.js b/view/adminhtml/web/js/show-more.js
new file mode 100755
index 0000000..b7e80d2
--- /dev/null
+++ b/view/adminhtml/web/js/show-more.js
@@ -0,0 +1,41 @@
+require([
+    'jquery',
+    'mage/translate',
+    '!domReady'
+], function ($, $t) {
+
+    let comment = $('.mm-datatrics-heading-comment'),
+        showMoreLessBtnHtml = `
+            <div class="mm-datatrics-show-more-actions hidden">
+                <a href="javascript:void(0)" class="mm-datatrics-show-btn-more">
+                    ${$t('Show more.')}
+                </a>
+            </div>`;
+
+    if(comment.length) {
+        comment.parent().append(showMoreLessBtnHtml);
+
+        $(document).on('click', '.mm-datatrics-show-more-actions a', (e) => {
+            let button = $(e.target),
+                parent = $(e.target).closest('.value').find('.mm-datatrics-heading-comment');
+
+            if (parent.hasClass('show')) {
+                parent.removeClass('show');
+                button.text($t('Show more.'));
+            } else {
+                parent.addClass('show');
+                button.text($t('Show less.'));
+            }
+        });
+
+        window.addEventListener("load", isShowMore);
+        window.addEventListener("resize", isShowMore);
+    }
+
+    function isShowMore() {
+        Array.from(comment).forEach((item) => {
+            const BTN = item.closest('td').querySelector('.mm-datatrics-show-more-actions');
+            item.scrollHeight <= 55 ? BTN.classList.add('hidden') : BTN.classList.remove('hidden');
+        });
+    }
+});

From 3e3745d510a13e6584ca5b77169fcd438a157dc3 Mon Sep 17 00:00:00 2001
From: Marvin Besselsen <marvin@magmodules.eu>
Date: Tue, 22 Aug 2023 11:57:09 +0200
Subject: [PATCH 4/4] Version bump

---
 composer.json  | 2 +-
 etc/config.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index a60ad96..a37ca46 100755
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "datatrics/magento2-integration",
     "description": "Datatrics Connect extension for Magento 2",
     "type": "magento2-module",
-    "version": "1.6.8",
+    "version": "1.7.0",
     "license": [
         "BSD-2-Clause"
     ],
diff --git a/etc/config.xml b/etc/config.xml
index 58c8946..cd1dae4 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -10,7 +10,7 @@
     <default>
         <datatrics_connect_general>
             <general>
-                <version>v1.6.8</version>
+                <version>v1.7.0</version>
                 <enable>0</enable>
                 <source>Magento 2</source>
                 <debug>0</debug>