diff --git a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/pom.xml b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/pom.xml
index 4e664f830c..31044dcdd6 100644
--- a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/pom.xml
+++ b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>4.0.86-SNAPSHOT</version>
+        <version>4.0.88-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -86,6 +86,26 @@
             <artifactId>javax.cache.wso2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+            <artifactId>org.wso2.carbon.appmgt.mdm.restconnector</artifactId>
+            <version>4.0.88-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>RELEASE</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java
index 93a7ad1c06..efb6dc6ce4 100644
--- a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java
+++ b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.devicegroup/src/main/java/org/wso2/extension/siddhi/devicegroup/IsDeviceInGroupFunctionExecutor.java
@@ -31,6 +31,7 @@ import org.wso2.siddhi.core.executor.function.FunctionExecutor;
 import org.wso2.siddhi.query.api.definition.Attribute;
 import org.wso2.siddhi.query.api.exception.ExecutionPlanValidationException;
 
+
 /**
  * isDeviceInGroup(deviceId , groupId)
  * Returns true if device belongs to group, otherwise false.
@@ -50,10 +51,10 @@ public class IsDeviceInGroupFunctionExecutor extends FunctionExecutor {
                     "Invalid no of arguments passed to group:isDeviceInGroup() function, required 3, but found "
                             + attributeExpressionExecutors.length);
         }
-        if (attributeExpressionExecutors[0].getReturnType() != Attribute.Type.INT) {
+        if (attributeExpressionExecutors[0].getReturnType()!= Attribute.Type.INT) {
             throw new ExecutionPlanValidationException(
                     "Invalid parameter type found for the first argument (group id) of group:isDeviceInGroup() " +
-                    "function, required " + Attribute.Type.INT + ", but found " +
+                    "function, required " + org.wso2.siddhi.query.api.definition.Attribute.Type.INT + ", but found " +
                     attributeExpressionExecutors[0].getReturnType().toString());
         }
         if (attributeExpressionExecutors[1].getReturnType() != Attribute.Type.STRING) {
diff --git a/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml b/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml
index 7263fcfd1b..340dd59c77 100644
--- a/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.extension.siddhi.devicegroup.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>4.0.86-SNAPSHOT</version>
+        <version>4.0.88-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index a75dde1783..1db0d2d723 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1179,7 +1179,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>3.0.135</carbon.devicemgt.version>
+        <carbon.devicemgt.version>3.0.136-SNAPSHOT</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>
 
         <!-- Carbon App Management -->