diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java
index 28606783d..2d0dc8c91 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java
@@ -24,8 +24,11 @@ import org.wso2.carbon.apimgt.api.APIManagementException;
 import org.wso2.carbon.apimgt.api.APIProvider;
 import org.wso2.carbon.apimgt.impl.APIManagerConfigurationService;
 import org.wso2.carbon.apimgt.impl.APIManagerFactory;
+import org.wso2.carbon.apimgt.impl.utils.APIMgtDBUtil;
+import org.wso2.carbon.core.ServerStartupObserver;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagerService;
+import org.wso2.carbon.device.mgt.mobile.MobileDeviceManagementStartupObserver;
 import org.wso2.carbon.device.mgt.mobile.config.APIConfig;
 import org.wso2.carbon.device.mgt.mobile.config.MobileDeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.mobile.config.MobileDeviceManagementConfig;
@@ -55,134 +58,101 @@ import java.util.List;
  */
 public class MobileDeviceManagementServiceComponent {
 
-	private ServiceRegistration androidServiceRegRef;
-	private ServiceRegistration iOSServiceRegRef;
-	private ServiceRegistration windowsServiceRegRef;
+    private ServiceRegistration androidServiceRegRef;
+    private ServiceRegistration iOSServiceRegRef;
+    private ServiceRegistration windowsServiceRegRef;
+    private ServiceRegistration serverStartupObserverRef;
 
-	private static final Log log = LogFactory.getLog(MobileDeviceManagementServiceComponent.class);
+    private static final Log log = LogFactory.getLog(MobileDeviceManagementServiceComponent.class);
 
-	protected void activate(ComponentContext ctx) {
-		if (log.isDebugEnabled()) {
-			log.debug("Activating Mobile Device Management Service Component");
-		}
-		try {
-			BundleContext bundleContext = ctx.getBundleContext();
+    protected void activate(ComponentContext ctx) {
+        if (log.isDebugEnabled()) {
+            log.debug("Activating Mobile Device Management Service Component");
+        }
+        try {
+            BundleContext bundleContext = ctx.getBundleContext();
 
             /* Initialize the datasource configuration */
-			MobileDeviceConfigurationManager.getInstance().initConfig();
-			MobileDeviceManagementConfig config = MobileDeviceConfigurationManager.getInstance()
-			                                                                      .getMobileDeviceManagementConfig();
-			MobileDataSourceConfig dsConfig =
-					config.getMobileDeviceMgtRepository().getMobileDataSourceConfig();
-
-			MobileDeviceManagementDAOFactory.setMobileDataSourceConfig(dsConfig);
-			MobileDeviceManagementDAOFactory.init();
-			String setupOption = System.getProperty("setup");
-			if (setupOption != null) {
-				if (log.isDebugEnabled()) {
-					log.debug(
-							"-Dsetup is enabled. Mobile Device management repository schema initialization is about " +
-							"to begin");
-				}
-				try {
-					MobileDeviceManagementDAOUtil.setupMobileDeviceManagementSchema(
-							MobileDeviceManagementDAOFactory.getDataSource());
-				} catch (DeviceManagementException e) {
-					log.error(
-							"Exception occurred while initializing mobile device management database schema",
-							e);
-				}
-			}
-
-			androidServiceRegRef =
-					bundleContext.registerService(DeviceManagerService.class.getName(),
-					                              new AndroidDeviceManagerService(), null);
-			iOSServiceRegRef =
-					bundleContext.registerService(DeviceManagerService.class.getName(),
-					                              new IOSDeviceManagerService(), null);
-			windowsServiceRegRef =
-					bundleContext.registerService(DeviceManagerService.class.getName(),
-					                              new WindowsDeviceManagerService(), null);
-
-            /* Initialize all API configurations with corresponding API Providers */
-			this.initAPIConfigs();
-	        /* Publish all mobile device management related JAX-RS services as APIs */
-			this.publishAPIs();
-
-			if (log.isDebugEnabled()) {
-				log.debug(
-						"Mobile Device Management Service Component has been successfully activated");
-			}
-		} catch (Throwable e) {
-			log.error("Error occurred while activating Mobile Device Management Service Component",
-			          e);
-		}
-	}
-
-	protected void deactivate(ComponentContext ctx) {
-		if (log.isDebugEnabled()) {
-			log.debug("De-activating Mobile Device Management Service Component");
-		}
-		try {
-			BundleContext bundleContext = ctx.getBundleContext();
-
-			androidServiceRegRef.unregister();
-			iOSServiceRegRef.unregister();
-			windowsServiceRegRef.unregister();
+            MobileDeviceConfigurationManager.getInstance().initConfig();
+            MobileDeviceManagementConfig config = MobileDeviceConfigurationManager.getInstance()
+                    .getMobileDeviceManagementConfig();
+            MobileDataSourceConfig dsConfig =
+                    config.getMobileDeviceMgtRepository().getMobileDataSourceConfig();
+
+            MobileDeviceManagementDAOFactory.setMobileDataSourceConfig(dsConfig);
+            MobileDeviceManagementDAOFactory.init();
+            String setupOption = System.getProperty("setup");
+            if (setupOption != null) {
+                if (log.isDebugEnabled()) {
+                    log.debug(
+                            "-Dsetup is enabled. Mobile Device management repository schema initialization is about " +
+                                    "to begin");
+                }
+                try {
+                    MobileDeviceManagementDAOUtil.setupMobileDeviceManagementSchema(
+                            MobileDeviceManagementDAOFactory.getDataSource());
+                } catch (DeviceManagementException e) {
+                    log.error("Exception occurred while initializing mobile device management database schema", e);
+                }
+            }
+
+            androidServiceRegRef =
+                    bundleContext.registerService(DeviceManagerService.class.getName(),
+                            new AndroidDeviceManagerService(), null);
+            iOSServiceRegRef =
+                    bundleContext.registerService(DeviceManagerService.class.getName(),
+                            new IOSDeviceManagerService(), null);
+            windowsServiceRegRef =
+                    bundleContext.registerService(DeviceManagerService.class.getName(),
+                            new WindowsDeviceManagerService(), null);
+
+            serverStartupObserverRef = bundleContext.registerService(ServerStartupObserver.class,
+                    new MobileDeviceManagementStartupObserver(), null);
+            if (log.isDebugEnabled()) {
+                log.debug("Mobile Device Management Service Component has been successfully activated");
+            }
+        } catch (Throwable e) {
+            log.error("Error occurred while activating Mobile Device Management Service Component", e);
+        }
+    }
+
+    protected void deactivate(ComponentContext ctx) {
+        if (log.isDebugEnabled()) {
+            log.debug("De-activating Mobile Device Management Service Component");
+        }
+        try {
+            androidServiceRegRef.unregister();
+            iOSServiceRegRef.unregister();
+            windowsServiceRegRef.unregister();
+            serverStartupObserverRef.unregister();
 
             /* Removing all APIs published upon start-up for mobile device management related JAX-RS
                services */
-			this.removeAPIs();
-			if (log.isDebugEnabled()) {
-				log.debug(
-						"Mobile Device Management Service Component has been successfully de-activated");
-			}
-		} catch (Throwable e) {
-			log.error("Error occurred while de-activating Mobile Device Management bundle", e);
-		}
-	}
-
-	private void initAPIConfigs() throws DeviceManagementException {
-		List<APIConfig> apiConfigs =
-				MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig().
-						getApiPublisherConfig().getAPIs();
-		for (APIConfig apiConfig : apiConfigs) {
-			try {
-				APIProvider provider =
-						APIManagerFactory.getInstance().getAPIProvider(apiConfig.getOwner());
-				apiConfig.init(provider);
-			} catch (APIManagementException e) {
-				throw new DeviceManagementException(
-						"Error occurred while initializing API Config '" +
-						apiConfig.getName() + "'", e);
-			}
-		}
-	}
-
-	private void publishAPIs() throws DeviceManagementException {
-		List<APIConfig> apiConfigs =
-				MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig().
-						getApiPublisherConfig().getAPIs();
-		for (APIConfig apiConfig : apiConfigs) {
-			DeviceManagementAPIPublisherUtil.publishAPI(apiConfig);
-		}
-	}
-
-	private void removeAPIs() throws DeviceManagementException {
-		List<APIConfig> apiConfigs =
-				MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig().
-						getApiPublisherConfig().getAPIs();
-		for (APIConfig apiConfig : apiConfigs) {
-			DeviceManagementAPIPublisherUtil.removeAPI(apiConfig);
-		}
-	}
-
-	protected void setAPIManagerConfigurationService(APIManagerConfigurationService service) {
-		//do nothing
-	}
-
-	protected void unsetAPIManagerConfigurationService(APIManagerConfigurationService service) {
-		//do nothing
-	}
+            this.removeAPIs();
+            if (log.isDebugEnabled()) {
+                log.debug(
+                        "Mobile Device Management Service Component has been successfully de-activated");
+            }
+        } catch (Throwable e) {
+            log.error("Error occurred while de-activating Mobile Device Management bundle", e);
+        }
+    }
+
+    private void removeAPIs() throws DeviceManagementException {
+        List<APIConfig> apiConfigs =
+                MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig().
+                        getApiPublisherConfig().getAPIs();
+        for (APIConfig apiConfig : apiConfigs) {
+            DeviceManagementAPIPublisherUtil.removeAPI(apiConfig);
+        }
+    }
+
+    protected void setAPIManagerConfigurationService(APIManagerConfigurationService service) {
+        //do nothing
+    }
+
+    protected void unsetAPIManagerConfigurationService(APIManagerConfigurationService service) {
+        //do nothing
+    }
 
 }
diff --git a/product/modules/distribution/src/assembly/filter.properties b/product/modules/distribution/src/assembly/filter.properties
index 19404cf6e..6910642d5 100644
--- a/product/modules/distribution/src/assembly/filter.properties
+++ b/product/modules/distribution/src/assembly/filter.properties
@@ -1,5 +1,5 @@
 product.name=WSO2 Mobile Device Manager
-product.version=1.0.0-SNAPSHOT
+product.version=2.0.0-SNAPSHOT
 product.key=MDM
 hotdeployment=true
 hotupdate=true