diff --git a/all/pom.xml b/all/pom.xml
index 5163513e..2f15c168 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -74,6 +74,11 @@
                             <type>zip</type>
                             <target>/apps/saas-aem-module-packages/application/install</target>
                         </embedded>
+                        <embedded>
+                                <groupId>com.adobe.cq</groupId>
+                                <artifactId>core.wcm.components.core</artifactId>
+                                <target>/apps/saas-aem-module-vendor-packages/application/install</target>
+                        </embedded>
                     </embeddeds>
                 </configuration>
             </plugin>
@@ -187,5 +192,9 @@
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
+        <dependency>
+            <groupId>com.adobe.cq</groupId>
+            <artifactId>core.wcm.components.core</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index 6dafcab2..0ffc08e8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -131,6 +131,10 @@
             <artifactId>commons-io</artifactId>
             <groupId>commons-io</groupId>
         </dependency>
+        <dependency>
+            <groupId>com.adobe.cq</groupId>
+            <artifactId>core.wcm.components.core</artifactId>
+        </dependency>
         <!-- AEM 6.5 Dependencies, this has to be last dependency before the Testing section -->
         <dependency>
             <groupId>com.adobe.aem</groupId>
diff --git a/core/src/main/java/com/valtech/aem/saas/core/fulltextsearch/SearchModelImpl.java b/core/src/main/java/com/valtech/aem/saas/core/fulltextsearch/SearchModelImpl.java
index 2a42251a..94450ef4 100644
--- a/core/src/main/java/com/valtech/aem/saas/core/fulltextsearch/SearchModelImpl.java
+++ b/core/src/main/java/com/valtech/aem/saas/core/fulltextsearch/SearchModelImpl.java
@@ -3,6 +3,10 @@
 import com.adobe.cq.export.json.ComponentExporter;
 import com.adobe.cq.export.json.ContainerExporter;
 import com.adobe.cq.export.json.ExporterConstants;
+import com.adobe.cq.wcm.core.components.models.Container;
+import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
+import com.adobe.cq.wcm.core.components.models.datalayer.builder.DataLayerBuilder;
+import com.adobe.cq.wcm.core.components.util.ComponentUtils;
 import com.day.cq.i18n.I18n;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -52,7 +56,7 @@
        resourceType = RESOURCE_TYPE)
 @Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME,
           extensions = ExporterConstants.SLING_MODEL_EXTENSION)
