diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js
index fba0c0d83..950b6c500 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js
@@ -18,7 +18,7 @@
 
 $(document).ready(function () {
     invokerUtil.get(
-        "/devicemgt_admin/configuration",
+        "/api/device-mgt/android_sense/v1.0/configuration",
         function (data) {
             data = JSON.parse(data);
             if (data && data.configuration) {
@@ -52,7 +52,7 @@ var addConfiguration = function () {
     var errorMsgWrapper = "#android_sense-config-error-msg";
     var errorMsg = "#android_sense-config-error-msg span";
     var addConfigFormData = {};
-    var configList = new Array();
+    var configList = [];
     var mqttEp = $("input#mqtt-endpoint").val();
     var mqttConfig = {
         "name": "ANDROID_SENSE_MQTT_EP",
@@ -61,10 +61,10 @@ var addConfiguration = function () {
     };
 
     configList.push(mqttConfig);
-    addConfigFormData.type = "android_sense"
+    addConfigFormData.type = "android_sense";
     addConfigFormData.configuration = configList;
 
-    var addConfigAPI = "/devicemgt_admin/configuration";
+    var addConfigAPI = "/api/device-mgt/android_sense/v1.0/configuration";
     invokerUtil.post(
         addConfigAPI,
         addConfigFormData,
diff --git a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js
index 202eefaa3..b2f6a8fd5 100644
--- a/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js
+++ b/components/iot-plugins/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js
@@ -18,7 +18,7 @@
 
 $(document).ready(function () {
     invokerUtil.get(
-        "/devicemgt_admin/configuration",
+        "/api/device-mgt/arduino/v1.0/configuration",
         function (data) {
             data = JSON.parse(data);
             if (data && data.configuration) {
@@ -69,10 +69,10 @@ var addConfiguration = function () {
 
     configList.push(httpConfig);
     configList.push(httpsConfig);
-    addConfigFormData.type = "arduino"
+    addConfigFormData.type = "arduino";
     addConfigFormData.configuration = configList;
 
-    var addConfigAPI = "/devicemgt_admin/configuration";
+    var addConfigAPI = "/api/device-mgt/arduino/v1.0/configuration";
     invokerUtil.post(
         addConfigAPI,
         addConfigFormData,
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/public/js/policy-edit.js b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/public/js/policy-edit.js
index d42dd0109..edea5b06d 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/public/js/policy-edit.js
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.edit/public/js/policy-edit.js
@@ -248,7 +248,7 @@ var updatePolicy = function (policy, state) {
         payload["roles"] = [];
     }
 
-    var serviceURL = "/devicemgt_admin/policies/" + getParameterByName("id");
+    var serviceURL = "/api/device-mgt/v1.0/policies/" + getParameterByName("id");
     invokerUtil.put(
         serviceURL,
         payload,
@@ -257,7 +257,7 @@ var updatePolicy = function (policy, state) {
             if (state == "save"){
                 var policyList = [];
                 policyList.push(getParameterByName("id"));
-                serviceURL = "/devicemgt_admin/policies/inactivate";
+                serviceURL = "/api/device-mgt/v1.0/policies/inactivate";
                 invokerUtil.put(
                     serviceURL,
                     policyList,
@@ -274,7 +274,7 @@ var updatePolicy = function (policy, state) {
             }else if(state == "publish"){
                 var policyList = [];
                 policyList.push(getParameterByName("id"));
-                serviceURL = "/devicemgt_admin/policies/activate";
+                serviceURL = "/api/device-mgt/v1.0/policies/activate";
                 invokerUtil.put(
                     serviceURL,
                     policyList,
@@ -451,7 +451,7 @@ $(document).ready(function () {
             data: function (params) {
                 var postData = {};
                 postData.actionMethod = "GET";
-                postData.actionUrl = "/devicemgt_admin/users?q=ad";
+                postData.actionUrl = "/api/device-mgt/v1.0/users?q=ad";
                 postData.actionPayload = JSON.stringify({
                     q: params.term, // search term
                     page: params.page
@@ -479,7 +479,7 @@ $(document).ready(function () {
 
     var policyPayloadObj;
     invokerUtil.get(
-        "/devicemgt_admin/policies/" + getParameterByName("id"),
+        "/api/device-mgt/v1.0/policies/" + getParameterByName("id"),
         // on success
         function (data) {
             data = JSON.parse(data);
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.view/public/js/policy-view.js b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.view/public/js/policy-view.js
index 67e2c7f8a..ad5b87a5e 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.view/public/js/policy-view.js
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.view/public/js/policy-view.js
@@ -111,7 +111,7 @@ $(document).ready(function () {
 
     var policyPayloadObj;
     invokerUtil.get(
-        "/devicemgt_admin/policies/" + getParameterByName("id"),
+        "/api/device-mgt/v1.0/policies/" + getParameterByName("id"),
         // on success
         function (data) {
             // console.log("success: " + JSON.stringify(data));
diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/public/js/policy-create.js b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/public/js/policy-create.js
index 4c838a1c4..45e73a71e 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/public/js/policy-create.js
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.ui/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.policy.wizard/public/js/policy-create.js
@@ -241,9 +241,9 @@ var savePolicy = function (policy, state) {
 
     var serviceURL;
     if (state == "save") {
-        serviceURL = "/devicemgt_admin/policies/inactive-policy"
+        serviceURL = "/api/device-mgt/v1.0/policies/inactive-policy"
     } else if (state == "publish") {
-        serviceURL = "/devicemgt_admin/policies/active-policy"
+        serviceURL = "/api/device-mgt/v1.0/policies/active-policy"
     }
     invokerUtil.post(
             serviceURL,
@@ -414,7 +414,7 @@ $(document).ready(function () {
                                       data: function (params) {
                                           var postData = {};
                                           postData.actionMethod = "GET";
-                                          postData.actionUrl = "/devicemgt_admin/users";
+                                          postData.actionUrl = "/api/device-mgt/v1.0/users";
                                           postData.actionPayload = JSON.stringify({
                                                                                       q: params.term, // search term
                                                                                       page: params.page
@@ -442,7 +442,7 @@ $(document).ready(function () {
                                   templateSelection: formatRepoSelection // omitted for brevity, see the source of this page
                               });
 
-    $("#groups-input").select2({
+                            $("#groups-input").select2({
                                   multiple: true,
                                   tags: true,
                                   ajax: {
@@ -457,7 +457,7 @@ $(document).ready(function () {
                                           var postData = {};
                                           postData.actionMethod = "GET";
                                           var username = $("#platform").data("username");
-                                          postData.actionUrl = "/devicemgt_admin/groups/user/" + username +
+                                          postData.actionUrl = "/api/device-mgt/v1.0/groups/user/" + username +
                                                                "/search?groupName=" + params.term;
                                           return JSON.stringify(postData);
                                       },
diff --git a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js
index ca2136dbb..c82bba71b 100644
--- a/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js
+++ b/components/iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js
@@ -18,7 +18,7 @@
 
 $(document).ready(function () {
     invokerUtil.get(
-        "/devicemgt_admin/configuration",
+        "/api/device-mgt/raspberrypi/v1.0/configuration",
         function (data) {
             data = JSON.parse(data);
             if (data && data.configuration) {
@@ -79,10 +79,10 @@ var addConfiguration = function () {
     configList.push(httpConfig);
     configList.push(httpsConfig);
     configList.push(mqttConfig);
-    addConfigFormData.type = "raspberrypi"
+    addConfigFormData.type = "raspberrypi";
     addConfigFormData.configuration = configList;
 
-    var addConfigAPI = "/devicemgt_admin/configuration";
+    var addConfigAPI = "/api/device-mgt/raspberrypi/v1.0/configuration";
     invokerUtil.post(
         addConfigAPI,
         addConfigFormData,
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js
index 57013c1a3..19f1c9ff3 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js
@@ -18,7 +18,7 @@
 
 $(document).ready(function () {
     invokerUtil.get(
-        "/devicemgt_admin/configuration",
+        "/api/device-mgt/virtual_firealarm/v1.0/configuration",
         function (data) {
             data = JSON.parse(data);
             if (data && data.configuration) {
@@ -69,10 +69,10 @@ var addConfiguration = function () {
     configList.push(httpConfig);
     configList.push(httpsConfig);
     configList.push(mqttConfig);
-    addConfigFormData.type = "virtual_firealarm"
+    addConfigFormData.type = "virtual_firealarm";
     addConfigFormData.configuration = configList;
 
-    var addConfigAPI = "/devicemgt_admin/configuration";
+    var addConfigAPI = "/api/device-mgt/virtual_firealarm/v1.0/configuration";
     invokerUtil.post(
         addConfigAPI,
         addConfigFormData,
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
index 49c3512b9..20cf3c165 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
@@ -21,57 +21,265 @@
     var deviceIdentifier = deviceId.data("deviceid");
     var deviceType = deviceId.data("type");
     var payload = [deviceIdentifier];
-    var serviceUrl = "/mdm-android-agent/operation/device-info";
-    invokerUtil.post(serviceUrl, payload,
-        function (message) {
-            console.log(message);
-        }, function (message) {
-            console.log(message);
-        });
+    var operationTable;
+    if (deviceType == "ios") {
+        serviceUrl = "/ios/operation/deviceinfo";
+    } else if (deviceType == "android") {
+        //var serviceUrl = "/mdm-android-agent/operation/device-info";
+        serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info";
+    }
+    if (serviceUrl) {
+        invokerUtil.post(serviceUrl, payload,
+                         function (message) {
+                             console.log(message);
+                         }, function (message) {
+                console.log(message);
+            });
+    }
     $(document).ready(function () {
         $(".panel-body").removeClass("hidden");
         $("#loading-content").remove();
+
+        loadOperationsLog();
         loadApplicationsList();
+        loadPolicyCompliance();
+
+        $("#refresh-policy").click(function () {
+            $('#policy-spinner').removeClass('hidden');
+            loadPolicyCompliance();
+        });
 
         $("#refresh-apps").click(function () {
             $('#apps-spinner').removeClass('hidden');
             loadApplicationsList();
         });
+
+        $("#refresh-operations").click(function () {
+            $('#operations-spinner').removeClass('hidden');
+            loadOperationsLog(true);
+        });
         loadOperationBar(deviceType);
     });
 
+    function loadOperationsLog(update) {
+        var operationsLogTable = "#operations-log-table";
+        if (update) {
+            operationTable = $(operationsLogTable).DataTable();
+            operationTable.ajax.reload(false);
+            return;
+        }
+        operationTable = $(operationsLogTable)
+            .datatables_extended({
+                                     serverSide: true,
+                                     processing: false,
+                                     searching: false,
+                                     ordering: false,
+                                     pageLength: 10,
+                                     order: [],
+                                     ajax: {
+                                         url: context + "/api/operation/paginate",
+                                         data: {
+                                             deviceId: deviceIdentifier,
+                                             deviceType: deviceType
+                                         },
+                                         dataSrc: function (json) {
+                                             $("#operations-spinner").addClass(
+                                                 "hidden");
+                                             $("#operations-log-container").empty();
+                                             return json.data;
+                                         }
+                                     },
+                                     columnDefs: [
+                                         {targets: 0, data: "code"},
+                                         {
+                                             targets: 1,
+                                             data: "status",
+                                             render: function (status) {
+                                                 var html;
+                                                 switch (status) {
+                                                     case "COMPLETED" :
+                                                         html =
+                                                             "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
+                                                         break;
+                                                     case "PENDING" :
+                                                         html =
+                                                             "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
+                                                         break;
+                                                     case "ERROR" :
+                                                         html =
+                                                             "<span><i class='fw fw-error icon-danger'></i> Error</span>";
+                                                         break;
+                                                     case "IN_PROGRESS" :
+                                                         html =
+                                                             "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
+                                                         break;
+                                                     case "REPEATED" :
+                                                         html =
+                                                             "<span><i class='fw fw-ok icon-warning'></i> Repeated</span>";
+                                                         break;
+                                                 }
+                                                 return html;
+                                             }
+                                         },
+                                         {
+                                             targets: 2,
+                                             data: "createdTimeStamp",
+                                             render: function (date) {
+                                                 var value = String(date);
+                                                 return value.slice(0, 16);
+                                             }
+                                         }
+                                     ],
+                                     "createdRow": function (row, data) {
+                                         $(row).attr("data-type", "selectable");
+                                         $(row).attr("data-id", data["id"]);
+                                         $.each($("td", row),
+                                                function (colIndex) {
+                                                    switch (colIndex) {
+                                                        case 1:
+                                                            $(this).attr(
+                                                                "data-grid-label",
+                                                                "Code");
+                                                            $(this).attr(
+                                                                "data-display",
+                                                                data["code"]);
+                                                            break;
+                                                        case 2:
+                                                            $(this).attr(
+                                                                "data-grid-label",
+                                                                "Status");
+                                                            $(this).attr(
+                                                                "data-display",
+                                                                data["status"]);
+                                                            break;
+                                                        case 3:
+                                                            $(this).attr(
+                                                                "data-grid-label",
+                                                                "Created Timestamp");
+                                                            $(this).attr(
+                                                                "data-display",
+                                                                data["createdTimeStamp"]);
+                                                            break;
+                                                    }
+                                                }
+                                         );
+                                     }
+                                 });
+    }
+
     function loadApplicationsList() {
         var applicationsList = $("#applications-list");
-        var deviceListingSrc = applicationsList.attr("src");
+        var applicationListingTemplate = applicationsList.attr("src");
         var deviceId = applicationsList.data("device-id");
         var deviceType = applicationsList.data("device-type");
 
-        $.template("application-list", deviceListingSrc, function (template) {
-            var serviceURL = "/devicemgt_admin/operations/" + deviceType + "/" + deviceId + "/apps";
+        $.template("application-list", applicationListingTemplate, function (template) {
+            var serviceURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/" + deviceId + "/applications";
+            invokerUtil.get(
+                serviceURL,
+                // success-callback
+                function (data, textStatus, jqXHR) {
+                    if (jqXHR.status == 200 && data) {
+                        data = JSON.parse(data);
+                        $("#apps-spinner").addClass("hidden");
+                        if (data.length > 0) {
+                            for (var i = 0; i < data.length; i++) {
+                                data[i]["name"] = decodeURIComponent(data[i]["name"]);
+                                data[i]["platform"] = deviceType;
+                            }
 
-            var successCallback = function (data) {
-                data = JSON.parse(data);
-                $('#apps-spinner').addClass('hidden');
-                var viewModel = {};
-                if (data != null && data.length > 0) {
-                    for (var i = 0; i < data.length; i++) {
-                        data[i].name = data[i].name.replace(/[^\w\s]/gi, ' ');
-                        data[i].name = data[i].name.replace(/[0-9]/g, ' ');
+                            var viewModel = {};
+                            viewModel["applications"] = data;
+                            viewModel["deviceType"] = deviceType;
+                            var content = template(viewModel);
+                            $("#applications-list-container").html(content);
+                        } else {
+                            $("#applications-list-container").
+                            html("<div class='message message-info'><h4><i class='icon fw fw-info'></i>No applications found.</h4>" +
+                                 "<p>Please try refreshing the list in a while.</p></div>");
+                        }
                     }
-                }
-                viewModel.applications = data;
-                viewModel.deviceType = deviceType;
-                if (data.length > 0) {
-                    var content = template(viewModel);
-                    $("#applications-list-container").html(content);
-                }
-
-            };
-            invokerUtil.get(serviceURL,
-                successCallback, function (message) {
-                    console.log(message);
+                },
+                // error-callback
+                function () {
+                    $("#applications-list-container").
+                    html("<div class='panel-body'><br><p class='fw-warning'>&nbsp;Loading application list " +
+                         "was not successful. please try refreshing the list in a while.<p></div>");
                 });
         });
     }
 
+    function loadPolicyCompliance() {
+        var policyCompliance = $("#policy-view");
+        var policyComplianceTemplate = policyCompliance.attr("src");
+        var deviceId = policyCompliance.data("device-id");
+        var deviceType = policyCompliance.data("device-type");
+        var activePolicy = null;
+
+        $.template(
+            "policy-view",
+            policyComplianceTemplate,
+            function (template) {
+                var getEffectivePolicyURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/" + deviceId + "/effective-policy";
+                var getDeviceComplianceURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/" + deviceId + "/compliance-data";
+
+                invokerUtil.get(
+                    getEffectivePolicyURL,
+                    // success-callback
+                    function (data, textStatus, jqXHR) {
+                        if (jqXHR.status == 200 && data) {
+                            data = JSON.parse(data);
+                            $("#policy-spinner").addClass("hidden");
+                            if (data["active"] == true) {
+                                activePolicy = data;
+                                invokerUtil.get(
+                                    getDeviceComplianceURL,
+                                    // success-callback
+                                    function (data, textStatus, jqXHR) {
+                                        if (jqXHR.status == 200 && data) {
+                                            var viewModel = {};
+                                            viewModel["policy"] = activePolicy;
+                                            viewModel["deviceType"] = deviceType;
+                                            data = JSON.parse(data);
+                                            var content;
+                                            if (data["complianceData"]) {
+                                                if (data["complianceData"]["complianceFeatures"] &&
+                                                    data["complianceData"]["complianceFeatures"].length > 0) {
+                                                    viewModel["compliance"] = "NON-COMPLIANT";
+                                                    viewModel["complianceFeatures"] = data["complianceData"]["complianceFeatures"];
+                                                    content = template(viewModel);
+                                                    $("#policy-list-container").html(content);
+                                                } else {
+                                                    viewModel["compliance"] = "COMPLIANT";
+                                                    content = template(viewModel);
+                                                    $("#policy-list-container").html(content);
+                                                    $("#policy-compliance-table").addClass("hidden");
+                                                }
+                                            } else {
+                                                $("#policy-list-container").
+                                                html("<div class='panel-body'><br><p class='fw-warning'> This device " +
+                                                     "has no policy applied.<p></div>");
+                                            }
+                                        }
+                                    },
+                                    // error-callback
+                                    function () {
+                                        $("#policy-list-container").
+                                        html("<div class='panel-body'><br><p class='fw-warning'> Loading policy compliance related data " +
+                                             "was not successful. please try refreshing data in a while.<p></div>");
+                                    }
+                                );
+                            }
+                        }
+                    },
+                    // error-callback
+                    function () {
+                        $("#policy-list-container").
+                        html("<div class='panel-body'><br><p class='fw-warning'> Loading policy compliance related data " +
+                             "was not successful. please try refreshing data in a while.<p></div>");
+                    }
+                );
+            }
+        );
+    }
 }());
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/public/js/policy-create.js
index a51ae295d..0f18bad58 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/public/js/policy-create.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.wizard/public/js/policy-create.js
@@ -1822,13 +1822,13 @@ stepForwardFrom["policy-naming-publish"] = function () {
     policy["policyName"] = $("#policy-name-input").val();
     policy["description"] = $("#policy-description-input").val();
     //All data is collected. Policy can now be updated.
-    savePolicy(policy, "/devicemgt_admin/policies/active-policy");
+    savePolicy(policy, "/api/device-mgt/v1.0/policies/active-policy");
 };
 stepForwardFrom["policy-naming"] = function () {
     policy["policyName"] = $("#policy-name-input").val();
     policy["description"] = $("#policy-description-input").val();
     //All data is collected. Policy can now be updated.
-    savePolicy(policy, "/devicemgt_admin/policies/inactive-policy");
+    savePolicy(policy, "/api/device-mgt/v1.0/policies/inactive-policy");
 };
 
 var savePolicy = function (policy, serviceURL) {
@@ -2058,9 +2058,9 @@ $(document).ready(function () {
             data: function (params) {
                 var postData = {};
                 postData.actionMethod = "GET";
-                postData.actionUrl = "/devicemgt_admin/users";
+                postData.actionUrl = "/api/device-mgt/v1.0/users/search/usernames";
                 postData.actionPayload = JSON.stringify({
-                    q: params.term, // search term
+                    filter: params.term, // search term
                     page: params.page
                 });
 
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/constants.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/constants.js
index 862a66ce0..ee9c63977 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/constants.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/modules/constants.js
@@ -18,7 +18,7 @@
 
 var WEB_APP_TITLE = "WSO2 CDM";
 var WEB_APP_CONTEXT = "/devicemgt";
-var ADMIN_SERVICE_CONTEXT = "/devicemgt_admin";
+var ADMIN_SERVICE_CONTEXT = "/api/device-mgt/v1.0";
 var USER_SESSION_KEY = "_UUF_USER";
 var UNSPECIFIED = "Unspecified";
 var httpURL = "httpURL";
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.device-view/public/js/device-detail.js 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.device-view/public/js/device-detail.js
index aa2384fc3..5f9c788de 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.device-view/public/js/device-detail.js
+++ 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.device-view/public/js/device-detail.js
@@ -23,9 +23,10 @@
     var payload = [deviceIdentifier];
     var operationTable;
     if (deviceType == "ios") {
-        var serviceUrl = "/ios/operation/deviceinfo";
+        serviceUrl = "/ios/operation/deviceinfo";
     } else if (deviceType == "android") {
-        var serviceUrl = "/mdm-android-agent/operation/device-info";
+        //var serviceUrl = "/mdm-android-agent/operation/device-info";
+        serviceUrl = "/api/device-mgt/android/v1.0/admin/devices/info";
     }
     if (serviceUrl) {
         invokerUtil.post(serviceUrl, payload,
@@ -61,137 +62,224 @@
     });
 
     function loadOperationsLog(update) {
-        var operationsLog = $("#operations-log");
-        var deviceListingSrc = operationsLog.attr("src");
-        var deviceId = operationsLog.data("device-id");
-        var deviceType = operationsLog.data("device-type");
-
-        $.template("operations-log", deviceListingSrc, function (template) {
-            var serviceURL = "/devicemgt_admin/operations/" + deviceType + "/" + deviceId;
-
-            var successCallback = function (data) {
-                data = JSON.parse(data);
-                $('#operations-spinner').addClass('hidden');
-                var viewModel = {};
-                viewModel.operations = data;
-                if (data.length > 0) {
-                    var content = template(viewModel);
-                    if (!update) {
-                        $("#operations-log-container").html(content);
-                        operationTable = $('#operations-log-table').datatables_extended();
-                    } else {
-                        $('#operations-log-table').dataTable().fnClearTable();
-                        for (var i = 0; i < data.length; i++) {
-                            var status;
-                            if (data[i].status == "COMPLETED") {
-                                status = "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
-                            } else if (data[i].status == "PENDING") {
-                                status = "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
-                            } else if (data[i].status == "ERROR") {
-                                status = "<span><i class='fw fw-error icon-danger'></i> Error</span>";
-                            } else if (data[i].status == "IN_PROGRESS") {
-                                status = "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
-                            }
-
-                            $('#operations-log-table').dataTable().fnAddData([
-                                data[i].code,
-                                status,
-                                data[i].createdTimeStamp
-                            ]);
-                        }
-                    }
-                }
-
-            };
-            invokerUtil.get(serviceURL,
-                successCallback, function (message) {
-                    console.log(message);
-                });
-        });
-
+        var operationsLogTable = "#operations-log-table";
+        if (update) {
+            operationTable = $(operationsLogTable).DataTable();
+            operationTable.ajax.reload(false);
+            return;
+        }
+        operationTable = $(operationsLogTable)
+            .datatables_extended({
+                                     serverSide: true,
+                                     processing: false,
+                                     searching: false,
+                                     ordering: false,
+                                     pageLength: 10,
+                                     order: [],
+                                     ajax: {
+                                         url: context + "/api/operation/paginate",
+                                         data: {
+                                             deviceId: deviceIdentifier,
+                                             deviceType: deviceType
+                                         },
+                                         dataSrc: function (json) {
+                                             $("#operations-spinner").addClass(
+                                                 "hidden");
+                                             $("#operations-log-container").empty();
+                                             return json.data;
+                                         }
+                                     },
+                                     columnDefs: [
+                                         {targets: 0, data: "code"},
+                                         {
+                                             targets: 1,
+                                             data: "status",
+                                             render: function (status) {
+                                                 var html;
+                                                 switch (status) {
+                                                     case "COMPLETED" :
+                                                         html =
+                                                             "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
+                                                         break;
+                                                     case "PENDING" :
+                                                         html =
+                                                             "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
+                                                         break;
+                                                     case "ERROR" :
+                                                         html =
+                                                             "<span><i class='fw fw-error icon-danger'></i> Error</span>";
+                                                         break;
+                                                     case "IN_PROGRESS" :
+                                                         html =
+                                                             "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
+                                                         break;
+                                                     case "REPEATED" :
+                                                         html =
+                                                             "<span><i class='fw fw-ok icon-warning'></i> Repeated</span>";
+                                                         break;
+                                                 }
+                                                 return html;
+                                             }
+                                         },
+                                         {
+                                             targets: 2,
+                                             data: "createdTimeStamp",
+                                             render: function (date) {
+                                                 var value = String(date);
+                                                 return value.slice(0, 16);
+                                             }
+                                         }
+                                     ],
+                                     "createdRow": function (row, data) {
+                                         $(row).attr("data-type", "selectable");
+                                         $(row).attr("data-id", data["id"]);
+                                         $.each($("td", row),
+                                                function (colIndex) {
+                                                    switch (colIndex) {
+                                                        case 1:
+                                                            $(this).attr(
+                                                                "data-grid-label",
+                                                                "Code");
+                                                            $(this).attr(
+                                                                "data-display",
+                                                                data["code"]);
+                                                            break;
+                                                        case 2:
+                                                            $(this).attr(
+                                                                "data-grid-label",
+                                                                "Status");
+                                                            $(this).attr(
+                                                                "data-display",
+                                                                data["status"]);
+                                                            break;
+                                                        case 3:
+                                                            $(this).attr(
+                                                                "data-grid-label",
+                                                                "Created Timestamp");
+                                                            $(this).attr(
+                                                                "data-display",
+                                                                data["createdTimeStamp"]);
+                                                            break;
+                                                    }
+                                                }
+                                         );
+                                     }
+                                 });
     }
-
+    
     function loadApplicationsList() {
         var applicationsList = $("#applications-list");
-        var deviceListingSrc = applicationsList.attr("src");
+        var applicationListingTemplate = applicationsList.attr("src");
         var deviceId = applicationsList.data("device-id");
         var deviceType = applicationsList.data("device-type");
 
-        $.template("application-list", deviceListingSrc, function (template) {
-            var serviceURL = "/devicemgt_admin/operations/" + deviceType + "/" + deviceId + "/apps";
+        $.template("application-list", applicationListingTemplate, function (template) {
+            var serviceURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/" + deviceId + "/applications";
+            invokerUtil.get(
+                serviceURL,
+                // success-callback
+                function (data, textStatus, jqXHR) {
+                    if (jqXHR.status == 200 && data) {
+                        data = JSON.parse(data);
+                        $("#apps-spinner").addClass("hidden");
+                        if (data.length > 0) {
+                            for (var i = 0; i < data.length; i++) {
+                                data[i]["name"] = decodeURIComponent(data[i]["name"]);
+                                data[i]["platform"] = deviceType;
+                            }
 
-            var successCallback = function (data) {
-                data = JSON.parse(data);
-                $('#apps-spinner').addClass('hidden');
-                var viewModel = {};
-                if (data != null && data.length > 0) {
-                    for (var i = 0; i < data.length; i++) {
-                        data[i].name = data[i].name.replace(/[^\w\s]/gi, ' ');
-                        data[i].name = data[i].name.replace(/[0-9]/g, ' ');
+                            var viewModel = {};
+                            viewModel["applications"] = data;
+                            viewModel["deviceType"] = deviceType;
+                            var content = template(viewModel);
+                            $("#applications-list-container").html(content);
+                        } else {
+                            $("#applications-list-container").
+                            html("<div class='message message-info'><h4><i class='icon fw fw-info'></i>No applications found.</h4>" +
+                                 "<p>Please try refreshing the list in a while.</p></div>");
+                        }
                     }
-                }
-                viewModel.applications = data;
-                viewModel.deviceType = deviceType;
-                if (data.length > 0) {
-                    var content = template(viewModel);
-                    $("#applications-list-container").html(content);
-                }
-
-            };
-            invokerUtil.get(serviceURL,
-                successCallback, function (message) {
-                    console.log(message);
+                },
+                // error-callback
+                function () {
+                    $("#applications-list-container").
+                    html("<div class='panel-body'><br><p class='fw-warning'>&nbsp;Loading application list " +
+                         "was not successful. please try refreshing the list in a while.<p></div>");
                 });
         });
     }
 
     function loadPolicyCompliance() {
         var policyCompliance = $("#policy-view");
-        var policySrc = policyCompliance.attr("src");
+        var policyComplianceTemplate = policyCompliance.attr("src");
         var deviceId = policyCompliance.data("device-id");
         var deviceType = policyCompliance.data("device-type");
         var activePolicy = null;
 
-        $.template("policy-view", policySrc, function (template) {
-            var serviceURLPolicy = "/devicemgt_admin/policies/" + deviceType + "/" + deviceId + "/active-policy"
-            var serviceURLCompliance = "/devicemgt_admin/policies/" + deviceType + "/" + deviceId;
-
-            var successCallbackCompliance = function (data) {
-                var viewModel = {};
-                viewModel.policy = activePolicy;
-                viewModel.deviceType = deviceType;
-                if (data != null && data.complianceFeatures != null && data.complianceFeatures != undefined && data.complianceFeatures.length > 0) {
-                    viewModel.compliance = "NON-COMPLIANT";
-                    viewModel.complianceFeatures = data.complianceFeatures;
-                    var content = template(viewModel);
-                    $("#policy-list-container").html(content);
-                } else {
-                    viewModel.compliance = "COMPLIANT";
-                    var content = template(viewModel);
-                    $("#policy-list-container").html(content);
-                    $("#policy-compliance-table").addClass("hidden");
-                }
-
-            };
-
-            var successCallbackPolicy = function (data) {
-                data = JSON.parse(data);
-                $('#policy-spinner').addClass('hidden');
-                if (data != null && data.active == true) {
-                    activePolicy = data;
-                    invokerUtil.get(serviceURLCompliance,
-                        successCallbackCompliance, function (message) {
-                            console.log(message);
-                        });
-                }
-            };
-
-            invokerUtil.get(serviceURLPolicy,
-                successCallbackPolicy, function (message) {
-                    console.log(message);
-                });
-        });
+        $.template(
+            "policy-view",
+            policyComplianceTemplate,
+            function (template) {
+                var getEffectivePolicyURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/" + deviceId + "/effective-policy";
+                var getDeviceComplianceURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/" + deviceId + "/compliance-data";
 
+                invokerUtil.get(
+                    getEffectivePolicyURL,
+                    // success-callback
+                    function (data, textStatus, jqXHR) {
+                        if (jqXHR.status == 200 && data) {
+                            data = JSON.parse(data);
+                            $("#policy-spinner").addClass("hidden");
+                            if (data["active"] == true) {
+                                activePolicy = data;
+                                invokerUtil.get(
+                                    getDeviceComplianceURL,
+                                    // success-callback
+                                    function (data, textStatus, jqXHR) {
+                                        if (jqXHR.status == 200 && data) {
+                                            var viewModel = {};
+                                            viewModel["policy"] = activePolicy;
+                                            viewModel["deviceType"] = deviceType;
+                                            data = JSON.parse(data);
+                                            var content;
+                                            if (data["complianceData"]) {
+                                                if (data["complianceData"]["complianceFeatures"] &&
+                                                    data["complianceData"]["complianceFeatures"].length > 0) {
+                                                    viewModel["compliance"] = "NON-COMPLIANT";
+                                                    viewModel["complianceFeatures"] = data["complianceData"]["complianceFeatures"];
+                                                    content = template(viewModel);
+                                                    $("#policy-list-container").html(content);
+                                                } else {
+                                                    viewModel["compliance"] = "COMPLIANT";
+                                                    content = template(viewModel);
+                                                    $("#policy-list-container").html(content);
+                                                    $("#policy-compliance-table").addClass("hidden");
+                                                }
+                                            } else {
+                                                $("#policy-list-container").
+                                                html("<div class='panel-body'><br><p class='fw-warning'> This device " +
+                                                     "has no policy applied.<p></div>");
+                                            }
+                                        }
+                                    },
+                                    // error-callback
+                                    function () {
+                                        $("#policy-list-container").
+                                        html("<div class='panel-body'><br><p class='fw-warning'> Loading policy compliance related data " +
+                                             "was not successful. please try refreshing data in a while.<p></div>");
+                                    }
+                                );
+                            }
+                        }
+                    },
+                    // error-callback
+                    function () {
+                        $("#policy-list-container").
+                        html("<div class='panel-body'><br><p class='fw-warning'> Loading policy compliance related data " +
+                             "was not successful. please try refreshing data in a while.<p></div>");
+                    }
+                );
+            }
+        );
     }
-
 }());