diff --git a/components/org.wso2.carbon.identity.notification.push.device.handler/pom.xml b/components/org.wso2.carbon.identity.notification.push.device.handler/pom.xml
index 6e4d33b..2b71137 100644
--- a/components/org.wso2.carbon.identity.notification.push.device.handler/pom.xml
+++ b/components/org.wso2.carbon.identity.notification.push.device.handler/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.notification.push</groupId>
         <artifactId>identity-notification-push</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -87,12 +87,18 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/features/org.wso2.carbon.identity.notification.push.feature/pom.xml b/features/org.wso2.carbon.identity.notification.push.feature/pom.xml
index 39407ff..0eac9ca 100644
--- a/features/org.wso2.carbon.identity.notification.push.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.notification.push.feature/pom.xml
@@ -37,10 +37,10 @@
             <groupId>org.wso2.carbon.identity.notification.push</groupId>
             <artifactId>org.wso2.carbon.identity.notification.push.common</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.wso2.carbon.identity.notification.push</groupId>-->
-<!--            <artifactId>org.wso2.carbon.identity.notification.push.device.handler</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.wso2.carbon.identity.notification.push</groupId>
+            <artifactId>org.wso2.carbon.identity.notification.push.device.handler</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.notification.push</groupId>
             <artifactId>org.wso2.carbon.identity.notification.push.provider</artifactId>
@@ -85,7 +85,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>org.wso2.carbon.identity.notification.push:org.wso2.carbon.identity.notification.push.common</bundleDef>
-<!--                                <bundleDef>org.wso2.carbon.identity.notification.push:org.wso2.carbon.identity.notification.push.device.handler</bundleDef>-->
+                                <bundleDef>org.wso2.carbon.identity.notification.push:org.wso2.carbon.identity.notification.push.device.handler</bundleDef>
                                 <bundleDef>org.wso2.carbon.identity.notification.push:org.wso2.carbon.identity.notification.push.provider</bundleDef>
                                 <bundleDef>org.wso2.orbit.com.google.firebase:firebase-admin</bundleDef>
                                 <bundleDef>org.wso2.orbit.org.apache.httpcomponents:httpclient5</bundleDef>
diff --git a/pom.xml b/pom.xml
index 816936d..8186967 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
     <modules>
         <module>components/org.wso2.carbon.identity.notification.push.common</module>
-<!--        <module>components/org.wso2.carbon.identity.notification.push.device.handler</module>-->
+        <module>components/org.wso2.carbon.identity.notification.push.device.handler</module>
         <module>components/org.wso2.carbon.identity.notification.push.provider</module>
         <module>features/org.wso2.carbon.identity.notification.push.feature</module>
     </modules>
@@ -346,7 +346,7 @@
         <carbon.kernel.package.import.version.range>[4.5.0, 5.0.0)</carbon.kernel.package.import.version.range>
         <org.wso2.carbon.database.utils.version>2.1.6</org.wso2.carbon.database.utils.version>
         <org.wso2.carbon.database.utils.version.range>[2.0.0,3.0.0)</org.wso2.carbon.database.utils.version.range>
-        <identity.notification.sender.tenant.config.version>1.9.4</identity.notification.sender.tenant.config.version>
+        <identity.notification.sender.tenant.config.version>1.9.34</identity.notification.sender.tenant.config.version>
         <identity.event.handler.notification.imp.pkg.version.range>[1.3.15, 2.0.0)</identity.event.handler.notification.imp.pkg.version.range>
         <com.google.auth.osgi.version>1.20.0.wso2v1</com.google.auth.osgi.version>
         <com.google.api.http.clients.osgi.version>1.43.3.wso2v1</com.google.api.http.clients.osgi.version>