diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/dao/impl/WindowsDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/dao/impl/WindowsDeviceDAOImpl.java
index 897eb7aece..237f881687 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/dao/impl/WindowsDeviceDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/dao/impl/WindowsDeviceDAOImpl.java
@@ -63,17 +63,21 @@ public class WindowsDeviceDAOImpl implements MobileDeviceDAO {
             while (rs.next()) {
                 mobileDevice = new MobileDevice();
                 mobileDevice.setMobileDeviceId(rs.getString(WindowsPluginConstants.MOBILE_DEVICE_ID));
-                mobileDevice.setVendor(rs.getString(WindowsPluginConstants.IMEI));
-                mobileDevice.setLatitude(rs.getString(WindowsPluginConstants.IMSI));
-                mobileDevice.setLongitude(rs.getString(WindowsPluginConstants.OS_VERSION));
-                mobileDevice.setImei(rs.getString(WindowsPluginConstants.DEVICE_MODEL));
-                mobileDevice.setImsi(rs.getString(WindowsPluginConstants.VENDOR));
+                mobileDevice.setImei(rs.getString(WindowsPluginConstants.IMEI));
+                mobileDevice.setImsi(rs.getString(WindowsPluginConstants.IMSI));
+                mobileDevice.setModel(rs.getString(WindowsPluginConstants.DEVICE_MODEL));
+                mobileDevice.setVendor(rs.getString(WindowsPluginConstants.VENDOR));
+                mobileDevice.setLatitude(rs.getString(WindowsPluginConstants.LATITUDE));
+                mobileDevice.setLongitude(rs.getString(WindowsPluginConstants.LONGITUDE));
+                mobileDevice.setSerial(rs.getString(WindowsPluginConstants.SERIAL));
                 mobileDevice.setOsVersion(rs.getString(WindowsPluginConstants.LATITUDE));
 
                 Map<String, String> propertyMap = new HashMap<String, String>();
                 propertyMap.put(WindowsPluginConstants.CHANNEL_URI, rs.getString(WindowsPluginConstants.CHANNEL_URI));
                 propertyMap.put(WindowsPluginConstants.DEVICE_INFO, rs.getString(WindowsPluginConstants.DEVICE_INFO));
+                propertyMap.put(WindowsPluginConstants.MAC_ADDRESS, rs.getString(WindowsPluginConstants.MAC_ADDRESS));
                 propertyMap.put(WindowsPluginConstants.DEVICE_NAME, rs.getString(WindowsPluginConstants.DEVICE_NAME));
+
                 mobileDevice.setDeviceProperties(propertyMap);
             }
             if (log.isDebugEnabled()) {