diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java
index b5f19808b..66420e82d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java
@@ -21,4 +21,7 @@ public class MobilePluginConstants {
     public static final String MOBILE_DB_SCRIPTS_FOLDER = "cdm";
     public static final String MOBILE_CONFIG_REGISTRY_ROOT = "/_system/config";
 
+    public static final String MEDIA_TYPE_XML = "application/xml";
+    public static final String CHARSET_UTF8 = "UTF8";
+
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
index 0417af08e..d4e064ef4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java
@@ -27,11 +27,11 @@ import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager;
 import org.wso2.carbon.device.mgt.extensions.license.mgt.registry.RegistryBasedLicenseManager;
 import org.wso2.carbon.device.mgt.mobile.common.MobileDeviceMgtPluginException;
+import org.wso2.carbon.device.mgt.mobile.common.MobilePluginConstants;
 import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.mobile.dto.MobileDevice;
 import org.wso2.carbon.device.mgt.mobile.impl.android.dao.AndroidDAOFactory;
-import org.wso2.carbon.device.mgt.mobile.impl.android.util.AndroidPluginConstants;
 import org.wso2.carbon.device.mgt.mobile.impl.android.util.AndroidPluginUtils;
 import org.wso2.carbon.device.mgt.mobile.util.MobileDeviceManagementUtil;
 import org.wso2.carbon.registry.api.RegistryException;
@@ -91,7 +91,7 @@ public class AndroidDeviceManager implements DeviceManager {
 
 			resource = MobileDeviceManagementUtil.getRegistry().newResource();
 			resource.setContent(writer.toString());
-			resource.setMediaType(AndroidPluginConstants.MEDIA_TYPE_XML);
+			resource.setMediaType(MobilePluginConstants.MEDIA_TYPE_XML);
 			MobileDeviceManagementUtil.putRegistryResource(resourcePath, resource);
 			status = true;
 		} catch (MobileDeviceMgtPluginException e) {
@@ -99,10 +99,10 @@ public class AndroidDeviceManager implements DeviceManager {
 					"Error occurred while retrieving the Registry instance : " + e.getMessage(), e);
 		} catch (RegistryException e) {
 			throw new DeviceManagementException(
-					"Error occurred while persisting the Registry resource : " + e.getMessage(), e);
+					"Error occurred while persisting the Registry resource of Android Configuration : " + e.getMessage(), e);
 		} catch (JAXBException e) {
 			throw new DeviceManagementException(
-					"Error occurred while parsing the configuration : " + e.getMessage(), e);
+					"Error occurred while parsing the Android configuration : " + e.getMessage(), e);
 		}
 		return status;
 	}
