diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/CommandOperation.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/CommandOperation.java
index bc132a9b20..c7eb730c4e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/CommandOperation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/CommandOperation.java
@@ -22,6 +22,10 @@ public class CommandOperation extends Operation {
 
     private boolean enabled;
 
+    public CommandOperation() {
+        setControl(Control.NO_REPEAT);
+    }
+
     public boolean isEnabled() {
         return enabled;
     }
@@ -34,8 +38,4 @@ public class CommandOperation extends Operation {
         return Type.COMMAND;
     }
 
-    public Control getControl(){
-        return Control.NO_REPEAT;
-    }
-
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/ConfigOperation.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/ConfigOperation.java
index c2be65a372..28116d5dc6 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/ConfigOperation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/ConfigOperation.java
@@ -23,10 +23,11 @@ import java.util.List;
 
 public class ConfigOperation extends Operation {
 
-    private List<Property> properties;
+    private final List<Property> properties;
 
     public ConfigOperation() {
-        properties = new ArrayList<Property>();
+        properties = new ArrayList<>();
+        setControl(Control.REPEAT);
     }
 
     public List<Property> getConfigProperties() {
@@ -37,6 +38,10 @@ public class ConfigOperation extends Operation {
         properties.add(new Property(name, value, type));
     }
 
+    public Type getType() {
+        return Type.CONFIG;
+    }
+
     public static class Property {
         private String name;
         private Object value;
@@ -73,13 +78,4 @@ public class ConfigOperation extends Operation {
         }
     }
 
-    public Type getType() {
-        return Type.CONFIG;
-    }
-
-
-    public Control getControl(){
-        return Control.REPEAT;
-    }
-
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/PolicyOperation.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/PolicyOperation.java
index dc6ae4dd78..bc93bcf0f8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/PolicyOperation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/PolicyOperation.java
@@ -19,7 +19,13 @@ package org.wso2.carbon.device.mgt.core.dto.operation.mgt;
 
 import java.util.List;
 
-public class PolicyOperation extends Operation{
+public class PolicyOperation extends Operation {
+
+    private List<ProfileOperation> profileOperations;
+
+    public PolicyOperation() {
+        setControl(Control.REPEAT);
+    }
 
     public List<ProfileOperation> getProfileOperations() {
         return profileOperations;
@@ -29,10 +35,4 @@ public class PolicyOperation extends Operation{
         this.profileOperations = profileOperations;
     }
 
-    private List<ProfileOperation> profileOperations;
-
-    public Control getControl(){
-        return Control.REPEAT;
-    }
-
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/ProfileOperation.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/ProfileOperation.java
index 107cf091d7..9e3db16f2e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/ProfileOperation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/operation/mgt/ProfileOperation.java
@@ -22,13 +22,12 @@ import java.io.Serializable;
 
 public class ProfileOperation extends ConfigOperation implements Serializable {
 
-    public Type getType() {
-        return Type.PROFILE;
+    public ProfileOperation() {
+        super();
     }
 
-
-    public Control getControl(){
-        return Control.REPEAT;
+    public Type getType() {
+        return Type.PROFILE;
     }
 
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/CommandOperation.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/CommandOperation.java
index 3a9ecefca3..618c05adf3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/CommandOperation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/CommandOperation.java
@@ -24,6 +24,10 @@ public class CommandOperation extends Operation {
 
     private boolean enabled;
 
+    public CommandOperation() {
+        setControl(Control.NO_REPEAT);
+    }
+
     public boolean isEnabled() {
         return enabled;
     }
@@ -35,8 +39,5 @@ public class CommandOperation extends Operation {
     public Type getType() {
         return Type.COMMAND;
     }
-    public Control getControl(){
-        return Control.NO_REPEAT;
-    }
 
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/ConfigOperation.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/ConfigOperation.java
index 69d8aafc4a..753b170a1b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/ConfigOperation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/ConfigOperation.java
@@ -21,8 +21,6 @@ package org.wso2.carbon.device.mgt.core.operation.mgt;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 public class ConfigOperation extends Operation {
 
@@ -38,6 +36,15 @@ public class ConfigOperation extends Operation {
         properties.add(new Property(name, value, type));
     }*/
 
+    public ConfigOperation() {
+        //properties = new ArrayList<>();
+        setControl(Control.REPEAT);
+    }
+
+    public Type getType() {
+        return Type.CONFIG;
+    }
+
     public static class Property implements Serializable {
         private String name;
         private Object value;
@@ -74,12 +81,4 @@ public class ConfigOperation extends Operation {
         }
     }
 
-    public Type getType() {
-        return Type.CONFIG;
-    }
-
-    public Control getControl(){
-        return Control.REPEAT;
-    }
-
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/PolicyOperation.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/PolicyOperation.java
index 6b36492a83..47ca55f95e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/PolicyOperation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/PolicyOperation.java
@@ -18,6 +18,7 @@
 package org.wso2.carbon.device.mgt.core.operation.mgt;
 
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
+
 import java.util.List;
 
 public class PolicyOperation extends Operation {
@@ -25,6 +26,10 @@ public class PolicyOperation extends Operation {
     public static final String POLICY_OPERATION_CODE = "POLICY_BUNDLE";
     private List<ProfileOperation> profileOperations;
 
+    public PolicyOperation() {
+        setControl(Control.REPEAT);
+    }
+
     public List<ProfileOperation> getProfileOperations() {
         return profileOperations;
     }
@@ -33,8 +38,4 @@ public class PolicyOperation extends Operation {
         this.profileOperations = profileOperations;
     }
 
-    public Control getControl(){
-        return Control.REPEAT;
-    }
-
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/ProfileOperation.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/ProfileOperation.java
index 3423524666..ac1082317b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/ProfileOperation.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/ProfileOperation.java
@@ -19,21 +19,21 @@
 package org.wso2.carbon.device.mgt.core.operation.mgt;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
 public class ProfileOperation extends ConfigOperation implements Serializable {
+
     private static final long serialVersionUID = -3322674908775087365L;
     private List<Integer> correctiveActionIds;
 
     private List<Integer> reactiveActionIds;
 
-    public Type getType() {
-        return Type.PROFILE;
+    public ProfileOperation() {
+        super();
     }
 
-    public Control getControl(){
-        return Control.REPEAT;
+    public Type getType() {
+        return Type.PROFILE;
     }
 
     public List<Integer> getCorrectiveActionIds() {
@@ -51,4 +51,5 @@ public class ProfileOperation extends ConfigOperation implements Serializable {
     public void setReactiveActionIds(List<Integer> reactiveActionIds) {
         this.reactiveActionIds = reactiveActionIds;
     }
+
 }