diff --git a/MageWire/Component.php b/MageWire/Component.php
deleted file mode 100644
index 02832084..00000000
--- a/MageWire/Component.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php declare(strict_types=1);
-
-// phpcs:ignoreFile -- Only 1 class allowed in one file
-
-namespace Tagging\GTM\MageWire;
-
-use Magento\Framework\View\Element\Block\ArgumentInterface;
-
-if (class_exists('\Magewirephp\Magewire\Component')) {
-    class Component extends \Magewirephp\Magewire\Component
-    {
-        public function isHyvaCheckoutEnabled(): bool
-        {
-            return true;
-        }
-    }
-} else {
-    class Component implements ArgumentInterface
-    {
-        public function isHyvaCheckoutEnabled(): bool
-        {
-            return false;
-        }
-    }
-}
diff --git a/MageWire/Component/AbstractComponent.php b/MageWire/Component/AbstractComponent.php
new file mode 100644
index 00000000..ab4eb627
--- /dev/null
+++ b/MageWire/Component/AbstractComponent.php
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);
+
+namespace Tagging\GTM\MageWire\Component;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+abstract class AbstractComponent implements ArgumentInterface
+{
+    abstract public function isHyvaCheckoutEnabled(): bool;
+} 
\ No newline at end of file
diff --git a/MageWire/Component/ComponentFactory.php b/MageWire/Component/ComponentFactory.php
new file mode 100644
index 00000000..85d4847e
--- /dev/null
+++ b/MageWire/Component/ComponentFactory.php
@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+namespace Tagging\GTM\MageWire\Component;
+
+class ComponentFactory
+{
+    public function create(): AbstractComponent
+    {
+        if (class_exists('\Magewirephp\Magewire\Component')) {
+            return new MagewireComponent();
+        }
+        
+        return new DefaultComponent();
+    }
+} 
\ No newline at end of file
diff --git a/MageWire/Component/DefaultComponent.php b/MageWire/Component/DefaultComponent.php
new file mode 100644
index 00000000..b1b8d712
--- /dev/null
+++ b/MageWire/Component/DefaultComponent.php
@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+namespace Tagging\GTM\MageWire\Component;
+
+class DefaultComponent extends AbstractComponent
+{
+    public function isHyvaCheckoutEnabled(): bool
+    {
+        return false;
+    }
+} 
\ No newline at end of file
diff --git a/MageWire/Component/MagewireComponent.php b/MageWire/Component/MagewireComponent.php
new file mode 100644
index 00000000..c3057cea
--- /dev/null
+++ b/MageWire/Component/MagewireComponent.php
@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+namespace Tagging\GTM\MageWire\Component;
+
+class MagewireComponent extends \Magewirephp\Magewire\Component
+{
+    public function isHyvaCheckoutEnabled(): bool
+    {
+        return true;
+    }
+} 
\ No newline at end of file
diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
deleted file mode 100644
index 7404bf4e..00000000
--- a/Setup/UpgradeSchema.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tagging\GTM\Setup;
-
-
-use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\DB\Ddl\Table;
-
-class UpgradeSchema implements UpgradeSchemaInterface
-{
-    public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
-    {
-        $installer = $setup;
-        $installer->startSetup();
-
-        $tableName = $installer->getTable('sales_order');
-
-        if ($installer->getConnection()->isTableExists($tableName) == true) {
-            $installer->getConnection()->addColumn(
-                $setup->getTable('sales_order'),
-                'trytagging_marketing',
-                [
-                    'type' => Table::TYPE_TEXT,
-                    'nullable' => true,
-                    'comment' => 'TryTagging Marketing Data'
-                ]
-            );
-        }
-
-        $installer->endSetup();
-    }
-}
diff --git a/Test/Integration/Util/ProductDataMapperTest.php b/Test/Integration/Util/ProductDataMapperTest.php
deleted file mode 100644
index 2c6d57c2..00000000
--- a/Test/Integration/Util/ProductDataMapperTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Tagging\GTM\Test\Integration\Util;
-
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\Data\ProductInterfaceFactory;
-use Magento\Framework\App\ObjectManager;
-use PHPUnit\Framework\TestCase;
-use Tagging\GTM\DataLayer\Mapper\ProductDataMapper;
-use Yireo\IntegrationTestHelper\Test\Integration\Traits\AssertNonEmptyValueInArray;
-
-class ProductDataMapperTest extends TestCase
-{
-    use AssertNonEmptyValueInArray;
-
-    public function testMapByProduct()
-    {
-        $product = $this->createProduct(
-            1,
-            'Product 1',
-            'product1',
-            1.42,
-        );
-
-        $productDataMapper = ObjectManager::getInstance()->get(ProductDataMapper::class);
-        $productData = $productDataMapper->mapByProduct($product);
-
-        $this->assertNonEmptyValueInArray('item_id', $productData);
-        $this->assertSame(1, $productData['magento_id']);
-        $this->assertSame('product1', $productData['magento_sku']);
-        $this->assertSame('product1', $productData['item_id']);
-        $this->assertSame('product1', $productData['item_sku']);
-        $this->assertSame('Product 1', $productData['item_name']);
-        $this->assertSame(1.42, $productData['price']);
-    }
-
-    /**
-     * @param int $id
-     * @param string $name
-     * @param string $sku
-     * @param float $price
-     * @return ProductInterface
-     */
-    private function createProduct(int $id, string $name, string $sku, float $price): ProductInterface
-    {
-        $productFactory = ObjectManager::getInstance()->get(ProductInterfaceFactory::class);
-        $product = $productFactory->create();
-        $product->setId($id);
-        $product->setName($name);
-        $product->setSku($sku);
-        $product->setPrice($price);
-        return $product;
-    }
-}
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
new file mode 100644
index 00000000..f2a34891
--- /dev/null
+++ b/etc/db_schema.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="sales_order" resource="default" engine="innodb">
+        <column xsi:type="text" name="trytagging_marketing" nullable="true" comment="TryTagging Marketing Data"/>
+    </table>
+</schema> 
\ No newline at end of file
diff --git a/etc/di.xml b/etc/di.xml
index c989bdde..f528ef4e 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -57,4 +57,10 @@
     <type name="Magento\Sales\Api\OrderRepositoryInterface">
         <plugin name="tagging_gtm_order_repository_plugin" type="Tagging\GTM\Plugin\OrderRepositoryPlugin" />
     </type>