-public class SearchModelImpl implements SearchModel, ContainerExporter {
+public class SearchModelImpl implements SearchModel, Container {
 
     public static final String RESOURCE_TYPE = "saas-aem-module/components/search";
     public static final String NODE_NAME_SEARCH_TABS_CONTAINER = "search-tabs";
@@ -154,6 +158,20 @@ public class SearchModelImpl implements SearchModel, ContainerExporter {
 
     private SearchCAConfigurationModel searchCAConfigurationModel;
 
+    @Override
+    public ComponentData getData() {
+        if (ComponentUtils.isDataLayerEnabled(this.resource)) {
+            return DataLayerBuilder.forContainer()
+                                   .withId(this::getId)
+                                   .withTitle(this::getTitle)
+                                   .withType(this::getExportedType)
+                                   .build();
+
+        }
+        return null;
+    }
+
+
     @PostConstruct
     private void init() {
         searchCAConfigurationModel = resource.adaptTo(SearchCAConfigurationModel.class);
diff --git a/core/src/main/java/com/valtech/aem/saas/core/fulltextsearch/SearchTabModelImpl.java b/core/src/main/java/com/valtech/aem/saas/core/fulltextsearch/SearchTabModelImpl.java
index 711e7b65..a6f091e5 100644
--- a/core/src/main/java/com/valtech/aem/saas/core/fulltextsearch/SearchTabModelImpl.java
+++ b/core/src/main/java/com/valtech/aem/saas/core/fulltextsearch/SearchTabModelImpl.java
@@ -3,6 +3,10 @@
 
 import com.adobe.cq.export.json.ComponentExporter;
 import com.adobe.cq.export.json.ExporterConstants;
+import com.adobe.cq.wcm.core.components.models.Component;
+import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
+import com.adobe.cq.wcm.core.components.models.datalayer.builder.DataLayerBuilder;
+import com.adobe.cq.wcm.core.components.util.ComponentUtils;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.valtech.aem.saas.api.caconfig.SearchCAConfigurationModel;
@@ -15,6 +19,7 @@
 import com.valtech.aem.saas.api.resource.PathTransformer;
 import com.valtech.aem.saas.core.common.request.RequestWrapper;
 import com.valtech.aem.saas.core.common.resource.ResourceWrapper;
+import com.valtech.aem.saas.core.util.ResourceUtil;
 import com.valtech.aem.saas.core.util.StringToInteger;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -47,7 +52,7 @@
        resourceType = RESOURCE_TYPE)
 @Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME,
           extensions = ExporterConstants.SLING_MODEL_EXTENSION)
-public class SearchTabModelImpl implements SearchTabModel, ComponentExporter {
+public class SearchTabModelImpl implements SearchTabModel, Component {
 
     public static final String RESOURCE_TYPE = "saas-aem-module/components/searchtab";
     public static final int DEFAULT_START_PAGE = 1;
@@ -137,6 +142,26 @@ private void init() {
         });
     }
 
+    @Override
+    public ComponentData getData() {
+        if (ComponentUtils.isDataLayerEnabled(this.resource)) {
+            return DataLayerBuilder.forComponent()
+                                   .withId(this::getId)
+                                   .withParentId(() -> Optional.ofNullable(parentSearch).map(SearchModel::getId).orElse(""))
+                                   .withTitle(this::getTitle)
+                                   .withType(this::getExportedType)
+                                   .build();
+
+        }
+        return null;
+    }
+
+    @Override
+    public String getId() {
+        return ResourceUtil.generateId("saas", resource.getPath());
+    }
+
+
     private Optional<Integer> getConfiguredResultsPerPage() {
         return Optional.ofNullable(parentSearch).map(SearchModel::getResultsPerPage);
     }
diff --git a/pom.xml b/pom.xml
index bf8cea23..227963b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,8 +92,8 @@
 
         <sonar.organization>valtech-ch</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-        <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml
-        </sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <core.wcm.components.version>2.17.2</core.wcm.components.version>
 
     </properties>
 
@@ -866,6 +866,11 @@
                 <version>2.8.0</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>com.adobe.cq</groupId>
+                <artifactId>core.wcm.components.core</artifactId>
+                <version>${core.wcm.components.version}</version>
+            </dependency>
             <!-- AEM 6.5 Dependencies, this has to be last dependency before the Testing section -->
             <dependency>
                 <groupId>com.adobe.aem</groupId>
@@ -873,7 +878,6 @@
                 <version>6.5.10</version>
                 <scope>provided</scope>
             </dependency>
-
             <!-- Testing -->
             <dependency>
                 <groupId>org.junit</groupId>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 8156cebc..20ead5b3 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -52,7 +52,6 @@
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>
                     <group>com.valtech.aem</group>
-                    <name>saas.ui.apps</name>
                     <packageType>application</packageType>
                     <repositoryStructurePackages>
                         <repositoryStructurePackage>
diff --git a/ui.config/pom.xml b/ui.config/pom.xml
index 410c766a..46793e7b 100644
--- a/ui.config/pom.xml
+++ b/ui.config/pom.xml
@@ -49,6 +49,7 @@
                     <properties>
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>
+                    <group>com.valtech.aem</group>
                     <packageType>container</packageType>
                     <showImportPackageReport>false</showImportPackageReport>
                     <repositoryStructurePackages>
diff --git a/ui.content/pom.xml b/ui.content/pom.xml
index 587b72e6..4aef6289 100644
--- a/ui.content/pom.xml
+++ b/ui.content/pom.xml
@@ -51,7 +51,6 @@
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>
                     <group>com.valtech.aem</group>
-                    <name>saas.ui.content</name>
                     <packageType>content</packageType>
                     <accessControlHandling>merge</accessControlHandling>
                     <validatorsSettings>
diff --git a/ui.frontend/src/main/webpack/site/js/buildSearch.ts b/ui.frontend/src/main/webpack/site/js/buildSearch.ts
index 14300ee1..3d716917 100644
--- a/ui.frontend/src/main/webpack/site/js/buildSearch.ts
+++ b/ui.frontend/src/main/webpack/site/js/buildSearch.ts
@@ -53,10 +53,12 @@ export const buildSearch = async (
     autocompleteTriggerThreshold,
     autoSuggestText,
     noResultsText,
+    dataLayer,
   } = searchConfig
 
   const searchContainer = document.createElement('div')
   searchContainer.classList.add('cmp-saas')
+  searchContainer.dataset.cmpDataLayer = JSON.stringify(dataLayer)
 
   const searchFormElement = buildSearchForm()
   const searchResetButton = buildSearchClearButton()
@@ -123,4 +125,8 @@ export const buildSearch = async (
       callbacks,
     )
   }
+  const DOMContentLoadedEvent = new Event('DOMContentLoaded', {
+    bubbles: true
+  });
+  window.document.dispatchEvent(DOMContentLoadedEvent)
 }
