diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Permission.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Permission.java
deleted file mode 100644
index 14d447ac2c..0000000000
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Permission.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.wso2.carbon.apimgt.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This class is the representation of custom developed Permission annotation.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Permission {
-
-    /**
-     * Represents the permission name.
-     * @return Returns permission name.
-     */
-    String name();
-
-    /**
-     * Represents the permission string.
-     * @return Returns permission string.
-     */
-    String permission();
-
-}
\ No newline at end of file
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Scope.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Scope.java
index 9e0068635b..701a6f183c 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Scope.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Scope.java
@@ -1,21 +1,3 @@
-/*
- * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 package org.wso2.carbon.apimgt.annotations.api;
 
 import java.lang.annotation.ElementType;
@@ -24,28 +6,18 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * This class is the representation of custom developed Permission annotation.
+ * This class is the representation of custom developed Scopes annotation.
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Scope {
 
-    /**
-     * Represents the scope key which should be unique.
-     * @return Returns scope key.
-     */
-    String key();
-
-    /**
-     * Represents the scope name.
-     * @return Returns scope name.
-     */
     String name();
 
-    /**
-     * Represents the scope description.
-     * @return Returns scope description.
-     */
     String description();
 
+    String key();
+
+    String[] permissions();
+
 }
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Scopes.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Scopes.java
new file mode 100644
index 0000000000..ebbda6f9d4
--- /dev/null
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Scopes.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.apimgt.annotations.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This class is the representation of custom developed Scopes annotation.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Scopes {
+
+    Scope[] scopes();
+
+}
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java
index c1719f2296..a4afb01808 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java
@@ -269,18 +269,7 @@ public class APIPublisherUtil {
         }
         apiConfig.setOwner(owner);
 
