diff --git a/IntelliSenseHelper.php b/IntelliSenseHelper.php
index 94dc65a..4666e9e 100644
--- a/IntelliSenseHelper.php
+++ b/IntelliSenseHelper.php
@@ -28,6 +28,7 @@ namespace D3\GoogleAnalytics4\Modules\Application\Controller{
     use OxidEsales\Eshop\Application\Controller\AccountNoticeListController;
     use OxidEsales\Eshop\Application\Controller\AccountRecommlistController;
     use OxidEsales\Eshop\Application\Controller\AccountWishlistController;
+    use OxidEsales\Eshop\Application\Controller\Admin\ManufacturerController;
     use OxidEsales\Eshop\Application\Controller\ArticleListController;
     use OxidEsales\Eshop\Application\Controller\SearchController;
     use OxidEsales\Eshop\Application\Controller\StartController;
@@ -48,6 +49,8 @@ namespace D3\GoogleAnalytics4\Modules\Application\Controller{
     class d3GtmStartController_parent extends StartController {}
 
     class d3GtmSearchController_parent extends SearchController {}
+
+    class d3GtmManufacturerListController_parent extends ManufacturerController {}
 }
 
 namespace D3\GoogleAnalytics4\Modules\Application\Component{
@@ -55,4 +58,11 @@ namespace D3\GoogleAnalytics4\Modules\Application\Component{
     use OxidEsales\Eshop\Application\Component\BasketComponent;
 
     class d3GtmBasketComponentExtension_parent extends BasketComponent {}
+}
+
+namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget{
+
+    use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails;
+
+    class d3GtmWidgetArticleDetails_parent extends ArticleDetails {}
 }
\ No newline at end of file
diff --git a/Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php b/Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php
new file mode 100644
index 0000000..9bb5c43
--- /dev/null
+++ b/Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget;
+
+
+class d3GtmWidgetArticleDetails extends d3GtmWidgetArticleDetails_parent
+{
+    public function render()
+    {
+        $return = parent::render();
+
+        $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
+
+        return $return;
+    }
+}
\ No newline at end of file
diff --git a/Modules/Application/Controller/d3GtmManufacturerListController.php b/Modules/Application/Controller/d3GtmManufacturerListController.php
new file mode 100644
index 0000000..8064beb
--- /dev/null
+++ b/Modules/Application/Controller/d3GtmManufacturerListController.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace D3\GoogleAnalytics4\Modules\Application\Controller;
+
+
+class d3GtmManufacturerListController extends d3GtmManufacturerListController_parent
+{
+    public function render()
+    {
+        $return = parent::render();
+
+        $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
+
+        return $return;
+    }
+}
\ No newline at end of file
diff --git a/metadata.php b/metadata.php
index 01bb270..4ecf4a6 100755
--- a/metadata.php
+++ b/metadata.php
@@ -1,12 +1,14 @@
 <?php
 
 use D3\GoogleAnalytics4\Modules\Application\Component\d3GtmBasketComponentExtension;
+use D3\GoogleAnalytics4\Modules\Application\Component\Widget\d3GtmWidgetArticleDetails as d3GtmWidgetArticleDetails;
 use D3\GoogleAnalytics4\Modules\Application\Controller\ArticleDetailsController;
 use D3\GoogleAnalytics4\Modules\Application\Controller\ArticleListController_AddToCartHelpMethods;
 use D3\GoogleAnalytics4\Modules\Application\Controller\BasketController;
 use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmAccountNoticeListController;
 use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmAccountRecommlistController;
 use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmAccountWishlistController;
+use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmManufacturerListController as d3GtmManufacturerListController;
 use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmSearchController;
 use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmStartController;
 use D3\GoogleAnalytics4\Modules\Application\Controller\ThankYouController;
@@ -15,12 +17,14 @@ use D3\GoogleAnalytics4\Modules\Application\Model\Category as Category;
 use D3\GoogleAnalytics4\Modules\Application\Model\Manufacturer as Manufacturer;
 use D3\GoogleAnalytics4\Modules\Core\ViewConfig;
 use OxidEsales\Eshop\Application\Component\BasketComponent as OEBasketComponent;
+use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails as OEArticleDetails;
 use OxidEsales\Eshop\Application\Controller\AccountNoticeListController as OEAccountNoticeListController;
 use OxidEsales\Eshop\Application\Controller\AccountRecommlistController as OEAccountRecommlistController;
 use OxidEsales\Eshop\Application\Controller\AccountWishlistController as OEAccountWishlistController;
 use OxidEsales\Eshop\Application\Controller\ArticleDetailsController as OEArticleDetailsController;
 use OxidEsales\Eshop\Application\Controller\ArticleListController as OEArticleListController;
 use OxidEsales\Eshop\Application\Controller\BasketController as OEBasketController;
+use OxidEsales\Eshop\Application\Controller\ManufacturerListController as OEManufacturerListController;
 use OxidEsales\Eshop\Application\Controller\SearchController as OESearchController;
 use OxidEsales\Eshop\Application\Controller\StartController as OEStartController;
 use OxidEsales\Eshop\Application\Controller\ThankYouController as OEThankYouController;
@@ -49,20 +53,29 @@ $aModule          = [
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
     'extend'      => [
+        // Core
         OEViewConfig::class                     => ViewConfig::class,
+
+        // Model
         OECategory::class                       => Category::class,
         OEBasket::class                         => Basket::class,
-        OEBasketController::class               => BasketController::class,
         OEManufacturer::class                   => Manufacturer::class,
+
+        // Controller
+        OEBasketController::class               => BasketController::class,
         OEThankYouController::class             => ThankYouController::class,
         OEArticleListController::class          => ArticleListController_AddToCartHelpMethods::class,
-        OEBasketComponent::class                => d3GtmBasketComponentExtension::class,
         OEArticleDetailsController::class       => ArticleDetailsController::class,
         OEAccountNoticeListController::class    => d3GtmAccountNoticeListController::class,
         OEAccountRecommlistController::class    => d3GtmAccountRecommlistController::class,
         OEAccountWishlistController::class      => d3GtmAccountWishlistController::class,
         OEStartController::class                => d3GtmStartController::class,
-        OESearchController::class               => d3GtmSearchController::class
+        OESearchController::class               => d3GtmSearchController::class,
+        OEManufacturerListController::class     => d3GtmManufacturerListController::class,
+
+        // Component
+        OEArticleDetails::class                 => d3GtmWidgetArticleDetails::class,
+        OEBasketComponent::class                => d3GtmBasketComponentExtension::class,
     ],
     'templates'   => [
         // Event files that store the GA4 Event-Information