@@ -119,17 +119,17 @@ public class AndroidDeviceManager implements DeviceManager {
 			Unmarshaller unmarshaller = context.createUnmarshaller();
 			return (TenantConfiguration) unmarshaller.unmarshal(
 					new StringReader(new String((byte[]) resource.getContent(), Charset
-							.forName("UTF8"))));
+							.forName(MobilePluginConstants.CHARSET_UTF8))));
 
 		} catch (MobileDeviceMgtPluginException e) {
 			throw new DeviceManagementException(
 					"Error occurred while retrieving the Registry instance : " + e.getMessage(), e);
 		} catch (JAXBException e) {
 			throw new DeviceManagementException(
-					"Error occurred while parsing the configuration : " + e.getMessage(), e);
+					"Error occurred while parsing the Android configuration : " + e.getMessage(), e);
 		} catch (RegistryException e) {
 			throw new DeviceManagementException(
-					"Error occurred while retrieving the Registry resource : " + e.getMessage(), e);
+					"Error occurred while retrieving the Registry resource of Android Configuration : " + e.getMessage(), e);
 		}
 	}
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidPluginConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidPluginConstants.java
index 3666d75f4..56837f259 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidPluginConstants.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidPluginConstants.java
@@ -44,6 +44,4 @@ public class AndroidPluginConstants {
 	public static final String ANDROID_FEATURE_NAME = "NAME";
 	public static final String ANDROID_FEATURE_DESCRIPTION = "DESCRIPTION";
 
-	public static final String MEDIA_TYPE_XML = "application/xml";
-
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java
index e744e8e82..d7dbe3e61 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java
@@ -26,12 +26,23 @@ import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager;
 import org.wso2.carbon.device.mgt.extensions.license.mgt.registry.RegistryBasedLicenseManager;
+import org.wso2.carbon.device.mgt.mobile.common.MobileDeviceMgtPluginException;
+import org.wso2.carbon.device.mgt.mobile.common.MobilePluginConstants;
 import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.mobile.dto.MobileDevice;
 import org.wso2.carbon.device.mgt.mobile.impl.windows.dao.WindowsDAOFactory;
 import org.wso2.carbon.device.mgt.mobile.util.MobileDeviceManagementUtil;
-
+import org.wso2.carbon.registry.api.RegistryException;
+import org.wso2.carbon.registry.api.Resource;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
 import java.util.List;
 
 public class WindowsDeviceManager implements DeviceManager {
@@ -54,12 +65,62 @@ public class WindowsDeviceManager implements DeviceManager {
     @Override
     public boolean saveConfiguration(TenantConfiguration tenantConfiguration)
             throws DeviceManagementException {
-        return false;
+        boolean status = false;
+        Resource resource;
+        try {
+            if (log.isDebugEnabled()) {
+                log.debug("Persisting windows configurations in Registry");
+            }
+            String resourcePath = MobileDeviceManagementUtil.getPlatformConfigPath(
+                    DeviceManagementConstants.
+                            MobileDeviceTypes.MOBILE_DEVICE_TYPE_WINDOWS);
+            StringWriter writer = new StringWriter();
+            JAXBContext context = JAXBContext.newInstance(TenantConfiguration.class);
+            Marshaller marshaller = context.createMarshaller();
+            marshaller.marshal(tenantConfiguration, writer);
+
+            resource = MobileDeviceManagementUtil.getRegistry().newResource();
+            resource.setContent(writer.toString());
+            resource.setMediaType(MobilePluginConstants.MEDIA_TYPE_XML);
+            MobileDeviceManagementUtil.putRegistryResource(resourcePath, resource);
+            status = true;
+        } catch (MobileDeviceMgtPluginException e) {
+            throw new DeviceManagementException(
+                    "Error occurred while retrieving the Registry instance : " + e.getMessage(), e);
+        } catch (RegistryException e) {
+            throw new DeviceManagementException(
+                    "Error occurred while persisting the Registry resource of Windows configuration : " + e.getMessage(), e);
+        } catch (JAXBException e) {
+            throw new DeviceManagementException(
+                    "Error occurred while parsing the Windows configuration : " + e.getMessage(), e);
+        }
+        return status;
     }
 
     @Override
     public TenantConfiguration getConfiguration() throws DeviceManagementException {
-        return null;
+        Resource resource;
+        try {
+            String androidRegPath =
+                    MobileDeviceManagementUtil.getPlatformConfigPath(DeviceManagementConstants.
+                                                                             MobileDeviceTypes.MOBILE_DEVICE_TYPE_WINDOWS);
+            resource = MobileDeviceManagementUtil.getRegistryResource(androidRegPath);
+            JAXBContext context = JAXBContext.newInstance(TenantConfiguration.class);
+            Unmarshaller unmarshaller = context.createUnmarshaller();
+            return (TenantConfiguration) unmarshaller.unmarshal(
+                    new StringReader(new String((byte[]) resource.getContent(), Charset
+                            .forName(MobilePluginConstants.CHARSET_UTF8))));
+
+        } catch (MobileDeviceMgtPluginException e) {
+            throw new DeviceManagementException(
+                    "Error occurred while retrieving the Registry instance : " + e.getMessage(), e);
+        } catch (JAXBException e) {
+            throw new DeviceManagementException(
+                    "Error occurred while parsing the Windows configuration : " + e.getMessage(), e);
+        } catch (RegistryException e) {
+            throw new DeviceManagementException(
+                    "Error occurred while retrieving the Registry resource of Windows configuration : " + e.getMessage(), e);
+        }
     }
 
     @Override