-        String isSecuredParam = servletContext.getInitParameter(PARAM_MANAGED_API_IS_SECURED);
-        boolean isSecured;
-        if (isSecuredParam == null || isSecuredParam.isEmpty()) {
-            if (log.isDebugEnabled()) {
-                log.debug("'managed-api-isSecured' attribute is not configured. Therefore, using the default, " +
-                        "which is 'true'");
-            }
-            isSecured = false;
-        } else {
-            isSecured = Boolean.parseBoolean(isSecuredParam);
-        }
-        apiConfig.setSecured(isSecured);
+        apiConfig.setSecured(false);
 
         String transports = servletContext.getInitParameter(PARAM_MANAGED_API_TRANSPORTS);
         if (transports == null || transports.isEmpty()) {
diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
index 5611b563ca..b820a4426f 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
@@ -16,10 +16,12 @@
 
 package org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util;
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.SwaggerDefinition;
 import org.apache.catalina.core.StandardContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.apimgt.api.model.Scope;
 import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil;
 import org.wso2.carbon.apimgt.webapp.publisher.config.APIResource;
 import org.wso2.carbon.apimgt.webapp.publisher.config.APIResourceConfiguration;
@@ -37,9 +39,7 @@ import java.net.URI;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class AnnotationProcessor {
 
@@ -58,9 +58,15 @@ public class AnnotationProcessor {
     private static final String SWAGGER_ANNOTATIONS_EXTENSIONS = "extensions";
     private static final String SWAGGER_ANNOTATIONS_PROPERTIES = "properties";
     private static final String SWAGGER_ANNOTATIONS_PROPERTIES_NAME = "name";
+    private static final String SWAGGER_ANNOTATIONS_PROPERTIES_DESCRIPTION = "description";
+    private static final String SWAGGER_ANNOTATIONS_PROPERTIES_KEY = "key";
+    private static final String SWAGGER_ANNOTATIONS_PROPERTIES_PERMISSIONS = "permissions";
     private static final String SWAGGER_ANNOTATIONS_PROPERTIES_VERSION = "version";
     private static final String SWAGGER_ANNOTATIONS_PROPERTIES_CONTEXT = "context";
     private static final String SWAGGER_ANNOTATIONS_PROPERTIES_VALUE = "value";
+    private static final String ANNOTATIONS_SCOPES = "scopes";
+
+    private static final String PERMISSION_PREFIX = "/permission/admin";
 
 
     private StandardContext context;
@@ -75,6 +81,10 @@ public class AnnotationProcessor {
     private Class<io.swagger.annotations.Tag> tagClass;
     private Class<io.swagger.annotations.Extension> extensionClass;
     private Class<io.swagger.annotations.ExtensionProperty> extensionPropertyClass;
+    private Class<io.swagger.annotations.ApiOperation> apiOperation;
+    private Class<org.wso2.carbon.apimgt.annotations.api.Scope> scopeClass;
+    private Class<org.wso2.carbon.apimgt.annotations.api.Scopes> scopesClass;
+    private Map<String, Scope> apiScopes;
 
     public AnnotationProcessor(final StandardContext context) {
         servletContext = context.getServletContext();
@@ -91,7 +101,13 @@ public class AnnotationProcessor {
             extensionClass = (Class<io.swagger.annotations.Extension>)classLoader
                     .loadClass((io.swagger.annotations.Extension.class.getName()));
             extensionPropertyClass = (Class<io.swagger.annotations.ExtensionProperty>)classLoader
-                    .loadClass((io.swagger.annotations.ExtensionProperty.class.getName()));
+                    .loadClass(io.swagger.annotations.ExtensionProperty.class.getName());
+            scopeClass = (Class<org.wso2.carbon.apimgt.annotations.api.Scope>) classLoader
+                    .loadClass(org.wso2.carbon.apimgt.annotations.api.Scope.class.getName());
+            scopesClass = (Class<org.wso2.carbon.apimgt.annotations.api.Scopes>) classLoader
+                    .loadClass(org.wso2.carbon.apimgt.annotations.api.Scopes.class.getName());
+            apiOperation = (Class<io.swagger.annotations.ApiOperation>)classLoader
+                    .loadClass((io.swagger.annotations.ApiOperation.class.getName()));
         } catch (ClassNotFoundException e) {
             log.error("An error has occurred while loading classes ", e);
         }
@@ -120,6 +136,7 @@ public class AnnotationProcessor {
                                 try {
                                     clazz = classLoader.loadClass(className);
                                     Annotation swaggerDefinition = clazz.getAnnotation(apiClazz);
+                                    Annotation Scopes = clazz.getAnnotation(scopesClass);
                                     List<APIResource> resourceList;
                                     if (swaggerDefinition != null) {
                                         if (log.isDebugEnabled()) {
@@ -127,6 +144,9 @@ public class AnnotationProcessor {
                                         }
                                         try {
                                             apiResourceConfig = processAPIAnnotation(swaggerDefinition);
+                                            if (Scopes != null) {
+                                                apiScopes = processAPIScopes(Scopes);
+                                            }
                                             if(apiResourceConfig != null){
                                                 String rootContext = servletContext.getContextPath();
                                                 pathClazzMethods = pathClazz.getMethods();
@@ -158,7 +178,7 @@ public class AnnotationProcessor {
                                 } catch (ClassNotFoundException e1) {
                                     String msg = "Failed to load service class " + className + " for publishing APIs." +
                                             " This API will not be published.";
-                                    log.error(msg);
+                                    log.error(msg, e1);
                                 } catch (RuntimeException e) {
                                     log.error("Unexpected error has been occurred while publishing "+ className
                                             +"hence, this API will not be published.");
@@ -174,6 +194,39 @@ public class AnnotationProcessor {
         return apiResourceConfigs;
     }
 
+    private Map<String,Scope> processAPIScopes(Annotation annotation) throws Throwable {
+        Map<String, Scope> scopes = new HashMap<>();
+
+        InvocationHandler methodHandler = Proxy.getInvocationHandler(annotation);
+        Annotation[] annotatedScopes = (Annotation[]) methodHandler.invoke(annotation, scopesClass
+                .getMethod(ANNOTATIONS_SCOPES, null), null);
+
+        Scope scope;
+        String permissions[];
+        StringBuilder aggregatedPermissions;
+        for(int i=0; i<annotatedScopes.length; i++){
+            aggregatedPermissions = new StringBuilder();
+            methodHandler = Proxy.getInvocationHandler(annotatedScopes[i]);
+            scope = new Scope();
+            scope.setName(invokeMethod(scopeClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_NAME), annotatedScopes[i], STRING));
+            scope.setDescription(invokeMethod(scopeClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_DESCRIPTION), annotatedScopes[i], STRING));
+            scope.setKey(invokeMethod(scopeClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_KEY), annotatedScopes[i], STRING));
+            permissions = (String[])methodHandler.invoke(annotatedScopes[i], scopeClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_PERMISSIONS, null),null);
+            for (String permission : permissions) {
+                aggregatedPermissions.append(PERMISSION_PREFIX);
+                aggregatedPermissions.append(permission);
+                aggregatedPermissions.append(" ");
+            }
+            scope.setRoles(aggregatedPermissions.toString().trim());
+            scopes.put(scope.getKey(), scope);
+        }
+        return scopes;
+    }
+
     /**
      * Get Resources for each API
      *
@@ -211,6 +264,9 @@ public class AnnotationProcessor {
                         Annotation producesAnno = method.getAnnotation(producesClass);
                         resource.setProduces(invokeMethod(producesClassMethods[0], producesAnno, STRING_ARR));
                     }
+                    if (annotations[i].annotationType().getName().equals(ApiOperation.class.getName())) {
+                        resource.setScope(this.getScope(annotations[i]));
+                    }
                 }
                 resourceList.add(resource);
             }
@@ -375,4 +431,24 @@ public class AnnotationProcessor {
             throw new RuntimeException(e);
         }
     }
+
+    private Scope getScope(Annotation currentMethod) throws Throwable {
+        InvocationHandler methodHandler = Proxy.getInvocationHandler(currentMethod);
+        Annotation[] extensions = (Annotation[]) methodHandler.invoke(currentMethod,
+                apiOperation.getMethod(SWAGGER_ANNOTATIONS_EXTENSIONS, null), null);
+        methodHandler = Proxy.getInvocationHandler(extensions[0]);
+        Annotation[] properties =  (Annotation[])methodHandler.invoke(extensions[0], extensionClass
+                .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES,null), null);
+
+        for (Annotation property : properties) {
+            methodHandler = Proxy.getInvocationHandler(property);
+            String scopeKey = (String) methodHandler.invoke(property, extensionPropertyClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_VALUE, null),null);
+            if (scopeKey.isEmpty()) {
+                return null;
+            }
+            return apiScopes.get(scopeKey);
+        }
+        return null;
+    }
 }
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java
index 147e6669db..2357d61044 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java
@@ -1,18 +1,9 @@
 package org.wso2.carbon.certificate.mgt.jaxrs.api;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.Authorization;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Extension;
-import io.swagger.annotations.ExtensionProperty;
-import io.swagger.annotations.Info;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
+import io.swagger.annotations.*;
+
 import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.certificate.mgt.jaxrs.beans.ErrorResponse;
 
 import javax.ws.rs.Consumes;
@@ -45,8 +36,19 @@ import javax.ws.rs.core.Response;
                                                             "related operations.")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
+@Scopes(scopes = {
+        @Scope(
+                name = "Sign CSR",
+                description = "Sign CSR",
+                key = "perm:sign-csr",
+                permissions = {"/device-mgt/certificates/manage"}
+        )
+}
+)
 public interface CertificateMgtService {
 
+     String SCOPE = "scope";
+
     /**
      * Sign the client's certificate signing request and save it in the database.
      *
@@ -64,12 +66,10 @@ public interface CertificateMgtService {
             value = "Process a given CSR and return signed certificates.",
             notes = "This will return a signed certificate upon a given CSR.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/certificates/manage",
-                                    description = "Sign CSR") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = SCOPE, value = "perm:sign-csr")
+                    })
             }
     )
     @ApiResponses(
@@ -87,7 +87,6 @@ public interface CertificateMgtService {
                             message = "Internal Server Error. \n Error occurred while retrieving signed certificate.",
                             response = ErrorResponse.class)
             })
-    @Scope(key = "certificate:sign-csr", name = "Sign CSR", description = "")
     Response getSignedCertFromCSR(
             @ApiParam(
                     name = "If-Modified-Since",
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java
index 857f2ab2a6..14d06f00f0 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/CertificateManagementAdminService.java
@@ -6,13 +6,13 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.CertificateList;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.EnrollmentCertificate;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.ErrorResponse;
@@ -40,10 +40,39 @@ import javax.ws.rs.core.Response;
 )
 @Api(value = "Certificate Management", description = "This API includes all the certificate management related operations")
 @Path("/admin/certificates")
+@Scopes(scopes = {
+        @Scope(
+                name = "Adding a new SSL certificate",
+                description = "Adding a new SSL certificate",
+                key = "perm:admin:certificates:add",
+                permissions = {"/device-mgt/admin/certificates/add"}
+        ),
+        @Scope(
+                name = "Getting Details of an SSL Certificate",
+                description = "Getting Details of an SSL Certificate",
+                key = "perm:admin:certificates:details",
+                permissions = {"/device-mgt/admin/certificates/details"}
+        ),
+        @Scope(
+                name = "Getting Details of Certificates",
+                description = "Getting Details of Certificates",
+                key = "perm:admin:certificates:view",
+                permissions = {"/device-mgt/admin/certificates/view"}
+        ),
+        @Scope(
+                name = "Deleting an SSL Certificate",
+                description = "Deleting an SSL Certificate",
+                key = "perm:admin:certificates:delete",
+                permissions = {"/device-mgt/admin/certificates/delete"}
+        )
+}
+)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public interface CertificateManagementAdminService {
 
+    String SCOPE = "scope";
+
     /**
      * Save a list of certificates and relevant information in the database.
      *
@@ -59,12 +88,10 @@ public interface CertificateManagementAdminService {
             value = "Adding a new SSL certificate",
             notes = "Add a new SSL certificate to the client end database.\n",
             tags = "Certificate Management",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/certificates/manage",
-                                    description = "Manage certificates")}
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:add")
+                    })
             }
     )
     @ApiResponses(
@@ -130,12 +157,10 @@ public interface CertificateManagementAdminService {
             value = "Getting Details of an SSL Certificate",
             notes = "Get the client side SSL certificate details.",
             tags = "Certificate Management",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/certificates/view",
-                                    description = "View certificates")}
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:details")
+                    })
             }
     )
     @ApiResponses(value = {
@@ -203,12 +228,10 @@ public interface CertificateManagementAdminService {
                     + "view all the certificate details, it is not feasible to show all the details on one "
                     + "page. Therefore, the details are paginated.",
             tags = "Certificate Management",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/certificates/view",
-                                    description = "View certificates")}
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:view")
+                    })
             }
     )
     @ApiResponses(value = {
@@ -284,12 +307,10 @@ public interface CertificateManagementAdminService {
             value = "Deleting an SSL Certificate",
             notes = "Delete an SSL certificate that's on the client end.",
             tags = "Certificate Management",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/certificates/manage",
-                                    description = "Manage certificates")}
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = SCOPE, value = "perm:admin:certificates:delete")
+                    })
             }
     )
     @ApiResponses(value = {
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 f584554ecb..bf99446804 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
@@ -18,22 +18,13 @@
  */
 package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Info;
-import io.swagger.annotations.ExtensionProperty;
-import io.swagger.annotations.Extension;
-import io.swagger.annotations.Tag;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.ResponseHeader;
+import io.swagger.annotations.*;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ActivityList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.validation.constraints.Size;
 import javax.ws.rs.*;
@@ -61,6 +52,16 @@ import javax.ws.rs.core.Response;
 @Path("/activities")
 @Api(value = "Activity Info Provider", description = "Activity related information manipulation. For example" +
         " operation details and responses from devices.")
+@Scopes(
+        scopes = {
+        @Scope(
+                name = "Get activities",
+                description = "Get activities",
+                key = "perm:get-activity",
+                permissions = {"/device-mgt/devices/owning-device/view"}
+                )
+        }
+)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public interface ActivityInfoProviderService {
@@ -74,12 +75,10 @@ public interface ActivityInfoProviderService {
             notes = "Retrieve the details of a specific activity/operation, such as the meta information of " +
                     "an operation, including the responses from the devices.",
             tags = "Activity Info Provider",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view"
-                                    , description = "View Activities") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity")
+                })
             }
     )
     @ApiResponses(value = {
@@ -149,12 +148,10 @@ public interface ActivityInfoProviderService {
             notes = "Get the details of the operations/activities executed by the server on the devices registered" +
                     " with WSO2 EMM, during a defined time period.",
             tags = "Activity Info Provider",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view"
-                                    , description = "View Activities") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity")
+                    })
             }
     )
     @ApiResponses(value = {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ConfigurationManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ConfigurationManagementService.java
index a7575d88f0..840f4692a3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ConfigurationManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/ConfigurationManagementService.java
@@ -31,8 +31,11 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -61,6 +64,21 @@ import javax.ws.rs.core.Response;
         "through this API.")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
+@Scopes(scopes = {
+        @Scope(
+                name = "View configurations",
+                description = "",
+                key = "perm:view-configuration",
+                permissions = {"/device-mgt/platform-configurations/view"}
+        ),
+        @Scope(
+                name = "Manage configurations",
+                description = "",
+                key = "perm:manage-configuration",
+                permissions = {"/device-mgt/platform-configurations/manage"}
+        )
+}
+)
 public interface ConfigurationManagementService {
 
     @GET
@@ -72,11 +90,10 @@ public interface ConfigurationManagementService {
                     "General platform configurations include the settings on how often the device need to be monitored. " +
                     "Using this REST API you can get the general platform level configurations.",
             tags = "Configuration Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/platform-configurations/view", description = "View Configurations") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:view-configuration")
+                    })
             }
     )
     @ApiResponses(
@@ -132,11 +149,10 @@ public interface ConfigurationManagementService {
                     "General platform configurations include the settings on how often the the device need to be monitored." +
                     "Using this REST API you can update the general platform level configurations.",
             tags = "Configuration Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/platform-configurations/manage", description = "Manage configurations") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:manage-configuration")
+                    })
             }
     )
     @ApiResponses(
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
index 63e92c1f11..3a0564bb06 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
@@ -13,10 +13,13 @@ import io.swagger.annotations.Info;
 import io.swagger.annotations.ResponseHeader;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Tag;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.analytics.dashboard.bean.DeviceCountByGroup;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DashboardGadgetDataWrapper;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DashboardPaginationGadgetDataWrapper;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -44,6 +47,70 @@ import javax.ws.rs.core.Response;
                 @Tag(name = "device_management", description = "Device Analytics Dashboard related APIs.")
         }
 )
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Device Count Overview",
+                        description = "Device Count Overview",
+                        key = "perm:dashboard:count-overview",
+                        permissions = {"/device-mgt/dashboard/view"}
+                ),
+                @Scope(
+                        name = "Device Counts by Potential Vulnerabilities",
+                        description = "Device Counts by Potential Vulnerabilities",
+                        key = "perm:dashboard:vulnerabilities",
+                        permissions = {"/device-mgt/dashboard/view"}
+                ),
+                @Scope(
+                        name = "Get the number of devices that have not complied to a policy",
+                        description = "Get the number of devices that have not complied to a policy",
+                        key = "perm:dashboard:non-compliant",
+                        permissions = {"/device-mgt/dashboard/view"}
+                ),
+                @Scope(
+                        name = "Get the number of devices for a given device type, such as connectivity status, "
+                                + "potential vulnerability, platform, and ownership",
+                        description = "Get the number of devices for a given device type, such as connectivity status, "
+                                + "potential vulnerability, platform, and ownership",
+                        key = "perm:dashboard:by-groups",
+                        permissions = {"/device-mgt/dashboard/view"}
+                ),
+                @Scope(
+                        name = "Get the number of devices that have not complied to a given policy based on a particular",
+                        description = "Get the number of devices that have not complied to a given policy based on a particular",
+                        key = "perm:dashboard:device-counts",
+                        permissions = {"/device-mgt/dashboard/view"}
+                ),
+                @Scope(
+                        name = "Get the number of devices that have not complied to a given policy based on a particular"
+                                + " device type.",
+                        description = "Get the number of devices that have not complied to a given policy based on a " +
+                                "particular device type.",
+                        key = "perm:dashboard:filtered-count",
+                        permissions = {"/device-mgt/dashboard/view"}
+                ),
+                @Scope(
+                        name = "Get the number of devices that have not complied to a given policy over the total"
+                                + " number of devices registered with WSO2 EMM.\n",
+                        description = "Get the number of devices that have not complied to a given policy over the total"
+                                + " number of devices registered with WSO2 EMM.\n",
+                        key = "perm:dashboard:non-compliant-count",
+                        permissions = {"/device-mgt/dashboard/view"}
+                ),
+                @Scope(
+                        name = "Get device details of devices based on a particular device type.",
+                        description = "Get device details of devices based on a particular device type.",
+                        key = "perm:dashboard:details",
+                        permissions = {"/device-mgt/dashboard/view"}
+                ),
+                @Scope(
+                        name = "Get device details of non-compliant devices which do not comply to a given policy.",
+                        description = "Get device details of non-compliant devices which do not comply to a given policy.",
+                        key = "perm:dashboard:feature-non-compliant",
+                        permissions = {"/device-mgt/dashboard/view"}
+                )
+        }
+)
 @Path("/dashboard")
 @Api(value = "Device Analytics Dashboard",
         description = "Device Analytics Dashboard related information APIs are described here.")
