diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/OperationManagementDAOFactory.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/OperationManagementDAOFactory.java
index 960e5b8850..6879cd553b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/OperationManagementDAOFactory.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/OperationManagementDAOFactory.java
@@ -36,7 +36,6 @@ public class OperationManagementDAOFactory {
     private static DataSource dataSource;
     private static final Log log = LogFactory.getLog(OperationManagementDAOFactory.class);
     private static ThreadLocal<Connection> currentConnection = new ThreadLocal<Connection>();
-    private static final Object LOCK = new Object();
 
     public static OperationDAO getCommandOperationDAO() {
         return new CommandOperationDAOImpl();
@@ -67,6 +66,7 @@ public class OperationManagementDAOFactory {
     }
 
     public static void beginTransaction() throws OperationManagementDAOException {
+
         try {
             currentConnection.set(dataSource.getConnection());
         } catch (SQLException e) {
@@ -75,6 +75,7 @@ public class OperationManagementDAOFactory {
     }
 
     public static Connection getConnection() throws OperationManagementDAOException {
+
         if (currentConnection.get() == null) {
             try {
                 currentConnection.set(dataSource.getConnection());
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationDAOImpl.java
index 8b73a4fe8d..73c746b91c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationDAOImpl.java
@@ -289,6 +289,9 @@ public class OperationDAOImpl implements OperationDAO {
                     }
                     operation.setStatus(Operation.Status.valueOf(rs.getString("STATUS")));
                     operation.setCode(rs.getString("OPERATION_CODE"));
+                    if (rs.getObject("ENABLED") != null) {
+                        operation.setEnabled(rs.getBoolean("ENABLED"));
+                    }
                 }
                 operationList.add(operation);
             }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/util/OperationDAOUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/util/OperationDAOUtil.java
index 3025496814..8cabc6d3bd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/util/OperationDAOUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/util/OperationDAOUtil.java
@@ -81,6 +81,7 @@ public class OperationDAOUtil {
         operation.setId(dtoOperation.getId());
         operation.setPayLoad(dtoOperation.getPayLoad());
         operation.setReceivedTimeStamp(dtoOperation.getReceivedTimeStamp());
+        operation.setEnabled(dtoOperation.isEnabled());
 
         return operation;
     }
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
index 2b5c29a425..aa73445efc 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
@@ -17,7 +17,8 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
@@ -98,20 +99,28 @@
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.core:${carbon.device.mgt.version}
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.core:${carbon.device.mgt.version}
                                 </bundleDef>
-                                <bundleDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.common:${carbon.device.mgt.version}
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.common:${carbon.device.mgt.version}
                                 </bundleDef>
                                 <bundleDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.email.verification
                                 </bundleDef>
-                                <bundleDef>org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
+                                <bundleDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.governance.metadata:${carbon.governance.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.apimgt.core:${carbon.api.mgt.version}</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
+                                </importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.governance.metadata:${carbon.governance.version}
+                                </importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.apimgt.core:${carbon.api.mgt.version}
+                                </importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.transaction.manager:${carbon.commons.version}
+                                </importFeatureDef>
                             </importFeatures>
                         </configuration>
                     </execution>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
index 8cc9771877..987ee7513a 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
@@ -17,14 +17,38 @@
   ~ under the License.
 -->
 <APIPublisherConfig>
-        <APIs>
-            <API>
-               <Name>appmanager</Name>
-               <Owner>admin</Owner>
-               <Context>/devices</Context>
-               <Version>1.0.0</Version>
-               <Endpoint>http://localhost:9763/</Endpoint>
-               <Transports>http,https</Transports>
-            </API>
-        </APIs>
+    <APIs>
+        <API>
+            <Name>appmanager</Name>
+            <Owner>admin</Owner>
+            <Context>devices</Context>
+            <Version>1.0.0</Version>
+            <Endpoint>http://localhost:9763/</Endpoint>
+            <Transports>http,https</Transports>
+        </API>
+        <API>
+            <Name>enrollment</Name>
+            <Owner>admin</Owner>
+            <Context>enroll</Context>
+            <Version>1.0.0</Version>
+            <Endpoint>http://localhost:9763/cdm-android-api/enrollment/</Endpoint>
+            <Transports>http,https</Transports>
+        </API>
+        <API>
+            <Name>license</Name>
+            <Owner>admin</Owner>
+            <Context>license</Context>
+            <Version>1.0.0</Version>
+            <Endpoint>http://localhost:9763/cdm-android-api/devices/license</Endpoint>
+            <Transports>http,https</Transports>
+        </API>
+        <API>
+            <Name>operation</Name>
+            <Owner>admin</Owner>
+            <Context>operation</Context>
+            <Version>1.0.0</Version>
+            <Endpoint>http://localhost:9763/cdm-android-ap/operations/</Endpoint>
+            <Transports>http,https</Transports>
+        </API>
+    </APIs>
 </APIPublisherConfig>
diff --git a/pom.xml b/pom.xml
index 92474ab1ff..66efc3f230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -877,7 +877,6 @@
                 <version>${cxf.version}</version>
             </dependency>
             <!-- End of CXF dependencies -->
-
             <!-- Transaction Mgt features -->
             <dependency>
                 <groupId>org.wso2.carbon.commons</groupId>
@@ -891,7 +890,6 @@
                 <version>${carbon.commons.version}</version>
             </dependency>
             <!-- End of transaction Mgt features -->
-
         </dependencies>
     </dependencyManagement>