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 2081ae6ef..2e1e3b2ec 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
@@ -2,14 +2,9 @@
     <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>
-<!--
-		<property name="ContentType" value="application/xml" scope="axis2"/>
-		<property name="messageType" value="application/xml" scope="axis2"/>
-		 <property name="DISABLE_CHUNKING" value="true" scope="axis2" />
--->
-
                     <send>
                         <endpoint name="admin--Windows 10 Device management_APIproductionEndpoint_0">
                             <http uri-template="https://localhost:9443/api/device-mgt/windows/v1.0/management/devicemgt"/>
@@ -24,10 +19,6 @@
         </inSequence>
         <outSequence>
             <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
-<!--
-	    <property name="ContentType" value="application/vnd.syncml.dm+xml" scope="axis2"/>
-	    <property name="messageType" value="application/vnd.syncml.dm+xml" 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_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 ced6d1129..648089b83 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
@@ -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>
@@ -25,20 +26,8 @@
     </resource>
     <handlers>
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-        <!--handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+        <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_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
index 771f35509..af46dfc72 100644
--- 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
@@ -2,6 +2,7 @@
     <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>
@@ -26,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_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
index 2be45de64..74724bd8c 100644
--- 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
@@ -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>
@@ -26,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_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 7bab00a0f..3052fa8cf 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
@@ -42,3 +42,52 @@
         <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>
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 4b6e550a6..1806cf1dd 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
@@ -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>
@@ -25,20 +26,8 @@
     </resource>
     <handlers>
         <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.APIMgtLatencyStatsHandler"/>
-        <!--handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+        <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>