@@ -70,13 +137,12 @@ public interface Dashboard {
             notes = "Get the details of active, inactive, removed and total number of registered devices in"
                     + " WSO2 IoT.",
             tags = "Dashboard",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/dashboard/view",
-                                    description = "View Dashboard")}
-                    )
-            })
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:count-overview")
+                    })
+            }
+    )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
@@ -127,13 +193,12 @@ public interface Dashboard {
             httpMethod = "GET",
             value = "Get the number of unmonitored and non-compliant devices in WSO2 IoT.",
             tags = "Dashboard",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/dashboard/view",
-                                    description = "View Dashboard")}
-                    )
-            })
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:vulnerabilities")
+                    })
+            }
+    )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
@@ -185,13 +250,12 @@ public interface Dashboard {
             value = "Get the number of devices that have not complied to a policy that was enforced on a "
                     + "device.",
             tags = "Dashboard",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/dashboard/view",
-                                    description = "View Dashboard")}
-                    )
-            })
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:non-compliant")
+                    })
+            }
+    )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
@@ -256,13 +320,12 @@ public interface Dashboard {
             value = "Get the number of devices for a given device type, such as connectivity status, "
                     + "potential vulnerability, platform, and ownership.\n",
             tags = "Dashboard",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/dashboard/view",
-                                    description = "View Dashboard")}
-                    )
-            })
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:by-groups")
+                    })
+            }
+    )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
@@ -346,13 +409,12 @@ public interface Dashboard {
             value = "Get the number of devices that have not complied to a given policy based on a particular"
                     + " device type.",
             tags = "Dashboard",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/dashboard/view",
-                                    description = "View Dashboard")}
-                    )
-            })
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:device-counts")
+                    })
+            }
+    )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
@@ -426,13 +488,12 @@ public interface Dashboard {
                     + "The device ownership type, such as BYOD or COPE.\n" + "The device platform.\n"
                     + "The potential vulnerabilities faced by the devices.",
             tags = "Dashboard",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/dashboard/view",
-                                    description = "View Dashboard")}
-                    )
-            })
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:filtered-count")
+                    })
+            }
+    )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
@@ -519,13 +580,12 @@ public interface Dashboard {
             value = "Get the number of devices that have not complied to a given policy over the total"
                     + " number of devices registered with WSO2 IoT.\n",
             tags = "Dashboard",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/dashboard/view",
-                                    description = "View Dashboard")}
-                    )
-            })
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:non-compliant-count")
+                    })
+            }
+    )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
@@ -595,13 +655,12 @@ public interface Dashboard {
             httpMethod = "GET",
             value = "Get device details of devices based on a particular device type.",
             tags = "Dashboard",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/dashboard/view",
-                                    description = "View Dashboard")}
-                    )
-            })
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:details")
+                    })
+            }
+    )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
@@ -698,13 +757,12 @@ public interface Dashboard {
             httpMethod = "GET",
             value = "Get device details of non-compliant devices which do not comply to a given policy.",
             tags = "Dashboard",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/dashboard/view",
-                                    description = "View Dashboard")}
-                    )
-            })
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:dashboard:feature-non-compliant")
+                    })
+            }
+    )
     @ApiResponses(value = {
             @ApiResponse(
                     code = 200,
@@ -780,4 +838,4 @@ public interface Dashboard {
                     value = "Provide how many policy details you require from the starting pagination index.",
                     required = true)
             @QueryParam(RESULT_COUNT) int resultCount);
-}
\ No newline at end of file
+}
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 5a196d8fd9..3c96e96a50 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
@@ -24,13 +24,13 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.app.mgt.Application;
@@ -38,6 +38,7 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.search.SearchContext;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
 
@@ -64,6 +65,64 @@ import javax.ws.rs.core.Response;
                 @Tag(name = "device_management", description = "")
         }
 )
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Getting Details of Registered Devices",
+                        description = "Getting Details of Registered Devices",
+                        key = "perm:devices:view",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Getting Details of a Device",
+                        description = "Getting Details of a Device",
+                        key = "perm:devices:details",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Delete the device specified by device id",
+                        description = "Delete the device specified by device id",
+                        key = "perm:devices:delete",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Getting Feature Details of a Device",
+                        description = "Getting Feature Details of a Device",
+                        key = "perm:devices:features",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Advanced Search for Devices",
+                        description = "Advanced Search for Devices",
+                        key = "perm:devices:search",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Getting Installed Application Details of a Device",
+                        description = "Getting Installed Application Details of a Device",
+                        key = "perm:devices:applications",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Getting Device Operation Details",
+                        description = "Getting Device Operation Details",
+                        key = "perm:devices:operations",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Get the details of the policy that is enforced on a device.",
+                        description = "Get the details of the policy that is enforced on a device.",
+                        key = "perm:devices:effective-policy",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Getting Policy Compliance Details of a Device",
+                        description = "Getting Policy Compliance Details of a Device",
+                        key = "perm:devices:compliance-data",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                )
+        }
+)
 @Path("/devices")
 @Api(value = "Device Management", description = "This API carries all device management related operations " +
         "such as get all the available devices, etc.")
@@ -78,13 +137,11 @@ public interface DeviceManagementService {
             value = "Getting Details of Registered Devices",
             notes = "Provides details of all the devices enrolled with WSO2 EMM.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view"
-                                    , description = "View Devices") }
-                    )
-            }
+            extensions = {
+            @Extension(properties = {
+                    @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:view")
+            })
+    }
     )
     @ApiResponses(value = {
             @ApiResponse(code = 200, message = "OK. \n Successfully fetched the list of devices.",
@@ -205,12 +262,10 @@ public interface DeviceManagementService {
             value = "Getting Details of a Device",
             notes = "Get the details of a device by specifying the device type and device identifier.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                    description = "View Devices") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:details")
+                })
             }
     )
     @ApiResponses(
@@ -282,15 +337,13 @@ public interface DeviceManagementService {
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "DELETE",
-            value = "Delete the device speccified by device id",
+            value = "Delete the device specified by device id",
             notes = "Returns the status of the deleted device operation.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                    description = "View Devices") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:delete")
+                })
             }
     )
     @ApiResponses(
@@ -359,13 +412,11 @@ public interface DeviceManagementService {
                     "Using this REST API you can get the features that can be carried out on a preferred device type," +
                     " such as iOS, Android or Windows.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                    description = "View Devices") }
-                    )
-            }
+            extensions = {
+            @Extension(properties = {
+                    @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:features")
+            })
+    }
     )
     @ApiResponses(
             value = {
@@ -450,12 +501,10 @@ public interface DeviceManagementService {
             value = "Advanced Search for Devices",
             notes = "Search for devices by filtering the search result through the specified search terms.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                    description = "View Devices") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:search")
+                })
             }
     )
     @ApiResponses(
@@ -529,13 +578,12 @@ public interface DeviceManagementService {
             value = "Getting Installed Application Details of a Device",
             notes = "Get the list of applications subscribed to by a device.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                    description = "View Devices") }
-                    )
-            }
+            extensions = {
+            @Extension(properties = {
+                    @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:applications")
+            })
+
+    }
     )
     @ApiResponses(
             value = {
@@ -633,13 +681,11 @@ public interface DeviceManagementService {
             value = "Getting Device Operation Details",
             notes = "Get the details of operations carried out on a selected device.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                    description = "View Devices") }
-                    )
-            }
+            extensions = {
+            @Extension(properties = {
+                    @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:operations")
+            })
+    }
     )
     @ApiResponses(
             value = {
@@ -746,13 +792,11 @@ public interface DeviceManagementService {
                     "WSO2 EMM filters the policies based on the device platform (device type)," +
                     "the device ownership type, the user role or name and finally, the policy that matches these filters will be enforced on the device.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                    description = "View Devices") }
-                    )
-            }
+            extensions = {
+            @Extension(properties = {
+                    @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:effective-policy")
+            })
+    }
     )
     @ApiResponses(
             value = {
@@ -837,12 +881,10 @@ public interface DeviceManagementService {
             notes = "A policy is enforced on the devices that register with WSO2 EMM. " +
                     "The server checks if the settings in the device comply with the policy that is enforced on the device using this REST API.",
             tags = "Device Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                    description = "View Devices") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:devices:compliance-data")
+                })
             }
     )
     @ApiResponses(
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java
index 94b06ea751..83566b6f12 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java
@@ -24,15 +24,16 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceTypeList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.validation.constraints.Size;
 import javax.ws.rs.*;
@@ -54,6 +55,22 @@ import javax.ws.rs.core.Response;
                 @Tag(name = "device_management", description = "")
         }
 )
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Getting the Supported Device Platforms",
+                        description = "Getting the Supported Device Platforms",
+                        key = "perm:device-types:types",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Get Feature Details of a Device Type",
+                        description = "Get Feature Details of a Device Type",
+                        key = "perm:device-types:features",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                )
+        }
+)
 @Path("/device-types")
 @Api(value = "Device Type Management", description = "This API corresponds to all tasks related to device " +
         "type management")
