diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
index bfdce769452..4fbfde4dac3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
@@ -357,13 +357,13 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
 
     @Override
     public Operation getNextPendingOperation(DeviceIdentifier deviceId) throws OperationManagementException {
-        return null;
+        return operationManager.getNextPendingOperation(deviceId);
     }
 
     @Override
     public Operation updateOperation(int id, DeviceIdentifier deviceIdentifier,
                                      String payLoad) throws OperationManagementException {
-        return null;
+        return operationManager.updateOperation(id, deviceIdentifier, payLoad);
     }
 
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
index 7c88e429cce..cef57fffa69 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
@@ -116,7 +116,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
 
     @Override
     public boolean addOperation(Operation operation,
-            List<DeviceIdentifier> devices) throws OperationManagementException {
+                                List<DeviceIdentifier> devices) throws OperationManagementException {
         return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().addOperation(operation, devices);
     }
 
@@ -133,13 +133,14 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
 
     @Override
     public Operation getNextPendingOperation(DeviceIdentifier deviceId) throws OperationManagementException {
-        return null;
+        return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getNextPendingOperation(deviceId);
     }
 
     @Override
     public Operation updateOperation(int operationId, DeviceIdentifier deviceIdentifier,
                                      String responsePayLoad) throws OperationManagementException {
-        return null;
+        return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
+                updateOperation(operationId, deviceIdentifier, responsePayLoad);
     }
 
     @Override