diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
index cf72d3d1a2..2f8d129a4f 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
@@ -83,7 +83,7 @@
                             javax.xml.bind,
                             org.wso2.carbon.utils.*,
                             org.wso2.carbon.device.mgt.common.*,
-                            io.swagger.annotations.*,
+                            io.swagger.annotations.*;resolution:=optional,
                             org.wso2.carbon.device.mgt.core.*,
                             org.bouncycastle.pkcs.jcajce
                         </Import-Package>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
index 3d0e05776f..be584f36b0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
@@ -48,6 +48,10 @@
                         <Export-Package>
                             org.wso2.carbon.device.mgt.common.*
                         </Export-Package>
+                        <Import-Package>
+                            javax.xml.bind.annotation,
+                            io.swagger.annotations.*;resolution:=optional
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/Application.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/Application.java
index 0d45f903bd..1b17534dcf 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/Application.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/Application.java
@@ -18,26 +18,41 @@
  */
 package org.wso2.carbon.device.mgt.common.app.mgt;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.Properties;
 
+@ApiModel(value = "Application", description = "This class carries all information related application")
 public class Application implements Serializable {
 
     private static final long serialVersionUID = 1998101711L;
 
+    @ApiModelProperty(name = "id", value = "The ID given to the application when it is stored in the EMM database", required = true)
     private int id;
+    @ApiModelProperty(name = "platform", value = "The mobile device platform. It can be android, ios or windows", required = true)
     private String platform;
+    @ApiModelProperty(name = "category", value = "The application category", required = true)
     private String category;
+    @ApiModelProperty(name = "name", value = "The application's name", required = true)
     private String name;
+
     private String locationUrl;
+    @ApiModelProperty(name = "imageUrl", value = "The icon url of the application", required = true)
     private String imageUrl;
+    @ApiModelProperty(name = "version", value = "The application's version", required = true)
     private String version;
+    @ApiModelProperty(name = "type", value = "The application type", required = true)
     private String type;
+    @ApiModelProperty(name = "appProperties", value = "The properties of the application", required = true)
     private Properties appProperties;
+    @ApiModelProperty(name = "applicationIdentifier", value = "The application identifier", required = true)
     private String applicationIdentifier;
-
+    @ApiModelProperty(name = "memoryUsage", value = "AMount of memory used by the application", required = true)
     private int memoryUsage;
 
+
     public String getType() {
         return type;
     }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index 3e6c845eb9..7e36265173 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -83,7 +83,7 @@
                             org.apache.catalina.core,
                             org.apache.commons.collections,
                             org.wso2.carbon.email.sender.*,
-                            io.swagger.annotations.*,
+                            io.swagger.annotations.*;resolution:=optional,
                             org.wso2.carbon,
                             org.wso2.carbon.base
                         </Import-Package>