@@ -68,12 +85,10 @@ public interface DeviceTypeManagementService {
             value = "Getting the Supported Device Platforms",
             notes = "Get the list of device platforms supported by WSO2 EMM.",
             tags = "Device Type Management",
-            authorizations = {
-                @Authorization(
-                        value="permission",
-                        scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                description = "View Device Types") }
-                )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:types")
+                    })
             }
     )
     @ApiResponses(
@@ -123,6 +138,7 @@ public interface DeviceTypeManagementService {
                     String ifModifiedSince);
 
     @GET
+    @Path("/{type}/features")
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
@@ -131,12 +147,10 @@ public interface DeviceTypeManagementService {
                     "Using this REST API you can get the features that can be carried out on a preferred device type," +
                     " such as iOS, Android or Windows.",
             tags = "Device Type Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view",
-                                    description = "View Device Types") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:device-types:features")
+                })
             }
     )
     @ApiResponses(
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
index 9d1b255e96..51a6dae87c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
@@ -24,8 +24,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.Authorization;
-import io.swagger.annotations.AuthorizationScope;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Info;
@@ -33,6 +31,8 @@ import io.swagger.annotations.ResponseHeader;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Tag;
 import org.apache.axis2.transport.http.HTTPConstants;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceGroupList;
@@ -40,6 +40,7 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceToGroupsAssignment;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
@@ -75,6 +76,94 @@ import java.util.List;
                                                                "details.")
         }
 )
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Get the list of groups belongs to current user.",
+                        description = "Get the list of groups belongs to current user.",
+                        key = "perm:groups:groups",
+                        permissions = {"/device-mgt/groups/view"}
+                ),
+                @Scope(
+                        name = "Get the count of groups belongs to current user.",
+                        description = "Get the count of groups belongs to current user.",
+                        key = "perm:groups:count",
+                        permissions = {"/device-mgt/groups/view"}
+                ),
+                @Scope(
+                        name = "Add new device group to the system.",
+                        description = "Add new device group to the system.",
+                        key = "perm:groups:add",
+                        permissions = {"/device-mgt/groups/add"}
+                ),
+                @Scope(
+                        name = "View group specified",
+                        description = "View group specified",
+                        key = "perm:groups:groups-view",
+                        permissions = {"/device-mgt/groups/view"}
+                ),
+                @Scope(
+                        name = "Update a group",
+                        description = "Update a group",
+                        key = "perm:groups:update",
+                        permissions = {"/device-mgt/groups/update"}
+                ),
+                @Scope(
+                        name = "Delete a group",
+                        description = "Delete a group",
+                        key = "perm:groups:remove",
+                        permissions = {"/device-mgt/groups/remove"}
+                ),
+                @Scope(
+                        name = "Manage group sharing with a user",
+                        description = "Manage group sharing with a user",
+                        key = "perm:groups:share",
+                        permissions = {"/device-mgt/groups/share"}
+                ),
+                @Scope(
+                        name = "View list of roles of a device group",
+                        description = "View list of roles of a device group",
+                        key = "perm:groups:roles",
+                        permissions = {"/device-mgt/groups/roles/view"}
+                ),
+                @Scope(
+                        name = "View list of devices in the device group",
+                        description = "View list of devices in the device group",
+                        key = "perm:groups:devices",
+                        permissions = {"/device-mgt/groups/devices/view"}
+                ),
+                @Scope(
+                        name = "View list of device count in the device group",
+                        description = "View list of device count in the device group",
+                        key = "perm:groups:devices-count",
+                        permissions = {"/device-mgt/groups/devices/view"}
+                ),
+                @Scope(
+                        name = "Add devices to group",
+                        description = "Add devices to group",
+                        key = "perm:groups:devices-add",
+                        permissions = {"/device-mgt/groups/devices/add"}
+                ),
+                @Scope(
+                        name = "Remove devices from group",
+                        description = "Remove devices from group",
+                        key = "perm:groups:devices-remove",
+                        permissions = {"/device-mgt/groups/devices/remove"}
+                ),
+                @Scope(
+                        name = "Assign devices to groups",
+                        description = "Assign devices to groups",
+                        key = "perm:groups:assign",
+                        permissions = {"/device-mgt/groups/devices/add"}
+                ),
+                @Scope(
+                        name = "List of groups that have the device",
+                        description = "List of groups that have the device",
+                        key = "perm:groups:device",
+                        permissions = {"/device-mgt/groups/devices/view"}
+                )
+        }
+)
 @Path("/groups")
 @Api(value = "Device Group Management", description = "This API carries all device group management related " +
                                                       "operations such as get all the available groups, etc.")
@@ -89,12 +178,10 @@ public interface GroupManagementService {
             value = "Get the list of groups belongs to current user.",
             notes = "Returns all permitted groups enrolled with the system.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/view",
-                                    description = "View Groups") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups")
+                })
             }
     )
     @ApiResponses(value = {
@@ -154,13 +241,12 @@ public interface GroupManagementService {
             value = "Get the count of groups belongs to current user.",
             notes = "Returns count of all permitted groups enrolled with the system.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/view",
-                                    description = "View Groups") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:count")
+                })
             }
+
     )
     @ApiResponses(value = {
             @ApiResponse(code = 200, message = "OK. \n Successfully fetched the device group count.",
@@ -203,12 +289,10 @@ public interface GroupManagementService {
             value = "Add new device group to the system.",
             notes = "Add device group with current user as the owner.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/add",
-                                    description = "Add Group") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:add")
+                })
             }
     )
     @ApiResponses(
@@ -271,12 +355,10 @@ public interface GroupManagementService {
             value = "View group specified.",
             notes = "Returns details of group enrolled with the system.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/view",
-                                    description = "View Groups") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:groups-view")
+                })
             }
     )
     @ApiResponses(value = {
@@ -326,12 +408,10 @@ public interface GroupManagementService {
             notes = "If you wish to make changes to an existing group, that can be done by updating the group using " +
                     "this resource.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/update",
-                                    description = "Update Group") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:update")
+                })
             }
     )
     @ApiResponses(value = {
@@ -385,12 +465,10 @@ public interface GroupManagementService {
             notes = "If you wish to remove an existing group, that can be done by updating the group using " +
                     "this resource.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/remove",
-                                    description = "Remove Group") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:remove")
+                })
             }
     )
     @ApiResponses(value = {
@@ -439,12 +517,10 @@ public interface GroupManagementService {
             notes = "If you wish to share /un share an existing group with a user under defined sharing roles, " +
                     "that can be done using this resource.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/share",
-                                    description = "Share Group") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:share")
+                })
             }
     )
     @ApiResponses(value = {
@@ -497,12 +573,10 @@ public interface GroupManagementService {
             value = "View list of roles of a device group.",
             notes = "Returns details of roles which particular group has been shared with.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/roles/view",
-                                    description = "View roles") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:roles")
+                })
             }
     )
     @ApiResponses(value = {
@@ -551,12 +625,10 @@ public interface GroupManagementService {
             value = "View list of devices in the device group.",
             notes = "Returns list of devices in the device group.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/devices/view",
-                                    description = "View devices") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices")
+                })
             }
     )
     @ApiResponses(value = {
@@ -613,12 +685,10 @@ public interface GroupManagementService {
             value = "View list of device count in the device group.",
             notes = "Returns device count in the device group.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/devices/view",
-                                    description = "View devices") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-count")
+                })
             }
     )
     @ApiResponses(value = {
@@ -667,12 +737,10 @@ public interface GroupManagementService {
             value = "Add devices to group.",
             notes = "Add existing devices to the device group.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/devices/add",
-                                    description = "Add devices") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-add")
+                })
             }
     )
     @ApiResponses(value = {
@@ -725,12 +793,10 @@ public interface GroupManagementService {
             value = "Remove devices from group.",
             notes = "Remove existing devices from the device group.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/groups/devices/remove",
-                                    description = "Remove devices") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:devices-remove")
+                })
             }
     )
     @ApiResponses(value = {
@@ -783,12 +849,10 @@ public interface GroupManagementService {
             value = "Assign devices to groups",
             notes = "Add existing device to device groups.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/groups/devices/add",
-                                    description = "Add devices")}
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:assign")
+                    })
             }
     )
     @ApiResponses(value = {
@@ -837,12 +901,10 @@ public interface GroupManagementService {
             value = "List of groups that have the device",
             notes = "List of groups that have the device.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value = "permission",
-                            scopes = {@AuthorizationScope(scope = "/device-mgt/groups/devices/view",
-                                    description = "Add devices")}
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:groups:device")
+                    })
             }
     )
     @ApiResponses(value = {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java
index 0a2998251c..62db9aacd8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/NotificationManagementService.java
@@ -24,16 +24,17 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
 import org.wso2.carbon.device.mgt.jaxrs.NotificationList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Size;
@@ -60,6 +61,22 @@ import javax.ws.rs.core.Response;
                 @Tag(name = "device_management", description = "")
         }
 )
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Getting All Device Notification Details",
+                        description = "Getting All Device Notification Details",
+                        key = "perm:notifications:view",
+                        permissions = {"/device-mgt/notifications/view"}
+                ),
+                @Scope(
+                        name = "Updating the Device Notification Status",
+                        description = "Updating the Device Notification Status",
+                        key = "perm:notifications:mark-checked",
+                        permissions = {"/device-mgt/notifications/view"}
+                )
+        }
+)
 @Api(value = "Device Notification Management", description = "Device notification related operations can be found here.")
 @Path("/notifications")
 @Produces(MediaType.APPLICATION_JSON)
