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 2ba4c9abc..93337f0a2 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,13 +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.OS_VERSION.equals(os) && FEDERATED.equals(getAuthPolicy())) {
-            discoveryResponse = new DiscoveryResponse();
 
+        if (!PluginConstants.WindowsVersionProperties.REQUESTED_WIN81_VERSION.equals(discoveryRequest.getVersion())
+                && FEDERATED.equals(getAuthPolicy())) {
+            discoveryResponse = new DiscoveryResponse();
             discoveryResponse.setAuthPolicy(FEDERATED);
             discoveryResponse.setEnrollmentVersion(PluginConstants.WindowsVersionProperties.REQUESTED_WIN10_VERSION);
             discoveryResponse.setEnrollmentPolicyServiceUrl(PluginConstants.Discovery.DEVICE_ENROLLMENT_SUBDOMAIN +
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..68fac756c 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,16 @@ 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)
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ContextItem", namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE,
+        propOrder = {"Name", "Value"})
 public class ContextItem {
 
-    @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
+    @XmlAttribute(name = "Name", required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
     protected String Name;
-    @XmlElement(required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
+    @XmlElement(name = "Value", required = true, namespace = PluginConstants.SOAP_AUTHORIZATION_TARGET_NAMESPACE)
     protected String Value;
 
     public String getValue() {
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.policy-view/public/templates/windows-policy-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.policy-view/public/templates/windows-policy-view.hbs
index 2d6c205ef..503c31dd5 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.policy-view/public/templates/windows-policy-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.policy-view/public/templates/windows-policy-view.hbs
@@ -295,114 +295,5 @@
             </div>
         </div>
         <!-- /encrypt-storage -->
-
-        <!--app-restriction-->
-        <div class="wr-hidden-operation" data-operation="app-restriction">
-            <div class="panel panel-default operation-data" data-operation="app-restriction"
-                 data-operation-code="APP-RESTRICTION">
-                <div id="app-restriction-heading" class="panel-heading" role="tab">
-                    <h2 class="sub-title panel-title">
-                        Application Restriction Settings
-                        <label class="wr-input-control switch hidden" data-toggle="collapse"
-                               data-target="#app-restriction-body">
-                            <input type="checkbox"/>
-                            <span class="helper"></span>
-                            <span class="text"></span>
-                        </label>
-                    </h2>
-                    <div class="panel-title-description">
-                        This configuration can be used to create a black list or white list of applications.
-                    </div>
-                </div>
-                <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="app-restriction-body">
-                    <hr/>
-                    <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
-                        <i class="icon fw fw-error"></i><span></span>
-                    </div>
-
-                    <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType"
-                            disabled>
-                        <option value="" selected="selected">
-                            None
-                        </option>
-                        <option value="black-list">Black List</option>
-                        <option value="white-list">White List</option>
-                    </select>
-                    <br>
-                    <div class="wr-input-control">
-                        <label class="wr-input-label" for="restricted-applications">
-                            Restricted Application List
-                            <span class="helper" title="Add an application to restrict.">
-                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
-                            </span>
-                            <br>
-                            <br>
-                            <a href="#restricted-applications-grid" class="grid-input-add hidden"
-                               data-click-event="add-form">
-                                <span class="icon fw-stack">
-                                    <i class="fw fw-add fw-stack-1x"></i>
-                                    <i class="fw fw-circle-outline fw-stack-2x"></i>
-                                </span>
-
-                                Add Application
-                            </a>
-                        </label>
-                        <div id="restricted-applications"
-                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
-                             data-key="restrictedApplications" data-column-count="2">
-                            <table class="table table-responsive table-striped">
-                                <thead>
-                                <tr>
-                                    <th>No:</th>
-                                    <th>Application Name/Description</th>
-                                    <th>Package Name</th>
-                                    <th></th>
-                                </tr>
-                                </thead>
-                                <tbody data-add-form-container="#restricted-applications-grid">
-                                <tr data-help-text="add-form">
-                                    <td colspan="4">
-                                        No entries added yet .
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                            <table class="template hidden">
-                                <tbody data-add-form="#restricted-applications-grid">
-                                <tr data-add-form-element="clone">
-                                    <td data-title="No:">
-                                        <span class="index"></span>
-                                    </td>
-                                    <td data-title="App Name">
-                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
-                                               maxlength="100" data-default=""
-                                               placeholder="[ Application Name or Description ]" disabled/>
-                                    </td>
-                                    <td data-title="Package Name">
-                                        <input type="text" class="form-control grid-input-text"
-                                               data-child-key="packageName" maxlength="100" data-default=""
-                                               placeholder="[ Package Name of Application ]" disabled/>
-                                    </td>
-                                    <td>
-                                            <span class="list-group-item-actions hidden">
-                                                <a href="#restricted-applications-grid" class="grid-input-remove"
-                                                   data-click-event="remove-form">
-                                                    <span class="fw-stack helper" title="Remove Entry">
-                                                        <i class="fw fw-circle-outline fw-stack-2x"></i>
-                                                        <i class="fw fw-delete fw-stack-1x"></i>
-                                                    </span>
-                                                </a>
-                                            </span>
-                                    </td>
-                                </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <!--/app-restriction-->
     </div>
 </div>
\ No newline at end of file