diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index b7a35d4f..3e303886 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -29,7 +29,7 @@ cdmf.platform.role=CDMFPlatform
 cdmf.analytics.role=CDMFAnalytics
 geodashboard.role=GeoDashboard
 bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
-carbon-device-mgt-plugin-version=4.0.4
-carbon-device-mgt-version=3.0.7
+carbon-device-mgt-plugin-version=4.0.5
+carbon-device-mgt-version=3.0.8
 carbon-analytics-version=1.3.3
 carbon-kernel-version=4.4.14
diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml
index 37229f8a..c7de2e88 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml
@@ -74,7 +74,6 @@
 							org.wso2.carbon.base.*,
 							javax.xml.parsers.*;resolution:=optional
 						</Import-Package>
-
 						<Export-Package>
 							!org.coffeeking.connectedcup.plugin.internal,
 							org.coffeeking.connectedcup.plugin.*
diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
index cf080fa4..5354abee 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
+++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
@@ -20,30 +20,25 @@ package org.coffeeking.connectedcup.plugin.impl;
 
 import org.coffeeking.connectedcup.plugin.constants.ConnectedCupConstants;
 import org.wso2.carbon.base.MultitenantConstants;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.InitialOperationConfig;
 import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 
-import java.util.List;
-
 public class ConnectedCupManagerService implements DeviceManagementService {
-	private DeviceManager deviceManager;
+    private DeviceManager deviceManager;
 
-	@Override
-	public String getType() {
-		return ConnectedCupConstants.DEVICE_TYPE;
-	}
+    @Override
+    public String getType() {
+        return ConnectedCupConstants.DEVICE_TYPE;
+    }
 
     @Override
     public OperationMonitoringTaskConfig getOperationMonitoringConfig() {
@@ -51,42 +46,47 @@ public class ConnectedCupManagerService implements DeviceManagementService {
     }
 
     @Override
-	public void init() throws DeviceManagementException {
-		this.deviceManager=new ConnectedCupManager();
-	}
+    public void init() throws DeviceManagementException {
+        this.deviceManager = new ConnectedCupManager();
+    }
 
-	@Override
-	public DeviceManager getDeviceManager() {
-		return deviceManager;
-	}
+    @Override
+    public DeviceManager getDeviceManager() {
+        return deviceManager;
+    }
 
-	@Override
-	public ApplicationManager getApplicationManager() {
-		return null;
-	}
+    @Override
+    public ApplicationManager getApplicationManager() {
+        return null;
+    }
 
-	@Override
-	public ProvisioningConfig getProvisioningConfig() {
-		return new ProvisioningConfig(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME, false);
-	}
+    @Override
+    public ProvisioningConfig getProvisioningConfig() {
+        return new ProvisioningConfig(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME, false);
+    }
 
-	@Override
-	public PushNotificationConfig getPushNotificationConfig() {
-		return null;
-	}
+    @Override
+    public PushNotificationConfig getPushNotificationConfig() {
+        return null;
+    }
 
     @Override
     public PolicyMonitoringManager getPolicyMonitoringManager() {
         return null;
     }
 
-	@Override
-	public DeviceStatusTaskPluginConfig getDeviceStatusTaskPluginConfig() {
-		return null;
-	}
+    @Override
+    public DeviceStatusTaskPluginConfig getDeviceStatusTaskPluginConfig() {
+        return null;
+    }
+
+    @Override
+    public InitialOperationConfig getInitialOperationConfig() {
+        return null;
+    }
 
-	@Override
-	public InitialOperationConfig getInitialOperationConfig() {
-		return null;
-	}
+    @Override
+    public PullNotificationSubscriber getPullNotificationSubscriber() {
+        return null;
+    }
 }
diff --git a/modules/distribution/src/core/samples/connectedcup/pom.xml b/modules/distribution/src/core/samples/connectedcup/pom.xml
index 15def572..a523157f 100644
--- a/modules/distribution/src/core/samples/connectedcup/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/pom.xml
@@ -359,13 +359,13 @@
 
 
     <properties>
-		<carbon.kernel.version>@carbon-kernel-version@</carbon.kernel.version>
+        <carbon.kernel.version>4.4.14</carbon.kernel.version>
 
         <org.coffeeking.version>1.0.0</org.coffeeking.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>@carbon-device-mgt-version@</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>@carbon-device-mgt-plugin-version@</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>3.0.8</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>4.0.5</carbon.device.mgt.plugin.version>
 
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
@@ -380,7 +380,7 @@
         <commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
         <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
-        <analytics.version>@carbon.analytics.version@</analytics.version>
+        <analytics.version>1.3.3</analytics.version>
     </properties>
 
 </project>