+
+    <type name="Tagging\GTM\MageWire\Component\AbstractComponent">
+        <arguments>
+            <argument name="componentFactory" xsi:type="object">Tagging\GTM\MageWire\Component\ComponentFactory</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/etc/module.xml b/etc/module.xml
index 8065da11..26dadc23 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Tagging_GTM" setup_version="1.0.6">
+    <module name="Tagging_GTM">
         <sequence>
             <module name="Magento_Backend"/>
             <module name="Magento_Catalog"/>
diff --git a/view/frontend/templates/hyva_checkout/data-layer.phtml b/view/frontend/templates/hyva_checkout/data-layer.phtml
index d142454e..b3994745 100644
--- a/view/frontend/templates/hyva_checkout/data-layer.phtml
+++ b/view/frontend/templates/hyva_checkout/data-layer.phtml
@@ -3,11 +3,11 @@ declare(strict_types=1);
 
 use Magento\Framework\View\Element\Template;
 use Tagging\GTM\DataLayer\Event\BeginCheckout as BeginCheckoutEvent;
-use Tagging\GTM\MageWire\Checkout as CheckoutComponent;
+use Tagging\GTM\MageWire\Component\AbstractComponent;
 
 /** @var Template $block */
 /** @var BeginCheckoutEvent $beginCheckoutEvent */
-/** @var CheckoutComponent $magewire */
+/** @var AbstractComponent $magewire */
 $magewire = $block->getData('magewire');
 if (false === $magewire->isHyvaCheckoutEnabled()) {
     return;