diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
index 482136f08..7bd38fee9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
@@ -54,11 +54,11 @@ public class MobileDeviceManagementUtil {
 			DocumentBuilder docBuilder = factory.newDocumentBuilder();
 			return docBuilder.parse(file);
 		} catch (Exception e) {
-			throw new DeviceManagementException(
-					"Error occurred while parsing file, while converting " +
-					"to a org.w3c.dom.Document : " + e.getMessage(), e);
+			throw new DeviceManagementException("Error occurred while parsing file, while converting " +
+			                                    "to a org.w3c.dom.Document : " + e.getMessage(), e);
 		}
 	}
+
 	private static String getPropertyValue(Device device, String property) {
 		for (Device.Property prop : device.getProperties()) {
 			if (property.equals(prop.getName())) {
@@ -78,6 +78,7 @@ public class MobileDeviceManagementUtil {
 		}
 		return prop;
 	}
+
 	public static MobileDevice convertToMobileDevice(Device device) {
 		MobileDevice mobileDevice = null;
 		if (device != null) {
@@ -114,8 +115,7 @@ public class MobileDeviceManagementUtil {
 		return device;
 	}
 
-	public static MobileOperation convertToMobileOperation(
-			org.wso2.carbon.device.mgt.common.Operation operation) {
+	public static MobileOperation convertToMobileOperation(org.wso2.carbon.device.mgt.common.Operation operation) {
 		MobileOperation mobileOperation = new MobileOperation();
 		MobileOperationProperty operationProperty = null;
 		List<MobileOperationProperty> properties = new LinkedList<MobileOperationProperty>();
@@ -135,18 +135,18 @@ public class MobileDeviceManagementUtil {
 	public static List<Integer> getMobileOperationIdsFromMobileDeviceOperations(
 			List<MobileDeviceOperationMapping> mobileDeviceOperationMappings) {
 		List<Integer> mobileOperationIds = new ArrayList<Integer>();
-		for(MobileDeviceOperationMapping mobileDeviceOperationMapping : mobileDeviceOperationMappings){
+		for (MobileDeviceOperationMapping mobileDeviceOperationMapping : mobileDeviceOperationMappings) {
 			mobileOperationIds.add(mobileDeviceOperationMapping.getOperationId());
 		}
 		return mobileOperationIds;
 	}
 
-	public static Operation convertMobileOperationToOperation(MobileOperation mobileOperation){
+	public static Operation convertMobileOperationToOperation(MobileOperation mobileOperation) {
 		Operation operation = new Operation();
 		Properties properties = new Properties();
 		operation.setCode(mobileOperation.getFeatureCode());
-		for(MobileOperationProperty mobileOperationProperty:mobileOperation.getProperties()){
-			properties.put(mobileOperationProperty.getProperty(),mobileOperationProperty.getValue());
+		for (MobileOperationProperty mobileOperationProperty : mobileOperation.getProperties()) {
+			properties.put(mobileOperationProperty.getProperty(), mobileOperationProperty.getValue());
 		}
 		operation.setProperties(properties);
 		return operation;
diff --git a/product/modules/distribution/src/repository/jaggeryapps/cdm/modules/device.js b/product/modules/distribution/src/repository/jaggeryapps/cdm/modules/device.js
index c208c91a4..13d77bc29 100644
--- a/product/modules/distribution/src/repository/jaggeryapps/cdm/modules/device.js
+++ b/product/modules/distribution/src/repository/jaggeryapps/cdm/modules/device.js
@@ -18,25 +18,30 @@
 
 var utility = require("/modules/utility.js");
 var DeviceIdentifier = Packages.org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+var DeviceManagerUtil = Packages.org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
 var log = new Log();
-
 var deviceManagementService = utility.getDeviceManagementService();
 
 var listDevices = function () {
+
     var devices = deviceManagementService.getAllDevices("android");
+
     var deviceList = [];
 
+
     for (i = 0; i < devices.size(); i++) {
         var device = devices.get(i);
+
+        var propertiesList = DeviceManagerUtil.convertPropertiesToMap(device.getProperties());
         deviceList.push({
             "identifier": device.getDeviceIdentifier(),
             "name": device.getName(),
             "ownership": device.getOwnership(),
             "owner": device.getOwner(),
             "deviceType": device.getType(),
-            "vendor": device.getProperties().get("vendor"),
-            "model": device.getProperties().get("model"),
-            "osVersion": device.getProperties().get("osVersion")
+            "vendor": propertiesList.get("vendor"),
+            "model": propertiesList.get("model"),
+            "osVersion": propertiesList.get("osVersion")
         });
     }
     return deviceList;
@@ -50,9 +55,11 @@ var getDevice = function(type, deviceId){
 }
 
 var viewDevice = function(type, deviceId){
+
     var device = this.getDevice(type, deviceId);
 
-    var entries = device.getProperties().entrySet();
+    var propertiesList = DeviceManagerUtil.convertPropertiesToMap(device.getProperties());
+    var entries = propertiesList.entrySet();
     var iterator = entries.iterator();
     var properties = {};
     while(iterator.hasNext()){
@@ -67,9 +74,9 @@ var viewDevice = function(type, deviceId){
         "ownership": device.getOwnership(),
         "owner": device.getOwner(),
         "deviceType": device.getType(),
-        "vendor": device.getProperties().get("vendor"),
-        "model": device.getProperties().get("model"),
-        "osVersion": device.getProperties().get("osVersion"),
+        "vendor": propertiesList.get("vendor"),
+        "model": propertiesList.get("model"),
+        "osVersion": propertiesList.get("osVersion"),
         "properties": properties
     };
 }
\ No newline at end of file