diff --git a/Block/Gtm.php b/Block/Gtm.php
index aaeec08..5ded54f 100644
--- a/Block/Gtm.php
+++ b/Block/Gtm.php
@@ -30,6 +30,23 @@ public function __construct(
         $this->configProvider = $configProvider;
     }
 
+    /**
+     * Retrieve container id
+     *
+     * @return string
+     */
+    protected function getStapeContainerId()
+    {
+        $containerId = str_ireplace('GTM-', '', $this->configProvider->getContainerId());
+        $params = $this->configProvider->getContainerIdParams();
+        $containerId = http_build_query(array_merge(
+            ['id' => $this->_escaper->escapeJs($containerId)],
+            $this->getAdditionalQueryParams()
+        ));
+
+        return http_build_query(array_merge([$params['prefix'] => base64_encode($containerId)], $params['suffix']));
+    }
+
     /**
      * Retrieve domain
      *
@@ -47,7 +64,11 @@ public function getDomain()
      */
     public function getLoader()
     {
-        return trim($this->configProvider->getCustomLoader() ?: 'gtm', '/');
+        if (!$customLoader = $this->configProvider->getCustomLoader()) {
+            return 'gtm';
+        }
+
+        return implode('', [$this->configProvider->getCustomLoaderPrefix(), $customLoader]);
     }
 
     /**
@@ -57,10 +78,11 @@ public function getLoader()
      */
     public function getContainerId()
     {
-        if ($this->configProvider->getCustomDomain() && $this->configProvider->getCustomLoader()) {
-            return str_ireplace('GTM-', '', $this->configProvider->getContainerId());
+        if ($this->configProvider->getCustomLoader()) {
+            return $this->getStapeContainerId();
         }
-        return $this->configProvider->getContainerId();
+
+        return $this->_escaper->escapeJs($this->configProvider->getContainerId());
     }
 
     /**
@@ -115,4 +137,27 @@ public function getIdParamName()
     {
         return $this->configProvider->getCustomLoader() && $this->configProvider->getCustomDomain() ? 'st' : 'id';
     }
+
+    /**
+     * Retrieve analytics param
+     *
+     * @return string
+     */
+    public function getAnalyticsParam()
+    {
+        return $this->configProvider->isStapeAnalyticsEnabled() && !empty($this->configProvider->getCustomLoader())
+            ? 'y' : '';
+    }
+
+    /**
+     * Retrieve additional query params
+     *
+     * @return string[]
+     */
+    public function getAdditionalQueryParams()
+    {
+        return array_filter([
+            'as' => $this->getAnalyticsParam(),
+        ]);
+    }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3595fa5..0260908 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+v1.0.19
+- Implemented custom GTM loader generation logic with prefix as well as container id
+
 v1.0.18
 - Fixed potential issue with sending multiple purchase webhook events.
 
diff --git a/Model/Backend/CustomLoader.php b/Model/Backend/CustomLoader.php
new file mode 100644
index 0000000..201c4e2
--- /dev/null
+++ b/Model/Backend/CustomLoader.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Stape\Gtm\Model\Backend;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Stape\Gtm\Model\ConfigProvider;
+use Stape\Gtm\Model\Data\RandomString;
+use Stape\Gtm\Model\Data\RandomSuffix;
+
+class CustomLoader extends \Magento\Framework\App\Config\Value
+{
+    /**
+     * @var RandomString $randomString
+     */
+    private $randomString;
+
+    /**
+     * @var RandomSuffix $randomSuffix
+     */
+    private $randomSuffix;
+
+    /**
+     * @var \Magento\Config\Model\ConfigFactory $configFactory
+     */
+    private $configFactory;
+
+    /**
+     * @var Json $jsonSerializer
+     */
+    private $jsonSerializer;
+
+    /**
+     * Define class dependencies
+     *
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param ScopeConfigInterface $config
+     * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
+     * @param RandomString $randomString
+     * @param RandomSuffix $randomSuffix
+     * @param \Magento\Framework\Serialize\Serializer\Json $jsonSerializer
+     * @param \Magento\Config\Model\ConfigFactory $configFactory
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        ScopeConfigInterface $config,
+        \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
+        \Stape\Gtm\Model\Data\RandomString $randomString,
+        \Stape\Gtm\Model\Data\RandomSuffix $randomSuffix,
+        \Magento\Config\Model\ConfigFactory $configFactory,
+        \Magento\Framework\Serialize\Serializer\Json $jsonSerializer,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        array $data = []
+    ) {
+        parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
+        $this->randomString = $randomString;
+        $this->randomSuffix = $randomSuffix;
+        $this->configFactory = $configFactory;
+        $this->jsonSerializer = $jsonSerializer;
+    }
+
+    /**
+     * Save loader prefix
+     *
+     * @return void
+     * @throws \Exception
+     */
+    protected function saveLoaderPrefix()
+    {
+        $prefix = $this->randomString->generate(5);
+        $config = $this->configFactory->create();
+        $config->setScope($this->getScope());
+        $config->setScopeId($this->getScopeId());
+        $config->setSection('stape_gtm');
+        $config->setDataByPath(ConfigProvider::XPATH_GTM_LOADER_PREFIX, $prefix);
+        $config->save();
+    }
+
+    /**
+     * Save container id params
+     *
+     * @return void
+     * @throws \Exception
+     */
+    protected function saveContainerIdParams()
+    {
+        parse_str($this->randomSuffix->generate($this->getValue()), $suffix);
+        $value = $this->jsonSerializer->serialize([
+            'prefix' => $this->randomString->generate(),
+            'suffix' => $suffix,
+        ]);
+
+        $config = $this->configFactory->create();
+        $config->setScope($this->getScope());
+        $config->setScopeId($this->getScopeId());
+        $config->setSection('stape_gtm');
+        $config->setDataByPath(ConfigProvider::XPATH_GTM_CONTAINER_ID_PARAMS, $value);
+        $config->save();
+    }
+
+    /**
+     * Actions after saving
+     *
+     * @return CustomLoader
+     */
+    public function afterSave()
+    {
+        $loader = $this->getValue();
+
+        try {
+
+            $prefix = $this->_config->getValue(ConfigProvider::XPATH_GTM_LOADER_PREFIX, $this->getScope(), $this->getScopeId());
+
+            if (!empty($loader) && empty($prefix)) {
+                $this->saveLoaderPrefix();
+            }
+
+            $params = $this->_config->getValue(
+                ConfigProvider::XPATH_GTM_CONTAINER_ID_PARAMS,
+                $this->getScope(),
+                $this->getScopeId()
+            );
+
+            if (!empty($loader) && empty($params)) {
+                $this->saveContainerIdParams();
+            }
+        } catch (\Throwable $e) {
+
+        }
+
+        return parent::afterSave();
+    }
+}
diff --git a/Model/ConfigProvider.php b/Model/ConfigProvider.php
index 5b1f1cb..4c9faf4 100644
--- a/Model/ConfigProvider.php
+++ b/Model/ConfigProvider.php
@@ -3,6 +3,7 @@
 namespace Stape\Gtm\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Store\Model\ScopeInterface;
 
 class ConfigProvider
@@ -17,6 +18,11 @@ class ConfigProvider
      */
     public const XPATH_GTM_CONTAINER_ID = 'stape_gtm/general/container_id';
 
+    /*
+     * XPATH for GTM container id params config value
+     */
+    public const XPATH_GTM_CONTAINER_ID_PARAMS = 'stape_gtm/general/container_id_params';
+
     /*
      * XPATH for GTM domain config value
      */
@@ -27,6 +33,16 @@ class ConfigProvider
      */
     public const XPATH_GTM_LOADER = 'stape_gtm/general/custom_loader';
 
+    /*
+     * XPATH for GTM Custom Loader prefix config value
+     */
+    public const XPATH_GTM_LOADER_PREFIX = 'stape_gtm/general/custom_loader_prefix';
+
+    /*
+     * XPATH for Stape analytics
+     */
+    public const XPATH_GTM_STAPE_ANALYTICS_ENABLED = 'stape_gtm/general/stape_analytics_enabled';
+
     /*
      * XPATH for GTM Cookie Keeper config value
      */
@@ -67,14 +83,23 @@ class ConfigProvider
      */
     private $scopeConfig;
 
+    /**
+     * @var Json $jsonSerializer
+     */
+    private $jsonSerializer;
+
     /**
      * Define class dependencies
      *
      * @param ScopeConfigInterface $scopeConfig
+     * @param Json $jsonSerializer
      */
-    public function __construct(ScopeConfigInterface $scopeConfig)
-    {
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        Json $jsonSerializer
+    ) {
         $this->scopeConfig = $scopeConfig;
+        $this->jsonSerializer = $jsonSerializer;
     }
 
     /**
@@ -121,6 +146,48 @@ public function getCustomLoader($scopeCode = null)
         return $this->scopeConfig->getValue(self::XPATH_GTM_LOADER, ScopeInterface::SCOPE_STORE, $scopeCode);
     }
 
+    /**
+     * Retrieve encoded customer loader
+     *
+     * @param string|int $scopeCode
+     * @return string
+     */
+    public function getCustomLoaderPrefix($scopeCode = null)
+    {
+        return $this->scopeConfig->getValue(self::XPATH_GTM_LOADER_PREFIX, ScopeInterface::SCOPE_STORE, $scopeCode);
+    }
+
+    /**
+     * Retrieve container id params
+     *
+     * @param string|int $scopeCode
+     * @return array
+     */
+    public function getContainerIdParams($scopeCode = null)
+    {
+        $value = $this->scopeConfig->getValue(
+            self::XPATH_GTM_CONTAINER_ID_PARAMS,
+            ScopeInterface::SCOPE_STORE,
+            $scopeCode
+        );
+        return $this->jsonSerializer->unserialize($value ?? '');
+    }
+
+    /**
+     * Check if stape analytics is enabled
+     *
+     * @param string|int $scopeCode
+     * @return bool
+     */
+    public function isStapeAnalyticsEnabled($scopeCode = null)
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::XPATH_GTM_STAPE_ANALYTICS_ENABLED,
+            ScopeInterface::SCOPE_STORE,
+            $scopeCode
+        );
+    }
+
     /**
      * Check if cookie keeper should be used
      *
@@ -135,7 +202,7 @@ public function useCookieKeeper($scopeCode = null)
     /**
      * Check if datalayer e-commerce events tracking is enabled
      *
-     * @param string}null $scopeCode
+     * @param string|null $scopeCode
      * @return bool
      */
     public function ecommerceEventsEnabled($scopeCode = null)
