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/beans/AdditionalContext.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/beans/AdditionalContext.java
index fd62ef2ca..6ccb67774 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/beans/AdditionalContext.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/beans/AdditionalContext.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
-@XmlAccessorType(XmlAccessType.FIELD)
+@XmlAccessorType(XmlAccessType.PROPERTY)
 @XmlType(name = "OIDCollection", namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE,
         propOrder = {"contextitem"})
 @SuppressWarnings("unused")
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/beans/ContextItem.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/beans/ContextItem.java
index dbc690aa4..59bba8810 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/beans/ContextItem.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/beans/ContextItem.java
@@ -20,18 +20,15 @@ package org.wso2.carbon.device.mgt.mobile.windows.api.services.enrollment.beans;
 
 import org.wso2.carbon.device.mgt.mobile.windows.api.common.PluginConstants;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.*;
 
 @XmlAccessorType(XmlAccessType.PROPERTY)
 @XmlType(name = "ContextItem", namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
 public class ContextItem {
 
-    @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
+    @XmlAttribute(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
     protected String Name;
-    @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
+    @XmlValue
     protected String Value;
 
     public String getValue() {
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
index 2e1e3b2ec..dfbbd89b3 100644
--- 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
@@ -27,17 +27,5 @@
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
             <property name="apiImplementationType" value="ENDPOINT"/>
         </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
     </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
index 648089b83..10e325d62 100644
--- 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
@@ -20,7 +20,7 @@
         <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"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
             <send/>
         </outSequence>
     </resource>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml
deleted file mode 100644
index 640df9ea0..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Binary Security Token Service" context="/api/device-mgt/windows/v1.0/federated">
-    <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/federated/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_Binary_Security_Token_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_Binary_Security_Token_Service_v1.0.0.xml
deleted file mode 100644
index 830055ddf..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Binary_Security_Token_Service_v1.0.0.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Binary Security Token Service" context="/api/device-mgt/windows/v1.0/federated/1.0.0" version="1.0.0" version-type="context">
-    <resource methods="POST" url-mapping="/authentication" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Binary Security Token Service_APIproductionEndpoint_0">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/federated"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/federated"/>
-                        </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>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
-    </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_Configuration_Management.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml
deleted file mode 100644
index ecabcf446..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Configuration Management" context="/api/device-mgt/windows/v1.0/configuration">
-    <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/configuration/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_Configuration_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_Configuration_Management_v1.0.0.xml
deleted file mode 100644
index 2f5edcf76..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Configuration_Management_v1.0.0.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Configuration Management" context="/api/device-mgt/windows/v1.0/configuration/1.0.0" version="1.0.0" version-type="context">
-    <resource methods="PUT GET" url-mapping="/*" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Configuration Management_APIproductionEndpoint_0">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
-                        </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>
-    <resource methods="GET" url-mapping="/license" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Configuration Management_APIproductionEndpoint_1">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/configuration"/>
-                        </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>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
-    </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_Device_Management_Administrative_Service.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml
deleted file mode 100644
index 93a2834aa..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Device Management Administrative Service" context="/api/device-mgt/windows/v1.0/admin/devices">
-    <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/admin/devices/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_Device_Management_Administrative_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_Device_Management_Administrative_Service_v1.0.0.xml
deleted file mode 100644
index 73e001e5c..000000000
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/apis/admin--Windows_Device_Management_Administrative_Service_v1.0.0.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="admin--Windows Device Management Administrative Service" context="/api/device-mgt/windows/v1.0/admin/devices/1.0.0" version="1.0.0" version-type="context">
-    <resource methods="POST" url-mapping="/lock-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_0">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </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>
-    <resource methods="POST" url-mapping="/location" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_1">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </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>
-    <resource methods="POST" url-mapping="/reboot" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_2">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </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>
-    <resource methods="POST" url-mapping="/wipe-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_3">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </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>
-    <resource methods="POST" url-mapping="/ring-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_4">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </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>
-    <resource methods="POST" url-mapping="/disenroll-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_5">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </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>
-    <resource methods="POST" url-mapping="/lock-reset-devices" faultSequence="fault">
-        <inSequence>
-            <property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
-            <filter source="$ctx:AM_KEY_TYPE" regex="PRODUCTION">
-                <then>
-                    <send>
-                        <endpoint name="admin--Windows Device Management Administrative Service_APIproductionEndpoint_6">
-                            <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                            <property name="ENDPOINT_ADDRESS" value="https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices"/>
-                        </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>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
-    </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
index 3052fa8cf..dfcd34408 100644
--- 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
@@ -2,6 +2,7 @@
     <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>
@@ -28,66 +29,5 @@
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
             <property name="apiImplementationType" value="ENDPOINT"/>
         </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-            <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-            <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-            <property name="id" value="A"/>
-            <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-            <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-        </handler>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
     </handlers>
-</api>
-
-
-        <?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>
-    <!--
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.APIAuthenticationHandler"/>
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.throttling.APIThrottleHandler">
-                <property name="policyKey" value="gov:/apimgt/applicationdata/tiers.xml"/>
-                <property name="policyKeyApplication" value="gov:/apimgt/applicationdata/app-tiers.xml"/>
-                <property name="id" value="A"/>
-                <property name="policyKeyResource" value="gov:/apimgt/applicationdata/res-tiers.xml"/>
-            </handler>
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtUsageHandler"/>
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtGoogleAnalyticsTrackingHandler">
-                <property name="configKey" value="gov:/apimgt/statistics/ga-config.xml"/>
-            </handler>
-            <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerExtensionHandler"/>
-    -->
-</handlers>
-</api>
+</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_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
index 1806cf1dd..63fcea443 100644
--- 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
@@ -20,7 +20,7 @@
         <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"/>
+            <property name="COPY_CONTENT_LENGTH_FROM_INCOMING" value="true" scope="axis2"/>
             <send/>
         </outSequence>
     </resource>
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 e284e15ab..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
@@ -16,6 +16,10 @@ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../featur
 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);\