diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java
index f54701c716f..6cbdba08bc0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAO.java
@@ -33,65 +33,67 @@ public interface GadgetDataServiceDAO {
      */
     int getTotalDeviceCount() throws GadgetDataServiceDAOException;
 
+    /**
+     * Method to get active device count from a particular tenant.
+     *
+     * @return active device count.
+     */
     int getActiveDeviceCount() throws GadgetDataServiceDAOException;
 
+    /**
+     * Method to get inactive device count from a particular tenant.
+     *
+     * @return inactive device count.
+     */
     int getInactiveDeviceCount() throws GadgetDataServiceDAOException;
 
+    /**
+     * Method to get removed device count from a particular tenant.
+     *
+     * @return removed device count.
+     */
     int getRemovedDeviceCount() throws GadgetDataServiceDAOException;
 
     /**
-     * Method to get non-compliant device count.
+     * Method to get non-compliant device count from a particular tenant.
      *
      * @return Non-compliant device count.
      */
-    @SuppressWarnings("unused")
     int getNonCompliantDeviceCount() throws GadgetDataServiceDAOException;
 
     /**
-     * Method to get unmonitored device count.
+     * Method to get unmonitored device count from a particular tenant.
      *
      * @return Unmonitored device count.
      */
-    @SuppressWarnings("unused")
     int getUnmonitoredDeviceCount() throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     PaginationResult getNonCompliantDeviceCountsByFeatures(PaginationRequest paginationRequest) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     int getDeviceCount(Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     int getFeatureNonCompliantDeviceCount(String nonCompliantFeatureCode,
                                           Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     Map<String, Integer> getDeviceCountsByPlatforms(Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     Map<String, Integer> getFeatureNonCompliantDeviceCountsByPlatforms(String nonCompliantFeatureCode,
                                                     Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     Map<String, Integer> getDeviceCountsByOwnershipTypes(Map<String, Object> filters)
             throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     Map<String, Integer> getFeatureNonCompliantDeviceCountsByOwnershipTypes(String nonCompliantFeatureCode,
                                                     Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     PaginationResult getDevicesWithDetails(Map<String, Object> filters,
                                            PaginationRequest paginationRequest) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     PaginationResult getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
             Map<String, Object> filters, PaginationRequest paginationRequest) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
-    @SuppressWarnings("unused")
     List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
                                             Map<String, Object> filters) throws GadgetDataServiceDAOException;
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOImpl.java
index e56e241ec5b..fabd43ec8eb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOImpl.java
@@ -411,7 +411,6 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         PreparedStatement stmt = null;
         ResultSet rs = null;
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-        Map<String, Object> filteredDeviceWithDetails = new HashMap<>();
         List<Map<String, Object>> filteredDevicesWithDetails = new ArrayList<>();
         int totalRecordsCount = 0;
         try {
@@ -448,7 +447,9 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
             // executing query
             rs = stmt.executeQuery();
             // fetching query results
+            Map<String, Object> filteredDeviceWithDetails;
             while (rs.next()) {
+                filteredDeviceWithDetails = new HashMap<>();
                 filteredDeviceWithDetails.put("device-id", rs.getInt("DEVICE_ID"));
                 filteredDeviceWithDetails.put("platform", rs.getString("PLATFORM"));
                 filteredDeviceWithDetails.put("ownership", rs.getString("OWNERSHIP"));
@@ -559,7 +560,6 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
         PreparedStatement stmt = null;
         ResultSet rs = null;
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-        Map<String, Object> filteredDeviceWithDetails = new HashMap<>();
         List<Map<String, Object>> filteredDevicesWithDetails = new ArrayList<>();
         try {
             con = this.getConnection();
@@ -589,7 +589,9 @@ class GadgetDataServiceDAOImpl implements GadgetDataServiceDAO {
             // executing query
             rs = stmt.executeQuery();
             // fetching query results
+            Map<String, Object> filteredDeviceWithDetails;
             while (rs.next()) {
+                filteredDeviceWithDetails = new HashMap<>();
                 filteredDeviceWithDetails.put("device-id", rs.getInt("DEVICE_ID"));
                 filteredDeviceWithDetails.put("platform", rs.getString("PLATFORM"));
                 filteredDeviceWithDetails.put("ownership", rs.getString("OWNERSHIP"));
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java
index c0df361d9ff..2f31b84f403 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/internal/GadgetDataServiceImpl.java
@@ -270,12 +270,32 @@ class GadgetDataServiceImpl implements GadgetDataService {
 
     @Override
     public List<Map<String, Object>> getDevicesWithDetails(Map<String, Object> filters) {
-        return null;
+        List<Map<String, Object>> devicesWithDetails = null;
+        try {
+            GadgetDataServiceDAOFactory.openConnection();
+            devicesWithDetails = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().getDevicesWithDetails(filters);
+        } catch (GadgetDataServiceDAOException | SQLException e) {
+            return null;
+        } finally {
+            GadgetDataServiceDAOFactory.closeConnection();
+        }
+        return devicesWithDetails;
     }
 
     @Override
-    public List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode, Map<String, Object> filters) {
-        return null;
+    public List<Map<String, Object>> getFeatureNonCompliantDevicesWithDetails(String nonCompliantFeatureCode,
+                                                                              Map<String, Object> filters) {
+        List<Map<String, Object>> featureNonCompliantDevicesWithDetails = null;
+        try {
+            GadgetDataServiceDAOFactory.openConnection();
+            featureNonCompliantDevicesWithDetails = GadgetDataServiceDAOFactory.getGadgetDataServiceDAO().
+                getFeatureNonCompliantDevicesWithDetails(nonCompliantFeatureCode, filters);
+        } catch (GadgetDataServiceDAOException | SQLException e) {
+            return null;
+        } finally {
+            GadgetDataServiceDAOFactory.closeConnection();
+        }
+        return featureNonCompliantDevicesWithDetails;
     }
 
 }