diff --git a/Model/Data/RandomString.php b/Model/Data/RandomString.php
new file mode 100644
index 0000000..c7a84fc
--- /dev/null
+++ b/Model/Data/RandomString.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Stape\Gtm\Model\Data;
+
+class RandomString
+{
+    /**
+     * Generate random string
+     *
+     * @param int $length
+     * @return string
+     */
+    public function generate(int $length = 8)
+    {
+        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $length = rand(1, $length); // Random length between 1 and 8
+        $randomString = '';
+
+        for ($i = 0; $i < $length; $i++) {
+            $randomString .= $characters[rand(0, strlen($characters) - 1)];
+        }
+
+        // Check if the string ends with 'kp' or 'gt'
+        while (in_array(substr($randomString, -2), ['kp', 'gt'])) {
+            $randomString = substr($randomString, 0, -2); // Remove last two characters
+            $randomString .= $characters[rand(0, strlen($characters) - 1)];
+            $randomString .= $characters[rand(0, strlen($characters) - 1)];
+        }
+
+        return $randomString;
+    }
+}
diff --git a/Model/Data/RandomSuffix.php b/Model/Data/RandomSuffix.php
new file mode 100644
index 0000000..a898d43
--- /dev/null
+++ b/Model/Data/RandomSuffix.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Stape\Gtm\Model\Data;
+
+class RandomSuffix
+{
+    /**
+     * @param string $loaderId
+     * @return string
+     */
+    public function generate($loaderId)
+    {
+        $default = http_build_query(['apiKey' => mb_substr(md5($loaderId), 0, 8)]);
+        $options = [
+            $default,
+            'page=1',
+            'page=2',
+            'page=3',
+            'sort=asc',
+            'sort=desc',
+        ];
+        $key = rand(0, count($options) - 1);
+        return $options[$key] ?? $default;
+    }
+}
diff --git a/Setup/Patch/Data/PatchCustomLoader.php b/Setup/Patch/Data/PatchCustomLoader.php
new file mode 100644
index 0000000..08563d0
--- /dev/null
+++ b/Setup/Patch/Data/PatchCustomLoader.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Stape\Gtm\Setup\Patch\Data;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Stape\Gtm\Model\Backend\CustomLoaderFactory;
+use Stape\Gtm\Model\ConfigProvider;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Class EnableSegmentation.
+ *
+ * @package Magento\Catalog\Setup\Patch
+ */
+class PatchCustomLoader implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var ConfigProvider $configProvider
+     */
+    private $configProvider;
+
+    /**
+     * @var CustomLoaderFactory $customLoaderFactory
+     */
+    private $customLoaderFactory;
+
+    /**
+     * @var StoreManagerInterface $storeManager
+     */
+    private $storeManager;
+
+    /**
+     * Define class dependencies
+     *
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param ConfigProvider $configProvider
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        ConfigProvider $configProvider,
+        CustomLoaderFactory $configValueFactory,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->configProvider = $configProvider;
+        $this->customLoaderFactory = $configValueFactory;
+        $this->storeManager = $storeManager;
+    }
+
+    private function updateConfig($scopeCode)
+    {
+        if ($customLoader = $this->configProvider->getCustomLoader($scopeCode)) {
+            /** @var \Magento\Framework\App\Config\Value $configValue */
+            $configValue = $this->customLoaderFactory->create()
+                ->setPath(ConfigProvider::XPATH_GTM_LOADER)
+                ->setValue($customLoader)
+                ->setScope($scopeCode ?? ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+
+            $configValue->afterSave();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->startSetup();
+
+
+        $stores = $this->storeManager->getStores(true);
+
+        foreach ($stores as $store) {
+            if ($this->updateConfig($store->getCode())) {
+                break;
+            }
+        }
+
+        $this->moduleDataSetup->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/ViewModel/Cart.php b/ViewModel/Cart.php
index 2017c8e..0fed9b3 100644
--- a/ViewModel/Cart.php
+++ b/ViewModel/Cart.php
@@ -100,6 +100,7 @@ public function getJson()
 
         return $this->json->serialize([
             'event' => 'view_cart_stape',
+            'ecomm_pagetype' => 'basket',
             'cart_quantity' => (int) $quote->getItemsQty(),
             'cart_total' => $this->priceCurrency->round($quote->getBaseGrandTotal()),
             'ecommerce' => [
diff --git a/ViewModel/Category.php b/ViewModel/Category.php
index 4f4eeee..66902e4 100644
--- a/ViewModel/Category.php
+++ b/ViewModel/Category.php
@@ -108,6 +108,7 @@ public function getJson()
     {
         return $this->json->serialize([
             'event' => 'view_collection_stape',
+            'ecomm_pagetype' => 'category',
             'ecommerce' => [
                 'currency' => $this->storeManager->getStore()->getCurrentCurrency()->getCode(),
                 'item_list_name' => $this->getCategoryName(),
diff --git a/ViewModel/Checkout.php b/ViewModel/Checkout.php
index be97fee..bd1f6bf 100644
--- a/ViewModel/Checkout.php
+++ b/ViewModel/Checkout.php
@@ -100,6 +100,7 @@ public function getJson()
 
         return $this->json->serialize([
             'event' => 'begin_checkout_stape',
+            'ecomm_pagetype' => 'basket',
             'cart_quantity' => (int) $quote->getItemsQty(),
             'cart_total' => $this->priceCurrency->round($quote->getBaseGrandTotal()),
             'ecommerce' => [
diff --git a/ViewModel/Product.php b/ViewModel/Product.php
index 075c44b..ff3cef6 100644
--- a/ViewModel/Product.php
+++ b/ViewModel/Product.php
@@ -144,6 +144,7 @@ public function getJson()
     {
         return $this->json->serialize([
             'event' => 'view_item_stape',
+            'ecomm_pagetype' => 'product',
             'ecommerce' => [
                 'currency' => $this->storeManager->getStore()->getCurrentCurrency()->getCode(),
                 'items' => array_filter([
diff --git a/ViewModel/Success.php b/ViewModel/Success.php
index a4e749d..3e35b15 100644
--- a/ViewModel/Success.php
+++ b/ViewModel/Success.php
@@ -130,6 +130,7 @@ public function getJson()
 
         return $this->json->serialize([
             'event' => 'purchase_stape',
+            'ecomm_pagetype' => 'purchase',
             'user_data' => [
                 'first_name' => $address->getFirstname(),
                 'last_name' => $address->getLastname(),
diff --git a/composer.json b/composer.json
index 1a7ca53..623208f 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "license": [
         "GPL-3.0-only"
     ],
-    "version": "1.0.18",
+    "version": "1.0.19",
     "require": {
         "php": ">=7.4.0"
     },
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 2700d4d..cd5eb82 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -17,7 +17,7 @@
                     <label>Active</label>
                     <source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
                 </field>
-                <field id="container_id" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label">
+                <field id="container_id" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label">
                     <label>Web Container Id</label>
                     <depends>
                         <field id="stape_gtm/general/active">1</field>
@@ -25,17 +25,23 @@
                     <comment><![CDATA[Insert web GTM script</br>
                     Enter the WEB Google Tag Manager ID, should be formatted as "GTM-XXXXXX".]]></comment>
                 </field>
-                <field id="custom_domain" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label">
+                <field id="custom_domain" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="30" translate="label">
                     <label>Custom Domain</label>
                     <comment><![CDATA[If you use <a href="https://stape.io/gtm-server-hosting" target="blank">stape.io sGTM hosting</a> you can find custom domain of your sGTM container URL following <a href="https://help.stape.io/hc/en-us/articles/6080905799453-Find-server-container-URL-for-sGTM-container" target="blank">this guide</a>. Otherwise you can find sGTM container URL in the <a href="https://developers.google.com/tag-platform/tag-manager/server-side/app-engine-setup#4_add_the_server_url_to_google_tag_manager" target="blank">container settings<a>. <a href="https://stape.io/blog/how-to-add-a-custom-domain-to-the-google-tag-manager-server-container" target="blank">Custom domain</a> is used to set first party cookies. Leave empty if you want to use googletagmanager.com domain.]]></comment>
                     <validate>validate-https-url</validate>
                 </field>
-                <field id="custom_loader" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label">
+                <field id="custom_loader" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40" translate="label">
                     <label>Custom Loader</label>
+                    <backend_model>Stape\Gtm\Model\Backend\CustomLoader</backend_model>
                     <comment><![CDATA[Add stape container identifier. Follow <a href="https://help.stape.io/hc/en-us/articles/9697466601373-How-to-find-the-Stape-container-identifier" target="blank">this guide</a> to find stape container identifier.
 This feature is available only if you use <a href="https://stape.io/gtm-server-hosting" target="blank">stape.io sGTM hosting</a> and enabled <a href="https://help.stape.io/hc/en-us/articles/6080917962397-Set-up-custom-web-GTM-loader" target="blank">Custom Loader power up.</a> Custom loader allows you to increase the accuracy of tracking. ]]></comment>
                 </field>
-                <field id="cookie_keeper" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
+                <field id="stape_analytics_enabled" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="50" translate="label" type="select">
+                    <label>Stape Analytics Enabled?</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment><![CDATA[Tick this checkbox if you are using Stape Analytics. Learn more about it <a href="https://stape.io/blog/stape-analytics-measure-the-impact-of-your-server-side-tracking?mtm_campaign=magento_app_settings">here</a>.]]></comment>
+                </field>
+                <field id="cookie_keeper" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="60" translate="label" type="select">
                     <label>Cookie Keeper</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[Cookie Keeper is used to <a href="https://stape.io/blog/increase-first-party-cookie-lifetime-set-by-a-third-party-ip" target="blank">prolong cookie lifetime</a> in Safari and other browsers with ITP. This option available only if you use <a href="https://stape.io/gtm-server-hosting" target="blank">stape.io sGTM hosting</a> and set up <a href="https://stape.io/blog/increase-first-party-cookie-lifetime-set-by-a-third-party-ip#how-cookie-keeper-works" target="blank">Cookie Keeper power up.</a>]]></comment>
diff --git a/etc/module.xml b/etc/module.xml
index 5553851..2e41787 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Stape_Gtm" schema_version="1.0.18" setup_version="1.0.18">
+    <module name="Stape_Gtm" schema_version="1.0.19" setup_version="1.0.19">
         <sequence>
             <module name="Magento_Backend" />
             <module name="Magento_Catalog" />
diff --git a/view/base/templates/html/gtm/advanced.phtml b/view/base/templates/html/gtm/advanced.phtml
index 5cc5fe2..21cdb73 100644
--- a/view/base/templates/html/gtm/advanced.phtml
+++ b/view/base/templates/html/gtm/advanced.phtml
@@ -5,6 +5,6 @@
 
 // phpcs:disable ?>
 <!-- GTM Container Loader By GTM Server Side plugin -->
-<script>!function(){"use strict";function l(e){for(var t=e,r=0,n=document.cookie.split(";");r<n.length;r++){var o=n[r].split("=");if(o[0].trim()===t)return o[1]}}function s(e){return localStorage.getItem(e)}function u(e){return window[e]}function d(e,t){e=document.querySelector(e);return t?null==e?void 0:e.getAttribute(t):null==e?void 0:e.textContent}var e=window,t=document,r="script",n="dataLayer",o="<?= $escaper->escapeUrl($block->getContainerId()); ?>",a="<?= $escaper->escapeUrl($block->getDomain()); ?>",i="",c="<?= $escaper->escapeUrl($block->getLoader()); ?>",E="cookie",I="_sbp",v="",g=!1;try{var g=!!E&&(m=navigator.userAgent,!!(m=new RegExp("Version/([0-9._]+)(.*Mobile)?.*Safari.*").exec(m)))&&16.4<=parseFloat(m[1]),A="stapeUserId"===E,f=g&&!A?function(e,t,r){void 0===t&&(t="");var n={cookie:l,localStorage:s,jsVariable:u,cssSelector:d},t=Array.isArray(t)?t:[t];if(e&&n[e])for(var o=n[e],a=0,i=t;a<i.length;a++){var c=i[a],c=r?o(c,r):o(c);if(c)return c}else console.warn("invalid uid source",e)}(E,I,v):void 0;g=g&&(!!f||A)}catch(e){console.error(e)}var m=e,E=(m[n]=m[n]||[],m[n].push({"gtm.start":(new Date).getTime(),event:"gtm.js"}),t.getElementsByTagName(r)[0]),I="dataLayer"===n?"":"&l="+n,v=f?"&bi="+encodeURIComponent(f):"",A=t.createElement(r),e=g?"kp"+c:c,n=!g&&i?i:a;A.async=!0,A.src=n+"/"+e+".js?<?= $escaper->escapeUrl($block->getIdParamName()); ?>="+o+I+v,null!=(f=E.parentNode)&&f.insertBefore(A,E)}();</script>
+<script>!function(){"use strict";function l(e){for(var t=e,r=0,n=document.cookie.split(";");r<n.length;r++){var o=n[r].split("=");if(o[0].trim()===t)return o[1]}}function s(e){return localStorage.getItem(e)}function u(e){return window[e]}function d(e,t){e=document.querySelector(e);return t?null==e?void 0:e.getAttribute(t):null==e?void 0:e.textContent}var e=window,t=document,r="script",n="dataLayer",o="<?= $block->getContainerId(); ?>",a="<?= $escaper->escapeUrl($block->getDomain()); ?>",i="",c="<?= $escaper->escapeUrl($block->getLoader()); ?>",E="cookie",I="_sbp",v="",g=!1;try{var g=!!E&&(m=navigator.userAgent,!!(m=new RegExp("Version/([0-9._]+)(.*Mobile)?.*Safari.*").exec(m)))&&16.4<=parseFloat(m[1]),A="stapeUserId"===E,f=g&&!A?function(e,t,r){void 0===t&&(t="");var n={cookie:l,localStorage:s,jsVariable:u,cssSelector:d},t=Array.isArray(t)?t:[t];if(e&&n[e])for(var o=n[e],a=0,i=t;a<i.length;a++){var c=i[a],c=r?o(c,r):o(c);if(c)return c}else console.warn("invalid uid source",e)}(E,I,v):void 0;g=g&&(!!f||A)}catch(e){console.error(e)}var m=e,E=(m[n]=m[n]||[],m[n].push({"gtm.start":(new Date).getTime(),event:"gtm.js"}),t.getElementsByTagName(r)[0]),I="dataLayer"===n?"":"&l="+n,v=f?"&bi="+encodeURIComponent(f):"",A=t.createElement(r),e=g?"kp"+c:c,n=!g&&i?i:a;A.async=!0,A.src=n+"/"+e+".js?<?= $escaper->escapeUrl($block->getIdParamName()); ?>="+o+I+v,null!=(f=E.parentNode)&&f.insertBefore(A,E)}();</script>
 <!-- END of GTM Container Loader By GTM Server Side plugin -->
 <?php //phpcs:enable ?>
diff --git a/view/base/templates/html/gtm/default.phtml b/view/base/templates/html/gtm/default.phtml
index 4968f75..b701fc6 100644
--- a/view/base/templates/html/gtm/default.phtml
+++ b/view/base/templates/html/gtm/default.phtml
@@ -10,6 +10,6 @@
             new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
         j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
         '<?= $escaper->escapeUrl($block->getGtmUrl());?>.js?<?= $escaper->escapeUrl($block->getIdParamName()); ?>='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','<?= $escaper->escapeHtmlAttr($block->getContainerId()); ?>');</script>
+    })(window,document,'script','dataLayer','<?= $block->getContainerId(); ?>');</script>
 <!-- End Google Tag Manager -->
 <?php //phpcs:enable ?>
diff --git a/view/frontend/web/js/action/set-payment-information-mixin.js b/view/frontend/web/js/action/set-payment-information-mixin.js
index 8afec8e..f2eb39c 100644
--- a/view/frontend/web/js/action/set-payment-information-mixin.js
+++ b/view/frontend/web/js/action/set-payment-information-mixin.js
@@ -46,6 +46,7 @@ define([
 
                 window.dataLayer.push({
                     event: 'payment_info_stape',
+                    ecomm_pagetype: 'basket',
                     user_data: {
                         first_name: address.firstname,
                         last_name: address.lastname,
diff --git a/view/frontend/web/js/datalayer.js b/view/frontend/web/js/datalayer.js
index a0d1a8c..defdb03 100644
--- a/view/frontend/web/js/datalayer.js
+++ b/view/frontend/web/js/datalayer.js
@@ -70,6 +70,7 @@ define([
 
                 window.dataLayer.push({
                     event: 'add_to_cart_stape',
+                    ecomm_pagetype: 'product',
                     ecommerce: {
                         currency: config?.data?.ecommerce?.currency,
                         items: [
@@ -101,6 +102,7 @@ define([
 
                 window.dataLayer.push({
                     event: 'remove_from_cart_stape',
+                    ecomm_pagetype: 'product',
                     ecommerce: {
                         currency: config?.data?.ecommerce?.currency,
                         items: [