diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java
index 27a7b479e..bebdafe00 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/common/PluginConstants.java
@@ -342,6 +342,7 @@ public final class PluginConstants {
         }
         public static final String REQUESTED_WIN10_VERSION = "3.0";
         public static final String REQUESTED_WIN81_VERSION = "2.0";
+        public static final String OS_VERSION = "10";
     }
 
     /**
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
index 5461cf3c0..936b353ac 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
@@ -76,7 +76,7 @@ import java.util.List;
                         name = "Un-enroll Device",
                         description = "Unregister an Windows device",
                         key = "perm:windows:disenroll",
-                        permissions = {"/device-mgt/devices/disenroll/windows"}
+                        permissions = {"/device-mgt/devices/owning-device/operations/windows/disenroll"}
                 ),
                 @Scope(
                         name = "Factory Reset",
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java
index 06ff00717..602403cd6 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementService.java
@@ -21,11 +21,14 @@ package org.wso2.carbon.device.mgt.mobile.windows.api.services;
 
 import io.swagger.annotations.*;
 import org.w3c.dom.Document;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WindowsConfigurationException;
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.exceptions.WindowsDeviceEnrolmentException;
 import org.wso2.carbon.device.mgt.mobile.windows.api.operations.WindowsOperationException;
+import org.wso2.carbon.device.mgt.mobile.windows.api.operations.util.Constants;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -38,25 +41,17 @@ import javax.ws.rs.core.Response;
 /**
  * Interface for Windows 10 Device management phase.
  */
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows 10 Device management"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/management/devicemgt"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
+@Path("/devicemgt")
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Pending operations",
+                        description = "Register an Android device",
+                        key = "perm:windows:enroll",
+                        permissions = {"/device-mgt/devices/enroll/windows"}
+                )
         }
 )