@@ -73,12 +90,10 @@ public interface NotificationManagementService {
             value = "Getting All Device Notification Details",
             notes = "Get the details of all the notifications that were pushed to the devices registered with WSO2 EMM using this REST API.",
             tags = "Device Notification Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/notifications/view",
-                                    description = "View notifications") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:notifications:view")
+                })
             }
     )
     @ApiResponses(
@@ -164,12 +179,10 @@ public interface NotificationManagementService {
             notes = "When a user has read the the device notification the device notification status must "
                     + "change from NEW to CHECKED. This API is used to update device notification status.",
             tags = "Device Notification Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/notifications/view",
-                                    description = "View notifications") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:notifications:mark-checked")
+                })
             }
     )
     @ApiResponses(
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java
index 1097e2e1ef..7edf7a7556 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java
@@ -24,17 +24,17 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PolicyWrapper;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PriorityUpdatedPolicyWrapper;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import javax.validation.Valid;
@@ -63,6 +63,64 @@ import java.util.List;
                 @Tag(name = "device_management", description = "")
         }
 )
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Adding a Policy",
+                        description = "Adding a Policy",
+                        key = "perm:policies:manage",
+                        permissions = {"/device-mgt/policies/manage"}
+                ),
+                @Scope(
+                        name = "Getting Details of Policies",
+                        description = "Getting Details of Policies",
+                        key = "perm:policies:get-details",
+                        permissions = {"/device-mgt/policies/view"}
+                ),
+                @Scope(
+                        name = "Getting Details of a Policy",
+                        description = "Getting Details of a Policy",
+                        key = "perm:policies:get-policy-details",
+                        permissions = {"/device-mgt/policies/view"}
+                ),
+                @Scope(
+                        name = "Updating a Policy",
+                        description = "Updating a Policy",
+                        key = "perm:policies:update",
+                        permissions = {"/device-mgt/policies/manage"}
+                ),
+                @Scope(
+                        name = "Removing Multiple Policies",
+                        description = "Removing Multiple Policies",
+                        key = "perm:policies:remove",
+                        permissions = {"/device-mgt/policies/manage"}
+                ),
+                @Scope(
+                        name = "Activating Policies",
+                        description = "Activating Policies",
+                        key = "perm:policies:activate",
+                        permissions = {"/device-mgt/policies/manage"}
+                ),
+                @Scope(
+                        name = "Deactivating Policies",
+                        description = "Deactivating Policies",
+                        key = "perm:policies:deactivate",
+                        permissions = {"/device-mgt/policies/manage"}
+                ),
+                @Scope(
+                        name = "Applying Changes on Policies",
+                        description = "Applying Changes on Policies",
+                        key = "perm:policies:changes",
+                        permissions = {"/device-mgt/policies/manage"}
+                ),
+                @Scope(
+                        name = "Updating the Policy Priorities",
+                        description = "Updating the Policy Priorities",
+                        key = "perm:policies:priorities",
+                        permissions = {"/device-mgt/policies/manage"}
+                )
+        }
+)
 @Api(value = "Device Policy Management", description = "This API includes the functionality around device policy management")
 @Path("/policies")
 @Produces(MediaType.APPLICATION_JSON)
@@ -78,12 +136,10 @@ public interface PolicyManagementService {
             notes = "Add a policy using this REST API command. When adding a policy you will have the option of saving the policy or saving and publishing the policy." +
                     "Using this REST API you are able to save a created Policy and this policy will be in the inactive state.",
             tags = "Device Policy Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/policies/manage",
-                                    description = "Manage policies") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:manage")
+                })
             }
     )
     @ApiResponses(
@@ -148,12 +204,10 @@ public interface PolicyManagementService {
             notes = "Retrieve the details of all the policies in WSO2 EMM.",
             response = Policy.class,
             tags = "Device Policy Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/policies/view",
-                                    description = "View policies") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:get-details")
+                })
             }
     )
     @ApiResponses(
@@ -225,12 +279,10 @@ public interface PolicyManagementService {
             notes = "Retrieve the details of a policy that is in WSO2 EMM.",
             response = Policy.class,
             tags = "Device Policy Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/policies/view",
-                                    description = "View policies") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:get-policy-details")
+                })
             }
     )
     @ApiResponses(
@@ -295,12 +347,10 @@ public interface PolicyManagementService {
             value = "Updating a Policy",
             notes = "Make changes to an existing policy by updating the policy using this resource.",
             tags = "Device Policy Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/policies/manage",
-                                    description = "Manage policies") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:update")
+                })
             }
     )
     @ApiResponses(
@@ -365,12 +415,10 @@ public interface PolicyManagementService {
             value = "Removing Multiple Policies",
             notes = "Delete one or more than one policy using this API.",
             tags = "Device Policy Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/policies/manage",
-                                    description = "Manage policies") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:remove")
+                })
             }
     )
     @ApiResponses(
@@ -413,12 +461,10 @@ public interface PolicyManagementService {
             value = "Activating Policies",
             notes = "Publish a policy using this API to bring a policy that is in the inactive state to the active state.",
             tags = "Device Policy Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/policies/manage",
-                                    description = "Manage policies") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:activate")
+                })
             }
     )
     @ApiResponses(
@@ -456,12 +502,10 @@ public interface PolicyManagementService {
             value = "Deactivating Policies",
             notes = "Unpublish a policy using this API to bring a policy that is in the active state to the inactive state.",
             tags = "Device Policy Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/policies/manage",
-                                    description = "Manage policies") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:deactivate")
+                })
             }
     )
     @ApiResponses(
@@ -504,12 +548,10 @@ public interface PolicyManagementService {
                     " devices will not receive these changes immediately. Once all the required changes are made" +
                     " you need to apply the changes to push the policy changes to the existing devices.",
             tags = "Device Policy Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/policies/manage",
-                                    description = "Manage policies") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:changes")
+                })
             }
     )
     @ApiResponses(
@@ -534,13 +576,11 @@ public interface PolicyManagementService {
             value = "Updating the Policy Priorities",
             notes = "Make changes to the existing policy priority order by updating the priority order using this API.",
             tags = "Device Policy Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/policies/manage",
-                                    description = "Manage policies") }
-                    )
-            }
+            extensions = {
+            @Extension(properties = {
+                    @ExtensionProperty(name = Constants.SCOPE, value = "perm:policies:priorities")
+            })
+    }
     )
     @ApiResponses(
             value = {
@@ -565,7 +605,6 @@ public interface PolicyManagementService {
 
     @GET
     @Path("/effective-policy/{deviceType}/{deviceId}")
-    @Permission(name = "Get Effective Policy of Devices", permission = "/device-mgt/policies/view")
     Response getEffectivePolicy(@PathParam("deviceId") String deviceId, @PathParam("deviceType") String deviceType);
 
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java
index cc894b9c0b..e330d7d3d3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/RoleManagementService.java
@@ -24,16 +24,17 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.RoleInfo;
 import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 import org.wso2.carbon.user.mgt.common.UIPermissionNode;
 
 import javax.ws.rs.*;
@@ -56,6 +57,58 @@ import java.util.List;
                 @Tag(name = "device_management", description = "")
         }
 )
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Getting the List of Roles",
+                        description = "Getting the List of Roles",
+                        key = "perm:roles:view",
+                        permissions = {"/device-mgt/roles/view"}
+                ),
+                @Scope(
+                        name = "Getting Permission Details of a Role",
+                        description = "Getting Permission Details of a Role",
+                        key = "perm:roles:permissions",
+                        permissions = {"/device-mgt/roles/view"}
+                ),
+                @Scope(
+                        name = "Getting the List of Roles",
+                        description = "Getting the List of Roles",
+                        key = "perm:roles:details",
+                        permissions = {"/device-mgt/roles/view"}
+                ),
+                @Scope(
+                        name = "Adding a Role",
+                        description = "Adding a Role",
+                        key = "perm:roles:add",
+                        permissions = {"/device-mgt/roles/manage"}
+                ),
+                @Scope(
+                        name = "Adding a combined Role",
+                        description = "Adding a combined Role",
+                        key = "perm:roles:create-combined-role",
+                        permissions = {"/device-mgt/roles/manage"}
+                ),
+                @Scope(
+                        name = "Updating Role Details",
+                        description = "Updating Role Details",
+                        key = "perm:roles:update",
+                        permissions = {"/device-mgt/roles/manage"}
+                ),
+                @Scope(
+                        name = "Deleting a Role",
+                        description = "Deleting a Role",
+                        key = "perm:roles:delete",
+                        permissions = {"/device-mgt/roles/manage"}
+                ),
+                @Scope(
+                        name = "Adding Users to a Role",
+                        description = "Adding Users to a Role",
+                        key = "perm:roles:add-users",
+                        permissions = {"/device-mgt/roles/manage"}
+                )
+        }
+)
 @Path("/roles")
 @Api(value = "Role Management", description = "Role management related operations can be found here.")
 @Produces(MediaType.APPLICATION_JSON)
@@ -70,11 +123,10 @@ public interface RoleManagementService {
             notes = "WSO2 EMM supports role-based access control (RBAC) and role management. Using this API you can the list of roles that are in WSO2 EMM.\n" +
                     "Note: Internal roles, roles created for service-providers, and application related roles will not be given in the output.",
             tags = "Role Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/roles/view", description = "View Roles") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:view")
