diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
index 4dbde58f80..ee92e8e654 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
@@ -432,7 +432,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button class="close" type="button" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title">
+                <h4 id = "title" class="modal-title">
                     WSO2 Geo Dashboard
                 </h4>
             </div>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
index 8eea24e5ad..5faad97b48 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
@@ -29,8 +29,6 @@ $('body').on('hidden.bs.modal', '.modal', function () {
 /*Map layer configurations*/
 var map;
 
-initialLoad();
-
 function initialLoad() {
     if (document.getElementById('map') == null) {
         setTimeout(initialLoad, 500); // give everything some time to render
@@ -47,17 +45,18 @@ function initialLoad() {
 }
 
 function setPageTitle() {
-  var hash = window.parent.location.hash;
-  if(hash) {
-      var startIdx = hash.indexOf("/") + 1;
-      var lastIdx = hash.length;
-      var deviceInfoString = hash.substring(startIdx,lastIdx);
-      var deviceInfo = JSON.parse(deviceInfoString);
-      if(deviceInfo) {
-        var newTitle = "[ " + deviceInfo.device.id + "]" + " - Geo Dashboard ["  + deviceInfo.device.type + "]";
-        window.parent.document.title =  newTitle;
-      }
-  }
+    var hash = window.parent.location.hash;
+    if(hash) {
+        var startIdx = hash.indexOf("/") + 1;
+        var lastIdx = hash.length;
+        var deviceInfoString = hash.substring(startIdx,lastIdx);
+        var deviceInfo = JSON.parse(deviceInfoString);
+        if(deviceInfo) {
+            var newTitle = "[ " + deviceInfo.device.id + "]" + " - Geo Dashboard ["  + deviceInfo.device.type + "]";
+            window.parent.document.title =  newTitle;
+            $("#title").val(newTitle)
+        }
+    }
 }
 
 //function success(position) {
@@ -291,7 +290,9 @@ function focusOnSpatialObject(objectId) {
         });
         return false;
     }
-    clearFocus(); // Clear current focus if any
+    if (selectedSpatialObject != objectId) {
+        clearFocus(); // Clear current focus if any
+    }
     selectedSpatialObject = objectId; // (global) Why not use 'var' other than implicit declaration http://stackoverflow.com/questions/1470488/what-is-the-function-of-the-var-keyword-and-when-to-use-it-or-omit-it#answer-1471738
 
     console.log("Selected " + objectId + " type " + spatialObject.type);
@@ -354,6 +355,66 @@ function enableRealTime() {
     isBatchModeOn = false;
 }
 
+function InitSpatialObject() {
+    var fromDate = new Date();
+    fromDate.setHours(fromDate.getHours() - 2);
+    var toDate = new Date();
+    console.log(fromDate + " " + toDate);
+    var tableData = getProviderData(fromDate.valueOf(), toDate.valueOf());
+    for (var i = 0; i < tableData.length; i++) {
+        var data = tableData[i];
+        var geoMessage = {
+            "messageType": "Point",
+            "type": "Feature",
+            "id": data.id,
+            "deviceId": data.id,
+            "deviceType": data.type,
+            "properties": {
+                "speed": data.speed,
+                "heading": data.heading,
+                "state": data.state,
+                "information": data.information,
+                "notify": data.notify,
+                "type": data.type
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [data.longitude, data.latitude]
+            }
+        };
+        processPointMessage(geoMessage);
+    }
+    var spatialObject = currentSpatialObjects[deviceId];// (local)
+    if (!spatialObject) {
+        $.UIkit.notify({
+            message: "Spatial Object <span style='color:red'>" + deviceId + "</span> not in the Map!!",
+            status: 'warning',
+            timeout: ApplicationOptions.constance.NOTIFY_WARNING_TIMEOUT,
+            pos: 'top-center'
+        });
+        return false;
+    }
+    selectedSpatialObject = deviceId;
+    if (spatialObject.type == "area") {
+        spatialObject.focusOn(map);
+        return true;
+    }
+
+    map.setView(spatialObject.marker.getLatLng(), 15, {animate: true}); // TODO: check the map._layersMaxZoom and set the zoom level accordingly
+
+    $('#objectInfo').find('#objectInfoId').html(selectedSpatialObject);
+    spatialObject.marker.openPopup();
+    if (!toggled) {
+        $('#objectInfo').animate({width: 'toggle'}, 100);
+        toggled = true;
+    }
+    spatialObject.drawPath();
+    setTimeout(function () {
+        createChart();
+        chart.load({columns: [spatialObject.speedHistory.getArray()]});
+    }, 100);
+}
+
 function focusOnHistorySpatialObject(objectId, timeFrom, timeTo) {
     if (!timeFrom) {
         notifyError('No start time provided to show history. Please provide a suitable value' + timeFrom);
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
index ced06d0491..8f10a93342 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
@@ -602,6 +602,8 @@ var webSocketOnAlertError = function (e) {
 
 var webSocketOnOpen = function () {
     websocket.set_opened();
+    initialLoad();
+    InitSpatialObject();
     $.UIkit.notify({
         message: 'You Are Connected to Spatial Stream !!',
         status: 'success',
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java
index 9b6c2f15b7..e74362b4e5 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java
@@ -101,6 +101,7 @@ public class SenseDataReceiverManager {
             IntentFilter intentFilter = new IntentFilter();
             intentFilter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
             intentFilter.addAction(Intent.ACTION_NEW_OUTGOING_CALL);
+            intentFilter.setPriority(1000);
 
             context.registerReceiver(callDataReceiver, intentFilter);
         }
@@ -149,6 +150,7 @@ public class SenseDataReceiverManager {
             IntentFilter intentFilter = new IntentFilter();
             intentFilter.addAction(Telephony.Sms.Intents.SMS_RECEIVED_ACTION);
             intentFilter.addAction(Telephony.Sms.Intents.SMS_DELIVER_ACTION);
+            intentFilter.setPriority(1000);
             context.registerReceiver(smsDataReceiver, intentFilter);
         }
     }
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
index 41eaafb201..58a1b27184 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
@@ -56,13 +56,6 @@
       "ishidden": false,
       "subordinates": [],
       "title": "Communication"
-    },
-    {
-      "id": "test",
-      "isanon": false,
-      "ishidden": false,
-      "title": "Test",
-      "subordinates": []
     }
   ],
   "pages": [
@@ -1299,151 +1292,6 @@
         "fluidLayout": false
       },
       "title": "Communication"
-    },
-    {
-      "id": "test",
-      "title": "Test",
-      "layout": {
-        "content": {
-          "loggedIn": {
-            "blocks": [
-              {
-                "id": "49cada6f023f237c953761b597752212",
-                "x": 0,
-                "y": 1,
-                "width": 5,
-                "height": 1,
-                "banner": false
-              },
-              {
-                "id": "a26d2f62dbb0011edf13371a2eb3cdd1",
-                "x": 0,
-                "y": 0,
-                "width": 3,
-                "height": 1,
-                "banner": false
-              }
-            ]
-          }
-        },
-        "fluidLayout": false
-      },
-      "isanon": false,
-      "content": {
-        "default": {
-          "49cada6f023f237c953761b597752212": [
-            {
-              "id": "date-picker-widget-0",
-              "content": {
-                "id": "date-picker-widget",
-                "title": "Date Picker Widget",
-                "type": "widget",
-                "category": "Widgets",
-                "thumbnail": "fs://gadget/date-picker-widget/index.png",
-                "data": {
-                  "url": "fs://gadget/date-picker-widget/index.xml"
-                },
-                "options": {},
-                "styles": {
-                  "no_heading": true,
-                  "hide_gadget": false,
-                  "titlePosition": "left",
-                  "title": "Date Picker Widget"
-                },
-                "notify": {
-                  "date-selected": {
-                    "type": "message",
-                    "description": "This notifies selected date"
-                  }
-                },
-                "locale_titles": {
-                  "en-US": "Date Picker Widget"
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                }
-              }
-            }
-          ],
-          "33faa57accead8af549c70f111face99": [
-            {
-              "id": "EsbAnalytics-Gadget-Search_Box-0",
-              "content": {
-                "id": "EsbAnalytics-Gadget-Search_Box",
-                "title": "Search Box",
-                "type": "widget",
-                "category": "Widgets",
-                "thumbnail": "fs://gadget/usa-business-revenue/index.png",
-                "data": {
-                  "url": "fs://gadget/EsbAnalytics-Gadget-Search_Box/index.xml"
-                },
-                "styles": {
-                  "no_heading": true,
-                  "hide_gadget": false,
-                  "titlePosition": "left",
-                  "title": "Search Box"
-                },
-                "toolbarButtons": {
-                  "default": {
-                    "maximize": false,
-                    "configurations": false
-                  },
-                  "custom": [],
-                  "isDropdownView": false
-                },
-                "options": {},
-                "locale_titles": {
-                  "en-US": "Search Box"
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                }
-              }
-            }
-          ],
-          "be290fcc084ff118decc23588febc2ed": [],
-          "a26d2f62dbb0011edf13371a2eb3cdd1": [
-            {
-              "id": "Android_Device_SearchBox-0",
-              "content": {
-                "id": "Android_Device_SearchBox",
-                "title": "Search Box",
-                "type": "gadget",
-                "category": "Gadgets",
-                "thumbnail": "fs://gadget/usa-business-revenue/index.png",
-                "data": {
-                  "url": "fs://gadget/Android_Device_SearchBox/index.xml"
-                },
-                "styles": {
-                  "no_heading": true,
-                  "hide_gadget": false,
-                  "titlePosition": "left",
-                  "title": "Search Box"
-                },
-                "toolbarButtons": {
-                  "default": {
-                    "maximize": false,
-                    "configurations": false
-                  },
-                  "custom": [],
-                  "isDropdownView": false
-                },
-                "options": {},
-                "locale_titles": {
-                  "en-US": "Search Box"
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                }
-              }
-            }
-          ]
-        },
-        "anon": {}
-      }
     }
   ],
   "permissions": {
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
index b259eb6b59..aca23b6322 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
@@ -69,6 +69,8 @@ import javax.ws.rs.core.Response;
                 )
         }
 )
+@Api(value = "Android Sense Device Management",
+        description = "This carries all the resources related to the Android sense device management functionalities.")
 public interface AndroidSenseService {
 
     /**
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
index e23f3c0c1c..628f5fc116 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
@@ -44,7 +44,7 @@
     <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
            aria-controls="event_log">Operations Log</a></li>
     <li><a class="list-group-item" href="#geo_dashboard" role="tab" data-toggle="tab"
-           aria-controls="geo_dashboard">Map</a></li>
+           aria-controls="geo_dashboard">Geo Fencing</a></li>
 {{/zone}}
 
 {{#zone "device-view-tab-contents"}}
@@ -77,18 +77,18 @@
     </div>
     <div class="panel panel-default tab-pane"
          id="geo_dashboard" role="tabpanel" aria-labelledby="geo_dashboard">
-        <div class="panel-heading">Map</div>
+        <div class="panel-heading">Geo Fencing</div>
 
         <div id="chartWrapper">
         </div>
 
-        <a class="padding-left"
+        <a class="padding-left" target="_blank" 
            href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
 
             <span class="fw-stack">
                 <i class="fw fw-circle-outline fw-stack-2x"></i>
                 <i class="fw fw-statistics fw-stack-1x"></i>
-            </span> View Device Location
+            </span> Add Geo Fencing
         </a>
     </div>
 {{/zone}}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js
index a3ef93ec7b..e5ff0676c6 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.js
@@ -35,11 +35,11 @@ function onRequest(context) {
                 "autoCompleteParams": autoCompleteParams,
                 "encodedFeaturePayloads": "",
                 "portalUrl" : devicemgtProps['portalURL'],
-                "anchor" : JSON.stringify(anchor)
+                "anchor" : encodeURI(JSON.stringify(anchor))
             };
         } else {
             response.sendError(404, "Device Id " + deviceId + " of type " + deviceType + " cannot be found!");
             exit();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/asset/androidsense.apk b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/asset/androidsense.apk
index 570ae63466..4a7aa44329 100644
Binary files a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/asset/androidsense.apk and b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/asset/androidsense.apk differ
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/communication/mqtt/FireAlarmMQTTCommunicator.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/communication/mqtt/FireAlarmMQTTCommunicator.java
index cd5c25571b..275a8f221d 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/communication/mqtt/FireAlarmMQTTCommunicator.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/communication/mqtt/FireAlarmMQTTCommunicator.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.json.JSONObject;
 import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.core.AgentConstants;
 import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.core.AgentManager;
 import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.core.AgentUtilOperations;
@@ -115,8 +116,11 @@ public class FireAlarmMQTTCommunicator extends MQTTTransportHandler {
 
         try {
             receivedMessage = message.toString();
-            if(!receivedMessage.contains("POLICY")){
+            if(!receivedMessage.contains("policyDefinition")){
                 receivedMessage = AgentUtilOperations.extractMessageFromPayload(receivedMessage);
+            }else{
+                JSONObject jsonMessage = new JSONObject(receivedMessage);
+                updateCEPPolicy(jsonMessage.getString("policyDefinition"));
             }
             log.info(AgentConstants.LOG_APPENDER + "Message [" + receivedMessage + "] was received");
         } catch (AgentCoreOperationException e) {
@@ -289,6 +293,7 @@ public class FireAlarmMQTTCommunicator extends MQTTTransportHandler {
         String fileLocation = agentManager.getRootPath() + AgentConstants.CEP_FILE_NAME;
         message = AgentUtilOperations.formatMessage(message);
         AgentUtilOperations.writeToFile(message, fileLocation);
+        AgentManager.setUpdated(true);
         agentManager.addToPolicyLog(message);
     }
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/transport/CommunicationUtils.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/transport/CommunicationUtils.java
index e6e16ba52b..dfcc4268c5 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/transport/CommunicationUtils.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/transport/CommunicationUtils.java
@@ -43,7 +43,7 @@ public class CommunicationUtils {
     private static final Log log = LogFactory.getLog(TransportUtils.class);
 
     // The Signature Algorithm used.
-    private static final String SIGNATURE_ALG = "SHA1withRSA";
+    private static final String SHA_512 = "SHA-512";
     // The Encryption Algorithm and the Padding used.
     private static final String CIPHER_PADDING = "RSA/ECB/PKCS1Padding";
 
@@ -108,7 +108,7 @@ public class CommunicationUtils {
         String signedEncodedString;
 
         try {
-            signature = Signature.getInstance(SIGNATURE_ALG);
+            signature = Signature.getInstance(SHA_512);
             signature.initSign(signatureKey);
             signature.update(Base64.decodeBase64(message));
 
@@ -117,11 +117,11 @@ public class CommunicationUtils {
 
         } catch (NoSuchAlgorithmException e) {
             String errorMsg =
-                    "Algorithm not found exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+                    "Algorithm not found exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new TransportHandlerException(errorMsg, e);
         } catch (SignatureException e) {
-            String errorMsg = "Signature exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+            String errorMsg = "Signature exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new TransportHandlerException(errorMsg, e);
         } catch (InvalidKeyException e) {
@@ -153,7 +153,7 @@ public class CommunicationUtils {
         boolean verified;
 
         try {
-            signature = Signature.getInstance(SIGNATURE_ALG);
+            signature = Signature.getInstance(SHA_512);
             signature.initVerify(verificationKey);
             signature.update(Base64.decodeBase64(data));
 
@@ -161,11 +161,11 @@ public class CommunicationUtils {
 
         } catch (NoSuchAlgorithmException e) {
             String errorMsg =
-                    "Algorithm not found exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+                    "Algorithm not found exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new TransportHandlerException(errorMsg, e);
         } catch (SignatureException e) {
-            String errorMsg = "Signature exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+            String errorMsg = "Signature exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new TransportHandlerException(errorMsg, e);
         } catch (InvalidKeyException e) {
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/transport/TransportUtils.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/transport/TransportUtils.java
index 5045e43139..4fb1c5adb2 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/transport/TransportUtils.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/transport/TransportUtils.java
@@ -34,6 +34,8 @@ import java.net.ServerSocket;
 import java.net.SocketException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -172,27 +174,26 @@ public class TransportUtils {
      */
     public static synchronized int getAvailablePort(int randomAttempts) {
         ArrayList<Integer> failedPorts = new ArrayList<Integer>(randomAttempts);
-
-        Random randomNum = new Random();
-        int randomPort = MAX_PORT_NUMBER;
-
-        while (randomAttempts > 0) {
-            randomPort = randomNum.nextInt(MAX_PORT_NUMBER - MIN_PORT_NUMBER) + MIN_PORT_NUMBER;
-
-            if (checkIfPortAvailable(randomPort)) {
-                return randomPort;
+        try {
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+            int randomPort = MAX_PORT_NUMBER;
+            while (randomAttempts > 0) {
+                randomPort = secureRandom.nextInt(MAX_PORT_NUMBER - MIN_PORT_NUMBER) + MIN_PORT_NUMBER;
+                if (checkIfPortAvailable(randomPort)) {
+                    return randomPort;
+                }
+                failedPorts.add(randomPort);
+                randomAttempts--;
             }
-            failedPorts.add(randomPort);
-            randomAttempts--;
-        }
-
-        randomPort = MAX_PORT_NUMBER;
-
-        while (true) {
-            if (!failedPorts.contains(randomPort) && checkIfPortAvailable(randomPort)) {
-                return randomPort;
+            randomPort = MAX_PORT_NUMBER;
+            while (true) {
+                if (!failedPorts.contains(randomPort) && checkIfPortAvailable(randomPort)) {
+                    return randomPort;
+                }
+                randomPort--;
             }
-            randomPort--;
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("SHA1PRNG algorithm could not be found.");
         }
     }
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/virtual/VirtualHardwareManager.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/virtual/VirtualHardwareManager.java
index 59a13bb87f..1a676ed828 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/virtual/VirtualHardwareManager.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/advanced/virtual/VirtualHardwareManager.java
@@ -33,6 +33,8 @@ import javax.sound.sampled.Clip;
 import javax.swing.*;
 import java.io.IOException;
 import java.io.InputStream;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 
 /**
  * This class use to emulate virtual hardware functionality
@@ -188,9 +190,12 @@ public class VirtualHardwareManager {
             double mn = current - offset;
             min = (mn < min) ? min : (int) Math.round(mn);
         }
-
-        double rnd = Math.random() * (max - min) + min;
-        return (int) Math.round(rnd);
+        try {
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+            return secureRandom.nextInt(max - min) + min;
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("SHA1PRNG algorithm could not be found.");
+        }
 
     }
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java
index deaa5ac241..26006620fd 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java
@@ -129,11 +129,8 @@ public class EnrollmentManager {
 
     public void setEnrollmentStatus() {
         KeyStore keyStore;
-
         try {
             keyStore = KeyStore.getInstance(AgentConstants.DEVICE_KEYSTORE_TYPE);
-            keyStore.load(new FileInputStream(AgentConstants.DEVICE_KEYSTORE),
-                          AgentConstants.DEVICE_KEYSTORE_PASSWORD.toCharArray());
 
             this.isEnrolled = (keyStore.containsAlias(AgentConstants.DEVICE_CERT_ALIAS) &&
                     keyStore.containsAlias(AgentConstants.DEVICE_PRIVATE_KEY_ALIAS) &&
@@ -146,21 +143,7 @@ public class EnrollmentManager {
             log.error(AgentConstants.LOG_APPENDER + e);
             log.warn(AgentConstants.LOG_APPENDER + "Device will be re-enrolled.");
             return;
-        } catch (CertificateException | NoSuchAlgorithmException e) {
-            log.error(AgentConstants.LOG_APPENDER + "An error occurred whilst trying to [load] the device KeyStore '" +
-                              AgentConstants.DEVICE_KEYSTORE + "'.");
-            log.error(AgentConstants.LOG_APPENDER + e);
-            log.warn(AgentConstants.LOG_APPENDER + "Device will be re-enrolled.");
-            return;
-        } catch (IOException e) {
-            log.error(AgentConstants.LOG_APPENDER +
-                              "An error occurred whilst trying to load input stream with the keystore file: " +
-                              AgentConstants.DEVICE_KEYSTORE);
-            log.error(AgentConstants.LOG_APPENDER + e);
-            log.warn(AgentConstants.LOG_APPENDER + "Device will be re-enrolled.");
-            return;
         }
-
         try {
             if (this.isEnrolled) {
                 this.SCEPCertificate = (X509Certificate) keyStore.getCertificate(AgentConstants.DEVICE_CERT_ALIAS);
@@ -262,9 +245,6 @@ public class EnrollmentManager {
         KeyStore keyStore;
         try {
             keyStore = KeyStore.getInstance(AgentConstants.DEVICE_KEYSTORE_TYPE);
-            keyStore.load(new FileInputStream(AgentConstants.DEVICE_KEYSTORE),
-                          AgentConstants.DEVICE_KEYSTORE_PASSWORD.toCharArray());
-
             keyStore.setCertificateEntry(alias, certificate);
             keyStore.store(new FileOutputStream(AgentConstants.DEVICE_KEYSTORE),
                            AgentConstants.DEVICE_KEYSTORE_PASSWORD.toCharArray());
@@ -285,9 +265,6 @@ public class EnrollmentManager {
         KeyStore keyStore;
         try {
             keyStore = KeyStore.getInstance(AgentConstants.DEVICE_KEYSTORE_TYPE);
-            keyStore.load(new FileInputStream(AgentConstants.DEVICE_KEYSTORE),
-                          AgentConstants.DEVICE_KEYSTORE_PASSWORD.toCharArray());
-
             Certificate[] certChain = new Certificate[1];
             certChain[0] = certInCertChain;
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/CommunicationUtils.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/CommunicationUtils.java
index bb445a3d9d..46a43a0ba8 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/CommunicationUtils.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/CommunicationUtils.java
@@ -43,7 +43,7 @@ public class CommunicationUtils {
     private static final Log log = LogFactory.getLog(TransportUtils.class);
 
     // The Signature Algorithm used.
-    private static final String SIGNATURE_ALG = "SHA1withRSA";
+    private static final String SHA_512 = "SHA-512";
     // The Encryption Algorithm and the Padding used.
     private static final String CIPHER_PADDING = "RSA/ECB/PKCS1Padding";
 
@@ -107,7 +107,7 @@ public class CommunicationUtils {
         String signedEncodedString;
 
         try {
-            signature = Signature.getInstance(SIGNATURE_ALG);
+            signature = Signature.getInstance(SHA_512);
             signature.initSign(signatureKey);
             signature.update(Base64.decodeBase64(message));
 
@@ -116,11 +116,11 @@ public class CommunicationUtils {
 
         } catch (NoSuchAlgorithmException e) {
             String errorMsg =
-                    "Algorithm not found exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+                    "Algorithm not found exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new TransportHandlerException(errorMsg, e);
         } catch (SignatureException e) {
-            String errorMsg = "Signature exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+            String errorMsg = "Signature exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new TransportHandlerException(errorMsg, e);
         } catch (InvalidKeyException e) {
@@ -152,7 +152,7 @@ public class CommunicationUtils {
         boolean verified;
 
         try {
-            signature = Signature.getInstance(SIGNATURE_ALG);
+            signature = Signature.getInstance(SHA_512);
             signature.initVerify(verificationKey);
             signature.update(Base64.decodeBase64(data));
 
@@ -160,11 +160,11 @@ public class CommunicationUtils {
 
         } catch (NoSuchAlgorithmException e) {
             String errorMsg =
-                    "Algorithm not found exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+                    "Algorithm not found exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new TransportHandlerException(errorMsg, e);
         } catch (SignatureException e) {
-            String errorMsg = "Signature exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+            String errorMsg = "Signature exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new TransportHandlerException(errorMsg, e);
         } catch (InvalidKeyException e) {
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportUtils.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportUtils.java
index 11ebc04bfc..b55aee02df 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportUtils.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportUtils.java
@@ -36,6 +36,8 @@ import java.net.ServerSocket;
 import java.net.SocketException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -173,27 +175,26 @@ public class TransportUtils {
 	 */
 	public static synchronized int getAvailablePort(int randomAttempts) {
 		ArrayList<Integer> failedPorts = new ArrayList<Integer>(randomAttempts);
-
-		Random randomNum = new Random();
-		int randomPort = MAX_PORT_NUMBER;
-
-		while (randomAttempts > 0) {
-			randomPort = randomNum.nextInt(MAX_PORT_NUMBER - MIN_PORT_NUMBER) + MIN_PORT_NUMBER;
-
-			if (checkIfPortAvailable(randomPort)) {
-				return randomPort;
+		try {
+			SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+			int randomPort = MAX_PORT_NUMBER;
+			while (randomAttempts > 0) {
+				randomPort = secureRandom.nextInt(MAX_PORT_NUMBER - MIN_PORT_NUMBER) + MIN_PORT_NUMBER;
+				if (checkIfPortAvailable(randomPort)) {
+					return randomPort;
+				}
+				failedPorts.add(randomPort);
+				randomAttempts--;
 			}
-			failedPorts.add(randomPort);
-			randomAttempts--;
-		}
-
-		randomPort = MAX_PORT_NUMBER;
-
-		while (true) {
-			if (!failedPorts.contains(randomPort) && checkIfPortAvailable(randomPort)) {
-				return randomPort;
+			randomPort = MAX_PORT_NUMBER;
+			while (true) {
+				if (!failedPorts.contains(randomPort) && checkIfPortAvailable(randomPort)) {
+					return randomPort;
+				}
+				randomPort--;
 			}
-			randomPort--;
+		} catch (NoSuchAlgorithmException e) {
+			throw new RuntimeException("SHA1PRNG algorithm could not be found.");
 		}
 	}
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java
index 3b777cf75f..61135c58a4 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java
@@ -33,6 +33,8 @@ import javax.sound.sampled.Clip;
 import javax.swing.*;
 import java.io.IOException;
 import java.io.InputStream;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 
 /**
  * This class use to emulate virtual hardware functionality
@@ -174,19 +176,19 @@ public class VirtualHardwareManager {
     }
 
     private int getRandom(int max, int min, int current, boolean isSmoothed, int svf) {
-
         if (isSmoothed) {
             int offset = (max - min) * svf / 100;
             double mx = current + offset;
             max = (mx > max) ? max : (int) Math.round(mx);
-
             double mn = current - offset;
             min = (mn < min) ? min : (int) Math.round(mn);
         }
-
-        double rnd = Math.random() * (max - min) + min;
-        return (int) Math.round(rnd);
-
+        try {
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+            return secureRandom.nextInt(max - min) + min;
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("SHA1PRNG algorithm could not be found.");
+        }
     }
 
     private void setAudioSequencer() {
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/plugin/impl/VirtualFirealarmSecurityManager.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/plugin/impl/VirtualFirealarmSecurityManager.java
index 9ff12424ba..f7b19fdce2 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/plugin/impl/VirtualFirealarmSecurityManager.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/plugin/impl/VirtualFirealarmSecurityManager.java
@@ -51,7 +51,7 @@ public class VirtualFirealarmSecurityManager {
     private static final Log log = LogFactory.getLog(VirtualFirealarmSecurityManager.class);
 
     private static PrivateKey serverPrivateKey;
-    private static final String SIGNATURE_ALG = "SHA1withRSA";
+    private static final String SHA_512 = "SHA-512";
     private static final String CIPHER_PADDING = "RSA/ECB/PKCS1Padding";
     private static CertificateKeystoreConfig certificateKeystoreConfig;
     private VirtualFirealarmSecurityManager() {
@@ -162,7 +162,7 @@ public class VirtualFirealarmSecurityManager {
         String signedEncodedString;
 
         try {
-            signature = Signature.getInstance(SIGNATURE_ALG);
+            signature = Signature.getInstance(SHA_512);
             signature.initSign(signatureKey);
             signature.update(Base64.decodeBase64(encryptedData));
 
@@ -170,11 +170,11 @@ public class VirtualFirealarmSecurityManager {
             signedEncodedString = Base64.encodeBase64String(signatureBytes);
 
         } catch (NoSuchAlgorithmException e) {
-            String errorMsg = "Algorithm not found exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+            String errorMsg = "Algorithm not found exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new VirtualFirealarmDeviceMgtPluginException(errorMsg, e);
         } catch (SignatureException e) {
-            String errorMsg = "Signature exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+            String errorMsg = "Signature exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new VirtualFirealarmDeviceMgtPluginException(errorMsg, e);
         } catch (InvalidKeyException e) {
@@ -193,18 +193,18 @@ public class VirtualFirealarmSecurityManager {
         boolean verified;
 
         try {
-            signature = Signature.getInstance(SIGNATURE_ALG);
+            signature = Signature.getInstance(SHA_512);
             signature.initVerify(verificationKey);
             signature.update(Base64.decodeBase64(data));
 
             verified = signature.verify(Base64.decodeBase64(signedData));
 
         } catch (NoSuchAlgorithmException e) {
-            String errorMsg = "Algorithm not found exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+            String errorMsg = "Algorithm not found exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new VirtualFirealarmDeviceMgtPluginException(errorMsg, e);
         } catch (SignatureException e) {
-            String errorMsg = "Signature exception occurred for Signature instance of [" + SIGNATURE_ALG + "]";
+            String errorMsg = "Signature exception occurred for Signature instance of [" + SHA_512 + "]";
             log.error(errorMsg);
             throw new VirtualFirealarmDeviceMgtPluginException(errorMsg, e);
         } catch (InvalidKeyException e) {
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/app-conf.json b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/app-conf.json
index ea1f69b675..2d6fe00be9 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/app-conf.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/app-conf.json
@@ -27,10 +27,10 @@
         },
         "sso": {
             "enabled": false,
-            "issuer" : "emm",
-            "appName" : "emm",
+            "issuer" : "devicemgt",
+            "appName" : "devicemgt",
             "identityProviderUrl" : "https://localhost:9443/samlsso",
-            "acs": "https://localhost:9443/emm/uuf/sso/acs",
+            "acs": "https://localhost:9443/devicemgt/uuf/sso/acs",
             "identityAlias": "wso2carbon",
             "responseSigningEnabled" : "true",
             "useTenantKey": false
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
index 7b311e511d..6567a4f4bd 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/conf/config.json
@@ -31,7 +31,7 @@
             "location" : "%http.ip%/android-web-agent/public/mdm.page.enrollments.ios.download-agent/asset/ios-agent.ipa",
             "bundleID" : "org.wso2.carbon.emm.iOSMDMAgent",
             "version" : "1.0",
-            "appName" : "EMM iOS Agent"
+            "appName" : "IoT Server iOS Agent"
         }
     },
     "androidAgentApp" : "android-agent.apk",
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk
index 9577e93628..27ccbd0208 100644
Binary files a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk and b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk differ
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/device-view.hbs 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/device-view.hbs
index 38e3284f0a..4a24616964 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/device-view.hbs
+++ 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/device-view.hbs
@@ -339,7 +339,7 @@
                             </div>
                             <br/>
                             <a class="padding-left" target="_blank"
-                               href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{deviceId}},{{deviceType}}">
+                               href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
                                 <span class="fw-stack">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-map-location fw-stack-1x"></i>
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/device-view.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/device-view.js
index c192718e88..4dcc25e5dd 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/device-view.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/device-view.js
@@ -213,7 +213,6 @@ function onRequest(context) {
     deviceViewData["autoCompleteParams"] = autoCompleteParams;
 
     deviceViewData["portalUrl"] = devicemgtProps['portalURL'];
-    deviceViewData["deviceId"] = deviceId;
-    deviceViewData["deviceType"] = deviceType;
+    deviceViewData["anchor"] = encodeURI(JSON.stringify({ "device" : { "id" : deviceId, "type" : deviceType}}));
     return deviceViewData;
 }
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.policy-edit/public/templates/android-policy-edit.hbs 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.policy-edit/public/templates/android-policy-edit.hbs
index b6aba2f230..498558a289 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.policy-edit/public/templates/android-policy-edit.hbs
+++ 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.policy-edit/public/templates/android-policy-edit.hbs
@@ -96,7 +96,7 @@
                     class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" >
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" class="hide" >
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-register fw-stack-2x"></i>
             </span>
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.policy-wizard/public/templates/android-policy-operations.hbs 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.policy-wizard/public/templates/android-policy-operations.hbs
index 1f58ea3290..ee082f7b4d 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.policy-wizard/public/templates/android-policy-operations.hbs
+++ 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.policy-wizard/public/templates/android-policy-operations.hbs
@@ -96,7 +96,7 @@
                     class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" class="hide">
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-register fw-stack-2x"></i>
             </span>
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.type-view/public/js/type-view.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.type-view/public/js/type-view.js
index 5f33fdb5b7..7d9c779212 100755
--- 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.type-view/public/js/type-view.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.type-view/public/js/type-view.js
@@ -131,7 +131,10 @@ function loadNewNotifications() {
                                 viewModel["appContext"] = context;
                                 $(messageSideBar).html(template(viewModel));
                             } else {
-                                $(messageSideBar).html('<div class="alert alert-info" role="alert"><i class="icon fw fw-info"></i>No new notifications found...</div>');
+                                $(messageSideBar).html("<h4 class='text-center'>No New Notifications</h4>" +
+                                    "<h5 class='text-center text-muted'>" +
+                                    "Check this section for error notifications<br>related to device operations" +
+                                    "</h5>");
                             }
                         } else {
                             $(messageSideBar).html("<h4 class ='message-danger'>Unexpected error " +
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.type-view/public/js/type-view.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.type-view/public/js/type-view.js
index cd364ebbd0..9d6bcd2666 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.type-view/public/js/type-view.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.type-view/public/js/type-view.js
@@ -131,7 +131,10 @@ function loadNewNotifications() {
                                 viewModel["appContext"] = context;
                                 $(messageSideBar).html(template(viewModel));
                             } else {
-                                $(messageSideBar).html('<div class="alert alert-info" role="alert"><i class="icon fw fw-info"></i>No new notifications found...</div>');
+                                $(messageSideBar).html("<h4 class='text-center'>No New Notifications</h4>" +
+                                    "<h5 class='text-center text-muted'>" +
+                                    "Check this section for error notifications<br>related to device operations" +
+                                    "</h5>");
                             }
                         } else {
                             $(messageSideBar).html("<h4 class ='message-danger'>Unexpected error " +
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json
index ea1f69b675..2d6fe00be9 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/app-conf.json
@@ -27,10 +27,10 @@
         },
         "sso": {
             "enabled": false,
-            "issuer" : "emm",
-            "appName" : "emm",
+            "issuer" : "devicemgt",
+            "appName" : "devicemgt",
             "identityProviderUrl" : "https://localhost:9443/samlsso",
-            "acs": "https://localhost:9443/emm/uuf/sso/acs",
+            "acs": "https://localhost:9443/devicemgt/uuf/sso/acs",
             "identityAlias": "wso2carbon",
             "responseSigningEnabled" : "true",
             "useTenantKey": false
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
index a4249f5343..628134211b 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/conf/config.json
@@ -31,7 +31,7 @@
             "location" : "%http.ip%/windows-web-agent/public/mdm.page.enrollments.ios.download-agent/asset/ios-agent.ipa",
             "bundleID" : "org.wso2.carbon.emm.iOSMDMAgent",
             "version" : "1.0",
-            "appName" : "EMM iOS Agent"
+            "appName" : "IoT Server iOS Agent"
         }
     },
     "androidAgentApp" : "android-agent.apk",