-@Api(value = "Windows 10 Device management",
-        description = "This carries all the resources related to Windows 10 management session message flow.")
-@Path("/devicemgt")
 public interface DeviceManagementService {
     @Path("/pending-operations")
     @POST
@@ -68,14 +63,10 @@ public interface DeviceManagementService {
             notes = "Using this API to fetching more information to enroll the Device and " +
                     "getting pending operations.",
             tags = "Windows Device Management Administrative Service",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(
-                                    scope = "/device-mgt/devices/enroll/windows",
-                                    description = "Getting pending operations and " +
-                                            "device information to enroll the device")}
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:android:enroll")
+                    })
             }
     )
     @ApiResponses(value = {
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/DiscoveryService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/DiscoveryService.java
index db9a8125d..2b856cb85 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/DiscoveryService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/DiscoveryService.java
@@ -42,24 +42,7 @@ import javax.xml.ws.soap.SOAPBinding;
 /**
  * Interface for Discovery service related operations.
  */
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows Discovery Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/discovery/post"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-@Api(value = "Windows Discovery Service",
-        description = "This carries all the resources related to Windows Discovery service.")
+
 @WebService(targetNamespace = PluginConstants.DISCOVERY_SERVICE_TARGET_NAMESPACE,
         name = "IDiscoveryService")
 @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/beans/DiscoveryRequest.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/beans/DiscoveryRequest.java
index 2c8260fb9..d6e3a185e 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/beans/DiscoveryRequest.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/beans/DiscoveryRequest.java
@@ -86,4 +86,13 @@ public class DiscoveryRequest implements Serializable {
         this.osEdition = osEdition;
     }
 
-}
\ No newline at end of file
+    public String getApplicationVersion() {
+        return applicationVersion;
+    }
+
+    public void setApplicationVersion(String applicationVersion) {
+        this.applicationVersion = applicationVersion;
+    }
+
+
+}
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/impl/DiscoveryServiceImpl.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/impl/DiscoveryServiceImpl.java
index 08e69af07..2ba4c9abc 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/impl/DiscoveryServiceImpl.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/discovery/impl/DiscoveryServiceImpl.java
@@ -68,9 +68,11 @@ public class DiscoveryServiceImpl implements DiscoveryService {
         String emailId = discoveryRequest.getEmailId();
         String[] userDomains = emailId.split(DELIMITER);
         String domain = userDomains[DOMAIN_SEGMENT];
+        String applicationVersion = discoveryRequest.getApplicationVersion();
+        String[] osVersions = applicationVersion .split("\\.");
+        String os = osVersions[0];
         DiscoveryResponse discoveryResponse;
-        if (PluginConstants.WindowsVersionProperties.REQUESTED_WIN10_VERSION.equals(discoveryRequest.getVersion()) &&
-                FEDERATED.equals(getAuthPolicy())) {
+        if (PluginConstants.WindowsVersionProperties.OS_VERSION.equals(os) && FEDERATED.equals(getAuthPolicy())) {
             discoveryResponse = new DiscoveryResponse();
 
             discoveryResponse.setAuthPolicy(FEDERATED);
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/enrollment/EnrollmentService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/enrollment/EnrollmentService.java
index 42af80541..cb3e38091 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/enrollment/EnrollmentService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/enrollment/EnrollmentService.java
@@ -35,25 +35,6 @@ import javax.xml.ws.ResponseWrapper;
 import javax.xml.ws.soap.SOAPBinding;
 import java.io.UnsupportedEncodingException;
 
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @io.swagger.annotations.Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows 10 Enrollment Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/deviceenrolment/enrollment"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-@Api(value = "Windows 10 Enrollment Service",
-        description = "This carries all the resources related to Windows enrollment.")
-
 @WebService(targetNamespace = PluginConstants.DEVICE_ENROLLMENT_SERVICE_TARGET_NAMESPACE, name = "enrollment")
 @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
 public interface EnrollmentService {
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/DeviceManagementServiceImpl.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/DeviceManagementServiceImpl.java
index f754ff80c..38dfde51d 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/DeviceManagementServiceImpl.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/DeviceManagementServiceImpl.java
@@ -89,7 +89,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
 
                         if (modifyEnrollWithMoreDetail(request)) {
                             pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
-                            response = operationReply.generateReply(syncmlDocument,pendingOperations);
+                            response = operationReply.generateReply(syncmlDocument, pendingOperations);
                             return Response.status(Response.Status.OK).entity(response).build();
                         } else {
                             String msg = "Error occurred in while modify the enrollment.";
@@ -101,7 +101,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                         log.error(msg);
                         return Response.status(Response.Status.UNAUTHORIZED).entity(msg).build();
                     }
-                } else  {
+                } else {
                     if ((syncmlDocument.getBody().getAlert() != null)) {
                         if (!syncmlDocument.getBody().getAlert().getData().equals(Constants.DISENROLL_ALERT_DATA)) {
                             pendingOperations = operationHandler.getPendingOperations(syncmlDocument);
@@ -155,8 +155,8 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
     private boolean modifyEnrollWithMoreDetail(Document request) throws WindowsDeviceEnrolmentException,
             WindowsOperationException {
 
-        String devMan;
-        String devMod;
+        String devMan = null;
+        String devMod = null;
         boolean status = false;
         String user;
         SyncmlDocument syncmlDocument;
@@ -165,8 +165,15 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             syncmlDocument = SyncmlParser.parseSyncmlPayload(request);
             ReplaceTag replace = syncmlDocument.getBody().getReplace();
             List<ItemTag> itemList = replace.getItems();
-            devMan = itemList.get(PluginConstants.SyncML.DEVICE_MAN_POSITION).getData();
-            devMod = itemList.get(PluginConstants.SyncML.DEVICE_MODEL_POSITION).getData();
+            for (ItemTag itemTag : itemList) {
+                String locURI = itemTag.getSource().getLocURI();
+                if (OperationCode.Info.MANUFACTURER.getCode().equals(locURI)) {
+                    devMan = itemTag.getData();
+                }
+                if (OperationCode.Info.DEVICE_MODEL.getCode().equals(locURI)) {
+                    devMod = itemTag.getData();
+                }
+            }
             user = syncmlDocument.getHeader().getSource().getLocName();
             AuthenticationInfo authenticationInfo = new AuthenticationInfo();
             authenticationInfo.setUsername(user);
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/syncml/SyncmlService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/syncml/SyncmlService.java
index 7ba8c570b..d165763ae 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/syncml/SyncmlService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/syncml/SyncmlService.java
@@ -37,24 +37,7 @@ import javax.ws.rs.core.Response;
 /**
  * Interface for Windows 8.1 enrollment flow.
  */
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows 8.1 Device Management Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/syncml"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-@Api(value = "Windows 8.1 Device Management Service",
-        description = "This carries all the resources related to Windows syncml message flow.")
+
 @Path("/devicemanagement")
 public interface SyncmlService {
 
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/wstep/CertificateEnrollmentService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/wstep/CertificateEnrollmentService.java
index eb6f7001a..1b29298b3 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/wstep/CertificateEnrollmentService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/wstep/CertificateEnrollmentService.java
@@ -41,24 +41,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * Interface of WSTEP implementation.
  */
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows 8.1 Enrollment Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/deviceenrolment/wstep"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-@Api(value = "Windows Enrollment service Management",
-        description = "This carries all the resources related to Windows enrollment service.")
+
 @WebService(targetNamespace = PluginConstants.DEVICE_ENROLLMENT_SERVICE_TARGET_NAMESPACE, name = "wstep")
 @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
 public interface CertificateEnrollmentService {
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/xcep/CertificateEnrollmentPolicyService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/xcep/CertificateEnrollmentPolicyService.java
index 0934824c9..91cb4de1c 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/xcep/CertificateEnrollmentPolicyService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/xcep/CertificateEnrollmentPolicyService.java
@@ -41,24 +41,6 @@ import javax.xml.ws.soap.SOAPBinding;
  * Interface for MS-XCEP implementation.
  */
 
-@SwaggerDefinition(
-        info = @Info(
-                version = "1.0.0",
-                title = "",
-                extensions = {
-                        @io.swagger.annotations.Extension(properties = {
-                                @ExtensionProperty(name = "name", value = "Windows Enrollment policy Service"),
-                                @ExtensionProperty(name = "context",
-                                        value = "/api/device-mgt/windows/v1.0/certificatepolicy/xcep"),
-                        })
-                }
-        ),
-        tags = {
-                @Tag(name = "windows", description = "")
-        }
-)
-@Api(value = "Windows Enrollment policy Service",
-        description = "This carries all the resources related to Windows enrollment policy.")
 @WebService(targetNamespace = PluginConstants.CERTIFICATE_ENROLLMENT_POLICY_SERVICE_TARGET_NAMESPACE,
 		name = "IPolicy")
 @BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
index fe897ac41..3e999e40d 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
@@ -140,12 +140,12 @@
                         class="hidden-sm">Device Location</span>
                 </a>
             </li>
-            <li role="presentation" class="list-group-item">
+            <!--li role="presentation" class="list-group-item">
                 <a href="#installed_applications_tab" role="tab" data-toggle="tab"
                    aria-controls="installed_applications_tab">
                     <i class="icon fw fw-application"></i><span class="hidden-sm">Installed Applications</span>
                 </a>
-            </li>
+            </li-->
         {{/zone}}
 
         {{#zone "device-details-tab-contents"}}
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/config.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/config.json
index ed2bc42ca..f5d01d0d7 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/config.json
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/config.json
@@ -3,79 +3,46 @@
         "label": "Windows",
         "category": "mobile",
         "scopes" : [
-          "perm:windows:enroll"
+          "perm:windows:enroll",
+            "perm:windows:lock-devices",
+            "perm:windows:ring",
+            "perm:windows:wipe",
+            "perm:windows:lock-reset",
+            "perm:windows:reboot",
+            "perm:windows:location",
+            "perm:windows:disenroll"
         ],
         "analyticsEnabled": "false",
         "groupingEnabled": "false",
         "features": {
             "DEVICE_RING": {
-                "icon": "fw-dial-up"
+                "icon": "fw-dial-up",
+                "permission": "/device-mgt/devices/owning-device/operations/android/ring"
             },
             "DEVICE_LOCK": {
-                "icon": "fw-lock"
+                "icon": "fw-lock",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/lock"
             },
             "DEVICE_LOCATION": {
-                "icon": "fw-map-location"
-            },
-            "CLEAR_PASSWORD": {
-                "icon": "fw-clear"
+                "icon": "fw-map-location",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/location"
             },
             "DEVICE_REBOOT": {
-                "icon": "fw-refresh"
-            },
-            "UPGRADE_FIRMWARE": {
-                "icon": "fw-hardware",
-                "formParams": [
-                    {
-                        "type": "checkbox",
-                        "id": "immediate",
-                        "optional": true,
-                        "label": "Instant Upgrade",
-                        "helper": "Once enabled, device firmware upgrade process will start instantly."
-                    },
-                    {
-                        "type": "text",
-                        "id": "schedule",
-                        "optional": false,
-                        "label": "Enter the date and time to schedule firmware upgrade."
-                    },
-                    {
-                        "type": "text",
-                        "id": "server",
-                        "optional": true,
-                        "label": "Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota)"
-                    }
-                ]
-            },
-            "DEVICE_MUTE": {
-                "icon": "fw-mute"
-            },
-            "NOTIFICATION": {
-                "icon": "fw-message",
-                "formParams": [
-                    {
-                        "type": "text",
-                        "id": "messageText",
-                        "optional": false,
-                        "label": "Title Here..."
-                    },
-                    {
-                        "type": "text",
-                        "id": "messageTitle",
-                        "optional": false,
-                        "label": "Message Here..."
-                    }
-                ]
+                "icon": "fw-refresh",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/reboot"
             },
             "LOCK_RESET": {
-                "icon": "fw-security"
+                "icon": "fw-security",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/lock-reset"
 
             },
             "DISENROLL": {
-                "icon": "fw-block"
+                "icon": "fw-block",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/disenroll"
             },
             "WIPE_DATA": {
-                "icon": "fw-delete"
+                "icon": "fw-delete",
+                "permission": "/device-mgt/devices/owning-device/operations/windows/wipe"
             }
         }
     }
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management.xml
new file mode 100644
index 000000000..84586a896
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 10 Device management" context="/api/device-mgt/windows/v1.0/management/devicemgt">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/management/devicemgt/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
new file mode 100644
index 000000000..dfbbd89b3
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Device_management_v1.0.0.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 10 Device management" context="/api/device-mgt/windows/v1.0/management/devicemgt/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/pending-operations" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows 10 Device management_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/management/devicemgt"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/management/devicemgt"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service.xml
new file mode 100644
index 000000000..e901919e3
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 10 Enrollment Service" context="/api/device-mgt/windows/v1.0/deviceenrolment/enrollment">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/deviceenrolment/enrollment/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
new file mode 100644
index 000000000..10e325d62
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 10 Enrollment Service" context="/api/device-mgt/windows/v1.0/deviceenrolment/enrollment/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows 10 Enrollment Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/enrollment"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/enrollment"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service.xml
new file mode 100644
index 000000000..e8756d3bd
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 8.1 Device Management Service" context="/api/device-mgt/windows/v1.0/syncml">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/syncml/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml
new file mode 100644
index 000000000..af46dfc72
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 8.1 Device Management Service" context="/api/device-mgt/windows/v1.0/syncml/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/request" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows 8.1 Device Management Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/syncml"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/syncml"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service.xml
new file mode 100644
index 000000000..57c18f375
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 8.1 Enrollment Service" context="/api/device-mgt/windows/v1.0/deviceenrolment/wstep">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/deviceenrolment/wstep/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml
new file mode 100644
index 000000000..74724bd8c
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows 8.1 Enrollment Service" context="/api/device-mgt/windows/v1.0/deviceenrolment/wstep/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows 8.1 Enrollment Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/wstep"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/deviceenrolment/wstep"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service.xml
new file mode 100644
index 000000000..63b9966e2
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Discovery Service" context="/api/device-mgt/windows/v1.0/discovery/post">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/discovery/post/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
new file mode 100644
index 000000000..dfcd34408
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Discovery_Service_v1.0.0.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Discovery Service" context="/api/device-mgt/windows/v1.0/discovery/post/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Discovery Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/discovery/post"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/discovery/post"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+    </handlers>
+</api>
\ No newline at end of file
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service.xml
new file mode 100644
index 000000000..9e2e438d6
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Enrollment policy Service" context="/api/device-mgt/windows/v1.0/certificatepolicy/xcep">
+    <resource methods="HEAD DELETE POST GET OPTIONS PATCH PUT" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+            <filter source="$ctx:isDefault" regex="true">
+                <then>
+                    <log level="custom">
+                        <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+                    </log>
+                    <payloadFactory media-type="xml">
+                        <format>
+                            <am:fault xmlns:am="http://wso2.org/apimanager">
+                                <am:code>500</am:code>
+                                <am:type>Status report</am:type>
+                                <am:message>Internal Server Error</am:message>
+                                <am:description>Faulty invoking through default API</am:description>
+                            </am:fault>
+                        </format>
+                        <args/>
+                    </payloadFactory>
+                    <property name="HTTP_SC" value="500" scope="axis2"/>
+                    <property name="RESPONSE" value="true"/>
+                    <header name="To" action="remove"/>
+                    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+                    <property name="ContentType" scope="axis2" action="remove"/>
+                    <property name="Authorization" scope="transport" action="remove"/>
+                    <property name="Host" scope="transport" action="remove"/>
+                    <property name="Accept" scope="transport" action="remove"/>
+                    <send/>
+                </then>
+                <else>
+                    <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                    <property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                    <send>
+                        <endpoint>
+                            <http uri-template="http://localhost:{uri.var.portnum}/api/device-mgt/windows/v1.0/certificatepolicy/xcep/1.0.0">
+                                <timeout>
+                                    <duration>60000</duration>
+                                    <responseAction>fault</responseAction>
+                                </timeout>
+                            </http>
+                        </endpoint>
+                    </send>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+    <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
new file mode 100644
index 000000000..63fcea443
--- /dev/null
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Enrollment policy Service" context="/api/device-mgt/windows/v1.0/certificatepolicy/xcep/1.0.0" version="1.0.0" version-type="context">
+    <resource methods="POST" url-mapping="/*" faultSequence="fault">
+        <inSequence>
+            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+            <property name="AM_KEY_TYPE" value="PRODUCTION" scope="default"/>
+            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
+                <then>
+                    <send>
+                        <endpoint name="admin--Windows Enrollment policy Service_APIproductionEndpoint_0">
+                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/certificatepolicy/xcep"/>
+                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/certificatepolicy/xcep"/>
+                        </endpoint>
+                    </send>
+                </then>
+                <else>
+                    <sequence key="_sandbox_key_error_"/>
+                </else>
+            </filter>
+        </inSequence>
+        <outSequence>
+            <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+            <property name="FORCE_HTTP_CONTENT_LENGTH" scope="axis2" value="true"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+            <property name="apiImplementationType" value="ENDPOINT"/>
+        </handler>
+    </handlers>
+</api>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
index 517a9fe0b..a20e4ec38 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
@@ -120,6 +120,13 @@
                        type="application/json">
             </Operation>
         </Feature>
+        <Feature code="DEVICE_REBOOT">
+            <Name>Reboot</Name>
+            <Description>Reboot the device</Description>
+            <Operation context="/api/device-mgt/windows/v1.0/admin/devices/reboot" method="POST"
+                       type="application/json">
+            </Operation>
+        </Feature>
         <Feature code="DEVICE_INFO">
             <Name>Device info</Name>
             <Description>Request device information</Description>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
index 2888d1ef1..95c8bcca6 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
@@ -7,7 +7,19 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../data
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/database/,target:${installFolder}/../../database/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/devicetypes/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/devicetypes/,target:${installFolder}/../../deployment/server/devicetypes/,overwrite:true);\
-
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_Discovery_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_Discovery_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_Discovery_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_Discovery_Service_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_Enrollment_policy_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_Enrollment_policy_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_Enrollment_policy_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_Enrollment_policy_Service_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Enrollment_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Enrollment_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Enrollment_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Enrollment_Service_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Device_management.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Device_management.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Device_management_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Device_management_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_10_Device_management.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_10_Device_management.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_8.1_Device_Management_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_8.1_Device_Management_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_8.1_Device_Management_Service_v1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_8.1_Enrollment_Service.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_8.1_Enrollment_Service.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/apis/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/admin--Windows_8.1_Enrollment_Service_v1.0.0.xml,overwrite:true);\
 
 instructions.unconfigure = \
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/api#device-mgt#windows#v1.0.war);\
@@ -27,5 +39,4 @@ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../dep
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.date-range-picker);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/windows);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../database/WSO2MobileWindows_DB.h2.db);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../.
-./deployment/server/devicetypes/windows.xml);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/devicetypes/windows.xml);\
\ No newline at end of file