+                })
             }
     )
     @ApiResponses(
@@ -151,11 +203,10 @@ public interface RoleManagementService {
             response = UIPermissionNode.class,
             responseContainer = "List",
             tags = "Role Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/roles/view", description = "View Roles") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:permissions")
+                })
             }
     )
     @ApiResponses(
@@ -227,12 +278,10 @@ public interface RoleManagementService {
             notes = "Get the permissions associated with a role and role specific details using this REST API.",
             response = RoleInfo.class,
             tags = "Role Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/roles/view",
-                                    description = "View Roles") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:details")
+                })
             }
     )
     @ApiResponses(
@@ -303,12 +352,10 @@ public interface RoleManagementService {
             value = "Adding a Role",
             notes = "WSO2 EMM supports role-based access control (RBAC) and role management. Add a new role to WSO2 EMM using this REST API.",
             tags = "Role Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/roles/manage",
-                                    description = "Manage Roles") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:add")
+                })
             }
     )
     @ApiResponses(value = {
@@ -365,12 +412,10 @@ public interface RoleManagementService {
             value = "Adding a combined Role",
             notes = "WSO2 EMM supports role-based access control (RBAC) and role management. Add a new combined role to WSO2 EMM using this REST API.",
             tags = "Role Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/roles/manage",
-                                                           description = "Manage Roles") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:create-combined-role")
+                })
             }
     )
     @ApiResponses(value = {
@@ -430,12 +475,10 @@ public interface RoleManagementService {
             notes = "There will be situations where you need to update the role details, such as the permissions" +
                     " or the role name. Update the role details using this REST API.",
             tags = "Role Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/roles/manage",
-                                    description = "Manage Roles") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:update")
+                })
             }
     )
     @ApiResponses(value = {
@@ -498,12 +541,10 @@ public interface RoleManagementService {
             notes = "Roles become obsolete over time due to various reasons. In a situation where your Organization identifies that a specific role is no longer required, you " +
                     "can delete a role using this REST API.",
             tags = "Role Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/roles/manage",
-                                    description = "Manage Roles") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:delete")
+                })
             }
     )
     @ApiResponses(value = {
@@ -550,12 +591,10 @@ public interface RoleManagementService {
                     "be cumbersome. Therefore, you can define all the new employees that belong to the engineering " +
                     "role using this API.",
             tags = "Role Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/roles/manage",
-                                    description = "Manage Roles") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:roles:add-users")
+                })
             }
     )
     @ApiResponses(
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java
index 41353a0f4c..1b9acd0c65 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java
@@ -18,20 +18,22 @@
  */
 package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Info;
+import io.swagger.annotations.ExtensionProperty;
+import io.swagger.annotations.Extension;
+import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.AuthorizationScope;
+import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.Authorization;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Extension;
-import io.swagger.annotations.ExtensionProperty;
-import io.swagger.annotations.Info;
 import io.swagger.annotations.ResponseHeader;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
 import org.apache.axis2.transport.http.HTTPConstants;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfo;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfoList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.EnrollmentInvitation;
@@ -39,6 +41,7 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.OldPasswordResetWrapper;
 import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.UserInfo;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
@@ -70,6 +73,76 @@ import java.util.List;
                 @Tag(name = "device_management", description = "")
         }
 )
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Adding a User",
+                        description = "Adding a User",
+                        key = "perm:users:add",
+                        permissions = {"/device-mgt/users/manage"}
+                ),
+                @Scope(
+                        name = "Getting Details of a User",
+                        description = "Getting Details of a User",
+                        key = "perm:users:details",
+                        permissions = {"/device-mgt/users/view"}
+                ),
+                @Scope(
+                        name = "Updating Details of a User",
+                        description = "Updating Details of a User",
+                        key = "perm:users:update",
+                        permissions = {"/device-mgt/users/manage"}
+                ),
+                @Scope(
+                        name = "Deleting a User",
+                        description = "Deleting a User",
+                        key = "perm:users:delete",
+                        permissions = {"/device-mgt/users/manage"}
+                ),
+                @Scope(
+                        name = "Getting the Role Details of a User",
+                        description = "Getting the Role Details of a User",
+                        key = "perm:users:roles",
+                        permissions = {"/device-mgt/users/view"}
+                ),
+                @Scope(
+                        name = "Getting Details of Users",
+                        description = "Getting Details of Users",
+                        key = "perm:users:user-details",
+                        permissions = {"/device-mgt/users/view"}
+                ),
+                @Scope(
+                        name = "Getting the User Count",
+                        description = "Getting the User Count",
+                        key = "perm:users:count",
+                        permissions = {"/device-mgt/users/view"}
+                ),
+                @Scope(
+                        name = "Getting the User existence status",
+                        description = "Getting the User existence status",
+                        key = "perm:users:is-exist",
+                        permissions = {"/device-mgt/users/view"}
+                ),
+                @Scope(
+                        name = "Searching for a User Name",
+                        description = "Searching for a User Name",
+                        key = "perm:users:search",
+                        permissions = {"/device-mgt/users/view"}
+                ),
+                @Scope(
+                        name = "Changing the User Password",
+                        description = "Adding a User",
+                        key = "perm:users:credentials",
+                        permissions = {"/login"}
+                ),
+                @Scope(
+                        name = "Sending Enrollment Invitations to Users",
+                        description = "Sending Enrollment Invitations to Users",
+                        key = "perm:users:send-invitation",
+                        permissions = {"/device-mgt/users/manage"}
+                )
+        }
+)
 @Path("/users")
 @Api(value = "User Management", description = "User management related operations can be found here.")
 @Produces(MediaType.APPLICATION_JSON)
@@ -84,12 +157,10 @@ public interface UserManagementService {
             value = "Adding a User",
             notes = "WSO2 IoTS supports user management. Add a new user to the WSO2 IoTS user management system via this REST API",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/manage",
-                                    description = "Manage Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:add")
+                })
             }
     )
     @ApiResponses(
@@ -146,12 +217,10 @@ public interface UserManagementService {
             notes = "Get the details of a user registered with WSO2 IoTS using the REST API.",
             response = BasicUserInfo.class,
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/view",
-                                    description = "View Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:details")
+                })
             }
     )
     @ApiResponses(value = {
@@ -219,12 +288,10 @@ public interface UserManagementService {
             notes = "There will be situations where you will want to update the user details. In such "
                     + "situation you can update the user details using this REST API.",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/manage",
-                                    description = "Manage Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:update")
+                })
             }
     )
     @ApiResponses(value = {
@@ -286,12 +353,10 @@ public interface UserManagementService {
             value = "Deleting a User",
             notes = "When an employee leaves the organization, you can remove the user details from WSO2 IoTS using this REST API.",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/manage",
-                                    description = "Manage Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:delete")
+                })
             }
     )
     @ApiResponses(value = {
@@ -331,12 +396,10 @@ public interface UserManagementService {
             value = "Getting the Role Details of a User",
             notes = "A user can be assigned to one or more role in IoTS. Using this REST API you can get the role/roles a user is assigned to.",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/view",
-                                    description = "View Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:roles")
+                })
             }
     )
     @ApiResponses(value = {
@@ -395,12 +458,10 @@ public interface UserManagementService {
             notes = "You are able to manage users in WSO2 IoTS by adding, updating and removing users. If you wish to get the list of users registered with WSO2 IoTS, you can do so "
                     + "using this REST API",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/view",
-                                    description = "View Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:user-details")
+                })
             }
     )
     @ApiResponses(value = {
@@ -468,11 +529,10 @@ public interface UserManagementService {
             value = "Getting the User Count",
             notes = "Get the number of users in WSO2 IoTS via this REST API.",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/view", description = "View Users") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:count")
+                    })
             }
     )
     @ApiResponses(value = {
@@ -504,12 +564,10 @@ public interface UserManagementService {
             value = "Getting the User existence status",
             notes = "Check if the user exists in the user store.",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/view",
-                                    description = "View Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:is-exist")
+                })
             }
     )
     @ApiResponses(value = {
@@ -549,11 +607,10 @@ public interface UserManagementService {
                     + "You will be given a list of users having the user name in the exact order of the "
                     + "characters you provided.",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/view", description = "View Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:search")
+                })
             }
     )
     @ApiResponses(value = {
@@ -627,11 +684,10 @@ public interface UserManagementService {
             value = "Changing the User Password",
             notes = "A user is able to change the password to secure their WSO2 IoTS profile via this REST API.",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/login", description = "Reset user password") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:credentials")
+                })
             }
     )
     @ApiResponses(value = {
@@ -673,11 +729,10 @@ public interface UserManagementService {
             notes = "Send the users a mail inviting them to enroll their devices using the REST API given below.\n" +
                     "Before running the REST API command to send the enrollment invitations to users make sure to configure WSO2 IoTS as explained in step 4, under the WSO2 IoTS general server configurations documentation.",
             tags = "User Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/manage", description = "Manage Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:users:send-invitation")
+                })
             }
     )
     @ApiResponses(value = {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/ApplicationManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/ApplicationManagementAdminService.java
index 132d1e1377..92c42bfb3b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/ApplicationManagementAdminService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/ApplicationManagementAdminService.java
@@ -18,11 +18,22 @@
  */
 package org.wso2.carbon.device.mgt.jaxrs.service.api.admin;
 
-import io.swagger.annotations.*;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Info;
+import io.swagger.annotations.ExtensionProperty;
+import io.swagger.annotations.Extension;
+import io.swagger.annotations.Tag;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ApplicationWrapper;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -50,6 +61,22 @@ import javax.ws.rs.core.Response;
 @Api(value = "Application Management Administrative Service", description = "This an  API intended to be used by " +
         "'internal' components to log in as an admin user and do a selected number of operations. " +
         "Further, this is strictly restricted to admin users only ")
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Installing an Application (Internal API)",
+                        description = "Installing an Application (Internal API)",
+                        key = "perm:applications:install",
+                        permissions = {"/device-mgt/applications/manage"}
+                ),
+                @Scope(
+                        name = "Uninstalling an Application (Internal API)",
+                        description = "Uninstalling an Application (Internal API)",
+                        key = "perm:applications:uninstall",
+                        permissions = {"/device-mgt/applications/manage"}
+                )
+        }
+)
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 public interface ApplicationManagementAdminService {
@@ -64,12 +91,10 @@ public interface ApplicationManagementAdminService {
             notes = "This is an internal API that can be used to install an application on a device.",
             response = Activity.class,
             tags = "Application Management Administrative Service",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/applications/manage", description
-                                    = "Install/Uninstall applications") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:applications:install")
+                    })
             }
     )
     @ApiResponses(value = {
@@ -110,12 +135,10 @@ public interface ApplicationManagementAdminService {
             notes = "This is an internal API that can be used to uninstall an application.",
             response = Activity.class,
             tags = "Application Management Administrative Service",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/applications/manage", description
-                                    = "Install/Uninstall applications") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:applications:uninstall")
+                    })
             }
     )
     @ApiResponses(value = {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceAccessAuthorizationAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceAccessAuthorizationAdminService.java
index 3ee519e356..bea9ebedd5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceAccessAuthorizationAdminService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceAccessAuthorizationAdminService.java
@@ -22,7 +22,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAuthorizationResult;
 import org.wso2.carbon.device.mgt.jaxrs.beans.AuthorizationRequest;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java
index 6266a9b737..14a34d3520 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java
@@ -24,15 +24,16 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.validation.constraints.Size;
 import javax.ws.rs.*;
@@ -60,6 +61,16 @@ import javax.ws.rs.core.Response;
         "Further, this is strictly restricted to admin users only ")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "Getting Details of a Device",
+                        description = "Getting Details of a Device",
+                        key = "perm:admin:devices:view",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
+                )
+        }
+)
 public interface DeviceManagementAdminService {
 
     @GET
@@ -71,12 +82,10 @@ public interface DeviceManagementAdminService {
             response = Device.class,
             responseContainer = "List",
             tags = "Device Management Administrative Service",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/devices/owning-device/view", description
-                                    = "View Devices") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:devices:view")
+                    })
             }
     )
     @ApiResponses(value = {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
index daffe2a6c5..64020ce56e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
@@ -25,16 +25,17 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.ResponseHeader;
 import org.apache.axis2.transport.http.HTTPConstants;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceGroupList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -61,6 +62,22 @@ import javax.ws.rs.core.Response;
 @Api(value = "Group Management Administrative Service", description = "This an  API intended to be used by " +
         "'internal' components to log in as an admin user and do a selected number of operations. " +
         "Further, this is strictly restricted to admin users only ")
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "View groups",
+                        description = "",
+                        key = "perm:admin-groups:view",
+                        permissions = {"/device-mgt/admin/groups/view"}
+                ),
+                @Scope(
+                        name = "Count groups",
+                        description = "",
+                        key = "perm:admin-groups:count",
+                        permissions = {"/device-mgt/admin/groups/view"}
+                )
+        }
+)
 public interface GroupManagementAdminService {
 
     @GET
@@ -70,12 +87,10 @@ public interface GroupManagementAdminService {
             value = "Get the list of groups.",
             notes = "Returns all groups enrolled with the system.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/admin/groups/view", description
-                                    = "View Groups") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-groups:view")
+                    })
             }
     )
     @ApiResponses(value = {
@@ -135,12 +150,10 @@ public interface GroupManagementAdminService {
             value = "Get the count of groups belongs to current user.",
             notes = "Returns count of all permitted groups enrolled with the system.",
             tags = "Device Group Management",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/admin/groups/view", description
-                                    = "View Groups") }
-                    )
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-groups:count")
+                    })
             }
     )
     @ApiResponses(value = {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java
index 99914a94ab..c6c7130926 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/UserManagementAdminService.java
@@ -24,14 +24,15 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PasswordResetWrapper;
+import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.validation.constraints.Size;
 import javax.ws.rs.*;
@@ -53,6 +54,16 @@ import javax.ws.rs.core.Response;
                 @Tag(name = "device_management", description = "")
         }
 )