diff --git a/ui.frontend/src/main/webpack/site/js/components/searchResults.ts b/ui.frontend/src/main/webpack/site/js/components/searchResults.ts
index 40ba65c3..9c49e653 100644
--- a/ui.frontend/src/main/webpack/site/js/components/searchResults.ts
+++ b/ui.frontend/src/main/webpack/site/js/components/searchResults.ts
@@ -5,6 +5,7 @@ type SearchResultsOptions = {
   searchItems: SearchItem[]
   tabId: string
   onSearchItemClick?: OnSearchItemClickCallback
+  dataLayer: object
 }
 
 export const generateSearchItemList = (
@@ -29,9 +30,11 @@ const buildSearchResult = ({
   searchItems,
   tabId,
   onSearchItemClick,
+  dataLayer,
 }: SearchResultsOptions): HTMLDivElement => {
   const searchResults = document.createElement('div')
   searchResults.classList.add('cmp-saas__results')
+  searchResults.dataset.cmpDataLayer = JSON.stringify(dataLayer)
 
   const resultsItems = document.createElement('div')
   resultsItems.classList.add('cmp-saas__results-items')
diff --git a/ui.frontend/src/main/webpack/site/js/components/searchResultsTab.ts b/ui.frontend/src/main/webpack/site/js/components/searchResultsTab.ts
index 126655c5..c72a6356 100644
--- a/ui.frontend/src/main/webpack/site/js/components/searchResultsTab.ts
+++ b/ui.frontend/src/main/webpack/site/js/components/searchResultsTab.ts
@@ -39,6 +39,7 @@ const buildSearchResultsTab = ({
     results,
     url,
     facetFilters,
+    dataLayer,
   } = tabResult
 
   if (resultsTotal) {
@@ -51,13 +52,14 @@ const buildSearchResultsTab = ({
       tabNumberOfResults: resultsTotal,
       title,
       onSwitchTab,
-      searchContainer,
+      searchContainer
     })
 
     const searchResults = buildSearchResult({
       searchItems: results,
       tabId,
       onSearchItemClick,
+      dataLayer
     })
 
     searchForm?.parentNode?.insertBefore(
diff --git a/ui.frontend/src/main/webpack/site/js/components/searchTabs.ts b/ui.frontend/src/main/webpack/site/js/components/searchTabs.ts
index b6eb754a..c6c6500e 100644
--- a/ui.frontend/src/main/webpack/site/js/components/searchTabs.ts
+++ b/ui.frontend/src/main/webpack/site/js/components/searchTabs.ts
@@ -13,6 +13,7 @@ export type SearchTabOptions = {
 export type TabConfig = {
   title: string
   url: string
+  dataLayer: object
 }
 
 export type Suggestion = {
@@ -31,6 +32,7 @@ export type Tab = {
   url: string
   suggestion?: Suggestion
   facetFilters?: FacetFilters
+  dataLayer: object
 }
 
 const CMP_SAAS_RESULTS_CLASS = 'cmp-saas__results'
diff --git a/ui.frontend/src/main/webpack/site/js/searchElement.ts b/ui.frontend/src/main/webpack/site/js/searchElement.ts
index d92f3cd5..7f48a264 100644
--- a/ui.frontend/src/main/webpack/site/js/searchElement.ts
+++ b/ui.frontend/src/main/webpack/site/js/searchElement.ts
@@ -32,7 +32,6 @@ export const getDataAttributeFromSearchElement = (
   if (!element) {
     return null
   }
-
   const searchConfigStr = element.dataset.searchConfig || '{}'
   const searchConfig = JSON.parse(searchConfigStr) as SearchConfig
 
diff --git a/ui.frontend/src/main/webpack/site/js/types/searchOptions.ts b/ui.frontend/src/main/webpack/site/js/types/searchOptions.ts
index a7a14022..9f1aa073 100644
--- a/ui.frontend/src/main/webpack/site/js/types/searchOptions.ts
+++ b/ui.frontend/src/main/webpack/site/js/types/searchOptions.ts
@@ -18,4 +18,5 @@ export type SearchConfig = {
   autoSuggestText: string
   noResultsText: string
   trackingUrl?: string
+  dataLayer: string
 }
diff --git a/ui.frontend/src/main/webpack/static/index.html b/ui.frontend/src/main/webpack/static/index.html
index ff70b54a..e6b39330 100644
--- a/ui.frontend/src/main/webpack/static/index.html
+++ b/ui.frontend/src/main/webpack/static/index.html
@@ -34,7 +34,7 @@ <h1 class="cmp-title__text">Welcome to Valtech AEM SAAS!</h1>
 
               <div class="search">
                 <search
-                  data-search-config='{"title":"Search Cmp","searchFieldPlaceholderText":"Type search term here...","searchButtonText":"Search","loadMoreButtonText":"Load more","searchTabs":[{"title":"Search tab","url":"/content/saas-aem-module/us/en/_jcr_content/root/container/search/search-tabs/searchtab.model.json?wcmmode=disabled&q=wknd",":type":"saas-aem-module/components/searchtab"},{"title":"PDF Only","url":"/content/saas-aem-module/us/en/_jcr_content/root/container/search/search-tabs/searchtab_765476375.model.json?wcmmode=disabled&q=wknd",":type":"saas-aem-module/components/searchtab"}],"autocompleteUrl":"/content/saas-aem-module/us/en/_jcr_content/root/container/search.autocomplete.json","trackingUrl":"/content/saas-aem-module/us/en/_jcr_content/root/container/search.tracking.html","autoSuggestText":"Did you mean:","noResultsText":"No results found.","autocompleteTriggerThreshold":3,"id":"saas-2007378464",":type":"saas-aem-module/components/search",":items":{},":itemsOrder":[]}'
+                  data-search-config='{"title":"Search Cmp","searchFieldPlaceholderText":"Type search term here...","searchButtonText":"Search","loadMoreButtonText":"Load more","searchTabs":[{"title":"Search tab","url":"/content/saas-aem-module/us/en/search-page/_jcr_content/root/container/search/search-tabs/searchtab.model.json?wcmmode=disabled&q=wknd",":type":"saas-aem-module/components/searchtab"},{"title":"PDF Only","url":"/content/saas-aem-module/us/en/search-page/_jcr_content/root/container/search/search-tabs/searchtab_765476375.model.json?wcmmode=disabled&q=wknd",":type":"saas-aem-module/components/searchtab"}],"autocompleteUrl":"/content/saas-aem-module/us/en/search-page/_jcr_content/root/container/search.autocomplete.json","trackingUrl":"/content/saas-aem-module/us/en/search-page/_jcr_content/root/container/search.tracking.html","autoSuggestText":"Did you mean:","noResultsText":"No results found.","autocompleteTriggerThreshold":3,"id":"saas-2007378464",":type":"saas-aem-module/components/search",":items":{},":itemsOrder":[]}'
                 ></search>
               </div>
             </div>