diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ActivityInfoProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ActivityInfoProviderService.java
index 565c7366eae..301bb0f45fc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ActivityInfoProviderService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ActivityInfoProviderService.java
@@ -55,7 +55,7 @@ public interface ActivityInfoProviderService {
                     code = 200,
                     message = "OK. \n Activity details are successfully fetched",
                     response = Activity.class,
-                    responseHeaders = {
+                    responseHeaders =  {
                             @ResponseHeader(
                                     name = "Content-Type",
                                     description = "The content type of the body"),
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java
index d07290f1f75..7ebb1686340 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java
@@ -504,7 +504,7 @@ public interface DeviceManagementService {
             value = {
                     @ApiResponse(
                             code = 200,
-                            message = "OK. \n Device has successfully been enrolled. Location header " +
+                            message = "OK. \n Device list searched for has successfully been retrieved. Location header " +
                                     "contains URL of newly enrolled device",
                             response = DeviceWrapper.class,
                             responseContainer = "List",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
index dca5f7e1e2e..1664f315910 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
@@ -26,17 +26,16 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.ActivityInfoProviderService;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
+import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import java.util.List;
 
+
 public class ActivityProviderServiceImpl implements ActivityInfoProviderService {
 
     private static final Log log = LogFactory.getLog(ActivityProviderServiceImpl.class);
 
+    @GET
     @Override
     @Path("/{id}")
     public Response getActivity(
@@ -55,10 +54,11 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
         return Response.status(Response.Status.OK).entity(operation).build();
     }
 
+    @GET
     @Override
-    @Path("/")
     public Response getActivities(
-            @QueryParam("timestamp") String timestamp) {
+            @QueryParam("timestamp") String timestamp,
+            @HeaderParam("If-Modified-Since") String ifModifiedSince) {
         List<Activity> activities = null;
         DeviceManagementProviderService dmService;
         try {