+@Scopes(
+        scopes = {
+                @Scope(
+                        name = "View Users",
+                        description = "View Users",
+                        key = "perm:admin-users:view",
+                        permissions = {"/device-mgt/users/manage"}
+                )
+        }
+)
 @Path("/admin/users")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
@@ -71,12 +82,10 @@ public interface UserManagementAdminService {
             notes = "The EMM administrator is able to change the password of the users in " +
                     "the system and block them from logging into their EMM profile using this REST API.",
             tags = "User Management Administrative Service",
-            authorizations = {
-                    @Authorization(
-                            value="permission",
-                            scopes = { @AuthorizationScope(scope = "/device-mgt/users/manage", description
-                                    = "View Users") }
-                    )
+            extensions = {
+                @Extension(properties = {
+                        @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin-users:view")
+                })
             }
     )
     @ApiResponses(value = {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/swagger/extension/SecurityDefinitionConfigurator.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/swagger/extension/SecurityDefinitionConfigurator.java
index 32503d4c3a..dbf61c4761 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/swagger/extension/SecurityDefinitionConfigurator.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/swagger/extension/SecurityDefinitionConfigurator.java
@@ -24,8 +24,11 @@ import io.swagger.jaxrs.config.ReaderListener;
 import io.swagger.models.Swagger;
 import io.swagger.models.auth.OAuth2Definition;
 import io.swagger.models.auth.SecuritySchemeDefinition;
+import org.wso2.carbon.device.mgt.jaxrs.beans.Scope;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @SwaggerDefinition(
@@ -54,6 +57,7 @@ public class SecurityDefinitionConfigurator implements ReaderListener {
         schemes.put(TOKEN_AUTH_SCHEME, tokenScheme);
 
         swagger.setSecurityDefinitions(schemes);
+       //TODO: Have to add wso2-scopes to swagger definition from here
     }
 
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/Constants.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/Constants.java
index d9981ba782..c5fa21ae89 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/Constants.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/Constants.java
@@ -27,6 +27,7 @@ public class Constants {
 	public static final String USER_CLAIM_FIRST_NAME = "http://wso2.org/claims/givenname";
 	public static final String USER_CLAIM_LAST_NAME = "http://wso2.org/claims/lastname";
 	public static final String PRIMARY_USER_STORE = "PRIMARY";
+	public static final String SCOPE = "scope";
 
 	public final class ErrorMessages {
 		private ErrorMessages () { throw new AssertionError(); }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/AnnotationProcessor.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/AnnotationProcessor.java
index 86735ff88a..88849f2d22 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/AnnotationProcessor.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/AnnotationProcessor.java
@@ -23,6 +23,7 @@ import io.swagger.models.Swagger;
 import org.apache.catalina.core.StandardContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.apimgt.api.model.Scope;
 import org.wso2.carbon.device.mgt.common.permission.mgt.Permission;
 
 import javax.servlet.ServletContext;
@@ -38,10 +39,7 @@ import java.net.URI;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.*;
 
 public class AnnotationProcessor {
 
@@ -56,11 +54,16 @@ public class AnnotationProcessor {
     private static final String STRING_ARR = "string_arr";
     private static final String STRING = "string";
 
-    private static final String SWAGGER_ANNOTATIONS_AUTHORIZATIONS = "authorizations";
-    private static final String SWAGGER_ANNOTATIONS_PERMISSION = "permission";
-    private static final String SWAGGER_ANNOTATIONS_SCOPES = "scopes";
-    private static final String SWAGGER_ANNOTATIONS_SCOPE = "scope";
-    private static final String SWAGGER_ANNOTATIONS_DESCRIPTION = "description";
+    private static final String SWAGGER_ANNOTATIONS_PROPERTIES = "properties";
+    private static final String SWAGGER_ANNOTATIONS_EXTENSIONS = "extensions";
+    private static final String SWAGGER_ANNOTATIONS_PROPERTIES_VALUE = "value";
+    private static final String SWAGGER_ANNOTATIONS_PROPERTIES_NAME = "name";
+    private static final String SWAGGER_ANNOTATIONS_PROPERTIES_DESCRIPTION = "description";
+    private static final String SWAGGER_ANNOTATIONS_PROPERTIES_KEY = "key";
+    private static final String SWAGGER_ANNOTATIONS_PROPERTIES_PERMISSIONS = "permissions";
+    private static final String ANNOTATIONS_SCOPES = "scopes";
+
+    private static final String PERMISSION_PREFIX = "/permission/admin";
 
     private StandardContext context;
     private Method[] pathClazzMethods;
@@ -74,6 +77,11 @@ public class AnnotationProcessor {
     private Class<io.swagger.annotations.ApiOperation> apiOperation;
     private Class<io.swagger.annotations.Authorization> authorizationClass;
     private Class<io.swagger.annotations.AuthorizationScope> authorizationScopeClass;
+    private Class<io.swagger.annotations.Extension> extensionClass;
+    private Class<io.swagger.annotations.ExtensionProperty> extensionPropertyClass;
+    private Class<org.wso2.carbon.apimgt.annotations.api.Scope> scopeClass;
+    private Class<org.wso2.carbon.apimgt.annotations.api.Scopes> scopesClass;
+    private Map<String, Scope> apiScopes;
 
 
     public AnnotationProcessor(final StandardContext context) {
@@ -90,6 +98,15 @@ public class AnnotationProcessor {
                     .loadClass((io.swagger.annotations.Authorization.class.getName()));
             authorizationScopeClass = (Class<io.swagger.annotations.AuthorizationScope>)classLoader
                     .loadClass((io.swagger.annotations.AuthorizationScope.class.getName()));
+            extensionClass = (Class<io.swagger.annotations.Extension>)classLoader
+                    .loadClass((io.swagger.annotations.Extension.class.getName()));
+            extensionPropertyClass = (Class<io.swagger.annotations.ExtensionProperty>)classLoader
+                    .loadClass(io.swagger.annotations.ExtensionProperty.class.getName());
+            scopeClass = (Class<org.wso2.carbon.apimgt.annotations.api.Scope>) classLoader
+                    .loadClass(org.wso2.carbon.apimgt.annotations.api.Scope.class.getName());
+            scopesClass = (Class<org.wso2.carbon.apimgt.annotations.api.Scopes>) classLoader
+                    .loadClass(org.wso2.carbon.apimgt.annotations.api.Scopes.class.getName());
+
         } catch (ClassNotFoundException e) {
             log.error("An error has occurred while loading classes ", e);
         }
@@ -135,6 +152,10 @@ public class AnnotationProcessor {
                                 try {
                                     clazz = classLoader.loadClass(className);
                                     Annotation apiAnno = clazz.getAnnotation(apiClazz);
+                                    Annotation scopesAnno = clazz.getAnnotation(scopesClass);
+                                    if (scopesAnno != null) {
+                                        apiScopes = processAPIScopes(scopesAnno);
+                                    }
                                     List<Permission> resourceList;
                                     if (apiAnno != null) {
                                         if (log.isDebugEnabled()) {
@@ -165,7 +186,9 @@ public class AnnotationProcessor {
                                         }
                                     }
                                 } catch (ClassNotFoundException e) {
-                                    log.error("Error when passing the api annotation for device type apis.");
+                                    log.error("Error when passing the api annotation for device type apis.", e);
+                                } catch (Throwable e) {
+                                    log.error("Error when passing the scopes annotation for device type apis.", e);
                                 }
                                 return apiPermissions;
                             }
@@ -342,28 +365,55 @@ public class AnnotationProcessor {
 
     private void setPermission(Annotation currentMethod, Permission permission) throws Throwable {
         InvocationHandler methodHandler = Proxy.getInvocationHandler(currentMethod);
-        Annotation[] authorizations = (Annotation[]) methodHandler.invoke(currentMethod
-                , apiOperation.getMethod(SWAGGER_ANNOTATIONS_AUTHORIZATIONS,null),null);
-        for(int i=0; i<authorizations.length; i++){
-            methodHandler = Proxy.getInvocationHandler(authorizations[i]);
-            String value =(String)methodHandler.invoke(authorizations[i], authorizationClass.getMethod("value", null)
-                    ,null);
-            if(SWAGGER_ANNOTATIONS_PERMISSION.equals(value)){
-                Annotation[] scopes =(Annotation[])methodHandler.invoke(authorizations[i], authorizationClass
-                        .getMethod(SWAGGER_ANNOTATIONS_SCOPES, null),null);
-                String[] scopesList = new String[scopes.length];
-                String[] descriptions = new String[scopes.length];
-                for(int j=0; j<scopes.length; j++){
-                    methodHandler = Proxy.getInvocationHandler(scopes[j]);
-                    scopesList[j] = (String)methodHandler.invoke(authorizations[j], authorizationScopeClass
-                            .getMethod(SWAGGER_ANNOTATIONS_SCOPE, null),null);
-                    descriptions[j] = (String)methodHandler.invoke(authorizations[j], authorizationScopeClass
-                            .getMethod(SWAGGER_ANNOTATIONS_DESCRIPTION, null),null);
-                }
-                //todo currently permission tree supports only adding one permission per API point.
-                permission.setName(descriptions[0]);
-                permission.setPath(scopesList[0]);
+        Annotation[] extensions = (Annotation[]) methodHandler.invoke(currentMethod,
+                apiOperation.getMethod(SWAGGER_ANNOTATIONS_EXTENSIONS, null), null);
+        methodHandler = Proxy.getInvocationHandler(extensions[0]);
+        Annotation[] properties =  (Annotation[])methodHandler.invoke(extensions[0], extensionClass
+                .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES,null), null);
+        Scope scope;
+        for (Annotation property : properties) {
+            methodHandler = Proxy.getInvocationHandler(property);
+            String scopeKey = (String) methodHandler.invoke(property, extensionPropertyClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_VALUE, null),null);
+            if (!scopeKey.isEmpty()) {
+                scope = apiScopes.get(scopeKey);
+                permission.setName(scope.getName());
+                //TODO: currently permission tree supports only adding one permission per API point.
+                permission.setPath(scope.getRoles().split(" ")[0]);
+            }
+        }
+    }
+
+    private Map<String,Scope> processAPIScopes(Annotation annotation) throws Throwable {
+        Map<String, Scope> scopes = new HashMap<>();
+
+        InvocationHandler methodHandler = Proxy.getInvocationHandler(annotation);
+        Annotation[] annotatedScopes = (Annotation[]) methodHandler.invoke(annotation, scopesClass
+                .getMethod(ANNOTATIONS_SCOPES, null), null);
+
+        Scope scope;
+        String permissions[];
+        StringBuilder aggregatedPermissions;
+        for(int i=0; i<annotatedScopes.length; i++){
+            aggregatedPermissions = new StringBuilder();
+            methodHandler = Proxy.getInvocationHandler(annotatedScopes[i]);
+            scope = new Scope();
+            scope.setName(invokeMethod(scopeClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_NAME), annotatedScopes[i], STRING));
+            scope.setDescription(invokeMethod(scopeClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_DESCRIPTION), annotatedScopes[i], STRING));
+            scope.setKey(invokeMethod(scopeClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_KEY), annotatedScopes[i], STRING));
+            permissions = (String[])methodHandler.invoke(annotatedScopes[i], scopeClass
+                    .getMethod(SWAGGER_ANNOTATIONS_PROPERTIES_PERMISSIONS, null),null);
+            for (String permission : permissions) {
+                aggregatedPermissions.append(PERMISSION_PREFIX);
+                aggregatedPermissions.append(permission);
+                aggregatedPermissions.append(" ");
             }
+            scope.setRoles(aggregatedPermissions.toString());
+            scopes.put(scope.getKey(), scope);
         }
+        return scopes;
     }
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index e9e1d99ce6..442d77d41b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -62,53 +62,84 @@
         "copyrightSuffix" : " All Rights Reserved."
     },
     "scopes" : [
-        "user:manage",
-        "user:view",
-        "device-type:admin:view",
-        "device:view",
-        "notification:view",
-        "device:admin:view",
-        "application:manage",
-        "activity:view",
-        "user:admin:reset-password",
-        "policy:manage",
-        "policy:view",
-        "role:manage",
-        "role:view",
-        "configuration:view",
-        "configuration:modify",
-        "device:android:operation:reboot",
-        "device:android:operation:camera",
-        "device:android:operation:vpn",
-        "device:android:operation:lock",
-        "device:android:operation:ring",
-        "device:android:operation:update-app",
-        "device:android:operation:wipe",
-        "device:android:operation:encrypt",
-        "device:android:operation:blacklist-app",
-        "device:android:operation:applications",
-        "device:android:operation:enterprise-wipe",
-        "device:android:operation:info",
-        "device:android:operation:wifi",
-        "device:android:operation:uninstall-app",
-        "device:android:operation:change-lock",
-        "device:android:operation:notification",
-        "device:android:operation:upgrade",
-        "device:android:operation:unlock",
-        "device:android:operation:mute",
-        "device:android:operation:location",
-        "device:android:operation:webclip",
-        "device:android:operation:clear-password",
-        "device:android:operation:password-policy",
-        "device:android:operation:install-app",
-        "device:android:event:write",
-        "device:android:event:read",
-        "device:android:enroll",
-        "configuration:manage",
-        "configuration:view",
-        "device:android:enroll",
-        "certificate:view",
-        "certificate:manage"
+        "perm:sign-csr",
+        "perm:admin:devices:view",
+        "perm:roles:add",
+        "perm:roles:add-users",
+        "perm:roles:update",
+        "perm:roles:permissions",
+        "perm:roles:details",
+        "perm:roles:view",
+        "perm:roles:create-combined-role",
+        "perm:roles:delete",
+        "perm:dashboard:vulnerabilities",
+        "perm:dashboard:non-compliant-count",
+        "perm:dashboard:non-compliant",
+        "perm:dashboard:by-groups",
+        "perm:dashboard:device-counts",
+        "perm:dashboard:feature-non-compliant",
+        "perm:dashboard:count-overview",
+        "perm:dashboard:filtered-count",
+        "perm:dashboard:details",
+        "perm:get-activity",
+        "perm:devices:delete",
+        "perm:devices:applications",
+        "perm:devices:effective-policy",
+        "perm:devices:compliance-data",
+        "perm:devices:features",
+        "perm:devices:operations",
+        "perm:devices:search",
+        "perm:devices:details",
+        "perm:devices:view",
+        "perm:view-configuration",
+        "perm:manage-configuration",
+        "perm:policies:remove",
+        "perm:policies:priorities",
+        "perm:policies:deactivate",
+        "perm:policies:get-policy-details",
+        "perm:policies:manage",
+        "perm:policies:activate",
+        "perm:policies:update",
+        "perm:policies:changes",
+        "perm:policies:get-details",
+        "perm:users:add",
+        "perm:users:details",
+        "perm:users:count",
+        "perm:users:delete",
+        "perm:users:roles",
+        "perm:users:user-details",
+        "perm:users:credentials",
+        "perm:users:search",
+        "perm:users:is-exist",
+        "perm:users:update",
+        "perm:users:send-invitation",
+        "perm:admin-users:view",
+        "perm:groups:devices",
+        "perm:groups:update",
+        "perm:groups:add",
+        "perm:groups:device",
+        "perm:groups:devices-count",
+        "perm:groups:remove",
+        "perm:groups:groups",
+        "perm:groups:groups-view",
+        "perm:groups:share",
+        "perm:groups:count",
+        "perm:groups:roles",
+        "perm:groups:devices-remove",
+        "perm:groups:devices-add",
+        "perm:groups:assign",
+        "perm:device-types:features",
+        "perm:device-types:types",
+        "perm:applications:install",
+        "perm:applications:uninstall",
+        "perm:admin-groups:count",
+        "perm:admin-groups:view",
+        "perm:notifications:mark-checked",
+        "perm:notifications:view",
+        "perm:admin:certificates:delete",
+        "perm:admin:certificates:details",
+        "perm:admin:certificates:view",
+        "perm:admin:certificates:add"
     ],
     "isOAuthEnabled" : true,
     "backendRestEndpoints" : {
diff --git a/pom.xml b/pom.xml
index 25606f6ba1..e48e296762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1887,7 +1887,7 @@
     <properties>
         <servelet.jsp.version>2.2.1</servelet.jsp.version>
         <testng.version>6.1.1</testng.version>
-        <carbon.kernel.version>4.4.10</carbon.kernel.version>
+        <carbon.kernel.version>4.4.11</carbon.kernel.version>
         <carbon.kernel.449.version>4.4.9</carbon.kernel.449.version>
         <carbon.kernel.version.range>[4.4.0, 5.0.0)</carbon.kernel.version.range>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@@ -1931,12 +1931,12 @@
         <carbon.deployment.version>4.7.2</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.framework.version>5.6.89</carbon.identity.framework.version>
-        <identity.inbound.auth.oauth.version>5.2.33</identity.inbound.auth.oauth.version>
-        <identity.inbound.auth.saml.version>5.2.14</identity.inbound.auth.saml.version>
+        <carbon.identity.framework.version>5.7.0</carbon.identity.framework.version>
+        <identity.inbound.auth.oauth.version>5.3.1</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.saml.version>5.3.0</identity.inbound.auth.saml.version>
 
         <!-- Carbon Identity import version ranges -->
-        <carbon.identity.imp.pkg.version>[5.6.0, 6.0.0)</carbon.identity.imp.pkg.version>
+        <carbon.identity.imp.pkg.version>[5.7.0, 6.0.0)</carbon.identity.imp.pkg.version>
         <carbon.identity-inbound-auth-oauth.imp.pkg.version>[5.2.0, 6.0.0)</carbon.identity-inbound-auth-oauth.imp.pkg.version>
         <carbon.identity-user-ws.imp.pkg.version>[5.1.0, 6.0.0)</carbon.identity-user-ws.imp.pkg.version>
 
@@ -1962,7 +1962,7 @@
 	    <commons-lang.wso2.osgi.version.range>[2.6.0,3.0.0)</commons-lang.wso2.osgi.version.range>
 
         <!-- Carbon API Management -->
-        <carbon.api.mgt.version>6.1.2</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.1.35</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Analytics Commons -->