diff --git a/assembly/api/descriptors/kapua-api-jetty.xml b/assembly/api/descriptors/kapua-api-jetty.xml
index d98694e3596..8b7209f7604 100644
--- a/assembly/api/descriptors/kapua-api-jetty.xml
+++ b/assembly/api/descriptors/kapua-api-jetty.xml
@@ -64,4 +64,10 @@
             </excludes>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>${project.build.directory}/tmp/openapi.yaml</source>
+            <outputDirectory>var/opt/jetty/webapps/root/doc</outputDirectory>
+        </file>
+    </files>
 </assembly>
diff --git a/assembly/api/pom.xml b/assembly/api/pom.xml
index 4c23314822e..d6fdf943f58 100644
--- a/assembly/api/pom.xml
+++ b/assembly/api/pom.xml
@@ -24,6 +24,10 @@
     <packaging>pom</packaging>
     <artifactId>kapua-assembly-api</artifactId>
 
+    <properties>
+        <nodejs.version>10.16.3</nodejs.version>
+    </properties>
+
     <dependencies>
 
         <dependency>
@@ -222,6 +226,31 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install-node-and-npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>install-swagger-cli</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install -g swagger-cli</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <nodeVersion>v${nodejs.version}</nodeVersion>
+                    <installDirectory>target</installDirectory>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -244,7 +273,54 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>unpack-openapi</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.eclipse.kapua</groupId>
+                                    <artifactId>kapua-rest-api-resources</artifactId>
+                                    <version>${project.version}</version>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/tmp</outputDirectory>
+                                    <includes>openapi/**/*</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-openapi</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                    </execution>
                 </executions>
+                <configuration>
+                    <executable>${project.build.directory}/bin/swagger-cli</executable>
+                    <environmentVariables>
+                        <PATH>$PATH:${project.build.directory}/node</PATH>
+                    </environmentVariables>
+                    <arguments>
+                        <argument>bundle</argument>
+                        <argument>--dereference</argument>
+                        <argument>-t</argument>
+                        <argument>yaml</argument>
+                        <argument>-o</argument>
+                        <argument>${project.build.directory}/tmp/openapi.yaml</argument>
+                        <argument>${project.build.directory}/tmp/openapi/openapi.yaml</argument>
+                    </arguments>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/assembly/api/resources/index.html b/assembly/api/resources/index.html
index 73bdaa66afd..b3310485668 100644
--- a/assembly/api/resources/index.html
+++ b/assembly/api/resources/index.html
@@ -17,7 +17,7 @@
     <script>
       window.onload = function() {
         window.ui = SwaggerUIBundle({
-          url: "../v1/swagger.json",
+          url: "./openapi.yaml",
           dom_id: '#swagger-ui',
           deepLinking: true,
           presets: [
diff --git a/message/api/src/main/java/org/eclipse/kapua/message/KapuaMessage.java b/message/api/src/main/java/org/eclipse/kapua/message/KapuaMessage.java
index fb32e9ccb9b..1915d8a42a0 100644
--- a/message/api/src/main/java/org/eclipse/kapua/message/KapuaMessage.java
+++ b/message/api/src/main/java/org/eclipse/kapua/message/KapuaMessage.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.message;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.message.device.data.KapuaDataMessage;
 import org.eclipse.kapua.message.xml.MessageXmlRegistry;
 import org.eclipse.kapua.model.id.KapuaId;
@@ -76,7 +75,6 @@ public interface KapuaMessage<C extends KapuaChannel, P extends KapuaPayload> ex
      */
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getScopeId();
 
     /**
@@ -112,7 +110,6 @@ public interface KapuaMessage<C extends KapuaChannel, P extends KapuaPayload> ex
      */
     @XmlElement(name = "deviceId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getDeviceId();
 
     /**
diff --git a/message/api/src/main/java/org/eclipse/kapua/message/KapuaPayload.java b/message/api/src/main/java/org/eclipse/kapua/message/KapuaPayload.java
index b399815e118..96fb4f8ba6f 100644
--- a/message/api/src/main/java/org/eclipse/kapua/message/KapuaPayload.java
+++ b/message/api/src/main/java/org/eclipse/kapua/message/KapuaPayload.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.message;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.commons.util.Payloads;
 import org.eclipse.kapua.message.xml.MessageXmlRegistry;
 import org.eclipse.kapua.message.xml.MetricsXmlAdapter;
@@ -62,7 +61,6 @@ public interface KapuaPayload extends Payload {
      */
     @XmlElement(name = "body")
     @XmlJavaTypeAdapter(BinaryXmlAdapter.class)
-    @ApiModelProperty(dataType = "string")
     byte[] getBody();
 
     /**
diff --git a/pom.xml b/pom.xml
index c9a580385e9..ae0c1a80693 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,6 @@
 
         <logback.version>1.2.3</logback.version>
         <snakeyaml.version>1.15</snakeyaml.version>
-        <swagger.version>1.5.12</swagger.version>
         <cucumber.version>1.2.4</cucumber.version>
         <spotify.version>8.15.1</spotify.version>
         <elasticsearch.version>5.3.0</elasticsearch.version>
@@ -110,6 +109,7 @@
         <maven-dependency-plugin.version>3.0.1</maven-dependency-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
+        <maven-frontend-plugin.version>1.8.0</maven-frontend-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
         <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
@@ -124,6 +124,7 @@
         <dependency-check-maven.version>1.4.5</dependency-check-maven.version>
         <docker-maven-plugin.version>0.24.0</docker-maven-plugin.version>
         <eclipse-lifecycle-mapping.version>1.0.0</eclipse-lifecycle-mapping.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <jacoco.version>0.7.9</jacoco.version>
         <jacoco-extras.version>0.1.1</jacoco-extras.version>
         <karaf-maven-plugin.version>4.1.1</karaf-maven-plugin.version>
@@ -413,7 +414,7 @@
 
                         <sourceDirectory>${project.basedir}</sourceDirectory>
                         <includes>**/*.java, **/*.xml</includes>
-                        <excludes>**/target/**/*, **/.settings/**/*, maven/**/*, .maven/**/*, .idea/**/*</excludes>
+                        <excludes>**/target/**/*, **/.settings/**/*, maven/**/*, .maven/**/*, .idea/**/*, **/node/**/*</excludes>
                     </configuration>
                 </plugin>
             </plugins>
@@ -493,6 +494,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>${maven-frontend-plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>${exec-maven-plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 
@@ -1248,11 +1259,6 @@
                 <artifactId>opencsv</artifactId>
                 <version>${opencsv.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.paho</groupId>
                 <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
diff --git a/rest-api/core/src/main/java/org/eclipse/kapua/app/api/core/SwaggerDefinition.java b/rest-api/core/src/main/java/org/eclipse/kapua/app/api/core/SwaggerDefinition.java
deleted file mode 100644
index 02c61975e68..00000000000
--- a/rest-api/core/src/main/java/org/eclipse/kapua/app/api/core/SwaggerDefinition.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Eurotech and/or its affiliates and others
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.app.api.core;
-
-import io.swagger.annotations.ApiKeyAuthDefinition;
-import io.swagger.annotations.ApiKeyAuthDefinition.ApiKeyLocation;
-import io.swagger.annotations.SecurityDefinition;
-
-@io.swagger.annotations.SwaggerDefinition(
-        securityDefinition = @SecurityDefinition(
-                apiKeyAuthDefinitions = {
-                        @ApiKeyAuthDefinition(in = ApiKeyLocation.HEADER, name = "Authorization", key = "kapuaAccessToken")
-                }
-        )
-)
-public interface SwaggerDefinition { }
\ No newline at end of file
diff --git a/rest-api/core/src/main/java/org/eclipse/kapua/app/api/core/exception/model/EntityNotFoundExceptionInfo.java b/rest-api/core/src/main/java/org/eclipse/kapua/app/api/core/exception/model/EntityNotFoundExceptionInfo.java
index 9f31aadcae2..1bcbb571bc8 100644
--- a/rest-api/core/src/main/java/org/eclipse/kapua/app/api/core/exception/model/EntityNotFoundExceptionInfo.java
+++ b/rest-api/core/src/main/java/org/eclipse/kapua/app/api/core/exception/model/EntityNotFoundExceptionInfo.java
@@ -11,11 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.core.exception.model;
 
-import io.swagger.annotations.ApiModelProperty;
-import org.eclipse.kapua.KapuaEntityNotFoundException;
-import org.eclipse.kapua.model.id.KapuaId;
-import org.eclipse.kapua.model.id.KapuaIdAdapter;
-
 import javax.ws.rs.core.Response.Status;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,6 +18,10 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import org.eclipse.kapua.KapuaEntityNotFoundException;
+import org.eclipse.kapua.model.id.KapuaId;
+import org.eclipse.kapua.model.id.KapuaIdAdapter;
+
 @XmlRootElement(name = "entityNotFoundExceptionInfo")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class EntityNotFoundExceptionInfo extends ExceptionInfo {
@@ -32,7 +31,6 @@ public class EntityNotFoundExceptionInfo extends ExceptionInfo {
 
     @XmlElement(name = "entityId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     private KapuaId entityId;
 
     protected EntityNotFoundExceptionInfo() {
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessInfos.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessInfos.java
index de136211394..d81870e9290 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessInfos.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessInfos.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -48,7 +44,6 @@
  *
  * @since 1.0.0
  */
-@Api(value = "Access Info", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/accessinfos")
 public class AccessInfos extends AbstractKapuaResource {
 
@@ -69,15 +64,11 @@ public class AccessInfos extends AbstractKapuaResource {
      */
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @ApiOperation(nickname = "accessInfoSimpleQuery",
-            value = "Gets the AccessInfo list in the scope.",
-            notes = "Gets the AccessInfo list in the scope. The query parameter userId is optional and can be used to filter results",
-            response = AccessInfoListResult.class)
     public AccessInfoListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The optional User id to filter results") @QueryParam("userId") EntityId userId,
-            @ApiParam(value = "The result set offset", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("userId") EntityId userId,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
 
         AccessInfoQuery query = accessInfoFactory.newQuery(scopeId);
 
@@ -106,13 +97,9 @@ public AccessInfoListResult simpleQuery(
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @ApiOperation(nickname = "accessInfoQuery",
-            value = "Queries the AccessInfos",
-            notes = "Queries the AccessInfos with the given AccessInfoQuery parameter returning all matching AccessInfos",
-            response = AccessInfoListResult.class)
     public AccessInfoListResult query(
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The AccessInfoQuery to use to filter results", required = true) AccessInfoQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            AccessInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return accessInfoService.query(query);
@@ -131,13 +118,9 @@ public AccessInfoListResult query(
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @ApiOperation(nickname = "accessInfoCount",
-            value = "Counts the AccessInfos",
-            notes = "Counts the AccessInfos with the given AccessInfoQuery parameter returning the number of matching AccessInfos",
-            response = CountResult.class)
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The AccessInfoQuery to use to filter count results", required = true) AccessInfoQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            AccessInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(accessInfoService.count(query));
@@ -156,13 +139,9 @@ public CountResult count(
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    @ApiOperation(nickname = "accessInfoCreate",
-            value = "Creates a new AccessInfo",
-            notes = "Creates a new AccessInfo based on the information provided in AccessInfoCreator parameter",
-            response = AccessInfo.class)
     public AccessInfo create(
-            @ApiParam(value = "The ScopeId in which to create the AccessInfo", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "Provides the information for the new AccessInfo to be created", required = true) AccessInfoCreator accessInfoCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            AccessInfoCreator accessInfoCreator) throws Exception {
         accessInfoCreator.setScopeId(scopeId);
 
         return accessInfoService.create(accessInfoCreator);
@@ -180,13 +159,9 @@ public AccessInfo create(
     @GET
     @Path("{accessInfoId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @ApiOperation(nickname = "accessInfoFind",
-            value = "Gets an AccessInfo",
-            notes = "Gets the AccessInfo specified by the accessInfoId path parameter",
-            response = AccessInfo.class)
     public AccessInfo find(
-            @ApiParam(value = "The ScopeId of the requested AccessInfo.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested AccessInfo", required = true) @PathParam("accessInfoId") EntityId accessInfoId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId) throws Exception {
         AccessInfo accessInfo = accessInfoService.find(scopeId, accessInfoId);
 
         if (accessInfo == null) {
@@ -205,12 +180,11 @@ public AccessInfo find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessInfoDelete", value = "Deletes an AccessInfo", notes = "Deletes the AccessInfo specified by the accessInfoId path parameter")
     @DELETE
     @Path("{accessInfoId}")
     public Response deleteAccessInfo(
-            @ApiParam(value = "The ScopeId in which to create the AccessInfo", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the AccessInfo to delete", required = true) @PathParam("accessInfoId") EntityId accessInfoId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId) throws Exception {
         accessInfoService.delete(scopeId, accessInfoId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessPermissions.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessPermissions.java
index 11f89d8bed0..af0553dba36 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessPermissions.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessPermissions.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -48,7 +44,6 @@
  *
  * @since 1.0.0
  */
-@Api(value = "Access Info", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/accessinfos/{accessInfoId}/permissions")
 public class AccessPermissions extends AbstractKapuaResource {
 
@@ -67,14 +62,13 @@ public class AccessPermissions extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessPermissionSimpleQuery", value = "Gets the AccessPermission list in the scope", notes = "Gets the AccessPermission list in the scope. The query parameter accessInfoId is optional and can be used to filter results", response = AccessPermissionListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public AccessPermissionListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The optional id to filter results.") @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         AccessPermissionQuery query = accessPermissionFactory.newQuery(scopeId);
 
         query.setPredicate(query.attributePredicate(AccessPermissionAttributes.ACCESS_INFO_ID, accessInfoId));
@@ -95,15 +89,14 @@ public AccessPermissionListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessPermissionQuery", value = "Queries the AccessPermissions", notes = "Queries the AccessPermissions with the given AccessPermissionQuery parameter returning all matching AccessPermissions", response = AccessPermissionListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public AccessPermissionListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The AccessInfo id in which to search results.") @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The AccessPermissionQuery to use to filter results.", required = true) AccessPermissionQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            AccessPermissionQuery query) throws Exception {
 
         query.setScopeId(scopeId);
 
@@ -122,15 +115,14 @@ public AccessPermissionListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessPermissionCount", value = "Counts the AccessPermissions", notes = "Counts the AccessPermissions with the given AccessPermissionQuery parameter returning the number of matching AccessPermissions", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The AccessInfo id in which to count results.") @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The AccessPermissionQuery to use to filter count results", required = true) AccessPermissionQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            AccessPermissionQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         query.setPredicate(query.attributePredicate(AccessPermissionAttributes.ACCESS_INFO_ID, accessInfoId));
@@ -149,14 +141,13 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessPermissionCreate", value = "Create an AccessPermission", notes = "Creates a new AccessPermission based on the information provided in AccessPermissionCreator parameter.", response = AccessPermission.class)
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public AccessPermission create(
-            @ApiParam(value = "The ScopeId in which to create the AccessPermission", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The AccessInfo id in which to create the AccessPermission.", required = true) @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "Provides the information for the new AccessPermission to be created", required = true) AccessPermissionCreator accessPermissionCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            AccessPermissionCreator accessPermissionCreator) throws Exception {
         accessPermissionCreator.setScopeId(scopeId);
         accessPermissionCreator.setAccessInfoId(accessInfoId);
 
@@ -173,14 +164,13 @@ public AccessPermission create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessPermissionFind", value = "Get an AccessPermission", notes = "Returns the AccessPermission specified by the \"accessPermissionId\" path parameter.", response = AccessPermission.class)
     @GET
     @Path("{accessPermissionId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public AccessPermission find(
-            @ApiParam(value = "The ScopeId of the requested AccessPermission.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Specifies the AccessPermissionId for the requested AccessPermission", required = true) @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The id of the requested AccessPermission", required = true) @PathParam("accessPermissionId") EntityId accessPermissionId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            @PathParam("accessPermissionId") EntityId accessPermissionId) throws Exception {
         AccessPermissionQuery query = accessPermissionFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate(
@@ -211,13 +201,12 @@ public AccessPermission find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessPermissionDelete", value = "Delete an AccessPermission", notes = "Deletes the AccessPermission specified by the \"accessPermissionId\" path parameter.")
     @DELETE
     @Path("{accessPermissionId}")
     public Response deleteAccessPermission(
-            @ApiParam(value = "The ScopeId of the AccessPermission to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Specifies the AccessInfo Id for the requested AccessPermission", required = true) @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The id of the AccessPermission to be deleted", required = true) @PathParam("accessPermissionId") EntityId accessPermissionId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            @PathParam("accessPermissionId") EntityId accessPermissionId) throws Exception {
         accessPermissionService.delete(scopeId, accessPermissionId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessRoles.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessRoles.java
index ae5d211965b..78e930d8728 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessRoles.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/AccessRoles.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -42,7 +38,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Access Info", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/accessinfos/{accessInfoId}/roles")
 public class AccessRoles extends AbstractKapuaResource {
 
@@ -60,14 +55,13 @@ public class AccessRoles extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessRoleSimpleQuery", value = "Gets the AccessRole list in the scope", notes = "Returns the list of all the accessRoles associated to the current selected scope.", response = AccessRoleListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public AccessRoleListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The optional id to filter results.") @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50", required = true) @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         AccessRoleQuery query = accessRoleFactory.newQuery(scopeId);
 
         query.setPredicate(query.attributePredicate(AccessRoleAttributes.ACCESS_INFO_ID, accessInfoId));
@@ -87,15 +81,14 @@ public AccessRoleListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessRoleQuery", value = "Queries the AccessRoles", notes = "Queries the AccessRoles with the given AccessRoleQuery parameter returning all matching AccessRoles", response = AccessRoleListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public AccessRoleListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The AccessInfo id in which to search results.") @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The AccessRoleQuery to use to filter results.", required = true) AccessRoleQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            AccessRoleQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         query.setPredicate(query.attributePredicate(AccessRoleAttributes.ACCESS_INFO_ID, accessInfoId));
@@ -112,15 +105,14 @@ public AccessRoleListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessRoleCount", value = "Counts the AccessRoles", notes = "Counts the AccessRoles with the given AccessRoleQuery parameter returning the number of matching AccessRoles", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The AccessInfo id in which to count results.") @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The AccessRoleQuery to use to filter count results", required = true) AccessRoleQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            AccessRoleQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         query.setPredicate(query.attributePredicate(AccessRoleAttributes.ACCESS_INFO_ID, accessInfoId));
@@ -138,14 +130,13 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessRoleCreate", value = "Create an AccessRole", notes = "Creates a new AccessRole based on the information provided in AccessRoleCreator parameter.", response = AccessRole.class)
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public AccessRole create(
-            @ApiParam(value = "The ScopeId in which to create the AccessRole", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The AccessInfo id in which to create the AccessRole.", required = true) @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "Provides the information for the new AccessRole to be created", required = true) AccessRoleCreator accessRoleCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            AccessRoleCreator accessRoleCreator) throws Exception {
         accessRoleCreator.setScopeId(scopeId);
         accessRoleCreator.setAccessInfoId(accessInfoId);
 
@@ -161,14 +152,13 @@ public AccessRole create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessRoleFind", value = "Get an AccessRole", notes = "Returns the AccessRole specified by the \"accessRoleId\" path parameter.", response = AccessRole.class)
     @GET
     @Path("{accessRoleId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public AccessRole find(
-            @ApiParam(value = "The ScopeId of the requested AccessRole.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Specifies the AccessRoleId for the requested AccessRole", required = true) @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The id of the requested AccessRole", required = true) @PathParam("accessRoleId") EntityId accessRoleId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            @PathParam("accessRoleId") EntityId accessRoleId) throws Exception {
         AccessRoleQuery query = accessRoleFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate(
@@ -197,13 +187,12 @@ public AccessRole find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accessRoleDelete", value = "Delete an AccessRole", notes = "Deletes the AccessRole specified by the \"accessRoleId\" path parameter.")
     @DELETE
     @Path("{accessRoleId}")
     public Response deleteAccessRole(
-            @ApiParam(value = "The ScopeId of the AccessRole to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Specifies the AccessInfoId for the requested AccessPermission", required = true) @PathParam("accessInfoId") EntityId accessInfoId,
-            @ApiParam(value = "The id of the AccessRole to be deleted", required = true) @PathParam("accessRoleId") EntityId accessRoleId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("accessInfoId") EntityId accessInfoId,
+            @PathParam("accessRoleId") EntityId accessRoleId) throws Exception {
         accessRoleService.delete(scopeId, accessRoleId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Accounts.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Accounts.java
index 81a994ffc16..5f5bdfa5baa 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Accounts.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Accounts.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -44,7 +40,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Accounts", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/accounts")
 public class Accounts extends AbstractKapuaResource {
 
@@ -63,17 +58,12 @@ public class Accounts extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accountSimpleQuery",
-            value = "Gets the Account list in the scope", //
-            notes = "Returns the list of all the accounts associated to the current selected scope.", //
-            response = AccountListResult.class) //
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public AccountListResult simpleQuery( //
-                                          @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-                                          @ApiParam(value = "The account name to filter results.") @QueryParam("name") String name, //
-                                          @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset, //
-                                          @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+    public AccountListResult simpleQuery(@PathParam("scopeId") ScopeId scopeId, //
+                                         @QueryParam("name") String name, //
+                                         @QueryParam("offset") @DefaultValue("0") int offset, //
+                                         @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
 
         AccountQuery query = accountFactory.newQuery(scopeId);
 
@@ -98,17 +88,14 @@ public AccountListResult simpleQuery( //
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accountQuery",
-            value = "Queries the Accounts", //
-            notes = "Queries the Accounts with the given AccountQuery parameter returning all matching Accounts", //
-            response = AccountListResult.class) //
+    //
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public AccountListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The AccountQuery to use to filter results.", required = true) AccountQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            AccountQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return accountService.query(query);
@@ -123,17 +110,14 @@ public AccountListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accountCount",
-            value = "Counts the Accounts", //
-            notes = "Counts the Accounts with the given AccountQuery parameter returning the number of matching Accounts", //
-            response = CountResult.class)
+
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The AccountQuery to use to filter count results", required = true) AccountQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            AccountQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(accountService.count(query));
@@ -149,16 +133,13 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accountCreate",
-            value = "Create an Account",  //
-            notes = "Creates a new Account based on the information provided in AccountCreator parameter.",  //
-            response = Account.class)
+
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Account create(
-            @ApiParam(value = "The ScopeId in which to create the Account", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "Provides the information for the new Account to be created", required = true) AccountCreator accountCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            AccountCreator accountCreator) throws Exception {
         accountCreator.setScopeId(scopeId);
 
         return accountService.create(accountCreator);
@@ -173,16 +154,13 @@ public Account create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accountFind",
-            value = "Get an Account",  //
-            notes = "Returns the Account specified by the \"accountId\" path parameter.",  //
-            response = Account.class)
+
     @GET
     @Path("{accountId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Account find(
-            @ApiParam(value = "The ScopeId of the requested Account.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The id of the requested Account", required = true) @PathParam("accountId") EntityId accountId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            @PathParam("accountId") EntityId accountId) throws Exception {
         Account account = accountService.find(scopeId, accountId);
 
         if (account == null) {
@@ -202,18 +180,15 @@ public Account find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accountUpdate",
-            value = "Update an Account",  //
-            notes = "Updates a new Account based on the information provided in the Account parameter.",  //
-            response = Account.class)
+
     @PUT
     @Path("{accountId}")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Account update(
-            @ApiParam(value = "The ScopeId of the requested Account.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The id of the requested Account", required = true) @PathParam("accountId") EntityId accountId, //
-            @ApiParam(value = "The modified Account whose attributes needs to be updated", required = true) Account account) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            @PathParam("accountId") EntityId accountId, //
+            Account account) throws Exception {
         account.setScopeId(scopeId);
         account.setId(accountId);
 
@@ -229,14 +204,12 @@ public Account update(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "accountDelete",
-            value = "Delete an Account",  //
-            notes = "Deletes the Account specified by the \"accountId\" path parameter.")
+
     @DELETE
     @Path("{accountId}")
     public Response deleteAccount(
-            @ApiParam(value = "The ScopeId of the Account to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The id of the Account to be deleted", required = true) @PathParam("accountId") EntityId accountId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            @PathParam("accountId") EntityId accountId) throws Exception {
         accountService.delete(scopeId, accountId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Authentication.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Authentication.java
index bb2b1183288..46c53d4e507 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Authentication.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Authentication.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.service.KapuaService;
@@ -35,7 +31,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api("Authentication")
 @Path("/authentication")
 public class Authentication extends AbstractKapuaResource {
 
@@ -51,13 +46,12 @@ public class Authentication extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "authenticationUser", value = "Authenticate an user", notes = "Authenticates an user with username and password and returns " +
-            "the authentication token to be used in subsequent REST API calls.", response = AccessToken.class)
+
     @POST
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Path("user")
-    public AccessToken loginUsernamePassword(@ApiParam(value = "The username and password authentication credential of a user.", required = true) UsernamePasswordCredentials authenticationCredentials) throws Exception {
+    public AccessToken loginUsernamePassword(UsernamePasswordCredentials authenticationCredentials) throws Exception {
         return login(authenticationCredentials);
     }
 
@@ -70,13 +64,12 @@ public AccessToken loginUsernamePassword(@ApiParam(value = "The username and pas
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "authenticationApiKey", value = "Authenticate an user", notes = "Authenticates an user with API KEY and returns " +
-            "the authentication token to be used in subsequent REST API calls.", response = AccessToken.class)
+
     @POST
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Path("apikey")
-    public AccessToken loginApiKey(@ApiParam(value = "The API KEY authentication credential of a user.", required = true) ApiKeyCredentials authenticationCredentials) throws Exception {
+    public AccessToken loginApiKey(ApiKeyCredentials authenticationCredentials) throws Exception {
         return login(authenticationCredentials);
     }
 
@@ -89,13 +82,12 @@ public AccessToken loginApiKey(@ApiParam(value = "The API KEY authentication cre
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "authenticationJwt", value = "Authenticate an user", notes = "Authenticates an user with a JWT and returns " +
-            "the authentication token to be used in subsequent REST API calls.", response = AccessToken.class)
+
     @POST
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Path("jwt")
-    public AccessToken loginJwt(@ApiParam(value = "The JWT authentication credential of a user.", required = true) JwtCredentials authenticationCredentials) throws Exception {
+    public AccessToken loginJwt(JwtCredentials authenticationCredentials) throws Exception {
         return login(authenticationCredentials);
     }
 
@@ -107,7 +99,6 @@ public AccessToken loginJwt(@ApiParam(value = "The JWT authentication credential
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "authenticationLogout", value = "Logs out an user", notes = "Terminates the current session and invalidates the access token")
     @POST
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@@ -126,13 +117,12 @@ public Response logout() throws Exception {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "authenticationRefresh", value = "Refreshes an AccessToken", notes = "Both the current AccessToken and the Refresh token will be invalidated. "
-            + "If also the Refresh token is expired, the user will have to restart with a new login.")
+
     @POST
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Path("refresh")
-    public AccessToken refresh(@ApiParam(value = "The current AccessToken's tokenId and refreshToken", required = true) RefreshTokenCredentials refreshTokenCredentials) throws Exception {
+    public AccessToken refresh(RefreshTokenCredentials refreshTokenCredentials) throws Exception {
         return authenticationService.refreshAccessToken(refreshTokenCredentials.getTokenId(), refreshTokenCredentials.getRefreshToken());
     }
 
@@ -154,8 +144,7 @@ private AccessToken login(LoginCredentials loginCredentials) throws Exception {
      * @return A {@link LoginInfo} object containing all the permissions and the {@link AccessToken} for the current session
      * @throws KapuaException
      */
-    @ApiOperation(nickname = "loginInfo", value = "Gets the Session information", notes = "The response object will contain all the permissions related to the current" +
-            "session, plus all the AccessToken information")
+
     @GET
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Path("info")
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Credentials.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Credentials.java
index 453720d326e..5a7bbcbb34c 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Credentials.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Credentials.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -43,7 +39,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Credentials", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/credentials")
 public class Credentials extends AbstractKapuaResource {
 
@@ -61,14 +56,13 @@ public class Credentials extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "credentialSimpleQuery", value = "Gets the Credential list in the scope", notes = "Returns the list of all the credentials associated to the current selected scope.", response = CredentialListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public CredentialListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The optional id to filter results.") @QueryParam("userId") EntityId userId,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50", required = true) @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("userId") EntityId userId,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         CredentialQuery query = credentialFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -92,14 +86,13 @@ public CredentialListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "credentialQuery", value = "Queries the Credentials", notes = "Queries the Credentials with the given CredentialQuery parameter returning all matching Credentials", response = CredentialListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CredentialListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The CredentialQuery to use to filter results.", required = true) CredentialQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            CredentialQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return credentialService.query(query);
@@ -114,14 +107,13 @@ public CredentialListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "credentialCount", value = "Counts the Credentials", notes = "Counts the Credentials with the given CredentialQuery parameter returning the number of matching Credentials", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The CredentialQuery to use to filter count results", required = true) CredentialQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            CredentialQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(credentialService.count(query));
@@ -137,13 +129,12 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "credentialCreate", value = "Create a Credential", notes = "Creates a new Credential based on the information provided in CredentialCreator parameter.", response = Credential.class)
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Credential create(
-            @ApiParam(value = "The ScopeId in which to create the Credential", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Provides the information for the new Credential to be created", required = true) CredentialCreator credentialCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            CredentialCreator credentialCreator) throws Exception {
         credentialCreator.setScopeId(scopeId);
 
         return credentialService.create(credentialCreator);
@@ -158,13 +149,12 @@ public Credential create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "credentialFind", value = "Get a Credential", notes = "Returns the Credential specified by the \"credentialId\" path parameter.", response = Credential.class)
     @GET
     @Path("{credentialId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Credential find(
-            @ApiParam(value = "The ScopeId of the requested Credential.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Credential", required = true) @PathParam("credentialId") EntityId credentialId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("credentialId") EntityId credentialId) throws Exception {
         Credential credential = credentialService.find(scopeId, credentialId);
 
         if (credential == null) {
@@ -182,15 +172,14 @@ public Credential find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "credentialUpdate", value = "Update an Credential", notes = "Updates a new Credential based on the information provided in the Credential parameter.", response = Credential.class)
     @PUT
     @Path("{credentialId}")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Credential update(
-            @ApiParam(value = "The ScopeId of the requested Credential.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Credential", required = true) @PathParam("credentialId") EntityId credentialId,
-            @ApiParam(value = "The modified Credential whose attributed need to be updated", required = true) Credential credential) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("credentialId") EntityId credentialId,
+            Credential credential) throws Exception {
         credential.setScopeId(scopeId);
         credential.setId(credentialId);
 
@@ -205,12 +194,11 @@ public Credential update(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "credentialDelete", value = "Delete a Credential", notes = "Deletes the Credential specified by the \"credentialId\" path parameter.")
     @DELETE
     @Path("{credentialId}")
     public Response deleteCredential(
-            @ApiParam(value = "The ScopeId of the Credential to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Credential to be deleted", required = true) @PathParam("credentialId") EntityId credentialId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("credentialId") EntityId credentialId) throws Exception {
         credentialService.delete(scopeId, credentialId);
 
         return returnOk();
@@ -224,12 +212,11 @@ public Response deleteCredential(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "credentialUnlock", value = "Unlock a Credential", notes = "Unlocks a Credential that has been locked due to a lockout policy.")
     @POST
     @Path("{credentialId}/unlock")
     public Response unlockCredential(
-            @ApiParam(value = "The ScopeId of the Credential to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Credential to be unlocked", required = true) @PathParam("credentialId") EntityId credentialId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("credentialId") EntityId credentialId) throws Exception {
         credentialService.unlock(scopeId, credentialId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java
index e1c54eccd4a..503cce79c34 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataChannels.java
@@ -21,8 +21,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import io.swagger.annotations.Authorization;
-
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.StorableEntityId;
@@ -43,11 +41,6 @@
 
 import com.google.common.base.Strings;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api(value = "Data Channels", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/data/channels")
 public class DataChannels extends AbstractKapuaResource {
 
@@ -74,18 +67,15 @@ public class DataChannels extends AbstractKapuaResource {
      *             Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "dataChannelSimpleQuery",
-            value = "Gets the ChannelInfo list in the scope", //
-            notes = "Returns the list of all the channelInfos associated to the current selected scope.", //
-            response = ChannelInfoListResult.class)
+
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public ChannelInfoListResult simpleQuery( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,//
-            @ApiParam(value = "The client id to filter results") @QueryParam("clientId") String clientId, //
-            @ApiParam(value = "The channel name to filter results. It allows '#' wildcard in last channel level") @QueryParam("name") String name, //
-            @ApiParam(value = "The result set offset", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,//
-            @ApiParam(value = "The result set limit", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,//
+            @QueryParam("clientId") String clientId, //
+            @QueryParam("name") String name, //
+            @QueryParam("offset") @DefaultValue("0") int offset,//
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         AndPredicate andPredicate = new AndPredicateImpl();
         if (!Strings.isNullOrEmpty(clientId)) {
             TermPredicate clientIdPredicate = STORABLE_PREDICATE_FACTORY.newTermPredicate(ChannelInfoField.CLIENT_ID, clientId);
@@ -121,13 +111,10 @@ public ChannelInfoListResult simpleQuery( //
     @Path("_query")
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "dataChannelQuery",
-            value = "Queries the ChannelInfos", //
-            notes = "Queries the ChannelInfos with the given ChannelInfoQuery parameter returning all matching ChannelInfos",  //
-            response = ChannelInfoListResult.class)  //
+      //
     public ChannelInfoListResult query( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The ChannelInfoQuery to use to filter results", required = true) ChannelInfoQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            ChannelInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
         query.addFetchAttributes(ChannelInfoField.TIMESTAMP.field());
         return CHANNEL_INFO_REGISTRY_SERVICE.query(query);
@@ -149,13 +136,10 @@ public ChannelInfoListResult query( //
     @Path("_count")
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "dataChannelCount",
-            value = "Counts the ChannelInfos", //
-            notes = "Counts the ChannelInfos with the given ChannelInfoQuery parameter returning the number of matching ChannelInfos", //
-            response = CountResult.class)
+
     public CountResult count( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The ChannelInfoQuery to use to filter count results", required = true) ChannelInfoQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            ChannelInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(CHANNEL_INFO_REGISTRY_SERVICE.count(query));
@@ -174,13 +158,10 @@ public CountResult count( //
     @GET
     @Path("{channelInfoId}")
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "dataChannelFind",
-            value = "Gets an ChannelInfo", //
-            notes = "Gets the ChannelInfo specified by the channelInfoId path parameter", //
-            response = ChannelInfo.class)
+
     public ChannelInfo find( //
-            @ApiParam(value = "The ScopeId of the requested ChannelInfo.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested ChannelInfo", required = true) @PathParam("channelInfoId") StorableEntityId channelInfoId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("channelInfoId") StorableEntityId channelInfoId) throws Exception {
         ChannelInfo channelInfo = CHANNEL_INFO_REGISTRY_SERVICE.find(scopeId, channelInfoId);
 
         return returnNotNullEntity(channelInfo);
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java
index 0d2afcbdd4e..509f7abc599 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataClients.java
@@ -21,8 +21,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import io.swagger.annotations.Authorization;
-
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.StorableEntityId;
@@ -40,11 +38,6 @@
 
 import com.google.common.base.Strings;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api(value = "Data Clients", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/data/clients")
 public class DataClients extends AbstractKapuaResource {
 
@@ -69,17 +62,14 @@ public class DataClients extends AbstractKapuaResource {
      *             Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "dataClientSimpleQuery",
-            value = "Gets the ClientInfo list in the scope", //
-            notes = "Returns the list of all the clientInfos associated to the current selected scope.", //
-            response = ClientInfoListResult.class)
+
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public ClientInfoListResult simpleQuery( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,//
-            @ApiParam(value = "The client id to filter results") @QueryParam("clientId") String clientId, //
-            @ApiParam(value = "The result set offset", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,//
-            @ApiParam(value = "The result set limit", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,//
+            @QueryParam("clientId") String clientId, //
+            @QueryParam("offset") @DefaultValue("0") int offset,//
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         AndPredicate andPredicate = STORABLE_PREDICATE_FACTORY.newAndPredicate();
         if (!Strings.isNullOrEmpty(clientId)) {
             TermPredicate clientIdPredicate = STORABLE_PREDICATE_FACTORY.newTermPredicate(ClientInfoField.CLIENT_ID, clientId);
@@ -112,13 +102,9 @@ public ClientInfoListResult simpleQuery( //
     @Path("_query")
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "dataClientQuery",
-            value = "Queries the ClientInfos", //
-            notes = "Queries the ClientInfos with the given ClientInfoQuery parameter returning all matching ClientInfos",  //
-            response = ClientInfoListResult.class)  //
-    public ClientInfoListResult query( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The ClientInfoQuery to use to filter results", required = true) ClientInfoQuery query) throws Exception {
+    public ClientInfoListResult query(
+            @PathParam("scopeId") ScopeId scopeId, //
+            ClientInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
         query.addFetchAttributes(ClientInfoField.TIMESTAMP.field());
         return CLIENT_INFO_REGISTRY_SERVICE.query(query);
@@ -140,13 +126,10 @@ public ClientInfoListResult query( //
     @Path("_count")
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "dataClientCount",
-            value = "Counts the ClientInfos", //
-            notes = "Counts the ClientInfos with the given ClientInfoQuery parameter returning the number of matching ClientInfos", //
-            response = CountResult.class)
+
     public CountResult count( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The ClientInfoQuery to use to filter count results", required = true) ClientInfoQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            ClientInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(CLIENT_INFO_REGISTRY_SERVICE.count(query));
@@ -165,13 +148,10 @@ public CountResult count( //
     @GET
     @Path("{clientInfoId}")
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "dataClientFind",
-            value = "Gets an ClientInfo", //
-            notes = "Gets the ClientInfo specified by the clientInfoId path parameter", //
-            response = ClientInfo.class)
+
     public ClientInfo find( //
-            @ApiParam(value = "The ScopeId of the requested ClientInfo.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The id of the requested ClientInfo", required = true) @PathParam("clientInfoId") StorableEntityId clientInfoId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            @PathParam("clientInfoId") StorableEntityId clientInfoId) throws Exception {
         ClientInfo clientInfo = CLIENT_INFO_REGISTRY_SERVICE.find(scopeId, clientInfoId);
 
         return returnNotNullEntity(clientInfo);
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java
index 939842473fc..2934217810a 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessages.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.DateParam;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.MetricType;
@@ -32,7 +28,6 @@
 import org.eclipse.kapua.service.datastore.internal.mediator.MessageField;
 import org.eclipse.kapua.service.datastore.model.DatastoreMessage;
 import org.eclipse.kapua.service.datastore.model.MessageListResult;
-import org.eclipse.kapua.service.datastore.model.StorableId;
 import org.eclipse.kapua.service.datastore.model.query.AndPredicate;
 import org.eclipse.kapua.service.datastore.model.query.MessageQuery;
 import org.eclipse.kapua.service.datastore.model.query.MetricPredicate;
@@ -53,7 +48,6 @@
 import javax.ws.rs.core.MediaType;
 import java.util.Date;
 
-@Api(value = "Data Messages", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/data/messages")
 public class DataMessages extends AbstractKapuaResource {
 
@@ -77,25 +71,22 @@ public class DataMessages extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "dataMessageSimpleQuery",
-            value = "Gets the DatastoreMessage list in the scope", //
-            notes = "Returns the list of all the datastoreMessages associated to the current selected scope.", //
-            response = MessageListResult.class)
+
     @GET
     @Produces({ MediaType.APPLICATION_XML })
     public <V extends Comparable<V>> MessageListResult simpleQuery(  //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,//
-            @ApiParam(value = "The client id to filter results") @QueryParam("clientId") String clientId, //
-            @ApiParam(value = "The channel to filter results.") @QueryParam("channel") String channel,
-            @ApiParam(value = "Restrict the search only to this channel ignoring its children. Only meaningful if channel is set.") @QueryParam("strictChannel") boolean strictChannel,
-            @ApiParam(value = "The start date to filter the results. Must come before endDate parameter") @QueryParam("startDate") DateParam startDateParam,
-            @ApiParam(value = "The end date to filter the results. Must come after startDate parameter") @QueryParam("endDate") DateParam endDateParam,
-            @ApiParam(value = "The metric name to filter results") @QueryParam("metricName") String metricName, //
-            @ApiParam(value = "The metric type to filter results") @QueryParam("metricType") MetricType<V> metricType, //
-            @ApiParam(value = "The min metric value to filter results") @QueryParam("metricMin") String metricMinValue, //
-            @ApiParam(value = "The max metric value to filter results") @QueryParam("metricMax") String metricMaxValue, //
-            @ApiParam(value = "The result set offset", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,//
-            @ApiParam(value = "The result set limit", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,//
+            @QueryParam("clientId") String clientId, //
+            @QueryParam("channel") String channel,
+            @QueryParam("strictChannel") boolean strictChannel,
+            @QueryParam("startDate") DateParam startDateParam,
+            @QueryParam("endDate") DateParam endDateParam,
+            @QueryParam("metricName") String metricName, //
+            @QueryParam("metricType") MetricType<V> metricType, //
+            @QueryParam("metricMin") String metricMinValue, //
+            @QueryParam("metricMax") String metricMaxValue, //
+            @QueryParam("offset") @DefaultValue("0") int offset,//
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
 
         AndPredicate andPredicate = STORABLE_PREDICATE_FACTORY.newAndPredicate();
         if (!Strings.isNullOrEmpty(clientId)) {
@@ -150,13 +141,10 @@ public <V extends Comparable<V>> MessageListResult simpleQuery(  //
     @POST
     @Consumes({ MediaType.APPLICATION_XML })
     @Produces({ MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "dataMessageStore",
-            value = "Stores a new KapuaDataMessage", //
-            notes = "Stores a new KapuaDataMessage under the account of the currently connected user. In this case, the provided message will only be stored in the back-end database and it will not be forwarded to the message broker.", //
-            response = StorableId.class)
+
     public StorableEntityId storeMessage(
-            @ApiParam(value = "The ScopeId in which to store the message", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,//
-            @ApiParam(value = "The KapuaDataMessage to be stored") KapuaDataMessage message) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,//
+            KapuaDataMessage message) throws Exception {
         message.setScopeId(scopeId);
         return new StorableEntityId(MESSAGE_STORE_SERVICE.store(message).toString());
     }
@@ -174,13 +162,10 @@ public StorableEntityId storeMessage(
     @Path("_query")
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "dataMessageQuery",
-            value = "Queries the DatastoreMessages", //
-            notes = "Queries the DatastoreMessages with the given DatastoreMessageQuery parameter returning all matching DatastoreMessages",  //
-            response = MessageListResult.class)
+
     public MessageListResult query( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The DatastoreMessageQuery to use to filter results", required = true) MessageQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            MessageQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return MESSAGE_STORE_SERVICE.query(query);
@@ -199,13 +184,10 @@ public MessageListResult query( //
     @Path("_count")
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "dataMessageCount",
-            value = "Counts the DatastoreMessages", //
-            notes = "Counts the DatastoreMessages with the given DatastoreMessageQuery parameter returning the number of matching DatastoreMessages", //
-            response = CountResult.class)
+
     public CountResult count( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The DatastoreMessageQuery to use to filter count results", required = true) MessageQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            MessageQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(MESSAGE_STORE_SERVICE.count(query));
@@ -222,13 +204,10 @@ public CountResult count( //
     @GET
     @Path("{datastoreMessageId}")
     @Produces({ MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "dataMessageFind",
-            value = "Gets an DatastoreMessage", //
-            notes = "Gets the DatastoreMessage specified by the datastoreMessageId path parameter", //
-            response = DatastoreMessage.class)
+
     public DatastoreMessage find( //
-            @ApiParam(value = "The ScopeId of the requested DatastoreMessage.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested DatastoreMessage", required = true) @PathParam("datastoreMessageId") StorableEntityId datastoreMessageId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("datastoreMessageId") StorableEntityId datastoreMessageId) throws Exception {
         DatastoreMessage datastoreMessage = MESSAGE_STORE_SERVICE.find(scopeId, datastoreMessageId, StorableFetchStyle.SOURCE_FULL);
 
         return returnNotNullEntity(datastoreMessage);
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java
index 79ce0f73cd3..147cfc9f19e 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMessagesJson.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.app.api.resources.v1.resources.marker.JsonSerializationFixed;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.DateParam;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.MetricType;
@@ -33,7 +29,6 @@
 import org.eclipse.kapua.service.datastore.DatastoreObjectFactory;
 import org.eclipse.kapua.service.datastore.model.DatastoreMessage;
 import org.eclipse.kapua.service.datastore.model.MessageListResult;
-import org.eclipse.kapua.service.datastore.model.StorableId;
 import org.eclipse.kapua.service.datastore.model.query.MessageQuery;
 import org.eclipse.kapua.service.datastore.model.query.SortField;
 import org.eclipse.kapua.service.datastore.model.query.XmlAdaptedSortField;
@@ -53,7 +48,6 @@
 /**
  * @see JsonSerializationFixed
  */
-@Api(value = "Data Messages", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/data/messages")
 public class DataMessagesJson extends AbstractKapuaResource implements JsonSerializationFixed {
 
@@ -80,25 +74,22 @@ public class DataMessagesJson extends AbstractKapuaResource implements JsonSeria
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "dataMessageSimpleQuery",
-            value = "Gets the DatastoreMessage list in the scope",
-            notes = "Returns the list of all the datastoreMessages associated to the current selected scope.",
-            response = MessageListResult.class)
+
     @GET
     @Produces({MediaType.APPLICATION_JSON})
     public <V extends Comparable<V>> JsonMessageListResult simpleQueryJson(
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The client id to filter results") @QueryParam("clientId") String clientId,
-            @ApiParam(value = "The channel to filter results.") @QueryParam("channel") String channel,
-            @ApiParam(value = "Restrict the search only to this channel ignoring its children. Only meaningful if channel is set.") @QueryParam("strictChannel") boolean strictChannel,
-            @ApiParam(value = "The start date to filter the results. Must come before endDate parameter") @QueryParam("startDate") DateParam startDateParam,
-            @ApiParam(value = "The end date to filter the results. Must come after startDate parameter") @QueryParam("endDate") DateParam endDateParam,
-            @ApiParam(value = "The metric name to filter results") @QueryParam("metricName") String metricName,
-            @ApiParam(value = "The metric type to filter results") @QueryParam("metricType") MetricType<V> metricType,
-            @ApiParam(value = "The min metric value to filter results") @QueryParam("metricMin") String metricMinValue,
-            @ApiParam(value = "The max metric value to filter results") @QueryParam("metricMax") String metricMaxValue,
-            @ApiParam(value = "The result set offset", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("clientId") String clientId,
+            @QueryParam("channel") String channel,
+            @QueryParam("strictChannel") boolean strictChannel,
+            @QueryParam("startDate") DateParam startDateParam,
+            @QueryParam("endDate") DateParam endDateParam,
+            @QueryParam("metricName") String metricName,
+            @QueryParam("metricType") MetricType<V> metricType,
+            @QueryParam("metricMin") String metricMinValue,
+            @QueryParam("metricMax") String metricMaxValue,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
 
         MessageListResult result = DATA_MESSAGES.simpleQuery(
                 scopeId,
@@ -137,13 +128,10 @@ public <V extends Comparable<V>> JsonMessageListResult simpleQueryJson(
     @POST
     @Consumes({MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_JSON})
-    @ApiOperation(nickname = "dataMessageStore",
-            value = "Stores a new KapuaDataMessage",
-            notes = "Stores a new KapuaDataMessage under the account of the currently connected user. In this case, the provided message will only be stored in the back-end database and it will not be forwarded to the message broker.",
-            response = StorableId.class)
+
     public StorableEntityId storeMessageJson(
-            @ApiParam(value = "The ScopeId in which to store the message", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The KapuaDataMessage to be stored") JsonKapuaDataMessage jsonKapuaDataMessage) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            JsonKapuaDataMessage jsonKapuaDataMessage) throws Exception {
 
         KapuaDataMessage kapuaDataMessage = KAPUA_DATA_MESSAGE_FACTORY.newKapuaDataMessage();
 
@@ -188,13 +176,10 @@ public StorableEntityId storeMessageJson(
     @Path("_query")
     @Consumes({MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_JSON})
-    @ApiOperation(nickname = "dataMessageQuery",
-            value = "Queries the DatastoreMessages",
-            notes = "Queries the DatastoreMessages with the given DatastoreMessageQuery parameter returning all matching DatastoreMessages",
-            response = MessageListResult.class)
+
     public JsonMessageListResult queryJson(
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The DatastoreMessageQuery to use to filter results", required = true) JsonMessageQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            JsonMessageQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         MessageListResult result = DATA_MESSAGES.query(scopeId, convertQuery(query));
@@ -220,13 +205,10 @@ public JsonMessageListResult queryJson(
     @GET
     @Path("{datastoreMessageId}")
     @Produces({MediaType.APPLICATION_JSON})
-    @ApiOperation(nickname = "dataMessageFind",
-            value = "Gets an DatastoreMessage",
-            notes = "Gets the DatastoreMessage specified by the datastoreMessageId path parameter",
-            response = DatastoreMessage.class)
+
     public JsonDatastoreMessage findJson(
-            @ApiParam(value = "The ScopeId of the requested DatastoreMessage.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested DatastoreMessage", required = true) @PathParam("datastoreMessageId") StorableEntityId datastoreMessageId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("datastoreMessageId") StorableEntityId datastoreMessageId) throws Exception {
         DatastoreMessage datastoreMessage = DATA_MESSAGES.find(scopeId, datastoreMessageId);
 
         JsonDatastoreMessage jsonDatastoreMessage = new JsonDatastoreMessage(datastoreMessage);
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java
index f2fc1f8bb76..c30ac7ab76a 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DataMetrics.java
@@ -21,8 +21,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import io.swagger.annotations.Authorization;
-
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.StorableEntityId;
@@ -41,11 +39,6 @@
 
 import com.google.common.base.Strings;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api(value = "Data Metrics", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/data/metrics")
 public class DataMetrics extends AbstractKapuaResource {
 
@@ -72,19 +65,16 @@ public class DataMetrics extends AbstractKapuaResource {
      * @return The {@link MetricInfoListResult} of all the metricInfos associated to the current selected scope.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "dataMetricSimpleQuery",
-            value = "Gets the MetricInfo list in the scope", //
-            notes = "Returns the list of all the metricInfos associated to the current selected scope.", //
-            response = MetricInfoListResult.class)
+
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public MetricInfoListResult simpleQuery( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,//
-            @ApiParam(value = "The client id to filter results") @QueryParam("clientId") String clientId, //
-            @ApiParam(value = "The channel to filter results. It allows '#' wildcard in last channel level") @QueryParam("channel") String channel,
-            @ApiParam(value = "The metric name to filter results") @QueryParam("name") String name,
-            @ApiParam(value = "The result set offset", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,//
-            @ApiParam(value = "The result set limit", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,//
+            @QueryParam("clientId") String clientId, //
+            @QueryParam("channel") String channel,
+            @QueryParam("name") String name,
+            @QueryParam("offset") @DefaultValue("0") int offset,//
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         AndPredicate andPredicate = STORABLE_PREDICATE_FACTORY.newAndPredicate();
         if (!Strings.isNullOrEmpty(clientId)) {
             TermPredicate clientIdPredicate = STORABLE_PREDICATE_FACTORY.newTermPredicate(MetricInfoField.CLIENT_ID, clientId);
@@ -123,13 +113,10 @@ public MetricInfoListResult simpleQuery( //
     @Path("_query")
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "dataMetricQuery",
-            value = "Queries the MetricInfos", //
-            notes = "Queries the MetricInfos with the given MetricInfoQuery parameter returning all matching MetricInfos",  //
-            response = MetricInfoListResult.class)
+
     public MetricInfoListResult query( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The MetricInfoQuery to use to filter results", required = true) MetricInfoQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            MetricInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
         query.addFetchAttributes(MetricInfoField.TIMESTAMP_FULL.field());
         return METRIC_INFO_REGISTRY_SERVICE.query(query);
@@ -149,13 +136,10 @@ public MetricInfoListResult query( //
     @Path("_count")
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "dataMetricCount",
-            value = "Counts the MetricInfos", //
-            notes = "Counts the MetricInfos with the given MetricInfoQuery parameter returning the number of matching MetricInfos", //
-            response = CountResult.class)
+
     public CountResult count( //
-            @ApiParam(value = "The ScopeId in which to search results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The MetricInfoQuery to use to filter count results", required = true) MetricInfoQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId, //
+            MetricInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(METRIC_INFO_REGISTRY_SERVICE.count(query));
@@ -171,13 +155,10 @@ public CountResult count( //
     @GET
     @Path("{metricInfoId}")
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "dataMetricFind",
-            value = "Gets an MetricInfo", //
-            notes = "Gets the MetricInfo specified by the metricInfoId path parameter", //
-            response = MetricInfo.class)
-    public MetricInfo find( //
-            @ApiParam(value = "The ScopeId of the requested MetricInfo.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId, //
-            @ApiParam(value = "The id of the requested MetricInfo", required = true) @PathParam("metricInfoId") StorableEntityId metricInfoId) throws Exception {
+
+    public MetricInfo find(
+            @PathParam("scopeId") ScopeId scopeId, //
+            @PathParam("metricInfoId") StorableEntityId metricInfoId) throws Exception {
         MetricInfo metricInfo = METRIC_INFO_REGISTRY_SERVICE.find(scopeId, metricInfoId);
 
         return returnNotNullEntity(metricInfo);
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceConnectionOptions.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceConnectionOptions.java
index 26643f2351f..33e1efd0d85 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceConnectionOptions.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceConnectionOptions.java
@@ -27,11 +27,6 @@
 import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOption;
 import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOptionService;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api("Device Connections")
 @Path("{scopeId}/deviceconnections/{connectionId}/options")
 public class DeviceConnectionOptions extends AbstractKapuaResource {
 
@@ -51,12 +46,11 @@ public class DeviceConnectionOptions extends AbstractKapuaResource {
      *             Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(value = "Gets the DeviceConnection list in the scope", notes = "Returns the list of all the deviceConnections associated to the current selected scope.", response = DeviceConnection.class, responseContainer = "DeviceConnectionListResult")
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public DeviceConnectionOption find(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The connection id of the requested options.") @PathParam("connectionId") EntityId connectionId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("connectionId") EntityId connectionId) throws Exception {
         DeviceConnectionOption deviceConnectionOptions = deviceConnectionOptionsService.find(scopeId, connectionId);
 
         if (deviceConnectionOptions != null) {
@@ -79,13 +73,12 @@ public DeviceConnectionOption find(
      *             Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(value = "Get an DeviceConnectionOption", notes = "Returns the DeviceConnectionOption specified by the given parameters", response = DeviceConnectionOption.class)
     @PUT
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public DeviceConnectionOption update(
-            @ApiParam(value = "The ScopeId of the requested DeviceConnectionOptions.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested DeviceConnectionOptions", required = true) @PathParam("connectionId") EntityId deviceConnectionId,
-            @ApiParam(value = "The modified Device connection options whose attributed need to be updated", required = true) DeviceConnectionOption deviceConnectionOptions)
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("connectionId") EntityId deviceConnectionId,
+            DeviceConnectionOption deviceConnectionOptions)
             throws Exception {
 
         deviceConnectionOptions.setScopeId(scopeId);
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceConnections.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceConnections.java
index 4cb191c9918..fc4b0e1a38c 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceConnections.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceConnections.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -42,7 +38,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-@Api(value = "Device Connections", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/deviceconnections")
 public class DeviceConnections extends AbstractKapuaResource {
 
@@ -62,15 +57,14 @@ public class DeviceConnections extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceConnectionSimpleQuery", value = "Gets the DeviceConnection list in the scope", notes = "Returns the list of all the deviceConnections associated to the current selected scope.", response = DeviceConnectionListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public DeviceConnectionListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The client id to filter results.") @QueryParam("clientId") String clientId,
-            @ApiParam(value = "The connection status to filter results.") @QueryParam("status") DeviceConnectionStatus status,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("clientId") String clientId,
+            @QueryParam("status") DeviceConnectionStatus status,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         DeviceConnectionQuery query = deviceConnectionFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -97,14 +91,13 @@ public DeviceConnectionListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceConnectionQuery", value = "Queries the DeviceConnections", notes = "Queries the DeviceConnections with the given DeviceConnections parameter returning all matching DeviceConnections", response = DeviceConnectionListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public DeviceConnectionListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The DeviceConnectionQuery to use to filter results.", required = true) DeviceConnectionQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            DeviceConnectionQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return deviceConnectionService.query(query);
@@ -119,14 +112,13 @@ public DeviceConnectionListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceConnectionCount", value = "Counts the DeviceConnections", notes = "Counts the DeviceConnections with the given DeviceConnectionQuery parameter returning the number of matching DeviceConnections", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The DeviceConnectionQuery to use to filter count results", required = true) DeviceConnectionQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            DeviceConnectionQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(deviceConnectionService.count(query));
@@ -141,13 +133,12 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceConnectionFind", value = "Get an DeviceConnection", notes = "Returns the DeviceConnection specified by the \"deviceConnectionId\" path parameter.", response = DeviceConnection.class)
     @GET
     @Path("{deviceConnectionId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public DeviceConnection find(
-            @ApiParam(value = "The ScopeId of the requested DeviceConnection.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested DeviceConnection", required = true) @PathParam("deviceConnectionId") EntityId deviceConnectionId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceConnectionId") EntityId deviceConnectionId) throws Exception {
         DeviceConnection deviceConnection = deviceConnectionService.find(scopeId, deviceConnectionId);
 
         if (deviceConnection != null) {
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceEvents.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceEvents.java
index 2046905a55a..ffed3617afa 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceEvents.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceEvents.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -45,7 +41,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Devices", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/devices/{deviceId}/events")
 public class DeviceEvents extends AbstractKapuaResource {
 
@@ -67,15 +62,14 @@ public class DeviceEvents extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceEventSimpleQuery", value = "Gets the DeviceEvent list in the scope", notes = "Returns the list of all the deviceEvents associated to the current selected scope.", response = DeviceEventListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public DeviceEventListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The client id to filter results.") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The resource of the DeviceEvent in which to search results") @QueryParam("resource") String resource,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("resource") String resource,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         DeviceEventQuery query = deviceEventFactory.newQuery(scopeId);
 
         if (deviceRegistryService.find(scopeId, deviceId) == null) {
@@ -105,16 +99,14 @@ public DeviceEventListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceEventQuery", value = "Queries the DeviceEvents", notes = "Queries the DeviceEvents with the given DeviceEvents parameter returning all matching DeviceEvents", response = DeviceEventListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public DeviceEventListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Device in which to search results") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The DeviceEventQuery to use to filter results.", required = true) DeviceEventQuery query) throws Exception {
-
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            DeviceEventQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         if (deviceRegistryService.find(scopeId, deviceId) == null) {
@@ -141,15 +133,14 @@ public DeviceEventListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceEventCount", value = "Counts the DeviceEvents", notes = "Counts the DeviceEvents with the given DeviceEventQuery parameter returning the number of matching DeviceEvents", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Device in which to count results") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The DeviceEventQuery to use to filter count results", required = true) DeviceEventQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            DeviceEventQuery query) throws Exception {
 
         if (deviceRegistryService.find(scopeId, deviceId) == null) {
             throw new KapuaEntityNotFoundException(Device.TYPE, deviceId);
@@ -171,14 +162,13 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceEventFind", value = "Get an DeviceEvent", notes = "Returns the DeviceEvent specified by the \"deviceEventId\" path parameter.", response = DeviceEvent.class)
     @GET
     @Path("{deviceEventId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public DeviceEvent find(
-            @ApiParam(value = "The ScopeId of the requested DeviceEvent.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The id of the requested DeviceEvent", required = true) @PathParam("deviceEventId") EntityId deviceEventId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("deviceEventId") EntityId deviceEventId) throws Exception {
 
         if (deviceRegistryService.find(scopeId, deviceId) == null) {
             throw new KapuaEntityNotFoundException(Device.TYPE, deviceId);
@@ -213,12 +203,11 @@ public DeviceEvent find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceEventDelete", value = "Delete a DeviceEvent", notes = "Deletes the DeviceEvent specified by the \"deviceEventId\" path parameter.")
     @DELETE
     @Path("{deviceEventId}")
     public Response deleteDeviceEvent(@PathParam("scopeId") ScopeId scopeId,
-                                      @ApiParam(value = "The id of the Device in which to delete the event.", required = true) @PathParam("deviceId") EntityId deviceId,
-                                      @ApiParam(value = "The id of the DeviceEvent to be deleted", required = true) @PathParam("deviceEventId") EntityId deviceEventId) throws Exception {
+                                      @PathParam("deviceId") EntityId deviceId,
+                                      @PathParam("deviceEventId") EntityId deviceEventId) throws Exception {
 
         if (deviceRegistryService.find(scopeId, deviceId) == null) {
             throw new KapuaEntityNotFoundException(Device.TYPE, deviceId);
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementAssets.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementAssets.java
index 2b5eded6267..49154418a1e 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementAssets.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementAssets.java
@@ -19,8 +19,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import io.swagger.annotations.Authorization;
-
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.locator.KapuaLocator;
@@ -31,11 +29,6 @@
 import org.eclipse.kapua.service.device.management.asset.DeviceAssets;
 import org.eclipse.kapua.service.device.registry.Device;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api(value = "Devices", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/devices/{deviceId}/assets")
 public class DeviceManagementAssets extends AbstractKapuaResource {
 
@@ -59,11 +52,10 @@ public class DeviceManagementAssets extends AbstractKapuaResource {
      */
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceAssetGet", value = "Gets a list of assets", notes = "Returns the list of all the Assets installed on the device.", response = DeviceAssets.class)
     public DeviceAssets get(
-            @ApiParam(value = "The ScopeId of the device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout) throws Exception {
         return get(scopeId, deviceId, timeout, deviceAssetFilter.newAssetListResult());
     }
 
@@ -83,12 +75,11 @@ public DeviceAssets get(
      */
     @POST
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceAssetFilteredGet", value = "Gets a list of assets", notes = "Returns the list of all the Assets installed on the device.", response = DeviceAssets.class)
     public DeviceAssets get(
-            @ApiParam(value = "The ScopeId of the device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The filter of the request") DeviceAssets deviceAssetFilter) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout,
+            DeviceAssets deviceAssetFilter) throws Exception {
         return deviceManagementAssetService.get(scopeId, deviceId, deviceAssetFilter, timeout);
     }
 
@@ -109,12 +100,11 @@ public DeviceAssets get(
     @POST
     @Path("_read")
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceAssetRead", value = "Reads asset channel values", notes = "Returns the value read from the asset channel", response = DeviceAssets.class)
     public DeviceAssets read(
-            @ApiParam(value = "The ScopeId of the device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The filter of the read request") DeviceAssets deviceAssetFilter) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout,
+            DeviceAssets deviceAssetFilter) throws Exception {
         return deviceManagementAssetService.read(scopeId, deviceId, deviceAssetFilter, timeout);
     }
 
@@ -135,12 +125,11 @@ public DeviceAssets read(
     @POST
     @Path("_write")
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceAssetWrite", value = "Gets a list of assets", notes = "Returns the list of all the Assets installed on the device.", response = DeviceAssets.class)
     public DeviceAssets write(
-            @ApiParam(value = "The ScopeId of the device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The values to write to the asset channels") DeviceAssets deviceAssetFilter) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout,
+            DeviceAssets deviceAssetFilter) throws Exception {
         return deviceManagementAssetService.write(scopeId, deviceId, deviceAssetFilter, timeout);
     }
 
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementBundles.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementBundles.java
index dac6708b58d..297647d4137 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementBundles.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementBundles.java
@@ -20,8 +20,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import io.swagger.annotations.Authorization;
-
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.locator.KapuaLocator;
@@ -30,11 +28,6 @@
 import org.eclipse.kapua.service.device.management.bundle.DeviceBundles;
 import org.eclipse.kapua.service.device.registry.Device;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api(value = "Devices", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/devices/{deviceId}/bundles")
 public class DeviceManagementBundles extends AbstractKapuaResource {
 
@@ -57,11 +50,10 @@ public class DeviceManagementBundles extends AbstractKapuaResource {
      */
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceBundleGet", value = "Gets a list of bundles", notes = "Returns the list of all the Bundles installed on the device.", response = DeviceBundles.class)
     public DeviceBundles get(
-            @ApiParam(value = "The ScopeId of the device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout) throws Exception {
         return bundleService.get(scopeId, deviceId, timeout);
     }
 
@@ -84,12 +76,11 @@ public DeviceBundles get(
     @POST
     @Path("{bundleId}/_start")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "deviceBundleStart", value = "Start a bundle", notes = "Starts the specified bundle")
     public Response start(
-            @ApiParam(value = "The ScopeId of the device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "the ID of the bundle to start", required = true) @PathParam("bundleId") String bundleId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("bundleId") String bundleId,
+            @QueryParam("timeout") Long timeout) throws Exception {
         bundleService.start(scopeId, deviceId, bundleId, timeout);
 
         return returnOk();
@@ -110,12 +101,11 @@ public Response start(
     @POST
     @Path("{bundleId}/_stop")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "deviceBundleStop", value = "Stop a bundle", notes = "Stops the specified bundle")
     public Response stop(
-            @ApiParam(value = "The ScopeId of the device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "the ID of the bundle to stop", required = true) @PathParam("bundleId") String bundleId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("bundleId") String bundleId,
+            @QueryParam("timeout") Long timeout) throws Exception {
         bundleService.stop(scopeId, deviceId, bundleId, timeout);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementCommands.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementCommands.java
index ccec008a8d7..e974f0a6c08 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementCommands.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementCommands.java
@@ -19,8 +19,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import io.swagger.annotations.Authorization;
-
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.locator.KapuaLocator;
@@ -30,11 +28,6 @@
 import org.eclipse.kapua.service.device.management.command.DeviceCommandOutput;
 import org.eclipse.kapua.service.device.registry.Device;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api(value = "Devices", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/devices/{deviceId}/commands")
 public class DeviceManagementCommands extends AbstractKapuaResource {
 
@@ -47,7 +40,7 @@ public class DeviceManagementCommands extends AbstractKapuaResource {
      * <p>
      * Example to list all files in the current working directory:
      * <p>
-     * 
+     *
      * <pre>
      * Client client = client();
      * WebResource apisWeb = client.resource(APIS_TEST_URL);
@@ -81,12 +74,11 @@ public class DeviceManagementCommands extends AbstractKapuaResource {
     @Path("_execute")
     @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "deviceCommandExecute", value = "Executes a command", notes = "Executes a remote command on a device and return the command output.", response = DeviceCommandOutput.class)
     public DeviceCommandOutput sendCommand(
-            @ApiParam(value = "The ScopeId of the device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the command execution") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The input command", required = true) DeviceCommandInput commandInput) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout,
+            DeviceCommandInput commandInput) throws Exception {
         return commandService.exec(scopeId, deviceId, commandInput, timeout);
     }
 }
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementConfigurations.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementConfigurations.java
index cd893150c0c..430b7c3d011 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementConfigurations.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementConfigurations.java
@@ -21,8 +21,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import io.swagger.annotations.Authorization;
-
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.locator.KapuaLocator;
@@ -32,11 +30,6 @@
 import org.eclipse.kapua.service.device.management.configuration.DeviceConfigurationManagementService;
 import org.eclipse.kapua.service.device.registry.Device;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api(value = "Devices", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/devices/{deviceId}/configurations")
 public class DeviceManagementConfigurations extends AbstractKapuaResource {
 
@@ -59,11 +52,10 @@ public class DeviceManagementConfigurations extends AbstractKapuaResource {
      */
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceConfigurationGet", value = "Gets the device configurations", notes = "Returns the current configuration of a device", response = DeviceConfiguration.class)
     public DeviceConfiguration get(
-            @ApiParam(value = "The ScopeId of the Device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout) throws Exception {
         return getComponent(scopeId, deviceId, null, timeout);
     }
 
@@ -85,12 +77,11 @@ public DeviceConfiguration get(
      */
     @PUT
     @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceConfigurationUpdate", value = "Updates a device configuration", notes = "Updates a device configuration", response = DeviceConfiguration.class)
     public Response update(
-            @ApiParam(value = "The ScopeId of the Device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The configuration to send to the device", required = true) DeviceConfiguration deviceConfiguration) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout,
+            DeviceConfiguration deviceConfiguration) throws Exception {
         configurationService.put(scopeId, deviceId, deviceConfiguration, timeout);
 
         return returnOk();
@@ -119,16 +110,11 @@ public Response update(
     @GET
     @Path("{componentId}")
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceConfigurationComponentGet", value = "Gets the configuration of a component on a device", notes = "Returns the configuration of a device or the configuration of the OSGi component " +
-            "identified with specified PID (service's persistent identity). " +
-            "In the OSGi framework, the service's persistent identity is defined as the name attribute of the " +
-            "Component Descriptor XML file; at runtime, the same value is also available " +
-            "in the component.name and in the service.pid attributes of the Component Configuration.", response = DeviceConfiguration.class)
     public DeviceConfiguration getComponent(
-            @ApiParam(value = "The ScopeId of the Device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "An optional id of the component to get the configuration for", required = false) @PathParam("componentId") String componentId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("componentId") String componentId,
+            @QueryParam("timeout") Long timeout) throws Exception {
         return configurationService.get(scopeId, deviceId, null, componentId, timeout);
     }
 
@@ -157,13 +143,12 @@ public DeviceConfiguration getComponent(
     @PUT
     @Path("{componentId}")
     @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceConfigurationComponentUpdate", value = "Updates the configuration of a component on a device", notes = "Updates a device component configuration", response = DeviceConfiguration.class)
     public Response updateComponent(
-            @ApiParam(value = "The ScopeId of the Device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The component id to update", required = true) @PathParam("componentId") String componentId,
-            @ApiParam(value = "The timeout of the operation in milliseconds") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The component configuration to send to the device", required = true) DeviceComponentConfiguration deviceComponentConfiguration) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("componentId") String componentId,
+            @QueryParam("timeout") Long timeout,
+            DeviceComponentConfiguration deviceComponentConfiguration) throws Exception {
         deviceComponentConfiguration.setId(componentId);
 
         configurationService.put(scopeId, deviceId, deviceComponentConfiguration, timeout);
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperationNotifications.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperationNotifications.java
index e2da90682f2..e1a7cb05d37 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperationNotifications.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperationNotifications.java
@@ -11,8 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -40,8 +38,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-//@Api(value = "Devices Operations", authorizations = {@Authorization(value = "kapuaAccessToken")})
-@Path("{scopeId}/devices/{deviceId}/operations/{operationId}/notifications")
+//@Path("{scopeId}/devices/{deviceId}/operations/{operationId}/notifications")
 public class DeviceManagementOperationNotifications extends AbstractKapuaResource {
 
     private final KapuaLocator locator = KapuaLocator.getInstance();
@@ -60,16 +57,15 @@ public class DeviceManagementOperationNotifications extends AbstractKapuaResourc
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "ManagementOperationNotificationSimpleQuery", value = "Gets the ManagementOperationNotification list in the scope", notes = "Returns the list of all the ManagementOperationNotifications associated to the current selected scope.", response = ManagementOperationNotificationListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ManagementOperationNotificationListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The device id to filter results.") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The operation id to filter results.") @PathParam("operationId") EntityId operationId,
-            @ApiParam(value = "The resource of the ManagementOperationNotification in which to search results") @QueryParam("resource") String resource,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("operationId") EntityId operationId,
+            @QueryParam("resource") String resource,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         ManagementOperationNotificationQuery query = managementOperationNotificationFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate(query.attributePredicate(ManagementOperationNotificationAttributes.OPERATION_ID, operationId));
@@ -92,16 +88,15 @@ public ManagementOperationNotificationListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "ManagementOperationNotificationQuery", value = "Queries the ManagementOperationNotifications", notes = "Queries the ManagementOperationNotifications with the given ManagementOperationNotifications parameter returning all matching ManagementOperationNotifications", response = ManagementOperationNotificationListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public ManagementOperationNotificationListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The device id to filter results.") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The id of the Device in which to search results") @PathParam("operationId") EntityId operationId,
-            @ApiParam(value = "The ManagementOperationNotificationQuery to use to filter results.", required = true) ManagementOperationNotificationQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("operationId") EntityId operationId,
+            ManagementOperationNotificationQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -121,16 +116,15 @@ public ManagementOperationNotificationListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "ManagementOperationNotificationCount", value = "Counts the ManagementOperationNotifications", notes = "Counts the ManagementOperationNotifications with the given ManagementOperationNotificationQuery parameter returning the number of matching ManagementOperationNotifications", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The device id to filter results.") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The id of the Device in which to count results") @PathParam("operationId") EntityId operationId,
-            @ApiParam(value = "The ManagementOperationNotificationQuery to use to filter count results", required = true) ManagementOperationNotificationQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("operationId") EntityId operationId,
+            ManagementOperationNotificationQuery query) throws Exception {
         query.setScopeId(scopeId);
         query.setPredicate(query.attributePredicate(ManagementOperationNotificationAttributes.OPERATION_ID, operationId));
 
@@ -147,15 +141,14 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "ManagementOperationNotificationFind", value = "Get an ManagementOperationNotification", notes = "Returns the ManagementOperationNotification specified by the \"ManagementOperationNotificationId\" path parameter.", response = ManagementOperationNotification.class)
     @GET
     @Path("{managementOperationNotificationId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public ManagementOperationNotification find(
-            @ApiParam(value = "The ScopeId of the requested ManagementOperationNotification.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The device id to filter results.") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The id of the requested Device", required = true) @PathParam("operationId") EntityId operationId,
-            @ApiParam(value = "The id of the requested ManagementOperationNotification", required = true) @PathParam("managementOperationNotificationId") EntityId managementOperationNotificationId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("operationId") EntityId operationId,
+            @PathParam("managementOperationNotificationId") EntityId managementOperationNotificationId) throws Exception {
         ManagementOperationNotificationQuery query = managementOperationNotificationFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate(
@@ -185,14 +178,13 @@ public ManagementOperationNotification find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "ManagementOperationNotificationDelete", value = "Delete a ManagementOperationNotification", notes = "Deletes the ManagementOperationNotification specified by the \"ManagementOperationNotificationId\" path parameter.")
     @DELETE
     @Path("{managementOperationNotificationId}")
     public Response deleteManagementOperationNotification(
             @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The device id to filter results.") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The id of the Device in which to delete the ManagementOperation.", required = true) @PathParam("operationId") EntityId operationId,
-            @ApiParam(value = "The id of the ManagementOperationNotification to be deleted", required = true) @PathParam("managementOperationNotificationId") EntityId managementOperationNotificationId) throws Exception {
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("operationId") EntityId operationId,
+            @PathParam("managementOperationNotificationId") EntityId managementOperationNotificationId) throws Exception {
         managementOperationNotificationService.delete(scopeId, managementOperationNotificationId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperations.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperations.java
index e7253d2f16c..4dc7e038ca2 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperations.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementOperations.java
@@ -12,8 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -41,8 +39,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-//@Api(value = "Devices Operations", authorizations = {@Authorization(value = "kapuaAccessToken")})
-@Path("{scopeId}/devices/{deviceId}/operations")
+//@Path("{scopeId}/devices/{deviceId}/operations")
 public class DeviceManagementOperations extends AbstractKapuaResource {
 
     private final KapuaLocator locator = KapuaLocator.getInstance();
@@ -61,15 +58,14 @@ public class DeviceManagementOperations extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceManagementOperationSimpleQuery", value = "Gets the DeviceManagementOperation list in the scope", notes = "Returns the list of all the deviceManagementOperations associated to the current selected scope.", response = DeviceManagementOperationListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public DeviceManagementOperationListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The client id to filter results.") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The resource of the DeviceManagementOperation in which to search results") @QueryParam("resource") String resource,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("resource") String resource,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         DeviceManagementOperationQuery query = deviceManagementOperationFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -97,15 +93,14 @@ public DeviceManagementOperationListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceManagementOperationQuery", value = "Queries the DeviceManagementOperations", notes = "Queries the DeviceManagementOperations with the given DeviceManagementOperations parameter returning all matching DeviceManagementOperations", response = DeviceManagementOperationListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public DeviceManagementOperationListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Device in which to search results") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The DeviceManagementOperationQuery to use to filter results.", required = true) DeviceManagementOperationQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            DeviceManagementOperationQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -125,15 +120,14 @@ public DeviceManagementOperationListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceManagementOperationCount", value = "Counts the DeviceManagementOperations", notes = "Counts the DeviceManagementOperations with the given DeviceManagementOperationQuery parameter returning the number of matching DeviceManagementOperations", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Device in which to count results") @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The DeviceManagementOperationQuery to use to filter count results", required = true) DeviceManagementOperationQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            DeviceManagementOperationQuery query) throws Exception {
         query.setScopeId(scopeId);
         query.setPredicate(query.attributePredicate(DeviceManagementOperationAttributes.DEVICE_ID, deviceId));
 
@@ -150,14 +144,13 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceManagementOperationFind", value = "Get an DeviceManagementOperation", notes = "Returns the DeviceManagementOperation specified by the \"deviceManagementOperationId\" path parameter.", response = DeviceManagementOperation.class)
     @GET
     @Path("{deviceManagementOperationId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public DeviceManagementOperation find(
-            @ApiParam(value = "The ScopeId of the requested DeviceManagementOperation.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The id of the requested DeviceManagementOperation", required = true) @PathParam("deviceManagementOperationId") EntityId deviceManagementOperationId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("deviceManagementOperationId") EntityId deviceManagementOperationId) throws Exception {
         DeviceManagementOperationQuery query = deviceManagementOperationFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate(
@@ -187,12 +180,11 @@ public DeviceManagementOperation find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceManagementOperationDelete", value = "Delete a DeviceManagementOperation", notes = "Deletes the DeviceManagementOperation specified by the \"deviceManagementOperationId\" path parameter.")
     @DELETE
     @Path("{deviceManagementOperationId}")
     public Response deleteDeviceManagementOperation(@PathParam("scopeId") ScopeId scopeId,
-                                                    @ApiParam(value = "The id of the Device in which to delete the ManagementOperation.", required = true) @PathParam("deviceId") EntityId deviceId,
-                                                    @ApiParam(value = "The id of the DeviceManagementOperation to be deleted", required = true) @PathParam("deviceManagementOperationId") EntityId deviceManagementOperationId) throws Exception {
+                                                    @PathParam("deviceId") EntityId deviceId,
+                                                    @PathParam("deviceManagementOperationId") EntityId deviceManagementOperationId) throws Exception {
         deviceManagementOperationRegistryService.delete(scopeId, deviceManagementOperationId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementPackages.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementPackages.java
index 29d6552c90a..f4159c3335a 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementPackages.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementPackages.java
@@ -20,8 +20,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import io.swagger.annotations.Authorization;
-
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.locator.KapuaLocator;
@@ -32,11 +30,6 @@
 import org.eclipse.kapua.service.device.management.packages.model.uninstall.DevicePackageUninstallRequest;
 import org.eclipse.kapua.service.device.registry.Device;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api(value = "Devices", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/devices/{deviceId}/packages")
 public class DeviceManagementPackages extends AbstractKapuaResource {
 
@@ -59,11 +52,10 @@ public class DeviceManagementPackages extends AbstractKapuaResource {
      */
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "devicePackageGet", value = "Gets a list of packages", notes = "Returns the list of all the packages installed on the device.", response = DevicePackages.class)
     public DevicePackages get(
-            @ApiParam(value = "The ScopeId of the Device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation", required = false) @QueryParam("timeout") Long timeout) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout) throws Exception {
         return packageService.getInstalled(scopeId, deviceId, timeout);
     }
 
@@ -86,12 +78,11 @@ public DevicePackages get(
     @POST
     @Path("_download")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "devicePackageDownload", value = "Installs a package", notes = "Installs a package into the device.")
     public Response download(
-            @ApiParam(value = "The ScopeId of the Device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "Mandatory object with all the informations needed to download and install a package", required = true) DevicePackageDownloadRequest packageDownloadRequest)
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout,
+            DevicePackageDownloadRequest packageDownloadRequest)
             throws Exception {
         packageService.downloadExec(scopeId, deviceId, packageDownloadRequest, timeout);
 
@@ -117,12 +108,11 @@ public Response download(
     @POST
     @Path("_uninstall")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "devicePackageUninstall", value = "Uninstalls a package", notes = "Uninstalls a package into the device.")
     public Response uninstall(
-            @ApiParam(value = "The ScopeId of the Device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "Mandatory object with all the informations needed to uninstall a package", required = true) DevicePackageUninstallRequest packageUninstallRequest) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout,
+            DevicePackageUninstallRequest packageUninstallRequest) throws Exception {
         packageService.uninstallExec(scopeId, deviceId, packageUninstallRequest, timeout);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementRequests.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementRequests.java
index 82073ba3f43..eeb933c659b 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementRequests.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementRequests.java
@@ -12,10 +12,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.locator.KapuaLocator;
@@ -33,7 +29,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-@Api(value = "Devices", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/devices/{deviceId}/requests")
 public class DeviceManagementRequests extends AbstractKapuaResource {
 
@@ -55,12 +50,11 @@ public class DeviceManagementRequests extends AbstractKapuaResource {
     @POST
     @Consumes({MediaType.APPLICATION_XML})
     @Produces({MediaType.APPLICATION_XML})
-    @ApiOperation(nickname = "deviceRequestSend", value = "Sends a request", notes = "Sends a request message to a device", response = GenericResponseMessage.class)
     public GenericResponseMessage sendRequest(
-            @ApiParam(value = "The ScopeId of the device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the request execution") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The input request", required = true) GenericRequestMessage requestMessage) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout,
+            GenericRequestMessage requestMessage) throws Exception {
         requestMessage.setScopeId(scopeId);
         requestMessage.setDeviceId(deviceId);
 
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementRequestsJson.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementRequestsJson.java
index 6cb3c645e69..08b48aef786 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementRequestsJson.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementRequestsJson.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.app.api.resources.v1.resources.marker.JsonSerializationFixed;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
@@ -40,7 +36,6 @@
 /**
  * @see JsonSerializationFixed
  */
-@Api(value = "Devices", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/devices/{deviceId}/requests")
 public class DeviceManagementRequestsJson extends AbstractKapuaResource implements JsonSerializationFixed {
 
@@ -64,12 +59,11 @@ public class DeviceManagementRequestsJson extends AbstractKapuaResource implemen
     @POST
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "deviceRequestSend", value = "Sends a request", notes = "Sends a request message to a device", response = JsonGenericResponseMessage.class)
     public JsonGenericResponseMessage sendRequest(
-            @ApiParam(value = "The ScopeId of the device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the request execution") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The input request", required = true) JsonGenericRequestMessage jsonGenericRequestMessage) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout,
+            JsonGenericRequestMessage jsonGenericRequestMessage) throws Exception {
 
         GenericRequestMessage genericRequestMessage = GENERIC_REQUEST_FACTORY.newRequestMessage();
 
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementSnapshots.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementSnapshots.java
index 7e261ce4db3..cba00283b3a 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementSnapshots.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/DeviceManagementSnapshots.java
@@ -20,8 +20,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import io.swagger.annotations.Authorization;
-
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.locator.KapuaLocator;
@@ -30,11 +28,6 @@
 import org.eclipse.kapua.service.device.management.snapshot.DeviceSnapshots;
 import org.eclipse.kapua.service.device.registry.Device;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-@Api(value = "Devices", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/devices/{deviceId}/snapshots")
 public class DeviceManagementSnapshots extends AbstractKapuaResource {
 
@@ -57,11 +50,10 @@ public class DeviceManagementSnapshots extends AbstractKapuaResource {
      */
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "deviceSnapshotGet", value = "Gets a list of snapshots", notes = "Returns the list of all the Snapshots available on the device.", response = DeviceSnapshots.class)
     public DeviceSnapshots get(
-            @ApiParam(value = "The ScopeId of the device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The timeout of the operation", required = false) @QueryParam("timeout") Long timeout) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @QueryParam("timeout") Long timeout) throws Exception {
         return snapshotService.get(scopeId, deviceId, timeout);
     }
 
@@ -84,12 +76,11 @@ public DeviceSnapshots get(
     @POST
     @Path("{snapshotId}/_rollback")
     @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    @ApiOperation(nickname = "deviceSnapshotRollback", value = "Gets a list of snapshots", notes = "Updates the configuration of a device rolling back a given snapshot ID.")
     public Response rollback(
-            @ApiParam(value = "The ScopeId of the device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "the ID of the snapshot to rollback to", required = true) @PathParam("snapshotId") String snapshotId,
-            @ApiParam(value = "The timeout of the operation") @QueryParam("timeout") Long timeout) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            @PathParam("snapshotId") String snapshotId,
+            @QueryParam("timeout") Long timeout) throws Exception {
         snapshotService.rollback(scopeId, deviceId, snapshotId, timeout);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Devices.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Devices.java
index e325717062f..b29831a9ac0 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Devices.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Devices.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -46,7 +42,6 @@
 import javax.ws.rs.core.Response;
 import java.util.List;
 
-@Api(value = "Devices", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/devices")
 public class Devices extends AbstractKapuaResource {
 
@@ -67,17 +62,16 @@ public class Devices extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceSimpleQuery", value = "Gets the Device list in the scope", notes = "Returns the list of all the devices associated to the current selected scope.", response = DeviceListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public DeviceListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The tag id to filter results.") @QueryParam("tagId") EntityId tagId,
-            @ApiParam(value = "The client id to filter results.") @QueryParam("clientId") String clientId,
-            @ApiParam(value = "The connection status to filter results.") @QueryParam("status") DeviceConnectionStatus connectionStatus,
-            @ApiParam(value = "Additional attributes to be returned. Allowed values: connection, lastEvent", allowableValues = "connection, lastEvent", allowMultiple = true) @QueryParam("fetchAttributes") List<String> fetchAttributes,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("tagId") EntityId tagId,
+            @QueryParam("clientId") String clientId,
+            @QueryParam("status") DeviceConnectionStatus connectionStatus,
+            @QueryParam("fetchAttributes") List<String> fetchAttributes,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         DeviceQuery query = deviceFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -107,14 +101,13 @@ public DeviceListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceQuery", value = "Queries the Devices", notes = "Queries the Devices with the given Devices parameter returning all matching Devices", response = DeviceListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public DeviceListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The DeviceQuery to use to filter results.", required = true) DeviceQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            DeviceQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return deviceService.query(query);
@@ -129,14 +122,13 @@ public DeviceListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceCount", value = "Counts the Devices", notes = "Counts the Devices with the given DeviceQuery parameter returning the number of matching Devices", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The DeviceQuery to use to filter count results", required = true) DeviceQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            DeviceQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(deviceService.count(query));
@@ -152,13 +144,12 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceCreate", value = "Create an Device", notes = "Creates a new Device based on the information provided in DeviceCreator parameter.", response = Device.class)
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Device create(
-            @ApiParam(value = "The ScopeId in which to create the Device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Provides the information for the new Device to be created", required = true) DeviceCreator deviceCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            DeviceCreator deviceCreator) throws Exception {
         deviceCreator.setScopeId(scopeId);
 
         return deviceService.create(deviceCreator);
@@ -173,13 +164,12 @@ public Device create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceFind", value = "Get a Device", notes = "Returns the Device specified by the \"deviceId\" path parameter.", response = Device.class)
     @GET
     @Path("{deviceId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Device find(
-            @ApiParam(value = "The ScopeId of the requested Device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Device", required = true) @PathParam("deviceId") EntityId deviceId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId) throws Exception {
         Device device = deviceService.find(scopeId, deviceId);
 
         if (device != null) {
@@ -199,15 +189,14 @@ public Device find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceUpdate", value = "Update a Device", notes = "Updates a new Device based on the information provided in the Device parameter.", response = Device.class)
     @PUT
     @Path("{deviceId}")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Device update(
-            @ApiParam(value = "The ScopeId of the requested Device.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Device", required = true) @PathParam("deviceId") EntityId deviceId,
-            @ApiParam(value = "The modified Device whose attributed need to be updated", required = true) Device device) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId,
+            Device device) throws Exception {
         device.setScopeId(scopeId);
         device.setId(deviceId);
 
@@ -223,12 +212,11 @@ public Device update(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "deviceDelete", value = "Delete a Device", notes = "Deletes the Device specified by the \"deviceId\" path parameter.")
     @DELETE
     @Path("{deviceId}")
     public Response deleteDevice(
-            @ApiParam(value = "The ScopeId of the Device to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Device to be deleted", required = true) @PathParam("deviceId") EntityId deviceId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("deviceId") EntityId deviceId) throws Exception {
         deviceService.delete(scopeId, deviceId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Domains.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Domains.java
index b33b1f1a61c..4d98361787c 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Domains.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Domains.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -40,7 +36,6 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-@Api(value = "Domains", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/domains")
 public class Domains extends AbstractKapuaResource {
 
@@ -59,14 +54,13 @@ public class Domains extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "domainSimpleQuery", value = "Gets the Domain list in the scope", notes = "Returns the list of all the domains associated to the current selected scope.", response = DomainListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public DomainListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The domain name to filter results.") @QueryParam("name") String name,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("name") String name,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         DomainQuery query = domainFactory.newQuery(null);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -90,14 +84,13 @@ public DomainListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "domainQuery", value = "Queries the Domains", notes = "Queries the Domains with the given DomainQuery parameter returning all matching Domains", response = DomainListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public DomainListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The DomainQuery to use to filter results.", required = true) DomainQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            DomainQuery query) throws Exception {
         return domainRegistryService.query(query);
     }
 
@@ -110,14 +103,13 @@ public DomainListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "domainCount", value = "Counts the Domains", notes = "Counts the Domains with the given DomainQuery parameter returning the number of matching Domains", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The DomainQuery to use to filter count results", required = true) DomainQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            DomainQuery query) throws Exception {
         return new CountResult(domainRegistryService.count(query));
     }
 
@@ -130,13 +122,12 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "domainFind", value = "Get a Domain", notes = "Returns the Domain specified by the \"domainId\" path parameter.", response = Domain.class)
     @GET
     @Path("{domainId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Domain find(
-            @ApiParam(value = "The ScopeId of the requested Domain.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Domain", required = true) @PathParam("domainId") EntityId domainId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("domainId") EntityId domainId) throws Exception {
         Domain domain = domainRegistryService.find(scopeId, domainId);
 
         if (domain == null) {
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/EndpointInfos.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/EndpointInfos.java
index e7dd33ac2c8..3a0ef099002 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/EndpointInfos.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/EndpointInfos.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -44,7 +40,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "EndpointInfos", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/endpointInfos")
 public class EndpointInfos extends AbstractKapuaResource {
 
@@ -63,17 +58,14 @@ public class EndpointInfos extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "endpointInfoSimpleQuery",
-            value = "Gets the EndpointInfo list in the scope", //
-            notes = "Returns the list of all the endpointInfos associated to the current selected scope.", //
-            response = EndpointInfoListResult.class)
+
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public EndpointInfoListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The endpointInfo usage to filter results.") @QueryParam("usage") String usage,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("usage") String usage,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         EndpointInfoQuery query = endpointInfoFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -97,17 +89,14 @@ public EndpointInfoListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "endpointInfoQuery",
-            value = "Queries the EndpointInfos", //
-            notes = "Queries the EndpointInfos with the given EndpointInfoQuery parameter returning all matching EndpointInfos", //
-            response = EndpointInfoListResult.class)
+
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public EndpointInfoListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The EndpointInfoQuery to use to filter results.", required = true) EndpointInfoQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            EndpointInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return endpointInfoService.query(query);
@@ -122,17 +111,14 @@ public EndpointInfoListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "endpointInfoCount",
-            value = "Counts the EndpointInfos", //
-            notes = "Counts the EndpointInfos with the given EndpointInfoQuery parameter returning the number of matching EndpointInfos", //
-            response = CountResult.class)
+
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The EndpointInfoQuery to use to filter count results", required = true) EndpointInfoQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            EndpointInfoQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(endpointInfoService.count(query));
@@ -148,16 +134,13 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "createEndpointInfo",
-            value = "Create a EndpointInfo", //
-            notes = "Creates a new EndpointInfo based on the information provided in EndpointInfoCreator parameter.", //
-            response = EndpointInfo.class)
+
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public EndpointInfo create(
-            @ApiParam(value = "The ScopeId in which to create the EndpointInfo", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Provides the information for the new EndpointInfo to be created", required = true) EndpointInfoCreator endpointInfoCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            EndpointInfoCreator endpointInfoCreator) throws Exception {
         endpointInfoCreator.setScopeId(scopeId);
 
         return endpointInfoService.create(endpointInfoCreator);
@@ -172,16 +155,13 @@ public EndpointInfo create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "endpointInfoFind",
-            value = "Get a EndpointInfo", //
-            notes = "Returns the EndpointInfo specified by the \"endpointInfoId\" path parameter.", //
-            response = EndpointInfo.class)
+
     @GET
     @Path("{endpointInfoId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public EndpointInfo find(
-            @ApiParam(value = "The ScopeId of the requested EndpointInfo.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested EndpointInfo", required = true) @PathParam("endpointInfoId") EntityId endpointInfoId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("endpointInfoId") EntityId endpointInfoId) throws Exception {
         EndpointInfo endpointInfo = endpointInfoService.find(scopeId, endpointInfoId);
 
         if (endpointInfo == null) {
@@ -201,18 +181,15 @@ public EndpointInfo find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "endpointInfoUpdate",
-            value = "Update a EndpointInfo", //
-            notes = "Updates a new EndpointInfo based on the information provided in the EndpointInfo parameter.", //
-            response = EndpointInfo.class)
+
     @PUT
     @Path("{endpointInfoId}")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public EndpointInfo update(
-            @ApiParam(value = "The ScopeId of the requested EndpointInfo.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested EndpointInfo", required = true) @PathParam("endpointInfoId") EntityId endpointInfoId,
-            @ApiParam(value = "The modified EndpointInfo whose attributed need to be updated", required = true) EndpointInfo endpointInfo) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("endpointInfoId") EntityId endpointInfoId,
+            EndpointInfo endpointInfo) throws Exception {
         endpointInfo.setScopeId(scopeId);
         endpointInfo.setId(endpointInfoId);
 
@@ -228,14 +205,12 @@ public EndpointInfo update(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "endpointInfoDelete",
-            value = "Delete an EndpointInfo", //
-            notes = "Deletes the EndpointInfo specified by the \"endpointInfoId\" path parameter.")
+
     @DELETE
     @Path("{endpointInfoId}")
     public Response deleteEndpointInfo(
-            @ApiParam(value = "The ScopeId of the EndpointInfo to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the EndpointInfo to be deleted", required = true) @PathParam("endpointInfoId") EntityId endpointInfoId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("endpointInfoId") EntityId endpointInfoId) throws Exception {
         endpointInfoService.delete(scopeId, endpointInfoId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Groups.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Groups.java
index d5f110cbf35..348764e47c4 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Groups.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Groups.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -44,7 +40,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Groups", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/groups")
 public class Groups extends AbstractKapuaResource {
 
@@ -63,14 +58,13 @@ public class Groups extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "groupSimpleQuery", value = "Gets the Group list in the scope", notes = "Returns the list of all the groups associated to the current selected scope.", response = GroupListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public GroupListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The group name to filter results.") @QueryParam("name") String name,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("name") String name,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         GroupQuery query = groupFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -94,14 +88,13 @@ public GroupListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "groupQuery", value = "Queries the Groups", notes = "Queries the Groups with the given GroupQuery parameter returning all matching Groups", response = GroupListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public GroupListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The GroupQuery to use to filter results.", required = true) GroupQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            GroupQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return groupService.query(query);
@@ -116,14 +109,13 @@ public GroupListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "groupCount", value = "Counts the Groups", notes = "Counts the Groups with the given GroupQuery parameter returning the number of matching Groups", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The GroupQuery to use to filter count results", required = true) GroupQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            GroupQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(groupService.count(query));
@@ -137,13 +129,12 @@ public CountResult count(
      * @param groupCreator Provides the information for the new {@link Group} to be created.
      * @return The newly created {@link Group} object.
      */
-    @ApiOperation(nickname = "groupCreate", value = "Create a Group", notes = "Creates a new Group based on the information provided in GroupCreator parameter.", response = Group.class)
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Group create(
-            @ApiParam(value = "The ScopeId in which to create the Group", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Provides the information for the new Group to be created", required = true) GroupCreator groupCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            GroupCreator groupCreator) throws Exception {
         groupCreator.setScopeId(scopeId);
 
         return groupService.create(groupCreator);
@@ -158,13 +149,12 @@ public Group create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "groupFind", value = "Get an Group", notes = "Returns the Group specified by the \"groupId\" path parameter.", response = Group.class)
     @GET
     @Path("{groupId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Group find(
-            @ApiParam(value = "The ScopeId of the requested Group.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Group", required = true) @PathParam("groupId") EntityId groupId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("groupId") EntityId groupId) throws Exception {
         Group group = groupService.find(scopeId, groupId);
 
         if (group == null) {
@@ -184,15 +174,14 @@ public Group find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "groupUpdate", value = "Update an Group", notes = "Updates a new Group based on the information provided in the Group parameter.", response = Group.class)
     @PUT
     @Path("{groupId}")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Group update(
-            @ApiParam(value = "The ScopeId of the requested Group.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Group", required = true) @PathParam("groupId") EntityId groupId,
-            @ApiParam(value = "The modified Group whose attributed need to be updated", required = true) Group group) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("groupId") EntityId groupId,
+            Group group) throws Exception {
         group.setScopeId(scopeId);
         group.setId(groupId);
 
@@ -208,12 +197,11 @@ public Group update(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "groupDelete", value = "Delete an Group", notes = "Deletes the Group specified by the \"groupId\" path parameter.")
     @DELETE
     @Path("{groupId}")
     public Response deleteGroup(
-            @ApiParam(value = "The ScopeId of the Group to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Group to be deleted", required = true) @PathParam("groupId") EntityId groupId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("groupId") EntityId groupId) throws Exception {
         groupService.delete(scopeId, groupId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Roles.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Roles.java
index e841c49acae..4524ab5f155 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Roles.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Roles.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -44,7 +40,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Roles", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/roles")
 public class Roles extends AbstractKapuaResource {
 
@@ -63,14 +58,13 @@ public class Roles extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "roleSimpleQuery", value = "Gets the Role list in the scope", notes = "Returns the list of all the roles associated to the current selected scope.", response = RoleListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public RoleListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The role name to filter results.") @QueryParam("name") String name,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("name") String name,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         RoleQuery query = roleFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -94,14 +88,13 @@ public RoleListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "roleQuery", value = "Queries the Roles", notes = "Queries the Roles with the given RoleQuery parameter returning all matching Roles", response = RoleListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public RoleListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The RoleQuery to use to filter results.", required = true) RoleQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            RoleQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return roleService.query(query);
@@ -116,14 +109,13 @@ public RoleListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "roleCount", value = "Counts the Roles", notes = "Counts the Roles with the given RoleQuery parameter returning the number of matching Roles", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The RoleQuery to use to filter count results", required = true) RoleQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            RoleQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(roleService.count(query));
@@ -139,13 +131,12 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "roleCreate", value = "Create a Role", notes = "Creates a new Role based on the information provided in RoleCreator parameter.", response = Role.class)
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Role create(
-            @ApiParam(value = "The ScopeId in which to create the Account", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Provides the information for the new Role to be created", required = true) RoleCreator roleCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            RoleCreator roleCreator) throws Exception {
         roleCreator.setScopeId(scopeId);
 
         return roleService.create(roleCreator);
@@ -160,13 +151,12 @@ public Role create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "roleFind", value = "Get a Role", notes = "Returns the Role specified by the \"roleId\" path parameter.", response = Role.class)
     @GET
     @Path("{roleId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Role find(
-            @ApiParam(value = "The ScopeId of the requested Account.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Role", required = true) @PathParam("roleId") EntityId roleId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("roleId") EntityId roleId) throws Exception {
         Role role = roleService.find(scopeId, roleId);
 
         if (role == null) {
@@ -186,15 +176,14 @@ public Role find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "roleUpdate", value = "Update an Role", notes = "Updates a new Role based on the information provided in the Role parameter.", response = Role.class)
     @PUT
     @Path("{roleId}")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Role update(
-            @ApiParam(value = "The ScopeId of the requested Account.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Role", required = true) @PathParam("roleId") EntityId roleId,
-            @ApiParam(value = "The modified Role whose attributed need to be updated", required = true) Role role) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("roleId") EntityId roleId,
+            Role role) throws Exception {
         role.setScopeId(scopeId);
         role.setId(roleId);
 
@@ -210,12 +199,11 @@ public Role update(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "roleDelete", value = "Delete a Role", notes = "Deletes the Role specified by the \"roleId\" path parameter.")
     @DELETE
     @Path("{roleId}")
     public Response deleteRole(
-            @ApiParam(value = "The ScopeId of the Account to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Role to be deleted", required = true) @PathParam("roleId") EntityId roleId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("roleId") EntityId roleId) throws Exception {
         roleService.delete(scopeId, roleId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/RolesPermissions.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/RolesPermissions.java
index e251f64c1f3..681377d3e40 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/RolesPermissions.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/RolesPermissions.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -45,7 +41,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Roles", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/roles/{roleId}/permissions")
 public class RolesPermissions extends AbstractKapuaResource {
 
@@ -66,16 +61,15 @@ public class RolesPermissions extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "rolePermissionSimpleQuery", value = "Gets the RolePermission list in the scope", notes = "Returns the list of all the rolePermissions associated to the current selected scope.", response = RolePermissionListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public RolePermissionListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Role to filter results.") @PathParam("roleId") EntityId roleId,
-            @ApiParam(value = "The domain name to filter results.") @QueryParam("name") String domain,
-            @ApiParam(value = "The action to filter results.") @QueryParam("action") Actions action,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("roleId") EntityId roleId,
+            @QueryParam("name") String domain,
+            @QueryParam("action") Actions action,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         RolePermissionQuery query = rolePermissionFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -104,15 +98,14 @@ public RolePermissionListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "rolePermissionQuery", value = "Queries the RolePermissions", notes = "Queries the RolePermissions with the given RolePermissionQuery parameter returning all matching RolePermissions", response = RolePermissionListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public RolePermissionListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The Role id in which to search results.") @PathParam("roleId") EntityId roleId,
-            @ApiParam(value = "The RolePermissionQuery to use to filter results.", required = true) RolePermissionQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("roleId") EntityId roleId,
+            RolePermissionQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -135,15 +128,14 @@ public RolePermissionListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "rolePermissionCount", value = "Counts the RolePermissions", notes = "Counts the RolePermissions with the given RolePermissionQuery parameter returning the number of matching RolePermissions", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The Role id in which to count results.") @PathParam("roleId") EntityId roleId,
-            @ApiParam(value = "The RolePermissionQuery to use to filter results.", required = true) RolePermissionQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("roleId") EntityId roleId,
+            RolePermissionQuery query) throws Exception {
         query.setScopeId(scopeId);
         query.setPredicate(query.attributePredicate(RolePermissionAttributes.ROLE_ID, roleId));
 
@@ -161,14 +153,13 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "rolePermissionCreate", value = "Create a RolePermission", notes = "Creates a new RolePermission based on the information provided in RolePermissionCreator parameter.", response = RolePermission.class)
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public RolePermission create(
-            @ApiParam(value = "The ScopeId in which to create the RolePermission", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The Role id in which to create the RolePermission.", required = true) @PathParam("roleId") EntityId roleId,
-            @ApiParam(value = "Provides the information for the new RolePermission to be created", required = true) RolePermissionCreator rolePermissionCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("roleId") EntityId roleId,
+            RolePermissionCreator rolePermissionCreator) throws Exception {
         rolePermissionCreator.setScopeId(scopeId);
         rolePermissionCreator.setRoleId(roleId);
 
@@ -185,14 +176,13 @@ public RolePermission create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "rolePermissionFind", value = "Get a RolePermission", notes = "Returns the RolePermission specified by the \"rolePermissionId\" path parameter.", response = RolePermission.class)
     @GET
     @Path("{rolePermissionId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public RolePermission find(
-            @ApiParam(value = "The ScopeId of the requested RolePermission.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Specifies the RoleId for the requested RolePermission", required = true) @PathParam("roleId") EntityId roleId,
-            @ApiParam(value = "The id of the requested RolePermission", required = true) @PathParam("rolePermissionId") EntityId rolePermissionId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("roleId") EntityId roleId,
+            @PathParam("rolePermissionId") EntityId rolePermissionId) throws Exception {
         RolePermissionQuery query = rolePermissionFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate(
@@ -223,13 +213,12 @@ public RolePermission find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "rolePermissionDelete", value = "Delete an RolePermission", notes = "Deletes the RolePermission specified by the \"rolePermissionId\" path parameter.")
     @DELETE
     @Path("{rolePermissionId}")
     public Response deleteRolePermission(
-            @ApiParam(value = "The ScopeId of the RolePermission to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Specifies the Role Id for the requested RolePermission", required = true) @PathParam("roleId") EntityId roleId,
-            @ApiParam(value = "The id of the RolePermission to be deleted", required = true) @PathParam("rolePermissionId") EntityId rolePermissionId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("roleId") EntityId roleId,
+            @PathParam("rolePermissionId") EntityId rolePermissionId) throws Exception {
         rolePermissionService.delete(scopeId, rolePermissionId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/ServiceConfigurations.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/ServiceConfigurations.java
index edad1771750..05263727f37 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/ServiceConfigurations.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/ServiceConfigurations.java
@@ -35,12 +35,6 @@
 import org.eclipse.kapua.service.config.ServiceConfiguration;
 import org.eclipse.kapua.service.config.ServiceConfigurationFactory;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
-
-@Api(value = "Service Configurations", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/serviceConfigurations")
 public class ServiceConfigurations extends AbstractKapuaResource {
 
@@ -50,8 +44,7 @@ public class ServiceConfigurations extends AbstractKapuaResource {
 
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "serviceConfigurationGet", value = "Gets multiple services configurations", notes = "Returns the current configuration of multiple services from an account")
-    public ServiceConfiguration get(@ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId) throws Exception {
+    public ServiceConfiguration get(@PathParam("scopeId") ScopeId scopeId) throws Exception {
         List<KapuaConfigurableService> configurableServices = locator.getServices().stream().filter(service -> service instanceof KapuaConfigurableService).map(kapuaService -> (KapuaConfigurableService)kapuaService).collect(Collectors.toList());
         ServiceConfiguration serviceConfiguration = serviceConfigurationFactory.newConfigurationInstance();
         for (KapuaConfigurableService configurableService : configurableServices) {
@@ -71,10 +64,9 @@ public ServiceConfiguration get(@ApiParam(value = "The ScopeId in which to searc
     @PUT
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "serviceConfigurationUpdate", value = "Updates multiple services configuration", notes = "Updates the configuration of multiple services in an account")
     public Response update(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The values for the configurations", required = true) ServiceConfiguration serviceConfiguration
+            @PathParam("scopeId") ScopeId scopeId,
+            ServiceConfiguration serviceConfiguration
     ) throws Exception {
         for (ServiceComponentConfiguration serviceComponentConfiguration : serviceConfiguration.getComponentConfigurations()) {
             Class<KapuaService> configurableServiceClass = (Class<KapuaService>) Class.forName(serviceComponentConfiguration.getId()).asSubclass(KapuaService.class);
@@ -90,10 +82,9 @@ public Response update(
     @GET
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Path("{serviceId}")
-    @ApiOperation(nickname = "serviceConfigurationComponentGet", value = "Gets the configuration of a service on an account", notes = "Returns the configuration of a single service in an account")
     public ServiceComponentConfiguration getComponent(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The full class name of the service.", required = true) @PathParam("serviceId") String serviceId
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("serviceId") String serviceId
     ) throws Exception {
         Class<KapuaService> configurableServiceClass = (Class<KapuaService>) Class.forName(serviceId).asSubclass(KapuaService.class);
         if (KapuaConfigurableService.class.isAssignableFrom(configurableServiceClass)) {
@@ -115,11 +106,10 @@ public ServiceComponentConfiguration getComponent(
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Path("{serviceId}")
-    @ApiOperation(nickname = "serviceConfigurationComponentUpdate", value = "Updates the configuration of a service on an account", notes = "Updates a service component configuration")
     public Response updateComponent(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The full class name of the service.", required = true) @PathParam("serviceId") String serviceId,
-            @ApiParam(value = "The values for the configurations", required = true) ServiceComponentConfiguration serviceComponentConfiguration
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("serviceId") String serviceId,
+            ServiceComponentConfiguration serviceComponentConfiguration
     ) throws Exception {
         Class<KapuaService> configurableServiceClass = (Class<KapuaService>) Class.forName(serviceId).asSubclass(KapuaService.class);
         if (KapuaConfigurableService.class.isAssignableFrom(configurableServiceClass)) {
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Streams.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Streams.java
index c8e3985c376..0299faff0d2 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Streams.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Streams.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.message.device.data.KapuaDataMessage;
@@ -28,7 +24,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Streams", authorizations = { @Authorization(value = "kapuaAccessToken") })
 @Path("{scopeId}/streams")
 public class Streams extends AbstractKapuaResource {
 
@@ -85,11 +80,10 @@ public class Streams extends AbstractKapuaResource {
     @POST
     @Path("messages")
     @Consumes({ MediaType.APPLICATION_XML })
-    @ApiOperation(nickname = "streamPublish", value = "Publishes a fire-and-forget message", notes = "Publishes a fire-and-forget message to a topic composed of [account-name] / [client-id] / [semtantic-parts]")
     public Response publish(
-            @ApiParam(value = "The ScopeId of the device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The timeout of the request execution") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The input request", required = true) KapuaDataMessage requestMessage) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("timeout") Long timeout,
+            KapuaDataMessage requestMessage) throws Exception {
         requestMessage.setScopeId(scopeId);
         streamService.publish(requestMessage, timeout);
         return Response.ok().build();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/StreamsJson.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/StreamsJson.java
index 4aaa1ba22df..8519986aa56 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/StreamsJson.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/StreamsJson.java
@@ -11,10 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.app.api.resources.v1.resources.marker.JsonSerializationFixed;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.ScopeId;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.data.JsonKapuaDataMessage;
@@ -35,7 +31,6 @@
 /**
  * @see JsonSerializationFixed
  */
-@Api(value = "Streams", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/streams")
 public class StreamsJson extends AbstractKapuaResource implements JsonSerializationFixed {
 
@@ -94,11 +89,10 @@ public class StreamsJson extends AbstractKapuaResource implements JsonSerializat
     @POST
     @Path("messages")
     @Consumes({MediaType.APPLICATION_JSON})
-    @ApiOperation(nickname = "streamPublish", value = "Publishes a fire-and-forget message", notes = "Publishes a fire-and-forget message to a topic composed of [account-name] / [client-id] / [semtantic-parts]")
     public Response publish(
-            @ApiParam(value = "The ScopeId of the device", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The timeout of the request execution") @QueryParam("timeout") Long timeout,
-            @ApiParam(value = "The input request", required = true) JsonKapuaDataMessage jsonKapuaDataMessage) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("timeout") Long timeout,
+            JsonKapuaDataMessage jsonKapuaDataMessage) throws Exception {
 
         KapuaDataMessage kapuaDataMessage = KAPUA_DATA_MESSAGE_FACTORY.newKapuaDataMessage();
 
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Tags.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Tags.java
index daea6f82dd1..fb0ce0ba449 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Tags.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Tags.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -44,7 +40,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Tags", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/tags")
 public class Tags extends AbstractKapuaResource {
 
@@ -63,17 +58,14 @@ public class Tags extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "tagSimpleQuery",
-            value = "Gets the Tag list in the scope", //
-            notes = "Returns the list of all the tags associated to the current selected scope.", //
-            response = TagListResult.class)
+
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public TagListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The tag name to filter results.") @QueryParam("name") String name,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("name") String name,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         TagQuery query = tagFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -97,17 +89,14 @@ public TagListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "tagQuery",
-            value = "Queries the Tags", //
-            notes = "Queries the Tags with the given TagQuery parameter returning all matching Tags", //
-            response = TagListResult.class)
+
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public TagListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The TagQuery to use to filter results.", required = true) TagQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            TagQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return tagService.query(query);
@@ -122,17 +111,14 @@ public TagListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "tagCount",
-            value = "Counts the Tags", //
-            notes = "Counts the Tags with the given TagQuery parameter returning the number of matching Tags", //
-            response = CountResult.class)
+
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The TagQuery to use to filter count results", required = true) TagQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            TagQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(tagService.count(query));
@@ -148,16 +134,13 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "createTag",
-            value = "Create a Tag", //
-            notes = "Creates a new Tag based on the information provided in TagCreator parameter.", //
-            response = Tag.class)
+
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Tag create(
-            @ApiParam(value = "The ScopeId in which to create the Tag", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Provides the information for the new Tag to be created", required = true) TagCreator tagCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            TagCreator tagCreator) throws Exception {
         tagCreator.setScopeId(scopeId);
 
         return tagService.create(tagCreator);
@@ -172,16 +155,13 @@ public Tag create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "tagFind",
-            value = "Get a Tag", //
-            notes = "Returns the Tag specified by the \"tagId\" path parameter.", //
-            response = Tag.class)
+
     @GET
     @Path("{tagId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Tag find(
-            @ApiParam(value = "The ScopeId of the requested Tag.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Tag", required = true) @PathParam("tagId") EntityId tagId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("tagId") EntityId tagId) throws Exception {
         Tag tag = tagService.find(scopeId, tagId);
 
         if (tag == null) {
@@ -201,18 +181,15 @@ public Tag find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "tagUpdate",
-            value = "Update a Tag", //
-            notes = "Updates a new Tag based on the information provided in the Tag parameter.", //
-            response = Tag.class)
+
     @PUT
     @Path("{tagId}")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Tag update(
-            @ApiParam(value = "The ScopeId of the requested Tag.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested Tag", required = true) @PathParam("tagId") EntityId tagId,
-            @ApiParam(value = "The modified Tag whose attributed need to be updated", required = true) Tag tag) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("tagId") EntityId tagId,
+            Tag tag) throws Exception {
         tag.setScopeId(scopeId);
         tag.setId(tagId);
 
@@ -228,14 +205,12 @@ public Tag update(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "tagDelete",
-            value = "Delete an Tag", //
-            notes = "Deletes the Tag specified by the \"tagId\" path parameter.")
+
     @DELETE
     @Path("{tagId}")
     public Response deleteTag(
-            @ApiParam(value = "The ScopeId of the Tag to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the Tag to be deleted", required = true) @PathParam("tagId") EntityId tagId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("tagId") EntityId tagId) throws Exception {
         tagService.delete(scopeId, tagId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Users.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Users.java
index 55dc34efab5..14036ef99d6 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Users.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/Users.java
@@ -12,10 +12,6 @@
 package org.eclipse.kapua.app.api.resources.v1.resources;
 
 import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Authorization;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.CountResult;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.EntityId;
@@ -44,7 +40,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@Api(value = "Users", authorizations = {@Authorization(value = "kapuaAccessToken")})
 @Path("{scopeId}/users")
 public class Users extends AbstractKapuaResource {
 
@@ -63,14 +58,13 @@ public class Users extends AbstractKapuaResource {
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "userSimpleQuery", value = "Gets the User list in the scope", notes = "Returns the list of all the users associated to the current selected scope.", response = UserListResult.class)
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public UserListResult simpleQuery(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The user name to filter results.") @QueryParam("name") String name,
-            @ApiParam(value = "The result set offset.", defaultValue = "0") @QueryParam("offset") @DefaultValue("0") int offset,
-            @ApiParam(value = "The result set limit.", defaultValue = "50") @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @QueryParam("name") String name,
+            @QueryParam("offset") @DefaultValue("0") int offset,
+            @QueryParam("limit") @DefaultValue("50") int limit) throws Exception {
         UserQuery query = userFactory.newQuery(scopeId);
 
         AndPredicate andPredicate = query.andPredicate();
@@ -94,14 +88,13 @@ public UserListResult simpleQuery(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "userQuery", value = "Queries the Users", notes = "Queries the Users with the given UserQuery parameter returning all matching Users", response = UserListResult.class)
     @POST
     @Path("_query")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public UserListResult query(
-            @ApiParam(value = "The ScopeId in which to search results.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The UserQuery to use to filter results.", required = true) UserQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            UserQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return userService.query(query);
@@ -116,14 +109,13 @@ public UserListResult query(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "userCount", value = "Counts the Users", notes = "Counts the Users with the given UserQuery parameter returning the number of matching Users", response = CountResult.class)
     @POST
     @Path("_count")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public CountResult count(
-            @ApiParam(value = "The ScopeId in which to count results", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The UserQuery to use to filter count results", required = true) UserQuery query) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            UserQuery query) throws Exception {
         query.setScopeId(scopeId);
 
         return new CountResult(userService.count(query));
@@ -139,13 +131,12 @@ public CountResult count(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "userCreate", value = "Create an User", notes = "Creates a new User based on the information provided in UserCreator parameter.", response = User.class)
     @POST
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public User create(
-            @ApiParam(value = "The ScopeId in which to create the User", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "Provides the information for the new User to be created", required = true) UserCreator userCreator) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            UserCreator userCreator) throws Exception {
         userCreator.setScopeId(scopeId);
 
         return userService.create(userCreator);
@@ -160,13 +151,12 @@ public User create(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "userFind", value = "Get an User", notes = "Returns the User specified by the \"userId\" path parameter.", response = User.class)
     @GET
     @Path("{userId}")
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public User find(
-            @ApiParam(value = "The ScopeId of the requested User.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested User", required = true) @PathParam("userId") EntityId userId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("userId") EntityId userId) throws Exception {
         User user = userService.find(scopeId, userId);
 
         if (user == null) {
@@ -186,15 +176,14 @@ public User find(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "userUpdate", value = "Update an User", notes = "Updates a new User based on the information provided in the User parameter.", response = User.class)
     @PUT
     @Path("{userId}")
     @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public User update(
-            @ApiParam(value = "The ScopeId of the requested User.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the requested User", required = true) @PathParam("userId") EntityId userId,
-            @ApiParam(value = "The modified User whose attributes needs to be updated", required = true) User user) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("userId") EntityId userId,
+            User user) throws Exception {
         user.setScopeId(scopeId);
         user.setId(userId);
 
@@ -210,12 +199,11 @@ public User update(
      * @throws Exception Whenever something bad happens. See specific {@link KapuaService} exceptions.
      * @since 1.0.0
      */
-    @ApiOperation(nickname = "userDelete", value = "Delete an User", notes = "Deletes the User specified by the \"userId\" path parameter.")
     @DELETE
     @Path("{userId}")
     public Response deleteUser(
-            @ApiParam(value = "The ScopeId of the User to delete.", required = true, defaultValue = DEFAULT_SCOPE_ID) @PathParam("scopeId") ScopeId scopeId,
-            @ApiParam(value = "The id of the User to be deleted", required = true) @PathParam("userId") EntityId userId) throws Exception {
+            @PathParam("scopeId") ScopeId scopeId,
+            @PathParam("userId") EntityId userId) throws Exception {
         userService.delete(scopeId, userId);
 
         return returnOk();
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/data/JsonKapuaDataMessage.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/data/JsonKapuaDataMessage.java
index a136cf04248..7c36ce1f070 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/data/JsonKapuaDataMessage.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/data/JsonKapuaDataMessage.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources.model.data;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.message.JsonKapuaPayload;
 import org.eclipse.kapua.message.KapuaPayload;
 import org.eclipse.kapua.message.KapuaPosition;
@@ -72,7 +71,6 @@ public void setId(UUID id) {
 
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     public KapuaId getScopeId() {
         return scopeId;
     }
@@ -83,7 +81,6 @@ public void setScopeId(KapuaId scopeId) {
 
     @XmlElement(name = "deviceId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     public KapuaId getDeviceId() {
         return deviceId;
     }
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/device/management/JsonGenericRequestMessage.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/device/management/JsonGenericRequestMessage.java
index 832b1fb747a..c2d57493c1a 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/device/management/JsonGenericRequestMessage.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/device/management/JsonGenericRequestMessage.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources.model.device.management;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.message.JsonKapuaPayload;
 import org.eclipse.kapua.message.KapuaPayload;
 import org.eclipse.kapua.message.KapuaPosition;
@@ -72,7 +71,6 @@ public void setId(UUID id) {
 
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     public KapuaId getScopeId() {
         return scopeId;
     }
@@ -83,7 +81,6 @@ public void setScopeId(KapuaId scopeId) {
 
     @XmlElement(name = "deviceId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     public KapuaId getDeviceId() {
         return deviceId;
     }
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/device/management/JsonGenericResponseMessage.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/device/management/JsonGenericResponseMessage.java
index 837567f0ba3..e7352053d31 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/device/management/JsonGenericResponseMessage.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/device/management/JsonGenericResponseMessage.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources.model.device.management;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.message.JsonKapuaPayload;
 import org.eclipse.kapua.message.KapuaPayload;
 import org.eclipse.kapua.message.KapuaPosition;
@@ -72,7 +71,6 @@ public void setId(UUID id) {
 
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     public KapuaId getScopeId() {
         return scopeId;
     }
@@ -83,7 +81,6 @@ public void setScopeId(KapuaId scopeId) {
 
     @XmlElement(name = "deviceId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     public KapuaId getDeviceId() {
         return deviceId;
     }
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/message/JsonKapuaPayload.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/message/JsonKapuaPayload.java
index faa825d0210..b433505a255 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/message/JsonKapuaPayload.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/model/message/JsonKapuaPayload.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.resources.v1.resources.model.message;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.message.KapuaPayload;
 import org.eclipse.kapua.message.xml.XmlAdaptedMetric;
 import org.eclipse.kapua.model.type.ObjectValueConverter;
@@ -70,7 +69,6 @@ public void setMetrics(List<XmlAdaptedMetric> metrics) {
 
     @XmlElement(name = "body")
     @XmlJavaTypeAdapter(BinaryXmlAdapter.class)
-    @ApiModelProperty(dataType = "string")
     public byte[] getBody() {
         return body;
     }
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-_count.yaml
new file mode 100644
index 00000000000..fbb0fbf6835
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/_count:
+    post:
+      tags:
+        - Access Info
+      summary: Count the AccessInfos
+      operationId: accessInfoCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-_query.yaml
new file mode 100644
index 00000000000..3bd2c568a21
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/_query:
+    post:
+      tags:
+        - Access Info
+      summary: Query the AccessInfos
+      operationId: accessInfoQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessInfoListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions-_count.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions-_count.yaml
new file mode 100644
index 00000000000..4beb21a76b7
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions-_count.yaml
@@ -0,0 +1,34 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/{accessInfoId}/permissions/_count:
+    post:
+      tags:
+        - Access Permission
+      summary: Count the AccessPermissions
+      operationId: accessPermissionCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions-_query.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions-_query.yaml
new file mode 100644
index 00000000000..91595415ddd
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions-_query.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/{accessInfoId}/permissions/_query:
+    post:
+      tags:
+        - Access Permission
+      summary: Query the AccessPermissions
+      operationId: accessPermissionQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessPermissionListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions-accessPermissionId.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions-accessPermissionId.yaml
new file mode 100644
index 00000000000..a9ab0484f56
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions-accessPermissionId.yaml
@@ -0,0 +1,59 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Info
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/{accessInfoId}/permissions/{accessPermissionId}:
+    get:
+      tags:
+        - Access Permission
+      summary: Get a single AccessPermission
+      operationId: accessPermissionGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessPermissionId'
+      responses:
+        200:
+          description: The details of the desired AccessPermission
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessPermission'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Access Permission
+      summary: Delete a single AccessPermission
+      operationId: accessPermissionDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessPermissionId'
+      responses:
+        200:
+          description: The AccessPermission has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions.yaml
new file mode 100644
index 00000000000..450524c1c0c
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-permissions.yaml
@@ -0,0 +1,64 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Info
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/{accessInfoId}/permissions:
+    get:
+      tags:
+        - Access Permission
+      summary: Get all the AccessPermissions
+      operationId: accessPermissionList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the AccessPermission objects available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessPermissionListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Access Permission
+      summary: Create an AccessPermission
+      operationId: accessPermissionCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './accessInfo.yaml#/components/schemas/accessPermissionCreator'
+      responses:
+        200:
+          description: The AccessPermission that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessPermissionListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles-_count.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles-_count.yaml
new file mode 100644
index 00000000000..f6d2320f4c3
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles-_count.yaml
@@ -0,0 +1,34 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/{accessInfoId}/roles/_count:
+    post:
+      tags:
+        - Access Role
+      summary: Count the AccessRoles
+      operationId: accessRoleCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles-_query.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles-_query.yaml
new file mode 100644
index 00000000000..c77d0685bef
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles-_query.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/{accessInfoId}/roles/_query:
+    post:
+      tags:
+        - Access Role
+      summary: Query the AccessRoles
+      operationId: accessRoleQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessRoleListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles-accessRoleId.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles-accessRoleId.yaml
new file mode 100644
index 00000000000..f59a57f3f6a
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles-accessRoleId.yaml
@@ -0,0 +1,59 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Info
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/{accessInfoId}/roles/{accessRoleId}:
+    get:
+      tags:
+        - Access Role
+      summary: Get a single AccessRole
+      operationId: accessRoleGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessRoleId'
+      responses:
+        200:
+          description: The details of the desired AccessRole
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessRole'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Access Role
+      summary: Delete a single AccessRole
+      operationId: accessRoleDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessRoleId'
+      responses:
+        200:
+          description: The AccessRole has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles.yaml
new file mode 100644
index 00000000000..a523ba6beb4
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId-roles.yaml
@@ -0,0 +1,64 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Info
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/{accessInfoId}/roles:
+    get:
+      tags:
+        - Access Role
+      summary: Get all the AccessRoles
+      operationId: accessRolesList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the AccessRole objects available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessRoleListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Access Role
+      summary: Create an AccessRole
+      operationId: accessRoleCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './accessInfo.yaml#/components/schemas/accessRoleCreator'
+      responses:
+        200:
+          description: The AccessRole that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessRoleListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId.yaml
new file mode 100644
index 00000000000..fc2f3d7ee6b
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId-accessInfoId.yaml
@@ -0,0 +1,57 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Info
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos/{accessInfoId}:
+    get:
+      tags:
+        - Access Info
+      summary: Get a single AccessInfo
+      operationId: accessInfoGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+      responses:
+        200:
+          description: The details of the desired AccessInfo
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessInfo'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Access Info
+      summary: Delete a single AccessInfo
+      operationId: accessInfoDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/accessInfoId'
+      responses:
+        200:
+          description: The AccessInfo has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId.yaml
new file mode 100644
index 00000000000..e4b5e29759d
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo-scopeId.yaml
@@ -0,0 +1,65 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accessinfos:
+    get:
+      tags:
+        - Access Info
+      summary: Get all the AccessInfo
+      operationId: accessInfoList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './accessInfo.yaml#/components/parameters/userId'
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the AccessInfo objects available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessInfoListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Access Info
+      summary: Create an AccessInfo
+      operationId: accessInfoCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        description: The AccessInfoCreator object to create the new AccessInfo
+        content:
+          application/json:
+            schema:
+              $ref: './accessInfo.yaml#/components/schemas/accessInfoCreator'
+        required: true
+      responses:
+        200:
+          description: The AccessInfo that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './accessInfo.yaml#/components/schemas/accessInfoListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo.yaml b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo.yaml
new file mode 100644
index 00000000000..90f2a3ca6c7
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/accessInfo/accessInfo.yaml
@@ -0,0 +1,262 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Access Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    accessInfoId:
+      description: The ID of the AccessInfo on which to perform the operation
+      name: accessInfoId
+      in: path
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+    accessPermissionId:
+      name: accessPermissionId
+      in: path
+      description: The ID of the AccessPermission on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+    accessRoleId:
+      name: accessRoleId
+      in: path
+      description: The ID of the AccessRole on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+    userId:
+      name: userId
+      in: query
+      description: The ID of the User to use as a filter in the query
+      schema:
+        allOf:
+          - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+  schemas:
+    accessInfo:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntity'
+        - description: An AccessInfo represents all the security objects (Roles and Permissions) that can be attached to a User. There will be exactly one AccessInfo object for every User
+          type: object
+          properties:
+            userId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+                - description: The ID of the User to which this AccessInfo is attached to
+          example:
+            type: accessInfo
+            id: AQ
+            scopeId: AQ
+            createdOn: '2019-09-10T15:08:50.799Z'
+            createdBy: AQ
+            modifiedOn: '2019-09-10T15:08:50.799Z'
+            modifiedBy: AQ
+            optlock: 0
+            userId: AQ
+    accessInfoCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntityCreator'
+        - description: An object that contains the informations needed to create an AccessInfo
+          type: object
+          properties:
+            permissions:
+              description: An Array of Permission objects to attach to the new AccessInfo
+              type: array
+              items:
+                $ref: '#/components/schemas/permission'
+            userId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+                - description: The ID of the User to which the AccessInfo will be assigned
+            roleIds:
+              description: An Array of IDs whose Roles will be attached to the new AccessInfo
+              type: array
+              items:
+                $ref: '../openapi.yaml#/components/schemas/kapuaId'
+          example:
+            permissions:
+              - domain: broker
+                action: connect
+                targetScopeId: AQ
+                forwardable: false
+            userId: fjo0iXJEQh0
+            roleIds:
+              - CdIaNmq-Ggk
+    accessInfoListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - description: A container for a list of AccessInfo objects
+          type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/accessInfo'
+          example:
+            type: accessInfoListResult
+            limitExceeded: false
+            size: 2
+            items:
+              - type: accessInfo
+                id: Ag
+                scopeId: AQ
+                createdOn: '2019-09-10T15:08:50.799Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-10T15:08:50.799Z'
+                modifiedBy: AQ
+                optlock: 0
+                userId: Ag
+              - type: accessInfo
+                id: AQ
+                scopeId: AQ
+                createdOn: '2019-09-10T15:08:50.799Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-10T15:08:50.799Z'
+                modifiedBy: AQ
+                optlock: 0
+                userId: AQ
+    permission:
+      description: The representation of a Permission
+      type: object
+      properties:
+        domain:
+          description: The domain name in which the Permission acts. `*` means "Any Domains"
+          type: string
+        action:
+          description: The action that is permitted. `*` means "Any Action in the given Domain"
+          type: string
+        groupId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            - description: The ID of the Group to which the Permission applies. A `null` value means "Any group in the Scope"
+        targetScopeId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            - description: The Scope ID to which the Permission applies. A `null` value means "Any scope in the system"
+        forwardable:
+          description: When `true`, this permission is also active descending the entire Accounts hierarchy
+          type: boolean
+      required:
+        - domain
+        - action
+      example:
+        domain: broker
+        action: connect
+        targetScopeId: AQ
+        forwardable: false
+    accessPermission:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntity'
+        - description: An object that represents the link between an AccessInfo and a Permission
+          type: object
+          properties:
+            accessInfoId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+                - description: The ID of the AccessInfo
+            permission:
+              $ref: '#/components/schemas/permission'
+          example:
+            type: accessPermission
+            id: AQ
+            scopeId: AQ
+            createdOn: '2019-11-12T14:15:47.000Z'
+            createdBy: AQ
+            accessInfoId: Ag
+            permission:
+              domain: broker
+              action: connect
+              targetScopeId: AQ
+              forwardable: false
+    accessPermissionCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntityCreator'
+        - description: An object that contains the informations needed to create an AccessPermission
+          type: object
+          properties:
+            accessInfoId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+                - description: The ID of the AccessInfo to which attach the Permission
+            permission:
+              $ref: '#/components/schemas/permission'
+          required:
+            - accessInfoId
+            - permission
+    accessPermissionListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - description: A container for a list of AccessPermission objects
+          type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/accessPermission'
+          example:
+            type: accessPermissionListResult
+            limitExceeded: false
+            size: 1
+            items:
+              - type: accessPermission
+                id: Io4dVUnrBtE
+                scopeId: AQ
+                createdOn: 2019-09-11T14:14:15.786Z
+                createdBy: AQ
+                accessInfoId: FPRcCYjzgqs
+                permission:
+                  domain: broker
+                  action: connect
+                  forwardable: false
+    accessRole:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntity'
+        - description: An object that represents the link between an AccessInfo and a Role
+          type: object
+          properties:
+            accessInfoId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+                - description: The ID of the AccessInfo
+            roleId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+                - description: The ID of the Role attached to the AccessInfo
+    accessRoleCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntityCreator'
+        - description: An object that contains the informations needed to create an AccessRole
+          type: object
+          properties:
+            accessInfoId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+                - description: The ID of the AccessInfo to which attach the Permission
+            roleId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+                - description: The ID of the AccessInfo
+          required:
+            - accessInfoId
+            - roleId
+    accessRoleListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - description: A container for a list of AccessRole objects
+          type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/accessRole'
diff --git a/rest-api/resources/src/main/resources/openapi/account/account-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/account/account-scopeId-_count.yaml
new file mode 100644
index 00000000000..67b6185b9b4
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/account/account-scopeId-_count.yaml
@@ -0,0 +1,34 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Accounts
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accounts/_count:
+    post:
+      tags:
+        - Account
+      summary: Count the Accounts
+      operationId: accountCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      description: Returns the count of how many Accounts are present in the given Scope
diff --git a/rest-api/resources/src/main/resources/openapi/account/account-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/account/account-scopeId-_query.yaml
new file mode 100644
index 00000000000..0db666931f2
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/account/account-scopeId-_query.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Accounts
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accounts/_query:
+    post:
+      tags:
+        - Account
+      summary: Query the Accounts
+      operationId: accountQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './account.yaml#/components/schemas/accountListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      description: Returns a list of the Accounts matching the given query in the Scope. Predicates are not currently supported.
diff --git a/rest-api/resources/src/main/resources/openapi/account/account-scopeId-accountId.yaml b/rest-api/resources/src/main/resources/openapi/account/account-scopeId-accountId.yaml
new file mode 100644
index 00000000000..f098e356e1a
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/account/account-scopeId-accountId.yaml
@@ -0,0 +1,108 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Accounts
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accounts/{accountId}:
+    get:
+      tags:
+        - Account
+      summary: Get a single Account
+      operationId: accountGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './account.yaml#/components/parameters/accountId'
+      responses:
+        200:
+          description: The details of the desired Account
+          content:
+            application/json:
+              schema:
+                $ref: './account.yaml#/components/schemas/account'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      description: Get the details of a given Account, according to the `accountId` path parameter.
+    put:
+      tags:
+        - Account
+      summary: Update a single Account
+      operationId: accountUpdate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './account.yaml#/components/parameters/accountId'
+      requestBody:
+        description: An object containing the new properties for the Account to update
+        content:
+          application/json:
+            schema:
+              $ref: './account.yaml#/components/schemas/account'
+            example:
+              type: account
+              optlock: 2
+              name: acme-inc
+              expirationDate: '2019-31-12T00:00:00.000Z'
+              organization:
+                addressLine1: 123 Looney Tunes Drive
+                addressLine2: Block 1
+                addressLine3: Apartment 25
+                city: Somewhere City
+                country: United States
+                email: wile.coyote@acme.inc
+                name: ACME Inc.
+                personName: Wile Ethelbert Coyote
+                phoneNumber: +1 (555) 123 4567
+                stateProvinceCounty: Green County GC
+                zipPostCode: '00100'
+              parentAccountPath: /1/3315290947379772881
+        required: true
+      responses:
+        200:
+          description: The details of the updated Account
+          content:
+            application/json:
+              schema:
+                $ref: './account.yaml#/components/schemas/account'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      description: Update the details of a given Account, according to the `accountId` path parameter. Please note that some fields may be readonly for integrity purposes.
+    delete:
+      tags:
+        - Account
+      summary: Delete a single Account
+      operationId: accountDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './account.yaml#/components/parameters/accountId'
+      responses:
+        200:
+          description: The Account has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      description: Delete the given account, according to the `accountId` path parameter.
diff --git a/rest-api/resources/src/main/resources/openapi/account/account-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/account/account-scopeId.yaml
new file mode 100644
index 00000000000..eb6f78264d7
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/account/account-scopeId.yaml
@@ -0,0 +1,72 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Accounts
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/accounts:
+    get:
+      tags:
+        - Account
+      summary: Get all the Accounts
+      operationId: accountList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: name
+          in: query
+          description: An optional string to filter Accounts according to their name
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Accounts available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './account.yaml#/components/schemas/accountListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      description: Get all the Accounts in the given Scope
+    post:
+      tags:
+        - Account
+      summary: Create a new Account
+      operationId: accountCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        description: An object containing the properties for the new Account to be created
+        content:
+          application/json:
+            schema:
+              $ref: './account.yaml#/components/schemas/accountCreator'
+        required: true
+      responses:
+        200:
+          description: The Account that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './account.yaml#/components/schemas/account'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/account/account.yaml b/rest-api/resources/src/main/resources/openapi/account/account.yaml
new file mode 100644
index 00000000000..d494cc4575c
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/account/account.yaml
@@ -0,0 +1,205 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Accounts
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    accountId:
+      name: accountId
+      in: path
+      description: The ID of the Account on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    account:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntity'
+        - description: |
+            An object that holds all the informations pertaining an Account, including the details about the Contacts of that account.\
+            In Kapua an Account is the container of all other resources (Users, Devices, etc.), and is the equivalent of the concept of Tenant.\
+            Every entity in Kapua will have a `scopeId` property, that holds the ID of the Account who holds that entity.
+          type: object
+          properties:
+            organization:
+              type: object
+              properties:
+                name:
+                  type: string
+                  description: The Name of the Organization
+                addressLine1:
+                  type: string
+                  description: First line of the Address for the Organization
+                addressLine2:
+                  type: string
+                  description: Second line of the Address for the Organization
+                addressLine3:
+                  type: string
+                  description: Third line of the Address for the Organization
+                zipPostCode:
+                  type: string
+                  description: The Zip / Postcode for the Organization
+                city:
+                  type: string
+                  description: The City of the Organization
+                stateProvinceCounty:
+                  type: string
+                  description: The State / Province / County of the Organization
+                country:
+                  type: string
+                  description: The Country of the Organization
+                personName:
+                  type: string
+                  description: The Name of the Person listed as a Contact for the Organization
+                email:
+                  type: string
+                  description: The Email Address of the Person listed as a Contact for the Organization
+                phoneNumber:
+                  type: string
+                  description: The Phone Number of the Person listed as a Contact for the Organization
+              description: An object containing all the informations related to the Organization who holds the account
+            expirationDate:
+              type: string
+              format: 'date-time'
+              description: The Expiration date and time for the Account. If empty, the Account has no expiration
+            parentAccountPath:
+              type: string
+              description: The full Scope ID Hierarchy for the Account
+#            childAccounts:
+#              type: array
+#              items:
+#                $ref: '#/components/schemas/account'
+#              description: A list of Accounts available in the current Scope
+          example:
+            type: account
+            id: LgJHjS2jvdE
+            scopeId: AQ
+            createdOn: '2019-09-09T10:21:03.775Z'
+            createdBy: AQ
+            modifiedOn: '2019-09-09T10:21:03.789Z'
+            modifiedBy: AQ
+            optlock: 2
+            name: acme-inc
+            expirationDate: '2019-31-12T00:00:00.000Z'
+            organization:
+              addressLine1: 123 Looney Tunes Drive
+              addressLine2: Block 1
+              addressLine3: Apartment 25
+              city: Somewhere City
+              country: United States
+              email: wile.coyote@acme.inc
+              name: ACME Inc.
+              personName: Wile Ethelbert Coyote
+              phoneNumber: +1 (555) 123 4567
+              stateProvinceCounty: Green County, GC
+              zipPostCode: '00100'
+            parentAccountPath: /1/3315290947379772881
+    accountCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntityCreator'
+        - description: An object with all the information needed to create a new Account
+          type: object
+          properties:
+            organizationName:
+              type: string
+              description: The Name of the Organization
+            organizationAddressLine1:
+              type: string
+              description: First line of the Address for the Organization
+            organizationAddressLine2:
+              type: string
+              description: Second line of the Address for the Organization
+            organizationAddressLine3:
+              type: string
+              description: Third line of the Address for the Organization
+            organizationZipPostCode:
+              type: string
+              description: The Zip / Postcode for the Organization
+            organizationCity:
+              type: string
+              description: The City of the Organization
+            organizationStateProvinceCounty:
+              type: string
+              description: The State / Province / County of the Organization
+            organizationCountry:
+              type: string
+              description: The Country of the Organization
+            organizatioPpersonName:
+              type: string
+              description: The Name of the Person listed as a Contact for the Organization
+            organizationEmail:
+              type: string
+              format: email
+              description: The Email Address of the Person listed as a Contact for the Organization
+            phoneNumber:
+              type: string
+              description: The Phone Number of the Person listed as a Contact for the Organization
+            expirationDate:
+              type: string
+              format: 'date-time'
+              description: The Expiration date and time for the Account
+          required:
+            - organizationName
+            - organizationEmail
+          example:
+            name: acme-inc
+            organizationName: ACME Inc.
+            organizationEmail: wile.coyote@acme.inc
+            organizationAddressLine1: 123 Looney Tunes Drive
+            organizationAddressLine2: Block 1
+            organizationAddressLine3: Apartment 25
+            organizationZipPostCode: '00100'
+            organizationCity: Somewhere City
+            organizationStateProvinceCounty: Green County, GC
+            organizationCountry: United States
+            organizationPersonName: Wile Ethelbert Coyote
+            phoneNumber: +1 (555) 123 4567
+            expirationDate: '2019-31-12T00:00:00.000Z'
+    accountListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - description: A list container for Account objects
+          type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/account'
+          example:
+            type: accountListResult
+            size: 1
+            limitExceeded: false
+            items:
+              - type: account
+                id: LgJHjS2jvdE
+                scopeId: AQ
+                createdOn: '2019-09-09T10:21:03.775Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-09T10:21:03.789Z'
+                modifiedBy: AQ
+                optlock: 2
+                name: acme-inc
+                organization:
+                  addressLine1: 123 Looney Tunes Drive
+                  addressLine2: Block 1
+                  addressLine3: Apartment 25
+                  city: Somewhere City
+                  country: United States
+                  email: wile.coyote@acme.inc
+                  name: ACME Inc.
+                  personName: Wile Ethelbert Coyote
+                  phoneNumber: +1 (555) 123 4567
+                  stateProvinceCounty: Green County, GC
+                  zipPostCode: '00100'
+                parentAccountPath: /1/3315290947379772881
diff --git a/rest-api/resources/src/main/resources/openapi/authentication/authentication-apikey.yaml b/rest-api/resources/src/main/resources/openapi/authentication/authentication-apikey.yaml
new file mode 100644
index 00000000000..d6493e62b62
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/authentication/authentication-apikey.yaml
@@ -0,0 +1,42 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Authentication
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /authentication/apikey:
+    post:
+      tags:
+        - Authentication
+      summary: Login - API Key
+      operationId: authenticationApiKey
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                apiKey:
+                  type: string
+                  format: base64
+                  example: 'z8PEVr4XdBS/KKEKbVG9tJzj6DNNpSVCDpW53CWm'
+              required:
+                - apiKey
+      responses:
+        200:
+          description: The new AccessToken
+          content:
+            application/json:
+              schema:
+                $ref: './authentication.yaml#/components/schemas/accessToken'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      security: []
diff --git a/rest-api/resources/src/main/resources/openapi/authentication/authentication-info.yaml b/rest-api/resources/src/main/resources/openapi/authentication/authentication-info.yaml
new file mode 100644
index 00000000000..39ec730cd60
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/authentication/authentication-info.yaml
@@ -0,0 +1,32 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Authentication
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /authentication/info:
+    get:
+      description: Returns all the Authentication and Authorization informations about the current session
+      tags:
+        - Authentication
+      summary: Login Info
+      operationId: authenticationLoginInfo
+      responses:
+        200:
+          description: An object conatining all the Authentication and Authorization informations about the current session
+          content:
+            application/json:
+              schema:
+                $ref: './authentication.yaml#/components/schemas/loginInfo'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/authentication/authentication-jwt.yaml b/rest-api/resources/src/main/resources/openapi/authentication/authentication-jwt.yaml
new file mode 100644
index 00000000000..9a3ad2cfacf
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/authentication/authentication-jwt.yaml
@@ -0,0 +1,40 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Authentication
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /authentication/jwt:
+    post:
+      tags:
+        - Authentication
+      summary: Login - JWT
+      operationId: authenticationJwt
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                jwt:
+                  $ref: './authentication.yaml#/components/schemas/jwt'
+              required:
+                - jwt
+      responses:
+        200:
+          description: The new AccessToken
+          content:
+            application/json:
+              schema:
+                $ref: './authentication.yaml#/components/schemas/accessToken'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      security: []
diff --git a/rest-api/resources/src/main/resources/openapi/authentication/authentication-logout.yaml b/rest-api/resources/src/main/resources/openapi/authentication/authentication-logout.yaml
new file mode 100644
index 00000000000..46ff4a60a1e
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/authentication/authentication-logout.yaml
@@ -0,0 +1,27 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Authentication
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /authentication/logout:
+    post:
+      tags:
+        - Authentication
+      summary: Logout
+      operationId: authenticationLogout
+      responses:
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        200:
+          description: Logout Successful
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/authentication/authentication-refresh.yaml b/rest-api/resources/src/main/resources/openapi/authentication/authentication-refresh.yaml
new file mode 100644
index 00000000000..810ed98246b
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/authentication/authentication-refresh.yaml
@@ -0,0 +1,51 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Authentication
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /authentication/refresh:
+    post:
+      tags:
+        - Authentication
+      summary: Refresh an AccessToken
+      description: |
+        Creates a new AccessToken from an existing (even if expired) AccessToken and a Refresh Token that must be still valid.
+        Regardless of the expiration date, the AccessToken provided to the refresh operation WILL be invalidated
+      operationId: authenticationRefresh
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                refreshToken:
+                  type: string
+                  format: uuid
+                tokenId:
+                  $ref: './authentication.yaml#/components/schemas/jwt'
+              required:
+                - refreshToken
+                - tokenId
+      responses:
+        200:
+          description: The new AccessToken
+          content:
+            application/json:
+              schema:
+                $ref: './authentication.yaml#/components/schemas/accessToken'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      security: []
diff --git a/rest-api/resources/src/main/resources/openapi/authentication/authentication-user.yaml b/rest-api/resources/src/main/resources/openapi/authentication/authentication-user.yaml
new file mode 100644
index 00000000000..65fa18896e6
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/authentication/authentication-user.yaml
@@ -0,0 +1,51 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Authentication
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /authentication/user:
+    post:
+      tags:
+        - Authentication
+      summary: Login - User and Password
+      operationId: authenticationUser
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                username:
+                  allOf:
+                    - $ref: './authentication.yaml#/components/schemas/username'
+                password:
+                  allOf:
+                    - $ref: './authentication.yaml#/components/schemas/password'
+              required:
+                - username
+                - password
+            examples:
+              kapua-sys:
+                description: Default kapua-sys login credentials
+                value:
+                  username: kapua-sys
+                  password: kapua-password
+      responses:
+        200:
+          description: The new AccessToken
+          content:
+            application/json:
+              schema:
+                $ref: './authentication.yaml#/components/schemas/accessToken'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+      security: []
diff --git a/rest-api/resources/src/main/resources/openapi/authentication/authentication.yaml b/rest-api/resources/src/main/resources/openapi/authentication/authentication.yaml
new file mode 100644
index 00000000000..7354040d4de
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/authentication/authentication.yaml
@@ -0,0 +1,108 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Authentication
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  schemas:
+    accessToken:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntity'
+        - type: object
+          properties:
+            userId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            tokenId:
+              allOf:
+                - $ref: '#/components/schemas/jwt'
+            expiresOn:
+              type: string
+              format: 'date-time'
+            invalidatedOn:
+              type: string
+              format: 'date-time'
+            refreshToken:
+              type: string
+              format: uuid
+            refreshExpiresOn:
+              type: string
+              format: 'date-time'
+    loginInfo:
+      type: object
+      properties:
+        accessPermission:
+          type: array
+          items:
+            $ref: '../accessInfo/accessInfo.yaml#/components/schemas/accessPermission'
+        accessToken:
+          $ref: '#/components/schemas/accessToken'
+        rolePermissions:
+          type: array
+          items:
+            $ref: '../role/role.yaml#/components/schemas/rolePermission'
+      example:
+        type: loginInfo
+        accessPermission:
+          - id: Jfzafs5eUuw
+            scopeId: AQ
+            createdOn: '2019-11-15T14:43:11.451Z'
+            createdBy: AQ
+            accessInfoId: IKfvOdNER6M
+            permission:
+              domain: datastore
+              action: read
+              targetScopeId: AQ
+              forwardable: false
+        accessToken:
+          id: RSP1npB7wZ4
+          scopeId: AQ
+          createdOn: '2019-11-15T14:43:27.547Z'
+          createdBy: UlM9TGpJJ-g
+          modifiedOn: '2019-11-15T14:43:27.547Z'
+          modifiedBy: UlM9TGpJJ-g
+          optlock: 1
+          tokenId: eyJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJodHRwczovL3d3dy5lY2xpcHNlLm9yZy9rYXB1YSIsImlhdCI6MTU3MzgyOTAwNywiZXhwIjoxNTczODMwODA3LCJzdWIiOiJVbE05VEdwSkotZyIsInNJZCI6IkFRIn0.LgVFKAl1Ftd3g81MhtUglee5JjCqd-gGjilj1UAkDbKs4Xwgo1j9V-CBVPF4aop3r0x80U9YaVthYoPEikG2v4QaRHl7UGeikWOHk4g0lpeFCZvS_Kcag6VgbfYKKXd2C2ivtQE3enjZIUEz2UTEXz3KrcizuvgO4SP_PEz5hGkjqfbV2l1IM--_E8LQRBQoD7ixpGajaUlcrNlLsJcNgy8hRgyNp_Bqbyosd4oBttC4oDIyVA9Wmgq8aXUwFl7SZ42Kd4RIUUlMg-aAIAzWXVMQ2kCY1jYy7eNUmLszWdmPjMZsKbFcB5asXXYiHvZ_zy0x9AHFRnFte721ESjG3NLlvx8UKOWLFBkmlbvgPLd5fhlzTzim57ddpTjJpRsTM123VSwKL6Ul3ZZKiADrBVi4By-C4BhIkS9hVfa-HzfWlQKUOJvpa7PuUuRT1XzxxSTwIjgE4XuNdxHRqJpJPg0XtAuN67KXhmXjeQUaDi05GvpV3VyhtO6_GjjoLRd934N2hBdgS6FLIYkxBVMNSyqzjg9QO_A6Yzul5JK8T6H-f7ZhlYsx3trkWw0I9jetQguPveChFY0xbeTHSW0PwyNpyXKBzIUQhwCH2zoI9LxUy7TV7yn5wN3IW5MocnOXtKG49BTIbslT4eccoTWhtFQafGu8OF0TN-QyMf0eGTQ
+          userId: UlM9TGpJJ-g
+          expiresOn: '2019-11-15T15:13:27.506Z'
+          refreshToken: e8a53e18-0c6b-4f3c-9929-409069a9c66e
+          refreshExpiresOn: '2019-11-15T19:43:27.506Z'
+        rolePermission:
+          - id: a716DxmV9TI
+            scopeId: AQ
+            createdOn: '2019-11-15T14:42:28.859Z'
+            createdBy: AQ
+            roleId: OgkB8tR0kF4
+            permission:
+              domain: device
+              action: read
+              targetScopeId: AQ
+              forwardable: false
+          - id: O0X0yIQo6NU
+            scopeId: AQ
+            createdOn: '2019-11-15T14:42:04.153Z'
+            createdBy: AQ
+            roleId: EUkieLf-Y8M
+            permission:
+              domain: user
+              targetScopeId: AQ
+              forwardable: false
+    username:
+      type: string
+      pattern: '^[a-zA-Z0-9\_\-]{3,}$'
+    password:
+      type: string
+      pattern: '^.*(?=.{12,})(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!\"\#$%&''()*+,\-./:;<=>?@\[\]\\^_`{|}~]).*$'
+    jwt:
+      type: string
+      pattern: '^[A-Za-z0-9-_=]+\.[A-Za-z0-9-_=]+\.?[A-Za-z0-9-_.+/=]*$'
diff --git a/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-_count.yaml
new file mode 100644
index 00000000000..b8fbb2fa429
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Credentials
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/credentials/_count:
+    post:
+      tags:
+        - Credential
+      summary: Count the Credentials
+      operationId: credentialCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-_query.yaml
new file mode 100644
index 00000000000..c86a2f9eeb8
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Credentials
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/credentials/_query:
+    post:
+      tags:
+        - Credential
+      summary: Query the Credentials
+      operationId: credentialQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './credential.yaml#/components/schemas/credentialListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-credentialId-unlock.yaml b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-credentialId-unlock.yaml
new file mode 100644
index 00000000000..b391709a8e7
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-credentialId-unlock.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Credential
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/credentials/{credentialId}/unlock:
+    post:
+      tags:
+        - Credential
+      summary: Unlock a Credential
+      operationId: credentialUnlock
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './credential.yaml#/components/parameters/credentialId'
+      responses:
+        200:
+          description: The Credential has been unlocked
+          content:
+            application/json:
+              schema:
+                $ref: './credential.yaml#/components/schemas/credential'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-credentialId.yaml b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-credentialId.yaml
new file mode 100644
index 00000000000..f689004bdaf
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId-credentialId.yaml
@@ -0,0 +1,87 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Credentials
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/credentials/{credentialId}:
+    get:
+      tags:
+        - Credential
+      summary: Get a single Credential
+      operationId: credentialGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './credential.yaml#/components/parameters/credentialId'
+      responses:
+        200:
+          description: The details of the desired Credential
+          content:
+            application/json:
+              schema:
+                $ref: './credential.yaml#/components/schemas/credential'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Credential
+      summary: Update a single Credential
+      operationId: credentialUpdate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './credential.yaml#/components/parameters/credentialId'
+      requestBody:
+        description: An object containing the new properties for the Credential to update
+        content:
+          application/json:
+            schema:
+              $ref: './credential.yaml#/components/schemas/credential'
+        required: true
+      responses:
+        200:
+          description: The details of the updated Credential
+          content:
+            application/json:
+              schema:
+                $ref: './credential.yaml#/components/schemas/credential'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Credential
+      summary: Delete a single Credential
+      operationId: credentialDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './credential.yaml#/components/parameters/credentialId'
+      responses:
+        200:
+          description: The Credential has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId.yaml
new file mode 100644
index 00000000000..65b341ef792
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/credential/credential-scopeId.yaml
@@ -0,0 +1,88 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Credential
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/credentials:
+    get:
+      tags:
+        - Credential
+      summary: Get all the Credentials
+      operationId: credentialList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: userId
+          in: query
+          description: The optional id to filter results
+          schema:
+            $ref: '../openapi.yaml#/components/schemas/kapuaId'
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+
+      responses:
+        200:
+          description: The list of the Credentials available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './credential.yaml#/components/schemas/credentialListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Credential
+      summary: Create a new Credential
+      operationId: credentialCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        description: An object containing the properties for the new Credential to be created
+        content:
+          application/json:
+            schema:
+              $ref: './credential.yaml#/components/schemas/credentialCreator'
+            examples:
+              password:
+                description: Password
+                value:
+                    userId: "AQ"
+                    credentialType: PASSWORD
+                    credentialKey: "new-password-123!"
+                    credentialStatus: ENABLED
+                    expirationDate: "2019-12-31T00:00:00.000Z"
+              apikey:
+                description: API Key
+                value:
+                  userId: "AQ"
+                  credentialType: API_KEY
+                  credentialStatus: ENABLED
+                  expirationDate: "2019-12-31T00:00:00.000Z"
+        required: true
+      responses:
+        200:
+          description: The Credential that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './credential.yaml#/components/schemas/credential'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/credential/credential.yaml b/rest-api/resources/src/main/resources/openapi/credential/credential.yaml
new file mode 100644
index 00000000000..5f8c00fedda
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/credential/credential.yaml
@@ -0,0 +1,112 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Credentials
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    credentialId:
+      name: credentialId
+      in: path
+      description: The ID of the Credential on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    credential:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntity'
+        - description: An object containing all the information for a single Credential
+          type: object
+          properties:
+            userId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            credentialType:
+              type: string
+              enum:
+                - PASSWORD
+                - API_KEY
+                - JWT
+            credentialKey:
+              type: string
+            status:
+              type: string
+              enum:
+                - ENABLED
+                - DISABLED
+            expirationDate:
+              type: string
+              format: 'date-time'
+            loginFailures:
+              description: |
+                A count of how many times an user failed to login with this Credential.
+                This field is cleared after a successful login
+              type: integer
+            firstLoginFailure:
+              description: |
+                The moment when the first login failure has been recorded with this credential.
+                This field is cleared after a successful login
+              type: string
+              format: 'date-time'
+            loginFailuresReset:
+              description: |
+                The moment when the failure attempts for this Credential will be reset.
+                This field is cleared after a successful login
+              type: string
+              format: 'date-time'
+            lockoutReset:
+              description: |
+                The moment when this Credential will be enabled again after a lockout due to too many failures.
+                This field is cleared after a successful login
+              type: string
+              format: 'date-time'
+    credentialCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntityCreator'
+        - type: object
+          properties:
+            userId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            credentialType:
+              type: string
+              enum:
+                - PASSWORD
+                - API_KEY
+                - JWT
+            credentialKey:
+              type: string
+            credentialStatus:
+              type: string
+              enum:
+                - ENABLED
+                - DISABLED
+            expirationDate:
+              type: string
+              format: 'date-time'
+          example:
+            userId: "AQ"
+            credentialType: PASSWORD
+            credentialKey: "new-password-123!"
+            credentialStatus: ENABLED
+            expirationDate: "2019-12-31T00:00:00.000Z"
+    credentialListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/credential'
diff --git a/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel-scopeId-_count.yaml
new file mode 100644
index 00000000000..e1b512146de
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Channel
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/channels/_count:
+    post:
+      tags:
+        - Data Channel
+      summary: Count the ChannelInfos
+      operationId: dataChannelCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel-scopeId-channelInfoId.yaml b/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel-scopeId-channelInfoId.yaml
new file mode 100644
index 00000000000..17f40c98576
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel-scopeId-channelInfoId.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Channel
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/channels/{channelInfoId}:
+    get:
+      tags:
+        - Data Channel
+      summary: Get a single ChannelInfo
+      operationId: channelInfoGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './dataChannel.yaml#/components/parameters/channelInfoId'
+      responses:
+        200:
+          description: The desired ChannelInfo
+          content:
+            application/json:
+              schema:
+                $ref: './dataChannel.yaml#/components/schemas/channelInfo'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel-scopeId.yaml
new file mode 100644
index 00000000000..f2997e83e9d
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel-scopeId.yaml
@@ -0,0 +1,47 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Channel
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/channels:
+    get:
+      tags:
+        - Data Channel
+      summary: Query the Data Channels
+      operationId: dataChannelQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: clientId
+          in: query
+          schema:
+            type: string
+          description: The ClientID to filter results
+        - name: name
+          in: query
+          schema:
+            type: string
+          description: The channel name to filter results. It allows '#' wildcard in last channel level
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './dataChannel.yaml#/components/schemas/channelInfoListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel.yaml b/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel.yaml
new file mode 100644
index 00000000000..eccc9706306
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataChannel/dataChannel.yaml
@@ -0,0 +1,106 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Channel
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    channelInfoId:
+      name: channelInfoId
+      in: path
+      description: The ID of the ChannelInfo on which to perform the operation
+      schema:
+        type: string
+        format: base64
+      required: true
+  schemas:
+    channelInfo:
+      type: object
+      properties:
+        id:
+          type: string
+          format: base64
+        scopeId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            - readOnly: true
+        clientId:
+          type: string
+        name:
+          type: string
+        firstMessageId:
+          type: string
+          format: uuid
+        firstMessageOn:
+          type: string
+          format: 'date-time'
+        lastMessageId:
+          type: string
+          format: uuid
+        lastMessageOn:
+          type: string
+          format: 'date-time'
+      example:
+        type: channelInfo
+        id: xny9A7OkTUcSYxJIGf3oMZHyZIvi4AcsFqJJbY1N2yg=
+        scopeId: AQ
+        clientId: Client-Id-1
+        name: ALERT
+        firstMessageId: 18739b9f-6d8b-42c2-a536-507b37dd5f2a
+        firstMessageOn: '2019-09-12T08:04:13.920Z'
+        lastMessageId: a3e69394-1c20-4446-b596-6fcc4a2028fe
+        lastMessageOn: '2019-09-12T08:14:13.230Z'
+    channelInfoListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/channelInfo'
+            totalCount:
+              type: integer
+          example:
+              type: channelInfoListResult
+              limitExceeded: false
+              size: 3
+              totalCount: 3
+              items:
+                - type: channelInfo
+                  id: xny9A7OkTUcSYxJIGf3oMZHyZIvi4AcsFqJJbY1N2yg=
+                  scopeId: AQ
+                  clientId: Client-Id-1
+                  name: ALERT
+                  firstMessageId: 18739b9f-6d8b-42c2-a536-507b37dd5f2a
+                  firstMessageOn: '2019-09-12T08:04:13.920Z'
+                  lastMessageId: a3e69394-1c20-4446-b596-6fcc4a2028fe
+                  lastMessageOn: '2019-09-12T08:14:13.230Z'
+                - type: channelInfo
+                  id: vkyqKinEY2/UhxHHz2XRsmz02NtRK5KCsA7Fa1ot6CI=
+                  scopeId: AQ
+                  clientId: Client-Id-1
+                  name: DIAG
+                  firstMessageId: 308b0c38-76fa-4530-bb68-8c4c285c1f17
+                  firstMessageOn: '2019-09-12T08:04:13.887Z'
+                  lastMessageId: 8c59cd10-f23e-435e-a523-0aa8e952da1e
+                  lastMessageOn: '2019-09-12T09:04:49.710Z'
+                - type: channelInfo
+                  id: X0BcZAV6FfD+Wi9n4x5VOdHmSV/E6UpOTetaqpXAb+w=
+                  scopeId: AQ
+                  clientId: Client-Id-1
+                  name: heater/data
+                  firstMessageId: 3cec54f7-9633-4a68-ad5b-48f57ea7f0f3
+                  firstMessageOn: '2019-09-12T09:03:20.959Z'
+                  lastMessageId: a8597968-d785-42dd-9e04-1f15d42df774
+                  lastMessageOn: '2019-09-12T09:05:06.527Z'
diff --git a/rest-api/resources/src/main/resources/openapi/dataClient/dataClient-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/dataClient/dataClient-scopeId-_count.yaml
new file mode 100644
index 00000000000..2fb1e3d7365
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataClient/dataClient-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Client
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/clients/_count:
+    post:
+      tags:
+        - Data Client
+      summary: Count the ClientInfos
+      operationId: dataClientCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataClient/dataClient-scopeId-clientInfoId.yaml b/rest-api/resources/src/main/resources/openapi/dataClient/dataClient-scopeId-clientInfoId.yaml
new file mode 100644
index 00000000000..5e80ee2243c
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataClient/dataClient-scopeId-clientInfoId.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Client
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/clients/{clientInfoId}:
+    get:
+      tags:
+        - Data Client
+      summary: Get a single ClientInfo
+      operationId: clientInfoGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './dataClient.yaml#/components/parameters/clientInfoId'
+      responses:
+        200:
+          description: The desired ClientInfo
+          content:
+            application/json:
+              schema:
+                $ref: './dataClient.yaml#/components/schemas/clientInfo'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataClient/dataClient-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/dataClient/dataClient-scopeId.yaml
new file mode 100644
index 00000000000..b64600557a0
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataClient/dataClient-scopeId.yaml
@@ -0,0 +1,42 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Client
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/clients:
+    get:
+      tags:
+        - Data Client
+      summary: Query the Data Clients
+      operationId: dataClientQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: clientId
+          in: query
+          schema:
+            type: string
+          description: The ClientID to filter results
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './dataClient.yaml#/components/schemas/clientInfoListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataClient/dataClient.yaml b/rest-api/resources/src/main/resources/openapi/dataClient/dataClient.yaml
new file mode 100644
index 00000000000..5e98adb2621
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataClient/dataClient.yaml
@@ -0,0 +1,82 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Client
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    clientInfoId:
+      name: clientInfoId
+      in: path
+      description: The ID of the ClientInfo on which to perform the operation
+      schema:
+        type: string
+      required: true
+  schemas:
+    clientInfo:
+      type: object
+      properties:
+        id:
+          type: string
+        scopeId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            - readOnly: true
+        clientId:
+          type: string
+        firstMessageId:
+          type: string
+          format: uuid
+        firstMessageOn:
+          type: string
+          format: 'date-time'
+        lastMessageId:
+          type: string
+          format: uuid
+        lastMessageOn:
+          type: string
+          format: 'date-time'
+      example:
+        type: clientInfo
+        id: JOyqK0XfNrKYD5qcAe6MJyl3TMd6AjwzKnqQofb8USg=
+        scopeId: AQ
+        clientId: Client-Id-1
+        firstMessageId: a2320c45-6791-4525-a552-adb163928303
+        firstMessageOn: 2019-09-12T08:14:13.228Z
+        lastMessageId: bb07d7fc-dc62-492f-b8da-7e28df69e112
+        lastMessageOn: 2019-09-12T09:25:05.096Z
+    clientInfoListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/clientInfo'
+            totalCount:
+              type: integer
+          example:
+              type: clientInfoListResult
+              limitExceeded: false
+              size: 1
+              items:
+                type: clientInfo
+                id: JOyqK0XfNrKYD5qcAe6MJyl3TMd6AjwzKnqQofb8USg=
+                scopeId: AQ
+                clientId: Client-Id-1
+                firstMessageId: a2320c45-6791-4525-a552-adb163928303
+                firstMessageOn: 2019-09-12T08:14:13.228Z
+                lastMessageId: bb07d7fc-dc62-492f-b8da-7e28df69e112
+                lastMessageOn: 2019-09-12T09:25:05.096Z
+              totalCount: 1
diff --git a/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage-scopeId-_count.yaml
new file mode 100644
index 00000000000..ca04fb96933
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Message
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/messages/_count:
+    post:
+      tags:
+        - Data Message
+      summary: Count the MessageInfos
+      operationId: dataMessageCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage-scopeId-datastoreMessageId.yaml b/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage-scopeId-datastoreMessageId.yaml
new file mode 100644
index 00000000000..8b7e70e4171
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage-scopeId-datastoreMessageId.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Message
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/messages/{datastoreMessageId}:
+    get:
+      tags:
+        - Data Message
+      summary: Get a single DataMessage
+      operationId: dataMessageGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './dataMessage.yaml#/components/parameters/datastoreMessageId'
+      responses:
+        200:
+          description: The desired DataMessage
+          content:
+            application/json:
+              schema:
+                $ref: './dataMessage.yaml#/components/schemas/dataMessageListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage-scopeId.yaml
new file mode 100644
index 00000000000..b279caed28b
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage-scopeId.yaml
@@ -0,0 +1,137 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Message
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/messages:
+    get:
+      tags:
+        - Data Message
+      summary: Query the Data Messages
+      operationId: dataMessageQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - description: The ClientID to use as a filter for messages
+          name: clientId
+          in: query
+          schema:
+            type: string
+        - description: The Channel to use as a filter for messages
+          name: channel
+          in: query
+          schema:
+            type: string
+        - description: Restrict the search only to this channel ignoring its children. Only meaningful if channel is set
+          name: strictChannel
+          in: query
+          schema:
+            type: boolean
+        - description: The start date to filter the results. Must come before endDate parameter
+          name: startDate
+          in: query
+          schema:
+            type: string
+            format: 'date-time'
+        - description: The end date to filter the results. Must come after startDate parameter
+          name: endDate
+          in: query
+          schema:
+            type: string
+            format: 'date-time'
+        - description: The metric name to filter results. If filled, `metricType`, `metricMinValue` and `metricMaxValue` are also required
+          name: metricName
+          in: query
+          schema:
+            type: string
+        - description: The metric type to filter results
+          name: metricType
+          in: query
+          schema:
+            type: string
+        - description: The minimum metric value to filter results
+          name: metricMin
+          in: query
+          schema:
+            type: string
+        - description: The maximum metric value to filter results
+          name: metricMax
+          in: query
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './dataMessage.yaml#/components/schemas/dataMessageListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Data Message
+      summary: Store a new Message
+      operationId: dataMessageStore
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './dataMessage.yaml#/components/schemas/dataMessage'
+            example:
+              type: jsonDatastoreMessage
+              capturedOn: '2019-09-12T09:25:05.096Z'
+              channel:
+                type: kapuaDataChannel
+                semanticParts:
+                  - heater
+                  - data
+              clientId: Client-Id-1
+              deviceId: WyczTs_GuDM
+              payload:
+                metrics:
+                  - valueType: string
+                    value: 5.0
+                    name: temperatureExternal
+                  - valueType: string
+                    value: 20.0
+                    name: temperatureInternal
+                  - valueType: string
+                    value: 30.0
+                    name: temperatureExhaust
+                  - valueType: string
+                    value: 0
+                    name: errorCode
+              receivedOn: '2019-09-12T09:25:05.102Z'
+              sentOn: '2019-09-12T09:25:05.096Z'
+              datastoreId: bb07d7fc-dc62-492f-b8da-7e28df69e112
+              timestamp: '2019-09-12T09:25:05.096Z'
+      responses:
+        200:
+          description: The ID of the new DataMessage
+          content:
+            application/json:
+              schema:
+                $ref: './dataMessage.yaml#/components/schemas/dataMessageInsertResponse'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage.yaml b/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage.yaml
new file mode 100644
index 00000000000..ff2d930b8e1
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataMessage/dataMessage.yaml
@@ -0,0 +1,219 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Metric
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    datastoreMessageId:
+      name: datastoreMessageId
+      in: path
+      description: The ID of the MetricInfo on which to perform the operation
+      schema:
+        type: string
+      required: true
+  schemas:
+    dataMessage:
+      type: object
+      properties:
+        datastoreId:
+          type: string
+          format: uuid
+          readOnly: true
+        scopeId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            - readOnly: true
+        timestamp:
+          type: string
+          format: 'date-time'
+        deviceId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+        clientId:
+          type: string
+        receivedOn:
+          type: string
+          format: 'date-time'
+        sentOn:
+          type: string
+          format: 'date-time'
+        capturedOn:
+          type: string
+          format: 'date-time'
+        position:
+          $ref: '#/components/schemas/position'
+        channel:
+          type: object
+          properties:
+            semanticParts:
+              type: array
+              items:
+                type: string
+        payload:
+          type: object
+          properties:
+            metrics:
+              type: array
+              items:
+                type: object
+                properties:
+                  valueType:
+                    type: string
+                  value:
+                    type: string
+                  name:
+                    type: string
+            body:
+              type: string
+              format: base64
+      required:
+        - clientId
+        - deviceId
+      example:
+        type: jsonDatastoreMessage
+        capturedOn: '2019-09-12T09:25:05.096Z'
+        channel:
+          type: kapuaDataChannel
+          semanticParts:
+            - heater
+            - data
+        clientId: Client-Id-1
+        deviceId: WyczTs_GuDM
+        payload:
+          metrics:
+            - valueType: string
+              value: 5.0
+              name: temperatureExternal
+            - valueType: string
+              value: 20.0
+              name: temperatureInternal
+            - valueType: string
+              value: 30.0
+              name: temperatureExhaust
+            - valueType: string
+              value: 0
+              name: errorCode
+        receivedOn: '2019-09-12T09:25:05.102Z'
+        scopeId: AQ
+        sentOn: '2019-09-12T09:25:05.096Z'
+        datastoreId: bb07d7fc-dc62-492f-b8da-7e28df69e112
+        timestamp: '2019-09-12T09:25:05.096Z'
+    dataMessageInsertResponse:
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+          readOnly: true
+    dataMessageListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/dataMessage'
+          example:
+            type: storableListResult
+            limitExceeded: true
+            size: 2
+            items:
+              - type: jsonDatastoreMessage
+                capturedOn: '2019-09-12T09:35:04.383Z'
+                channel:
+                  type: kapuaDataChannel
+                  semanticParts:
+                    - heater
+                    - data
+                clientId: Client-Id-1
+                deviceId: WyczTs_GuDM
+                payload:
+                  metrics:
+                    - valueType: string
+                      value: 5.0
+                      name: temperatureExternal
+                    - valueType: string
+                      value: 20.25
+                      name: temperatureInternal
+                    - valueType: string
+                      value: 30.0
+                      name: temperatureExhaust
+                    - valueType: string
+                      value: -441478528
+                      name: errorCode
+                receivedOn: '2019-09-12T09:35:04.389Z'
+                scopeId: AQ
+                sentOn: '2019-09-12T09:35:04.383Z'
+                datastoreId: 6349cec8-396b-4aac-bc2f-8fca9fe0c67c
+                timestamp: '2019-09-12T09:35:04.383Z'
+              - type: jsonDatastoreMessage
+                capturedOn: '2019-09-12T09:25:05.096Z'
+                channel:
+                  type: kapuaDataChannel
+                  semanticParts:
+                    - heater
+                    - data
+                clientId: Client-Id-1
+                deviceId: WyczTs_GuDM
+                payload:
+                  metrics:
+                    - valueType: string
+                      value: 5.0
+                      name: temperatureExternal
+                    - valueType: string
+                      value: 20.0
+                      name: temperatureInternal
+                    - valueType: string
+                      value: 30.0
+                      name: temperatureExhaust
+                    - valueType: string
+                      value: 0
+                      name: errorCode
+                receivedOn: '2019-09-12T09:25:05.102Z'
+                scopeId: AQ
+                sentOn: '2019-09-12T09:25:05.096Z'
+                datastoreId: bb07d7fc-dc62-492f-b8da-7e28df69e112
+                timestamp: '2019-09-12T09:25:05.096Z'
+            totalCount: 61
+    position:
+      type: object
+      properties:
+        latitude:
+          type: number
+          format: double
+        longitude:
+          type: number
+          format: double
+        altitude:
+          type: number
+          format: double
+        precision:
+          type: number
+          format: double
+        heading:
+          type: number
+          format: double
+        speed:
+          type: number
+          format: double
+        timestamp:
+          type: string
+          format: 'date-time'
+        satellites:
+          type: integer
+          format: int32
+        status:
+          type: integer
+          format: int32
diff --git a/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric-scopeId-_count.yaml
new file mode 100644
index 00000000000..7222fe9cdf9
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Metric
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/metrics/_count:
+    post:
+      tags:
+        - Data Metric
+      summary: Count the MetricInfos
+      operationId: dataMetricCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric-scopeId-metricInfoId.yaml b/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric-scopeId-metricInfoId.yaml
new file mode 100644
index 00000000000..7871cd418b7
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric-scopeId-metricInfoId.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Metric
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/metrics/{metricInfoId}:
+    get:
+      tags:
+        - Data Metric
+      summary: Get a single MetricInfo
+      operationId: metricInfoGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './dataMetric.yaml#/components/parameters/metricInfoId'
+      responses:
+        200:
+          description: The desired MetricInfo
+          content:
+            application/json:
+              schema:
+                $ref: './dataMetric.yaml#/components/schemas/metricInfo'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric-scopeId.yaml
new file mode 100644
index 00000000000..1012f409467
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric-scopeId.yaml
@@ -0,0 +1,52 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Metric
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/data/metrics:
+    get:
+      tags:
+        - Data Metric
+      summary: Query the Data Metrics
+      operationId: dataMetricQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: clientId
+          in: query
+          schema:
+            type: string
+          description: The client ID to filter results
+        - name: channel
+          in: query
+          schema:
+            type: string
+          description: The channel to filter results. It allows '#' wildcard in last channel level
+        - name: name
+          in: query
+          schema:
+            type: string
+          description: The metric name to filter results
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './dataMetric.yaml#/components/schemas/metricInfoListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric.yaml b/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric.yaml
new file mode 100644
index 00000000000..c79c423321d
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/dataMetric/dataMetric.yaml
@@ -0,0 +1,104 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Data Metric
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    metricInfoId:
+      name: metricInfoId
+      in: path
+      description: The ID of the MetricInfo on which to perform the operation
+      schema:
+        type: string
+      required: true
+  schemas:
+    metricInfo:
+      type: object
+      properties:
+        id:
+          type: string
+          format: base64
+        scopeId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            - readOnly: true
+        clientId:
+          type: string
+        channel:
+          type: string
+        name:
+          type: string
+        metricType:
+          type: string
+        firstMessageId:
+          type: string
+          format: uuid
+        firstMessageOn:
+          type: string
+          format: 'date-time'
+        lastMessageId:
+          type: string
+          format: uuid
+        lastMessageOn:
+          type: string
+          format: 'date-time'
+      example:
+        type: metricInfo
+        id: oLVtE7wK67wO5Lxx4nZGsTEwbVjeo0xcFcnTvmhCxLU=
+        scopeId: AQ
+        clientId: Client-Id-1
+        channel: ALERT
+        name: alert_category
+        metricType: string
+        firstMessageId: c623d131-6f47-49af-9ba0-1474a90dd9ed
+        firstMessageOn: '2019-09-12T08:04:13.918Z'
+        lastMessageId: 653b4aee-e0d5-4af6-b120-ffc7c26057b9
+        lastMessageOn: '2019-09-12T09:24:48.352Z'
+    metricInfoListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/metricInfo'
+          example:
+            type: metricInfoListResult
+            limitExceeded: false
+            size: 2
+            items:
+              - type: metricInfo
+                id: oLVtE7wK67wO5Lxx4nZGsTEwbVjeo0xcFcnTvmhCxLU=
+                scopeId: AQ
+                clientId: Client-Id-1
+                channel: ALERT
+                name: alert_category
+                metricType: string
+                firstMessageId: c623d131-6f47-49af-9ba0-1474a90dd9ed
+                firstMessageOn: '2019-09-12T08:04:13.918Z'
+                lastMessageId: 653b4aee-e0d5-4af6-b120-ffc7c26057b9
+                lastMessageOn: '2019-09-12T09:24:48.352Z'
+              - type: metricInfo
+                id: q2vErAArLQ2rs/4m3eGZf5p6gqrCT+qZKxbeNPQrc+Q=
+                scopeId: AQ
+                clientId: Client-Id-1
+                channel: ALERT
+                name: alert_code
+                metricType: string
+                firstMessageId: c623d131-6f47-49af-9ba0-1474a90dd9ed
+                firstMessageOn: '2019-09-12T08:04:13.918Z'
+                lastMessageId: 653b4aee-e0d5-4af6-b120-ffc7c26057b9
+                lastMessageOn: '2019-09-12T09:24:48.352Z'
+            totalCount: 35
diff --git a/rest-api/resources/src/main/resources/openapi/device/device-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/device/device-scopeId-_count.yaml
new file mode 100644
index 00000000000..851d1a48896
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/device/device-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Devices
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/_count:
+    post:
+      tags:
+        - Device
+      summary: Count the Devices
+      operationId: deviceCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/device/device-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/device/device-scopeId-_query.yaml
new file mode 100644
index 00000000000..0d4391b3fd8
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/device/device-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Devices
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/_query:
+    post:
+      tags:
+        - Device
+      summary: Query the Devices
+      operationId: deviceQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './device.yaml#/components/schemas/deviceListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/device/device-scopeId-deviceId.yaml b/rest-api/resources/src/main/resources/openapi/device/device-scopeId-deviceId.yaml
new file mode 100644
index 00000000000..f726736ddf5
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/device/device-scopeId-deviceId.yaml
@@ -0,0 +1,101 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Devices
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}:
+    get:
+      tags:
+        - Device
+      summary: Get a single Device
+      operationId: deviceGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './device.yaml#/components/parameters/deviceId'
+      responses:
+        200:
+          description: The details of the desired Device
+          content:
+            application/json:
+              schema:
+                $ref: './device.yaml#/components/schemas/device'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Device
+      summary: Update a single Device
+      operationId: deviceUpdate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './device.yaml#/components/parameters/deviceId'
+      requestBody:
+        description: An object containing the new properties for the Device to update
+        content:
+          application/json:
+            schema:
+              $ref: './device.yaml#/components/schemas/device'
+            example:
+              type: device
+              optlock: 1
+              status: ENABLED
+              displayName: Test Device
+              serialNumber: 1234567890
+              modelId: Test Model
+              biosVersion: N/A
+              firmwareVersion: N/A
+              osVersion: 3.13.0-93-generic
+              jvmVersion: 24.111-b01 mixed mode
+              osgiFrameworkVersion: 1.7.0
+              acceptEncoding: gzip
+              tagIds: []
+        required: true
+      responses:
+        200:
+          description: The details of the updated Device
+          content:
+            application/json:
+              schema:
+                $ref: './device.yaml#/components/schemas/device'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Device
+      summary: Delete a single Device
+      operationId: deviceDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './device.yaml#/components/parameters/deviceId'
+      responses:
+        200:
+          description: The Device has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/device/device-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/device/device-scopeId.yaml
new file mode 100644
index 00000000000..39646bd7631
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/device/device-scopeId.yaml
@@ -0,0 +1,173 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Devices
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices:
+    get:
+      tags:
+        - Device
+      summary: Get all the Devices
+      operationId: deviceList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: tagId
+          in: query
+          description: The tag id to filter results
+          schema:
+            $ref: '../openapi.yaml#/components/schemas/kapuaId'
+        - $ref: './device.yaml#/components/parameters/clientId'
+        - $ref: '../deviceConnection/deviceConnection.yaml#/components/parameters/connectionStatus'
+        - $ref: './device.yaml#/components/parameters/fetchAttributes'
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Devices available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './device.yaml#/components/schemas/deviceListResult'
+              examples:
+                standard:
+                  value:
+                    type: deviceListResult
+                    limitExceeded: false
+                    size: 1
+                    items:
+                      - type: device
+                        id: WyczTs_GuDM
+                        scopeId: AQ
+                        createdOn: 2019-09-12T09:04:37.315Z
+                        createdBy: Ag
+                        modifiedOn: 2019-09-12T09:04:37.603Z
+                        modifiedBy: Ag
+                        optlock: 2
+                        clientId: Client-Id-1
+                        connectionId: Gd1BfeWwh3s
+                        status: ENABLED
+                        displayName:
+                        lastEventId: YYHQ2i1S-P0
+                        serialNumber: ESF-Docker-RHEL
+                        modelId: ESF-Docker-RHEL
+                        modelName: ESF-Docker-RHEL
+                        biosVersion: N/A
+                        firmwareVersion: N/A
+                        osVersion: 4.9.184-linuxkit #1 SMP Tue Jul 2 22:58:16 UTC 2019
+                        jvmVersion: 25.161-b12 mixed mode
+                        osgiFrameworkVersion: 1.8.0
+                        applicationFrameworkVersion: ESF_6.0.0
+                        connectionInterface: lo (00:00:00:00:00:00)
+                        connectionIp: 127.0.0.1
+                        applicationIdentifiers: heaterPROV-V2DEPLOY-V2VPNCLIENT-V2CONF-V1CERT-V1ASSET-V1CMD-V1
+                        acceptEncoding: gzip
+                        tagIds: []
+                with-fetch-attributes:
+                  value:
+                      type: deviceListResult
+                      limitExceeded: false
+                      size: 1
+                      items:
+                        - type: device
+                          id: WyczTs_GuDM
+                          scopeId: AQ
+                          createdOn: 2019-09-12T09:04:37.315Z
+                          createdBy: Ag
+                          modifiedOn: 2019-09-12T09:04:37.603Z
+                          modifiedBy: Ag
+                          optlock: 2
+                          clientId: Client-Id-1
+                          connectionId: Gd1BfeWwh3s
+                          connection:
+                            id: Gd1BfeWwh3s
+                            scopeId: AQ
+                            createdOn: 2019-09-12T09:04:32.101Z
+                            createdBy: Ag
+                            modifiedOn: 2019-09-12T09:04:32.101Z
+                            modifiedBy: Ag
+                            optlock: 1
+                            status: CONNECTED
+                            clientId: Client-Id-1
+                            userId: Ag
+                            allowUserChange: false
+                            userCouplingMode: INHERITED
+                            protocol: MQTT
+                            clientIp: tcp://172.21.0.1:59596
+                            serverIp: broker
+                          status: ENABLED
+                          displayName:
+                          lastEventId: YYHQ2i1S-P0
+                          lastEvent:
+                            id: YYHQ2i1S-P0
+                            scopeId: AQ
+                            createdOn: 2019-09-12T09:04:37.392Z
+                            createdBy: Ag
+                            deviceId: WyczTs_GuDM
+                            receivedOn: 2019-09-12T09:04:32.646Z
+                            position:
+                              altitude: 0
+                              latitude: 0
+                              longitude: 0
+                            resource: BIRTH
+                            action: CREATE
+                            responseCode: ACCEPTED
+                            eventMessage: acceptEncoding=gzip~~applicationFramework=Kura~~applicationFrameworkVersion=ESF_6.0.0~~applicationIdentifiers=heaterPROV-V2DEPLOY-V2VPNCLIENT-V2CONF-V1CERT-V1ASSET-V1CMD-V1~~availableProcessors=4~~bios=N/A~~biosVersion=N/A~~connectionInterface=lo (00:00:00:00:00:00)~~connectionIp=127.0.0.1~~containerFramework=Eclipse~~containerFrameworkVersion=1.8.0~~displayName=~~firmware=N/A~~firmwareVersion=N/A~~jvm=Java HotSpot(TM) 64-Bit Server VM~~jvmProfile=Java(TM) SE Runtime Environment 1.8.0_161-b12~~jvmVersion=25.161-b12 mixed mode~~modelId=ESF-Docker-RHEL~~modelName=ESF-Docker-RHEL~~os=Linux~~osArch=amd64~~osVersion=4.9.184-linuxkit #1 SMP Tue Jul 2 22:58:16 UTC 2019~~partNumber=ESF-Docker-RHEL~~serialNumber=ESF-Docker-RHEL~~totalMemory=1023488~~uptime=187894320
+                          serialNumber: ESF-Docker-RHEL
+                          modelId: ESF-Docker-RHEL
+                          modelName: ESF-Docker-RHEL
+                          biosVersion: N/A
+                          firmwareVersion: N/A
+                          osVersion: 4.9.184-linuxkit #1 SMP Tue Jul 2 22:58:16 UTC 2019
+                          jvmVersion: 25.161-b12 mixed mode
+                          osgiFrameworkVersion: 1.8.0
+                          applicationFrameworkVersion: ESF_6.0.0
+                          connectionInterface: lo (00:00:00:00:00:00)
+                          connectionIp: 127.0.0.1
+                          applicationIdentifiers: heaterPROV-V2DEPLOY-V2VPNCLIENT-V2CONF-V1CERT-V1ASSET-V1CMD-V1
+                          acceptEncoding: gzip
+                          tagIds: []
+
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Device
+      summary: Create a new Device
+      operationId: deviceCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        description: An object containing the properties for the new Device to be created
+        content:
+          application/json:
+            schema:
+              $ref: './device.yaml#/components/schemas/deviceCreator'
+        required: true
+      responses:
+        200:
+          description: The Device that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './device.yaml#/components/schemas/device'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/device/device.yaml b/rest-api/resources/src/main/resources/openapi/device/device.yaml
new file mode 100644
index 00000000000..236beba6703
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/device/device.yaml
@@ -0,0 +1,302 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Devices
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    deviceId:
+      name: deviceId
+      in: path
+      description: The ID of the Device on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+    timeout:
+      name: timeout
+      in: query
+      description: The timeout for the request in milliseconds
+      schema:
+        type: integer
+        default: 10000
+    fetchAttributes:
+      name: fetchAttributes
+      in: query
+      schema:
+        type: array
+        items:
+          type: string
+          enum:
+            - connection
+            - lastEvent
+    clientId:
+      name: clientId
+      in: query
+      description: The client id to filter results
+      schema:
+        type: string
+  schemas:
+    device:
+      properties:
+        groupId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            - description: The ID of the Access Group to which this Device is assigned to
+        clientId:
+          type: string
+          readOnly: true
+          description: The Kura Client ID of this device
+        connectionId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            - description: The ID of the Connection of this Device
+              readOnly: true
+        connection:
+          $ref: '../deviceConnection/deviceConnection.yaml#/components/schemas/connection'
+        status:
+          $ref: '#/components/schemas/status'
+        displayName:
+          description: The Kura Display Name of this Device
+          type: string
+        lastEventId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            - description: The ID of the last recorded Event from this Device
+              readOnly: true
+        lastEvent:
+          $ref: '#/components/schemas/event'
+        serialNumber:
+          description: The Serial Number of this Device
+          type: string
+        modelId:
+          description: The Model ID (not an Kapua ID) of this Device
+          type: string
+        modelName:
+          description: The Model Name of this Device
+          type: string
+        imei:
+          description: The IMEI Code of this Device
+          type: string
+        imsi:
+          description: The IMSI Code of this Device
+          type: string
+        iccid:
+          description: The ICCID Code of this Device
+          type: string
+        biosVersion:
+          description: The BIOS Version running on this Device
+          type: string
+        firmwareVersion:
+          description: The Firmware Version of this Device
+          type: string
+        osVersion:
+          description: The OS Version running on this Device
+          type: string
+        jvmVersion:
+          description: The JVM Version running on this Device
+          type: string
+        osgiFrameworkVersion:
+          description: The OSGi Framework Version running on this Device
+          type: string
+        applicationFrameworkVersion:
+          description: The Application Framework Version running on this Device
+          type: string
+        connectionInterface:
+          description: The Primary Connection Interface Name of this Device
+          type: string
+        connectionIp:
+          description: The IP Address of the Primary Connection Interface on this Device
+          type: string
+        applicationIdentifiers:
+          description: A string listing all the Kura Applications running on this Device
+          type: string
+        acceptEncoding:
+          description: The MIME Encoding accepted by this Device
+          type: string
+        customAttribute1:
+          description: A Custom Attirbute of this Device - 1
+          type: string
+        customAttribute2:
+          description: A Custom Attirbute of this Device - 2
+          type: string
+        customAttribute3:
+          description: A Custom Attirbute of this Device - 3
+          type: string
+        customAttribute4:
+          description: A Custom Attirbute of this Device - 4
+          type: string
+        customAttribute5:
+          description: A Custom Attirbute of this Device - 5
+          type: string
+        tagIds:
+          type: array
+          items:
+            allOf:
+              - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      example:
+          type: device
+          id: dIVxI5QpFUI
+          scopeId: AQ
+          createdOn: '2019-09-12T12:08:12.179Z'
+          createdBy: AQ
+          modifiedOn: '2019-09-12T12:08:12.179Z'
+          modifiedBy: AQ
+          optlock: 1
+          clientId: testDevice
+          status: ENABLED
+          displayName: Test Device
+          serialNumber: 1234567890
+          modelId: Test Model
+          biosVersion: N/A
+          firmwareVersion: N/A
+          osVersion: 3.13.0-93-generic
+          jvmVersion: 24.111-b01 mixed mode
+          osgiFrameworkVersion: 1.7.0
+          acceptEncoding: gzip
+          tagIds: []
+    deviceCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntityCreator'
+        - type: object
+          properties:
+            groupId:
+              $ref: '#/components/schemas/device/properties/groupId'
+            clientId:
+              $ref: '#/components/schemas/device/properties/clientId'
+            status:
+              $ref: '#/components/schemas/status'
+            lastEventId:
+              $ref: '#/components/schemas/device/properties/lastEventId'
+            displayName:
+              $ref: '#/components/schemas/device/properties/displayName'
+            serialNumber:
+              $ref: '#/components/schemas/device/properties/serialNumber'
+            modelId:
+              $ref: '#/components/schemas/device/properties/modelId'
+            modelName:
+              $ref: '#/components/schemas/device/properties/modelName'
+            imei:
+              $ref: '#/components/schemas/device/properties/imei'
+            imsi:
+              $ref: '#/components/schemas/device/properties/imsi'
+            iccid:
+              $ref: '#/components/schemas/device/properties/iccid'
+            biosVersion:
+              $ref: '#/components/schemas/device/properties/biosVersion'
+            firmwareVersion:
+              $ref: '#/components/schemas/device/properties/firmwareVersion'
+            osVersion:
+              $ref: '#/components/schemas/device/properties/osVersion'
+            jvmVersion:
+              $ref: '#/components/schemas/device/properties/jvmVersion'
+            osgiFrameworkVersion:
+              $ref: '#/components/schemas/device/properties/osgiFrameworkVersion'
+            applicationFrameworkVersion:
+              $ref: '#/components/schemas/device/properties/applicationFrameworkVersion'
+            connectionInterface:
+              $ref: '#/components/schemas/device/properties/connectionInterface'
+            connectionIp:
+              $ref: '#/components/schemas/device/properties/connectionIp'
+            applicationIdentifiers:
+              $ref: '#/components/schemas/device/properties/applicationIdentifiers'
+            acceptEncoding:
+              $ref: '#/components/schemas/device/properties/acceptEncoding'
+            customAttribute1:
+              $ref: '#/components/schemas/device/properties/customAttribute1'
+            customAttribute2:
+              $ref: '#/components/schemas/device/properties/customAttribute2'
+            customAttribute3:
+              $ref: '#/components/schemas/device/properties/customAttribute3'
+            customAttribute4:
+              $ref: '#/components/schemas/device/properties/customAttribute4'
+            customAttribute5:
+              $ref: '#/components/schemas/device/properties/customAttribute5'
+          required:
+            - clientId
+          example:
+            clientId: testDevice
+            status: ENABLED
+            displayName: Test Device
+            serialNumber: 1234567890
+            modelId: Test Model
+            biosVersion: N/A
+            firmwareVersion: N/A
+            osVersion: 3.13.0-93-generic ##140-Ubuntu SMP Mon Jul 18 21:21:05 UTC 2016
+            jvmVersion: 24.111-b01 mixed mode
+            osgiFrameworkVersion: 1.7.0
+            acceptEncoding: gzip
+            deviceCredentialsMode: LOOSE
+    deviceListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/device'
+    status:
+      type: string
+      enum:
+        - ENABLED
+        - DISABLED
+    action:
+      type: string
+      enum:
+        - READ
+        - CREATE
+        - WRITE
+        - DELETE
+        - OPTIONS
+        - EXECUTE
+    event:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntity'
+        - type: object
+          properties:
+            sentOn:
+              type: string
+              format: 'date-time'
+            receivedOn:
+              type: string
+              format: 'date-time'
+            position:
+              $ref: '../dataMessage/dataMessage.yaml#/components/schemas/position'
+            resource:
+              type: string
+            action:
+              $ref: '#/components/schemas/action'
+            responseCode:
+              type: string
+              enum:
+                - ACCEPTED
+                - BAD_REQUEST
+                - NOT_FOUND
+                - INTERNAL_ERROR
+            eventMessage:
+              type: string
+          example:
+            id: YYHQ2i1S-P0
+            scopeId: AQ
+            createdOn: '2019-09-12T09:04:37.392Z'
+            createdBy: Ag
+            deviceId: WyczTs_GuDM
+            receivedOn: '2019-09-12T09:04:32.646Z'
+            position:
+              altitude: 0
+              latitude: 0
+              longitude: 0
+            resource: BIRTH
+            action: CREATE
+            responseCode: ACCEPTED
+            eventMessage: 'acceptEncoding=gzip~~applicationFramework=Kura~~applicationFrameworkVersion=ESF_6.0.0~~applicationIdentifiers=heaterPROV-V2DEPLOY-V2VPNCLIENT-V2CONF-V1CERT-V1ASSET-V1CMD-V1~~availableProcessors=4~~bios=N/A~~biosVersion=N/A~~connectionInterface=lo (00:00:00:00:00:00)~~connectionIp=127.0.0.1~~containerFramework=Eclipse~~containerFrameworkVersion=1.8.0~~displayName=~~firmware=N/A~~firmwareVersion=N/A~~jvm=Java HotSpot(TM) 64-Bit Server VM~~jvmProfile=Java(TM) SE Runtime Environment 1.8.0_161-b12~~jvmVersion=25.161-b12 mixed mode~~modelId=ESF-Docker-RHEL~~modelName=ESF-Docker-RHEL~~os=Linux~~osArch=amd64~~osVersion=4.9.184-linuxkit #1 SMP Tue Jul 2 22:58:16 UTC 2019~~partNumber=ESF-Docker-RHEL~~serialNumber=ESF-Docker-RHEL~~totalMemory=1023488~~uptime=187894320'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset-scopeId-deviceId-_read.yaml b/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset-scopeId-deviceId-_read.yaml
new file mode 100644
index 00000000000..a363a9333ad
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset-scopeId-deviceId-_read.yaml
@@ -0,0 +1,49 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Asset
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/assets/_read:
+    post:
+      tags:
+        - Device Management - Asset
+      summary: Read the values for the Assets of a single Device
+      operationId: deviceAssetRead
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      requestBody:
+        description: An object containing the list of Assets to use as a filter
+        content:
+          application/json:
+            schema:
+              $ref: './deviceAsset.yaml#/components/schemas/deviceAssetDefinitions'
+            example:
+              deviceAsset:
+                - name: asset2
+        required: true
+      responses:
+        200:
+          description: The Asset list for the desired Device complete with values
+          content:
+            application/json:
+              schema:
+                $ref: './deviceAsset.yaml#/components/schemas/deviceAssetValues'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset-scopeId-deviceId-_write.yaml b/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset-scopeId-deviceId-_write.yaml
new file mode 100644
index 00000000000..c3278f8a1fd
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset-scopeId-deviceId-_write.yaml
@@ -0,0 +1,70 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Asset
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/assets/_write:
+    post:
+      tags:
+        - Device Management - Asset
+      summary: Write the values for the Assets of a single Device
+      operationId: deviceAssetWrite
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      requestBody:
+        description: An Asset list to be updated on the desired Devica
+        content:
+          application/json:
+            schema:
+              $ref: './deviceAsset.yaml#/components/schemas/deviceAssetValues'
+            example:
+              type: deviceAssets
+              deviceAsset:
+                - name: asset2
+                  channels:
+                    - valueType: integer
+                      value: 12
+                      name: Channel-2
+                    - valueType: integer
+                      value: 80
+                      name: Channel-3
+        required: true
+      responses:
+        200:
+          description: The updated Asset list for the desired Device with updated values
+          content:
+            application/json:
+              schema:
+                $ref: './deviceAsset.yaml#/components/schemas/deviceAssetValues'
+              example:
+                type: deviceAssets
+                deviceAsset:
+                  - name: asset2
+                    channels:
+                      - valueType: integer
+                        value: 12
+                        name: Channel-2
+                        timestamp: '2019-09-12T15:40:18.278Z'
+                      - valueType: integer
+                        value: 80
+                        name: Channel-3
+                        timestamp: '2019-09-12T15:40:18.278Z'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset-scopeId-deviceId.yaml b/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset-scopeId-deviceId.yaml
new file mode 100644
index 00000000000..d057a5d9e96
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset-scopeId-deviceId.yaml
@@ -0,0 +1,86 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Asset
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/assets:
+    get:
+      tags:
+        - Device Management - Asset
+      summary: Get the Assets Definitions of a single Device
+      operationId: deviceAssetList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      responses:
+        200:
+          description: The list of Assets definition of a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './deviceAsset.yaml#/components/schemas/deviceAssetDefinitions'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Device Management - Asset
+      summary: Get the Assets Definitions of a single Device
+      operationId: deviceAssetListFiltered
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      requestBody:
+        description: An object containing the list of Assets to use as a filter
+        content:
+          application/json:
+            schema:
+              $ref: './deviceAsset.yaml#/components/schemas/deviceAssetDefinitions'
+            example:
+              deviceAsset:
+                - name: asset2
+      responses:
+        200:
+          description: The list of Assets definition of a single Device according to the filter
+          content:
+            application/json:
+              schema:
+                $ref: './deviceAsset.yaml#/components/schemas/deviceAssetDefinitions'
+              example:
+                type: deviceAssets
+                deviceAsset:
+                  - name: asset2
+                    channels:
+                      - valueType: integer
+                        name: Channel-1
+                        mode: READ
+                      - valueType: integer
+                        name: Channel-2
+                        mode: WRITE
+                      - valueType: integer
+                        name: Channel-3
+                        mode: READ_WRITE
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset.yaml b/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset.yaml
new file mode 100644
index 00000000000..8c511fe6609
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceAsset/deviceAsset.yaml
@@ -0,0 +1,161 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Asset
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  schemas:
+    deviceAssetDefinition:
+      allOf:
+        - $ref: '#/components/schemas/assetDescription'
+        - type: object
+          properties:
+            channels:
+              type: array
+              items:
+                $ref: '#/components/schemas/channelDefinition'
+            name:
+              type: string
+          example:
+            name: asset1
+            channels:
+              - valueType: integer
+                name: Channel-1
+                mode: READ
+              - valueType: integer
+                name: Channel-2
+                mode: WRITE
+              - valueType: integer
+                name: Channel-3
+                mode: READ_WRITE
+    deviceAssetValue:
+      allOf:
+        - $ref: '#/components/schemas/assetDescription'
+        - type: object
+          properties:
+            channels:
+              type: array
+              items:
+                $ref: '#/components/schemas/channelValue'
+            name:
+              type: string
+          example:
+            name: asset2
+            channels:
+              - valueType: integer
+                value: 5
+                name: Channel-1
+                timestamp: '2019-09-12T14:50:24.446Z'
+              - valueType: integer
+                value: 8
+                name: Channel-3
+                timestamp: '2019-09-12T14:50:24.446Z'
+    deviceAssetDefinitions:
+      description: A list container for the Assets of a Device
+      type: object
+      properties:
+        deviceAsset:
+          type: array
+          items:
+            $ref: '#/components/schemas/deviceAssetDefinition'
+      example:
+        type: deviceAssets
+        deviceAsset:
+          - name: asset1
+            channels:
+              - valueType: integer
+                name: Channel-1
+                mode: READ
+              - valueType: integer
+                name: Channel-2
+                mode: WRITE
+              - valueType: integer
+                name: Channel-3
+                mode: READ_WRITE
+          - name: asset2
+            channels:
+              - valueType: integer
+                name: Channel-1
+                mode: READ
+              - valueType: integer
+                name: Channel-2
+                mode: WRITE
+              - valueType: integer
+                name: Channel-3
+                mode: READ_WRITE
+    deviceAssetValues:
+      description: A list container for the Assets of a Device
+      type: object
+      properties:
+        deviceAsset:
+          items:
+            type: array
+            items:
+              $ref: '#/components/schemas/deviceAssetValue'
+      example:
+        type: deviceAssets
+        deviceAsset:
+          - name: asset2
+            channels:
+              - valueType: integer
+                value: 5
+                name: Channel-1
+                timestamp: '2019-09-12T14:50:24.446Z'
+              - valueType: integer
+                value: 8
+                name: Channel-3
+                timestamp: '2019-09-12T14:50:24.446Z'
+    channelDefinition:
+      allOf:
+        - $ref: '#/components/schemas/assetDescription'
+        - type: object
+          properties:
+            mode:
+              type: string
+              enum:
+                - READ
+                - WRITE
+                - READ_WRITE
+            name:
+              type: string
+            valueType:
+              type: string
+          example:
+            valueType: integer
+            name: Channel-1
+            mode: READ
+    channelValue:
+      allOf:
+        - $ref: '#/components/schemas/assetDescription'
+        - type: object
+          properties:
+            name:
+              type: string
+            valueType:
+              type: string
+            value:
+              type: string
+            timestamp:
+              type: string
+              format: 'date-time'
+          example:
+            valueType: integer
+            value: 5
+            name: Channel-1
+            timestamp: '2019-09-12T14:50:24.446Z'
+    assetDescription:
+      description: |
+        An **Asset**, as defined in Kura, is a logical representation of a field device, described by a list of **Channels**.
+        The Asset uses a specific Driver instance to communicate with the underlying device and it models a generic device resource as a Channel.
+        A register in a PLC or a GATT Characteristic in a Bluetooth device are examples of Channels.
+        In this way, each Asset has multiple Channels for reading and writing data from/to an Industrial Device.
diff --git a/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle-scopeId-deviceId-_start.yaml b/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle-scopeId-deviceId-_start.yaml
new file mode 100644
index 00000000000..7d8181147bc
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle-scopeId-deviceId-_start.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Bundle
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/bundles/_start:
+    post:
+      tags:
+        - Device Management - Bundle
+      summary: Start the desired Bundle on a single Device
+      operationId: deviceBundleStart
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: './deviceBundle.yaml#/components/parameters/bundleId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      responses:
+        200:
+          description: The Bundle has been successfully started
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle-scopeId-deviceId-_stop.yaml b/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle-scopeId-deviceId-_stop.yaml
new file mode 100644
index 00000000000..a7765b70a2d
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle-scopeId-deviceId-_stop.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Bundle
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/bundles/_stop:
+    post:
+      tags:
+        - Device Management - Bundle
+      summary: Stop the desired Bundle on a single Device
+      operationId: deviceBundleStop
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: './deviceBundle.yaml#/components/parameters/bundleId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      responses:
+        200:
+          description: The Bundle has been successfully stopped
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle-scopeId-deviceId.yaml b/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle-scopeId-deviceId.yaml
new file mode 100644
index 00000000000..a22f4e17897
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle-scopeId-deviceId.yaml
@@ -0,0 +1,39 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Bundle
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/bundles:
+    get:
+      tags:
+        - Device Management - Bundle
+      summary: Get the Bundles installed on a single Device
+      operationId: deviceBundleList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      responses:
+        200:
+          description: The list of Bundles installed on a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './deviceBundle.yaml#/components/schemas/deviceBundles'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle.yaml b/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle.yaml
new file mode 100644
index 00000000000..cc7de6d5582
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceBundle/deviceBundle.yaml
@@ -0,0 +1,59 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Bundle
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    bundleId:
+      name: bundleId
+      in: path
+      description: The ID of the Bundle on which to perform the operation
+      schema:
+        type: string
+      required: true
+  schemas:
+    deviceBundle:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+        state:
+          type: string
+        version:
+          type: string
+      example:
+        id: 0
+        name: org.eclipse.osgi
+        state: ACTIVE
+        version: 3.12.50.v20170928-1321
+    deviceBundles:
+      type: object
+      properties:
+        bundle:
+          type: array
+          items:
+            $ref: '#/components/schemas/deviceBundle'
+      example:
+        type: deviceBundles
+        bundle:
+          - id: 0
+            name: org.eclipse.osgi
+            state: ACTIVE
+            version: 3.12.50.v20170928-1321
+          - id: 1
+            name: org.eclipse.equinox.cm
+            state: ACTIVE
+            version: 1.2.0.v20170105-1446
diff --git a/rest-api/resources/src/main/resources/openapi/deviceCommand/deviceCommand-scopeId-deviceId-_execute.yaml b/rest-api/resources/src/main/resources/openapi/deviceCommand/deviceCommand-scopeId-deviceId-_execute.yaml
new file mode 100644
index 00000000000..a08c8c1e9d4
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceCommand/deviceCommand-scopeId-deviceId-_execute.yaml
@@ -0,0 +1,64 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Command
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/commands/_execute:
+    post:
+      tags:
+        - Device Management - Command
+      summary: Execute a Command
+      operationId: deviceCommandExecute
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './deviceCommand.yaml#/components/schemas/commandInput'
+            examples:
+              singleArgument:
+                description: A command with a single argument
+                value:
+                  command: ls
+                  arguments:
+                    argument: -lisa
+                  timeout: 60000
+              multipleArguments:
+                description: A command with multiple arguments
+                value:
+                  command: ls
+                  arguments:
+                    argument:
+                      - -l
+                      - -i
+                      - -s
+                      - -a
+                  timeout: 60000
+        required: true
+      responses:
+        200:
+          description: The output of the Command executed on a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './deviceCommand.yaml#/components/schemas/commandOutput'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceCommand/deviceCommand.yaml b/rest-api/resources/src/main/resources/openapi/deviceCommand/deviceCommand.yaml
new file mode 100644
index 00000000000..7ae9833c00c
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceCommand/deviceCommand.yaml
@@ -0,0 +1,78 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Command
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  schemas:
+    commandInput:
+      description: An object containing the Command to be executed on a Device
+      type: object
+      properties:
+        command:
+          type: string
+        password:
+          type: string
+          format: password
+        arguments:
+          properties:
+            argument:
+              oneOf:
+                - description: An array of strings containing multiple arguments for the command
+                  type: array
+                  items:
+                    type: string
+                - description: A string containing the argument for the command
+                  type: string
+        timeout:
+          type: integer
+        workingDir:
+          type: string
+        body:
+          type: string
+          format: base64
+        environment:
+          type: array
+          items:
+            type: string
+        runAsynch:
+          type: boolean
+        stdin:
+          type: string
+      example:
+        command: ls
+        arguments:
+          argument: -lisa
+        timeout: 60000
+    commandOutput:
+      description: The output of a Command executed on a Device
+      type: object
+      properties:
+        stderr:
+          type: string
+        stdout:
+          type: string
+        exceptionMessage:
+          type: string
+        exceptionStack:
+          type: string
+        exitCode:
+          type: integer
+        hasTimedout:
+          type: boolean
+      example:
+        type: deviceCommandOutput
+        stderr: ""
+        stdout: "total 40\n12503707 4 drwxrwxrwt 1 root root 4096 Sep 13 07:44 .\n12507178 4 drwxr-xr-x 1 root root 4096 Sep 12 08:03 ..\n61409843 4 drwxrwxrwt 2 root root 4096 Feb 28  2018 .ICE-unix\n61409845 4 drwxrwxrwt 2 root root 4096 Feb 28  2018 .Test-unix\n61409838 4 drwxrwxrwt 2 root root 4096 Feb 28  2018 .X11-unix\n61409844 4 drwxrwxrwt 2 root root 4096 Feb 28  2018 .XIM-unix\n61409846 4 drwxrwxrwt 2 root root 4096 Feb 28  2018 .font-unix\n12503708 4 drwxr-xr-x 3 root root 4096 Sep 12 08:03 .kura\n12507353 4 drwxr-xr-x 2 root root 4096 Sep 12 08:03 hsperfdata_root\n12507385 4 drwxr-xr-x 3 root root 4096 Sep 12 08:03 kura\n"
+        exitCode: 0
+        hasTimedout: false
diff --git a/rest-api/resources/src/main/resources/openapi/deviceConfiguration/deviceConfiguration-scopeId-deviceId-componentId.yaml b/rest-api/resources/src/main/resources/openapi/deviceConfiguration/deviceConfiguration-scopeId-deviceId-componentId.yaml
new file mode 100644
index 00000000000..dd7cfc3212a
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceConfiguration/deviceConfiguration-scopeId-deviceId-componentId.yaml
@@ -0,0 +1,71 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Configuration
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/configurations/{componentId}:
+    get:
+      tags:
+        - Device Management - Configuration
+      summary: Read a single Configuration
+      operationId: deviceConfigurationRead
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../deviceConfiguration/deviceConfiguration.yaml#/components/parameters/componentId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      responses:
+        200:
+          description: The Configuration details of a single Service on a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './deviceConfiguration.yaml#/components/schemas/componentConfigurations'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Device Management - Configuration
+      summary: Update a single Configuration
+      operationId: deviceConfigurationWrite
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../deviceConfiguration/deviceConfiguration.yaml#/components/parameters/componentId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './deviceConfiguration.yaml#/components/schemas/componentConfigurationInput'
+        required: true
+      responses:
+        200:
+          description: The updated Configuration details of a single Service on a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './deviceConfiguration.yaml#/components/schemas/componentConfigurations'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceConfiguration/deviceConfiguration-scopeId-deviceId.yaml b/rest-api/resources/src/main/resources/openapi/deviceConfiguration/deviceConfiguration-scopeId-deviceId.yaml
new file mode 100644
index 00000000000..c92913f3797
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceConfiguration/deviceConfiguration-scopeId-deviceId.yaml
@@ -0,0 +1,69 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Configuration
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/configurations:
+    get:
+      tags:
+        - Device Management - Configuration
+      summary: Read multiple Configurations
+      operationId: deviceConfigurationsRead
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      responses:
+        200:
+          description: The list of the Configurations on a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './deviceConfiguration.yaml#/components/schemas/componentConfigurations'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Device Management - Configuration
+      summary: Update multiple Configurations
+      operationId: deviceConfigurationsWrite
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './deviceConfiguration.yaml#/components/schemas/componentConfigurationsInput'
+        required: true
+      responses:
+        200:
+          description: The updated list of Configurations on a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './deviceConfiguration.yaml#/components/schemas/componentConfiguration'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceConfiguration/deviceConfiguration.yaml b/rest-api/resources/src/main/resources/openapi/deviceConfiguration/deviceConfiguration.yaml
new file mode 100644
index 00000000000..e9c551f25ca
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceConfiguration/deviceConfiguration.yaml
@@ -0,0 +1,228 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Configuration
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    componentId:
+      name: componentId
+      in: path
+      description: The ID of the Component on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    attributeDefinition:
+      type: object
+      properties:
+        Option:
+          type: array
+          items:
+            type: object
+            properties:
+              label:
+                type: string
+              value:
+                type: string
+        default:
+          type: string
+        type:
+          type: object
+        cardinality:
+          type: integer
+        min:
+          type: string
+        max:
+          type: string
+        description:
+          type: string
+        id:
+          type: string
+        required:
+          type: boolean
+        name:
+          type: string
+      example:
+        cardinality: 0
+        description: The default wire graph JSON
+        id: WireGraph
+        name: WireGraph
+        required: true
+        type: String
+        Option: []
+    propertyDefinition:
+      type: object
+      properties:
+        name:
+          type: string
+        array:
+          type: boolean
+        encrypted:
+          type: boolean
+        type:
+          type: string
+        value:
+          type: array
+          items:
+            type: string
+      example:
+        name: kura.service.pid
+        array: false
+        encrypted: false
+        type: String
+        value:
+          - org.eclipse.kura.wire.graph.WireGraphService
+    componentConfiguration:
+      type: object
+      properties:
+        id:
+          type: string
+        definition:
+          type: object
+          properties:
+            id:
+              type: string
+            AD:
+              type: array
+              items:
+                $ref: '#/components/schemas/attributeDefinition'
+            Icon:
+              type: array
+              items:
+                type: object
+                properties:
+                  resource:
+                    type: string
+                  size:
+                    type: integer
+            name:
+              type: string
+            description:
+              type: string
+        properties:
+          type: object
+          properties:
+            property:
+              type: array
+              items:
+                $ref: '#/components/schemas/propertyDefinition'
+      example:
+        id: org.eclipse.kura.wire.graph.WireGraphService
+        definition:
+          description: WireGraphService metatype
+          id: org.eclipse.kura.wire.graph.WireGraphService
+          name: WireGraphService
+          AD:
+            - cardinality: 0
+              description: The default wire graph JSON
+              id: WireGraph
+              name: WireGraph
+              required: true
+              type: String
+              Option: []
+          Icon: []
+        properties:
+          property:
+            - name: WireGraph
+              array: false
+              encrypted: false
+              type: String
+              value:
+                - '{"components":[{"pid":"asset1","inputPortCount":1,"outputPortCount":1,"renderingProperties":{"position":{"x":-580,"y":-120},"inputPortNames":{},"outputPortNames":{}}},{"pid":"asset2","inputPortCount":1,"outputPortCount":1,"renderingProperties":{"position":{"x":-1100,"y":-100},"inputPortNames":{},"outputPortNames":{}}}],"wires":[]}'
+            - name: kura.service.pid
+              array: false
+              encrypted: false
+              type: String
+              value:
+                - org.eclipse.kura.wire.graph.WireGraphService
+            - name: service.pid
+              array: false
+              encrypted: false
+              type: String
+              value:
+                - org.eclipse.kura.wire.graph.WireGraphService
+    componentConfigurationInput:
+      type: object
+      properties:
+        id:
+          type: string
+        properties:
+          type: object
+          properties:
+            property:
+              type: array
+              items:
+                $ref: '#/components/schemas/propertyDefinition'
+    componentConfigurations:
+      type: object
+      properties:
+        configuration:
+          type: array
+          items:
+            $ref: '#/components/schemas/componentConfiguration'
+      example:
+        type: deviceConfiguration
+        configuration:
+          - id: org.eclipse.kura.wire.graph.WireGraphService
+            definition:
+              description: WireGraphService metatype
+              id: org.eclipse.kura.wire.graph.WireGraphService
+              name: WireGraphService
+              AD:
+                - cardinality: 0
+                  description: The default wire graph JSON
+                  id: WireGraph
+                  name: WireGraph
+                  required: true
+                  type: String
+                  Option: []
+              Icon: []
+            properties:
+              property:
+                - name: WireGraph
+                  array: false
+                  encrypted: false
+                  type: String
+                  value:
+                    - '{"components":[{"pid":"asset1","inputPortCount":1,"outputPortCount":1,"renderingProperties":{"position":{"x":-580,"y":-120},"inputPortNames":{},"outputPortNames":{}}},{"pid":"asset2","inputPortCount":1,"outputPortCount":1,"renderingProperties":{"position":{"x":-1100,"y":-100},"inputPortNames":{},"outputPortNames":{}}}],"wires":[]}'
+                - name: kura.service.pid
+                  array: false
+                  encrypted: false
+                  type: String
+                  value:
+                    - org.eclipse.kura.wire.graph.WireGraphService
+                - name: service.pid
+                  array: false
+                  encrypted: false
+                  type: String
+                  value:
+                    - org.eclipse.kura.wire.graph.WireGraphService
+    componentConfigurationsInput:
+      type: object
+      properties:
+        configuration:
+          type: array
+          items:
+            $ref: '#/components/schemas/componentConfigurationInput'
+      example:
+        configuration:
+          - id: org.eclipse.kura.wire.graph.WireGraphService
+            properties:
+              property:
+                - name: kura.service.pid
+                  array: false
+                  encrypted: false
+                  type: String
+                  value:
+                    - org.eclipse.kura.wire.graph.WireGraphService
diff --git a/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-_count.yaml
new file mode 100644
index 00000000000..e6a2602e4bc
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Connection
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/deviceconnections/_count:
+    post:
+      tags:
+        - Device Connection
+      summary: Count the Connections
+      operationId: connectionCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-_query.yaml
new file mode 100644
index 00000000000..71da74048e3
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Connection
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/deviceconnections/_query:
+    post:
+      tags:
+        - Device Connection
+      summary: Query the Connections
+      operationId: connectionQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './deviceConnection.yaml#/components/schemas/connectionListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-connectionId-options.yaml b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-connectionId-options.yaml
new file mode 100644
index 00000000000..8fff5c417b2
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-connectionId-options.yaml
@@ -0,0 +1,66 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Connection
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/deviceconnections/{connectionId}/options:
+    get:
+      tags:
+        - Device Connection
+      summary: Get the option for a Connection
+      operationId: connectionOptionGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './deviceConnection.yaml#/components/parameters/connectionId'
+      responses:
+        200:
+          description: The Options of the desired Connection
+          content:
+            application/json:
+              schema:
+                $ref: './deviceConnection.yaml#/components/schemas/connectionOptions'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Device Connection
+      summary: Update the option for a Connection
+      operationId: connectionOptionUpdate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './deviceConnection.yaml#/components/parameters/connectionId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './deviceConnection.yaml#/components/schemas/connectionOptions'
+      responses:
+        200:
+          description: The updated Options of the desired Connection
+          content:
+            application/json:
+              schema:
+                $ref: './deviceConnection.yaml#/components/schemas/connectionOptions'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-connectionId.yaml b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-connectionId.yaml
new file mode 100644
index 00000000000..4a1a3283c4b
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId-connectionId.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Connection
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/deviceconnections/{connectionId}:
+    get:
+      tags:
+        - Device Connection
+      summary: Get a single Connection
+      operationId: connectionGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './deviceConnection.yaml#/components/parameters/connectionId'
+      responses:
+        200:
+          description: The details of the desired Connection
+          content:
+            application/json:
+              schema:
+                $ref: './deviceConnection.yaml#/components/schemas/connection'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId.yaml
new file mode 100644
index 00000000000..b8f199945e1
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection-scopeId.yaml
@@ -0,0 +1,39 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Connection
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/deviceconnections:
+    get:
+      tags:
+        - Device Connection
+      summary: Get all the Connections
+      operationId: connectionList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/clientId'
+        - $ref: './deviceConnection.yaml#/components/parameters/connectionStatus'
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Connections available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './deviceConnection.yaml#/components/schemas/connectionListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection.yaml b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection.yaml
new file mode 100644
index 00000000000..4d343b87b60
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceConnection/deviceConnection.yaml
@@ -0,0 +1,140 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Connection
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    connectionId:
+      name: connectionId
+      in: path
+      description: The ID of the Connection on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+    connectionStatus:
+      name: status
+      in: query
+      description: The connection status to filter results
+      schema:
+        $ref: './deviceConnection.yaml#/components/schemas/connectionStatus'
+  schemas:
+    connection:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntity'
+        - type: object
+          properties:
+            status:
+              $ref: '#/components/schemas/connectionStatus'
+            clientId:
+              type: string
+            userId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            allowUserChange:
+              type: boolean
+            userCouplingMode:
+              $ref: '#/components/schemas/userCouplingMode'
+            reservedUserId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            protocol:
+              type: string
+            clientIp:
+              type: string
+            serverIp:
+              type: string
+              readOnly: true
+          example:
+            type: deviceConnection
+            id: Gd1BfeWwh3s
+            scopeId: AQ
+            createdOn: '2019-09-12T09:04:32.101Z'
+            createdBy: Ag
+            modifiedOn: '2019-09-13T08:04:49.927Z'
+            modifiedBy: Ag
+            optlock: 17
+            status: CONNECTED
+            clientId: Client-Id-1
+            userId: Ag
+            allowUserChange: false
+            userCouplingMode: INHERITED
+            protocol: MQTT
+            clientIp: tcp://172.21.0.1:44400
+            serverIp: broker
+    connectionListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/connection'
+          example:
+            type: deviceConnectionListResult
+            limitExceeded: false
+            size: 1
+            items:
+              - type: deviceConnection
+                id: Gd1BfeWwh3s
+                scopeId: AQ
+                createdOn: '2019-09-12T09:04:32.101Z'
+                createdBy: Ag
+                modifiedOn: '2019-09-13T08:04:49.927Z'
+                modifiedBy: Ag
+                optlock: 17
+                status: CONNECTED
+                clientId: Client-Id-1
+                userId: Ag
+                allowUserChange: false
+                userCouplingMode: INHERITED
+                protocol: MQTT
+                clientIp: tcp://172.21.0.1:44400
+                serverIp: broker
+    connectionOptions:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntity'
+        - type: object
+          properties:
+            allowUserChange:
+              type: boolean
+            userCouplingMode:
+              $ref: '#/components/schemas/userCouplingMode'
+            reservedUserId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+          example:
+            type: deviceConnectionOption
+            id: Gd1BfeWwh3s
+            scopeId: AQ
+            createdOn: '2019-09-12T09:04:32.101Z'
+            createdBy: Ag
+            modifiedOn: '2019-09-13T08:04:49.927Z'
+            modifiedBy: Ag
+            optlock: 17
+            allowUserChange: false
+            userCouplingMode: INHERITED
+    userCouplingMode:
+      type: string
+      enum:
+        - INHERITED
+        - LOOSE
+        - STRICT
+    connectionStatus:
+      type: string
+      enum:
+        - 'CONNECTED'
+        - 'DISCONNECTED'
+        - 'MISSING'
+        - 'NULL'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId-_count.yaml b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId-_count.yaml
new file mode 100644
index 00000000000..e494cc7fb11
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId-_count.yaml
@@ -0,0 +1,34 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Event
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/events/_count:
+    post:
+      tags:
+        - Device Event
+      summary: Count the Device Events
+      operationId: deviceEventCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId-_query.yaml b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId-_query.yaml
new file mode 100644
index 00000000000..d7bda4be465
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId-_query.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Event
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/events/_query:
+    post:
+      tags:
+        - Device Event
+      summary: Query the Device Event
+      operationId: deviceEventQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './deviceEvent.yaml#/components/schemas/deviceEventListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId-deviceEventId.yaml b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId-deviceEventId.yaml
new file mode 100644
index 00000000000..c5d5db1c62a
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId-deviceEventId.yaml
@@ -0,0 +1,59 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Event
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/events/{deviceEventId}:
+    get:
+      tags:
+        - Device Event
+      summary: Get a single DeviceEvent
+      operationId: deviceEventGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: './deviceEvent.yaml#/components/parameters/deviceEventId'
+      responses:
+        200:
+          description: The details of the desired Device Event
+          content:
+            application/json:
+              schema:
+                $ref: './deviceEvent.yaml#/components/schemas/deviceEvent'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Device Event
+      summary: Delete a single DeviceEvent
+      operationId: deviceEventDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: './deviceEvent.yaml#/components/parameters/deviceEventId'
+      responses:
+        200:
+          description: The Device Event has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId.yaml b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId.yaml
new file mode 100644
index 00000000000..a609bd08d9c
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent-scopeId-deviceId.yaml
@@ -0,0 +1,43 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Event
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/events:
+    get:
+      tags:
+        - Device Event
+      summary: Get all the DeviceEvents
+      operationId: deviceEventList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - name: resource
+          in: query
+          description: The resource of the DeviceEvent in which to search results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Device Events available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './deviceEvent.yaml#/components/schemas/deviceEventListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent.yaml b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent.yaml
new file mode 100644
index 00000000000..f30c024e09e
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceEvent/deviceEvent.yaml
@@ -0,0 +1,76 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Event
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    deviceEventId:
+      name: deviceEventId
+      in: path
+      description: The ID of the Device Event on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    deviceEvent:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntity'
+        - type: object
+          properties:
+            deviceId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            sentOn:
+              type: string
+              format: 'date-time'
+            receivedOn:
+              type: string
+              format: 'date-time'
+            position:
+              $ref: '../dataMessage/dataMessage.yaml#/components/schemas/position'
+            resource:
+              type: string
+            action:
+              type: string
+            responseCode:
+              type: string
+              enum:
+                - ACCEPTED
+                - BAD_REQUEST
+                - NOT_FOUND
+                - INTERNAL_ERROR
+            eventMessage:
+              type: string
+          example:
+            type: deviceEvent
+            id: JYINy4IMGK4
+            scopeId: AQ
+            createdOn: '2019-09-13T12:00:31.738Z'
+            createdBy: AQ
+            deviceId: IaIA6xbNR7E
+            sentOn: '2019-09-13T12:00:31.687Z'
+            receivedOn: '2019-09-13T12:00:31.718Z'
+            resource: CONFIGURATION
+            action: READ
+            responseCode: ACCEPTED
+            eventMessage:
+    deviceEventListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/deviceEvent'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId-_count.yaml b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId-_count.yaml
new file mode 100644
index 00000000000..0c7cb155895
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId-_count.yaml
@@ -0,0 +1,35 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Notifications
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/operations/{operationId}/notifications/_count:
+    post:
+      tags:
+        - Device Management - Notification
+      summary: Count the Registry Notifications
+      operationId: deviceRegistryNotificationCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../deviceOperation/deviceOperation.yaml#/components/parameters/operationId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId-_query.yaml b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId-_query.yaml
new file mode 100644
index 00000000000..f79e015d942
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId-_query.yaml
@@ -0,0 +1,39 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Notifications
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/operations/{operationId}/notifications/_query:
+    post:
+      tags:
+        - Device Management - Notification
+      summary: Query the Registry Notifications
+      operationId: deviceRegistryNotificationQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../deviceOperation/deviceOperation.yaml#/components/parameters/operationId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './deviceNotification.yaml#/components/schemas/deviceNotificationListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId-notificationId.yaml b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId-notificationId.yaml
new file mode 100644
index 00000000000..b2f6b2b771c
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId-notificationId.yaml
@@ -0,0 +1,61 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Notifications
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/operations/{operationId}/notifications/{notificationId}:
+    get:
+      tags:
+        - Device Management - Notification
+      summary: Get a single Device Registry Notification
+      operationId: deviceRegistryNotificationGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../deviceOperation/deviceOperation.yaml#/components/parameters/operationId'
+        - $ref: './deviceNotification.yaml#/components/parameters/notificationId'
+      responses:
+        200:
+          description: The details of the desired Registry Notification
+          content:
+            application/json:
+              schema:
+                $ref: './deviceNotification.yaml#/components/schemas/deviceNotification'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Device Management - Notification
+      summary: Delete a single Registry Notification
+      operationId: deviceRegistryNotificationDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../deviceOperation/deviceOperation.yaml#/components/parameters/operationId'
+        - $ref: './deviceNotification.yaml#/components/parameters/notificationId'
+      responses:
+        200:
+          description: The Registry Notification has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId.yaml b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId.yaml
new file mode 100644
index 00000000000..99b48963184
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification-scopeId-deviceId-operationId.yaml
@@ -0,0 +1,44 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Notifications
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/operations/{operationId}/notifications:
+    get:
+      tags:
+        - Device Management - Notification
+      summary: Get all the Device Registry Notifications
+      operationId: deviceRegistryNotificationList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../deviceOperation/deviceOperation.yaml#/components/parameters/operationId'
+        - name: resource
+          in: query
+          description: The resource of the DeviceEvent in which to search results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Device Management Registty Notifications available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './deviceNotification.yaml#/components/schemas/deviceNotificationListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification.yaml b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification.yaml
new file mode 100644
index 00000000000..07364528b61
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceNotification/deviceNotification.yaml
@@ -0,0 +1,85 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Notifications
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    notificationId:
+      name: notificationId
+      in: path
+      description: The ID of the Registry Notification on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    deviceNotification:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntity'
+        - properties:
+            operationId:
+              $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            progress:
+              type: integer
+            resource:
+              type: string
+            sentOn:
+              type: string
+              format: 'date-time'
+            status:
+              $ref: '../deviceOperation/deviceOperation.yaml#/components/schemas/deviceOperation'
+          example:
+            type: managementOperationNotification
+            id: RGoRWw9Pkhc
+            scopeId: AQ
+            createdOn: '2019-11-15T11:27:25.331Z'
+            createdBy: Ag
+            operationId: cjmXXKvLUY8
+            progress: 0
+            resource: download
+            sentOn: '2019-11-15T11:27:25.267Z'
+            status: RUNNING
+    deviceNotificationListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/deviceNotification'
+          example:
+            type: managementOperationNotificationListResult
+            limitExceeded: false
+            size: 2
+            items:
+              - type: managementOperationNotification
+                id: RGoRWw9Pkhc
+                scopeId: AQ
+                createdOn: '2019-11-15T11:27:25.331Z'
+                createdBy: Ag
+                operationId: cjmXXKvLUY8
+                progress: 0
+                resource: download
+                sentOn: '2019-11-15T11:27:25.267Z'
+                status: RUNNING
+              - type: managementOperationNotification
+                id: f1Hu1T8iIRw
+                scopeId: AQ
+                createdOn: '2019-11-15T11:27:32.331Z'
+                createdBy: Ag
+                operationId: cjmXXKvLUY8
+                progress: 5
+                resource: download
+                sentOn: '2019-11-15T11:27:32.277Z'
+                status: RUNNING
diff --git a/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId-_count.yaml b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId-_count.yaml
new file mode 100644
index 00000000000..f74d90cb727
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId-_count.yaml
@@ -0,0 +1,34 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Operations
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/operations/_count:
+    post:
+      tags:
+        - Device Management - Operation
+      summary: Count the Registry Operations
+      operationId: deviceRegistryOperationCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId-_query.yaml b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId-_query.yaml
new file mode 100644
index 00000000000..d4fc8a6d9da
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId-_query.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Operations
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/operations/_query:
+    post:
+      tags:
+        - Device Management - Operation
+      summary: Query the Registry Operations
+      operationId: deviceRegistryOperationQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './deviceOperation.yaml#/components/schemas/deviceOperationListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId-operationId.yaml b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId-operationId.yaml
new file mode 100644
index 00000000000..01646d43037
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId-operationId.yaml
@@ -0,0 +1,59 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Operations
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/operations/{operationId}:
+    get:
+      tags:
+        - Device Management - Operation
+      summary: Get a single Device Registry Operation
+      operationId: deviceRegistryOperationGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: './deviceOperation.yaml#/components/parameters/operationId'
+      responses:
+        200:
+          description: The details of the desired Registry Operation
+          content:
+            application/json:
+              schema:
+                $ref: './deviceOperation.yaml#/components/schemas/deviceOperation'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Device Management - Operation
+      summary: Delete a single Registry Operation
+      operationId: deviceRegistryOperationDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: './deviceOperation.yaml#/components/parameters/operationId'
+      responses:
+        200:
+          description: The Registry Operation has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId.yaml b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId.yaml
new file mode 100644
index 00000000000..4b4d12cb99a
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation-scopeId-deviceId.yaml
@@ -0,0 +1,43 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Operations
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/operations:
+    get:
+      tags:
+        - Device Management - Operation
+      summary: Get all the Device Registry Operations
+      operationId: deviceRegistryOperationList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - name: resource
+          in: query
+          description: The resource of the DeviceManagementOperation in which to search results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Device Management Registty Operations available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './deviceOperation.yaml#/components/schemas/deviceOperationListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation.yaml b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation.yaml
new file mode 100644
index 00000000000..da87ef6e0e5
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceOperation/deviceOperation.yaml
@@ -0,0 +1,193 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Operations
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    operationId:
+      name: operationId
+      in: path
+      description: The ID of the Registry Operation on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    deviceOperation:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntity'
+        - type: object
+          properties:
+            action:
+              $ref: '../device/device.yaml#/components/schemas/action'
+            appId:
+              type: string
+            deviceId:
+              $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            endedOn:
+              type: string
+              format: 'date-time'
+            operationProperties:
+              type: array
+              items:
+                $ref: '#/components/schemas/operationProperty'
+            log:
+              type: string
+            operationId:
+              $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            resource:
+              type: string
+            startedOn:
+              type: string
+              format: 'date-time'
+            status:
+              $ref: '#/components/schemas/operationStatus'
+          example:
+            type: deviceManagementOperation
+            id: cjmXXKvLUY8
+            scopeId: AQ
+            createdOn: '2019-11-15T11:27:24.857Z'
+            createdBy: AQ
+            modifiedOn: '2019-11-15T11:30:01.975Z'
+            modifiedBy: Ag
+            optlock: 3
+            action: EXECUTE
+            appId: DEPLOY
+            deviceId: UVjeGkGVT3A
+            endedOn: '2019-11-15T11:30:01.568Z'
+            operationProperties:
+              - name: kapau.package.download.file.type
+                propertyType: string
+                propertyValue: DEPLOYMENT_PACKAGE
+              - name: kapau.package.download.password
+                propertyType: string
+                propertyValue: kapua-password
+              - name: kapau.package.download.username
+                propertyType: string
+                propertyValue: kapua-sys
+              - name: kapua.package.download.block.delay
+                propertyType: integer
+                propertyValue: '1000'
+              - name: kapua.package.download.block.size
+                propertyType: integer
+                propertyValue: '128'
+              - name: kapua.package.download.block.timeout
+                propertyType: integer
+                propertyValue: '60000'
+              - name: kapua.package.download.install
+                propertyType: boolean
+                propertyValue: 'true'
+              - name: kapua.package.download.name
+                propertyType: string
+                propertyValue: heater
+              - name: kapua.package.download.uri
+                propertyType: java.net.URI
+                propertyValue: 'http://download.eclipse.org/kura/releases/4.1.0/org.eclipse.kura.demo.heater_1.0.500.dp'
+              - name: kapua.package.download.version
+                propertyType: string
+                propertyValue: 1.0.500
+              - name: kapua.package.operation.id
+                propertyType: org.eclipse.kapua.commons.model.id.KapuaEid
+                propertyValue: '2588799701293395515'
+              - name: kapua.package.reboot
+                propertyType: boolean
+                propertyValue: 'false'
+            log: ''
+            operationId: I-1DnL467js
+            resource: DOWNLOAD
+            startedOn: '2019-11-15T11:27:24.842Z'
+            status: COMPLETED
+    deviceOperationListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/deviceOperation'
+          example:
+            type: deviceManagementOperationListResult
+            limitExceeded: false
+            size: 1
+            items:
+              - type: deviceManagementOperation
+                id: cjmXXKvLUY8
+                scopeId: AQ
+                createdOn: '2019-11-15T11:27:24.857Z'
+                createdBy: AQ
+                modifiedOn: '2019-11-15T11:30:01.975Z'
+                modifiedBy: Ag
+                optlock: 3
+                action: EXECUTE
+                appId: DEPLOY
+                deviceId: UVjeGkGVT3A
+                endedOn: '2019-11-15T11:30:01.568Z'
+                operationProperties:
+                  - name: kapau.package.download.file.type
+                    propertyType: string
+                    propertyValue: DEPLOYMENT_PACKAGE
+                  - name: kapau.package.download.password
+                    propertyType: string
+                    propertyValue: kapua-password
+                  - name: kapau.package.download.username
+                    propertyType: string
+                    propertyValue: kapua-sys
+                  - name: kapua.package.download.block.delay
+                    propertyType: integer
+                    propertyValue: '1000'
+                  - name: kapua.package.download.block.size
+                    propertyType: integer
+                    propertyValue: '128'
+                  - name: kapua.package.download.block.timeout
+                    propertyType: integer
+                    propertyValue: '60000'
+                  - name: kapua.package.download.install
+                    propertyType: boolean
+                    propertyValue: 'true'
+                  - name: kapua.package.download.name
+                    propertyType: string
+                    propertyValue: heater
+                  - name: kapua.package.download.uri
+                    propertyType: java.net.URI
+                    propertyValue: 'http://download.eclipse.org/kura/releases/4.1.0/org.eclipse.kura.demo.heater_1.0.500.dp'
+                  - name: kapua.package.download.version
+                    propertyType: string
+                    propertyValue: 1.0.500
+                  - name: kapua.package.operation.id
+                    propertyType: org.eclipse.kapua.commons.model.id.KapuaEid
+                    propertyValue: '2588799701293395515'
+                  - name: kapua.package.reboot
+                    propertyType: boolean
+                    propertyValue: 'false'
+                log: ''
+                operationId: I-1DnL467js
+                resource: DOWNLOAD
+                startedOn: '2019-11-15T11:27:24.842Z'
+                status: COMPLETED
+    operationProperty:
+      type: object
+      properties:
+        name:
+          type: string
+        propertyType:
+          type: string
+        propertyValue:
+          type: string
+    operationStatus:
+      type: string
+      enum:
+        - RUNNING
+        - COMPLETED
+        - FAILED
+        - STALE
diff --git a/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage-scopeId-deviceId-_download.yaml b/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage-scopeId-deviceId-_download.yaml
new file mode 100644
index 00000000000..04d2f2d7219
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage-scopeId-deviceId-_download.yaml
@@ -0,0 +1,68 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Package
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/packages/_download:
+    post:
+      tags:
+        - Device Management - Package
+      summary: Download and install a Package
+      operationId: devicePackageDownload
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                uri:
+                  type: string
+                name:
+                  type: string
+                version:
+                  type: string
+                install:
+                  type: boolean
+                reboot:
+                  type: boolean
+                rebootDelay:
+                  type: integer
+              required:
+                - uri
+                - name
+                - version
+            example:
+              uri: http://download.eclipse.org/kura/releases/4.1.0/org.eclipse.kura.demo.heater_1.0.500.dp
+              name: heater
+              version: 1.0.500
+              install: true
+              reboot: false
+              rebootDelay: 0
+        required: true
+      responses:
+        200:
+          description: |
+            The Package Install request has been successfully received. However, this does NOT mean that the package has been successfully installed, since the Package Install
+            is an asynchronous operation and may still be in progress. APIs are available at `device/{deviceId}/operations` and `device/{deviceId}/operations/{operationId}/notifications`
+            to track asynchronous operations.
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage-scopeId-deviceId-_uninstall.yaml b/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage-scopeId-deviceId-_uninstall.yaml
new file mode 100644
index 00000000000..21235acc7fa
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage-scopeId-deviceId-_uninstall.yaml
@@ -0,0 +1,59 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Package
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/packages/_uninstall:
+    post:
+      tags:
+        - Device Management - Package
+      summary: Uninstall a Package
+      operationId: devicePackageUninstall
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                name:
+                  type: string
+                version:
+                  type: string
+                reboot:
+                  type: boolean
+                rebootDelay:
+                  type: integer
+              required:
+                - name
+                - version
+            example:
+              name: org.eclipse.kura.demo.heater
+              version: 1.0.500
+        required: true
+      responses:
+        200:
+          description: |
+            The Package Install request has been successfully received. However, this does NOT mean that the package has been successfully installed, since the Package Install
+            is an asynchronous operation and may still be in progress. APIs are available at `device/{deviceId}/operations` and `device/{deviceId}/operations/{operationId}/notifications`
+            to track asynchronous operations.
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage-scopeId-deviceId.yaml b/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage-scopeId-deviceId.yaml
new file mode 100644
index 00000000000..66a01376fe8
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage-scopeId-deviceId.yaml
@@ -0,0 +1,39 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Package
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/packages:
+    get:
+      tags:
+        - Device Management - Package
+      summary: Get the Packages installed on a single Device
+      operationId: devicePackageList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      responses:
+        200:
+          description: The list of Packages installed on a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './devicePackage.yaml#/components/schemas/devicePackages'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage.yaml b/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage.yaml
new file mode 100644
index 00000000000..7ed18643ed0
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/devicePackage/devicePackage.yaml
@@ -0,0 +1,63 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Package
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  schemas:
+    devicePackage:
+      type: object
+      description: A Device Package
+      properties:
+          name:
+            type: string
+          version:
+            type: string
+          bundleInfos:
+            type: object
+            properties:
+              bundleInfo:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    name:
+                      type: string
+                    version:
+                      type: string
+          installDate:
+            type: string
+            format: 'date-time'
+      example:
+        name: org.eclipse.kura.demo.heater
+        version: 1.0.300
+        bundleInfos:
+          bundleInfo:
+            - name: org.eclipse.kura.demo.heater
+              version: 1.0.300
+    devicePackages:
+      type: object
+      properties:
+        devicePackage:
+          type: array
+          items:
+            $ref: '#/components/schemas/devicePackage'
+      example:
+        type: devicePackages
+        devicePackage:
+          - name: org.eclipse.kura.demo.heater
+            version: 1.0.300
+            bundleInfos:
+              bundleInfo:
+                - name: org.eclipse.kura.demo.heater
+                  version: 1.0.300
diff --git a/rest-api/resources/src/main/resources/openapi/deviceRequest/deviceRequest-scopeId-deviceId.yaml b/rest-api/resources/src/main/resources/openapi/deviceRequest/deviceRequest-scopeId-deviceId.yaml
new file mode 100644
index 00000000000..36d8c741ba9
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceRequest/deviceRequest-scopeId-deviceId.yaml
@@ -0,0 +1,45 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Request
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/requests:
+    post:
+      tags:
+        - Device Management - Request
+      summary: Perform a Request
+      operationId: deviceRequestExec
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './deviceRequest.yaml#/components/schemas/requestInput'
+        required: true
+      responses:
+        200:
+          description: The list of Requests installed on a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './deviceRequest.yaml#/components/schemas/requestOutput'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceRequest/deviceRequest.yaml b/rest-api/resources/src/main/resources/openapi/deviceRequest/deviceRequest.yaml
new file mode 100644
index 00000000000..d775e38b9b0
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceRequest/deviceRequest.yaml
@@ -0,0 +1,144 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Request
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  schemas:
+    requestInput:
+      type: object
+      description: A Device Request
+      properties:
+        position:
+          $ref: '../dataMessage/dataMessage.yaml#/components/schemas/position'
+        channel:
+          type: object
+          properties:
+            semanticParts:
+              type: array
+              items:
+                type: string
+            appName:
+              type: string
+            version:
+              type: string
+            method:
+              $ref: '../device/device.yaml#/components/schemas/action'
+            resources:
+              type: array
+              items:
+                type: string
+      example:
+        channel:
+          type: genericRequestChannel
+          method: EXECUTE
+          appName: CMD
+          version: V1
+          resources:
+            - command
+        payload:
+          metrics:
+            - valueType: string
+              value: sleep
+              name: command.command
+            - valueType: string
+              value: '180'
+              name: command.argument
+    requestOutput:
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+        scopeId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+        deviceId:
+          allOf:
+            - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+        clientId:
+          type: string
+        receivedOn:
+          type: string
+          format: 'date-time'
+        sentOn:
+          type: string
+          format: 'date-time'
+        capturedOn:
+          type: string
+          format: 'date-time'
+        position:
+          $ref: '../dataMessage/dataMessage.yaml#/components/schemas/position'
+        channel:
+          type: object
+          properties:
+            appName:
+              type: string
+            version:
+              type: string
+            semanticParts:
+              type: array
+              items:
+                type: string
+        payload:
+          type: object
+          properties:
+            exceptionMessage:
+              type: string
+            exceptionStack:
+              type: string
+            metrics:
+              type: array
+              items:
+                type: object
+            body:
+              type: string
+              format: base64
+        responseCode:
+          type: string
+          enum:
+            - ACCEPTED
+            - BAD_REQUEST
+            - NOT_FOUND
+            - INTERNAL_ERROR
+      example:
+        capturedOn: '2019-09-13T13:53:09.447Z'
+        channel:
+          appName: CMD
+          version: V1
+        payload:
+          metrics:
+            - valueType: string
+              value: 'false'
+              name: command.timedout
+            - valueType: string
+              value: |
+                sleep: missing operand
+                Try 'sleep --help' for more information.
+              name: command.stderr
+            - valueType: string
+              name: kapua.response.exception.stack
+            - valueType: string
+              name: kapua.response.exception.message
+            - valueType: string
+              value: '1'
+              name: command.exit.code
+            - valueType: string
+              value: ''
+              name: command.stdout
+            - valueType: string
+              value: '200'
+              name: response.code
+        receivedOn: '2019-09-13T13:53:09.466Z'
+        scopeId: AQ
+        sentOn: '2019-09-13T13:53:09.447Z'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceSnapshot/deviceSnapshot-scopeId-deviceId.yaml b/rest-api/resources/src/main/resources/openapi/deviceSnapshot/deviceSnapshot-scopeId-deviceId.yaml
new file mode 100644
index 00000000000..bcc441b9421
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceSnapshot/deviceSnapshot-scopeId-deviceId.yaml
@@ -0,0 +1,39 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Snapshot
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/snapshots:
+    get:
+      tags:
+        - Device Management - Snapshot
+      summary: Get all Snapshots
+      operationId: deviceSnapshotList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      responses:
+        200:
+          description: The list of Snapshots available on a single Device
+          content:
+            application/json:
+              schema:
+                $ref: './deviceSnapshot.yaml#/components/schemas/snapshots'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/deviceSnapshot/deviceSnapshot.yaml b/rest-api/resources/src/main/resources/openapi/deviceSnapshot/deviceSnapshot.yaml
new file mode 100644
index 00000000000..4971ced2157
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceSnapshot/deviceSnapshot.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Snapshot
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  schemas:
+    snapshot:
+      type: object
+      properties:
+        id:
+          type: string
+        timestamp:
+          type: integer
+    snapshots:
+      type: object
+      properties:
+        snapshotId:
+          type: array
+          items:
+            $ref: '#/components/schemas/snapshot'
+      example:
+          type: deviceSnapshots
+          snapshotId:
+            - id: '0'
+              timestamp: 0
+            - id: '1568300687500'
+              timestamp: 1568300687500
diff --git a/rest-api/resources/src/main/resources/openapi/deviceSnapshot/deviceSnapshotRollback-scopeId-deviceId-snapshotId.yaml b/rest-api/resources/src/main/resources/openapi/deviceSnapshot/deviceSnapshotRollback-scopeId-deviceId-snapshotId.yaml
new file mode 100644
index 00000000000..d397b543a82
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/deviceSnapshot/deviceSnapshotRollback-scopeId-deviceId-snapshotId.yaml
@@ -0,0 +1,40 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Device Management - Snapshot
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/devices/{deviceId}/snapshots/{snapshotId}/_rollback:
+    post:
+      tags:
+        - Device Management - Snapshot
+      summary: Rollback to Snapshot
+      operationId: deviceSnapshotRollback
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: '../device/device.yaml#/components/parameters/deviceId'
+        - name: snapshotId
+          in: path
+          required: true
+          schema:
+            type: string
+        - $ref: '../device/device.yaml#/components/parameters/timeout'
+      responses:
+        200:
+          description: The Snapshot has been applied
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId-_count.yaml
new file mode 100644
index 00000000000..459dd4d1f13
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Domains
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/domains/_count:
+    post:
+      tags:
+        - Domain
+      summary: Count the Domains
+      operationId: domainCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId-_query.yaml
new file mode 100644
index 00000000000..777db4b06b5
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Domains
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/domains/_query:
+    post:
+      tags:
+        - Domain
+      summary: Query the Domains
+      operationId: domainQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './domain.yaml#/components/schemas/domainListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId-domainId.yaml b/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId-domainId.yaml
new file mode 100644
index 00000000000..ca129087834
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId-domainId.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Domains
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/domains/{domainId}:
+    get:
+      tags:
+        - Domain
+      summary: Get a single Domain
+      operationId: domainGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './domain.yaml#/components/parameters/domainId'
+      responses:
+        200:
+          description: The details of the desired Domain
+          content:
+            application/json:
+              schema:
+                $ref: './domain.yaml#/components/schemas/domain'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId.yaml
new file mode 100644
index 00000000000..8dd2b978923
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/domain/domain-scopeId.yaml
@@ -0,0 +1,42 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Domains
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/domains:
+    get:
+      tags:
+        - Domain
+      summary: Get all the Domains
+      operationId: domainList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: name
+          in: query
+          description: The domain name to filter results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Domains available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './domain.yaml#/components/schemas/domainListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/domain/domain.yaml b/rest-api/resources/src/main/resources/openapi/domain/domain.yaml
new file mode 100644
index 00000000000..4adea01b15b
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/domain/domain.yaml
@@ -0,0 +1,73 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Domains
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    domainId:
+      name: domainId
+      in: path
+      description: The ID of the Domain on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    domain:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntity'
+        - type: object
+          properties:
+            groupable:
+              type: boolean
+            actions:
+              type: array
+              items:
+                type: string
+            name:
+              type: string
+          example:
+            type: domain
+            id: AQ
+            createdOn: 2019-09-10T15:08:47.851Z
+            createdBy: AQ
+            name: account
+            actions:
+              - delete
+              - write
+              - read
+            groupable: false
+    domainListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/domain'
+          example:
+            type: domainListResult
+            limitExceeded: false
+            size: 1
+            items:
+              - type: domain
+                id: AQ
+                createdOn: 2019-09-10T15:08:47.851Z
+                createdBy: AQ
+                name: account
+                actions:
+                  - delete
+                  - write
+                  - read
+                groupable: false
diff --git a/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId-_count.yaml
new file mode 100644
index 00000000000..1b202563dd1
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Endpoint Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/endpointInfos/_count:
+    post:
+      tags:
+        - Endpoint Info
+      summary: Count the EndpointInfos
+      operationId: endpointInfoCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId-_query.yaml
new file mode 100644
index 00000000000..5bc5a65f2c8
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Endpoint Infos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/endpointInfos/_query:
+    post:
+      tags:
+        - Endpoint Info
+      summary: Query the EndpointInfos
+      operationId: endpointInfoQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './endpointInfo.yaml#/components/schemas/endpointInfoListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId-endpointInfoId.yaml b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId-endpointInfoId.yaml
new file mode 100644
index 00000000000..73f67614fc6
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId-endpointInfoId.yaml
@@ -0,0 +1,97 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - EndpointInfos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/endpointInfos/{endpointInfoId}:
+    get:
+      tags:
+        - Endpoint Info
+      summary: Get a single EndpointInfo
+      operationId: endpointInfoGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './endpointInfo.yaml#/components/parameters/endpointInfoId'
+      responses:
+        200:
+          description: The details of the desired EndpointInfo
+          content:
+            application/json:
+              schema:
+                $ref: './endpointInfo.yaml#/components/schemas/endpointInfo'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Endpoint Info
+      summary: Update a single EndpointInfo
+      operationId: endpointInfoUpdate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './endpointInfo.yaml#/components/parameters/endpointInfoId'
+      requestBody:
+        description: An object containing the new properties for the EndpointInfo to update
+        content:
+          application/json:
+            schema:
+              $ref: './endpointInfo.yaml#/components/schemas/endpointInfo'
+            example:
+              type: endpointInfo
+              optlock: 1
+              dns: 10.200.12.144
+              port: 1883
+              schema: mqtt
+              secure: false
+              usages:
+                - name: MESSAGE_BROKER
+                - name: PROVISION
+        required: true
+      responses:
+        200:
+          description: The details of the updated EndpointInfo
+          content:
+            application/json:
+              schema:
+                $ref: './endpointInfo.yaml#/components/schemas/endpointInfo'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Endpoint Info
+      summary: Delete a single EndpointInfo
+      operationId: endpointInfoDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './endpointInfo.yaml#/components/parameters/endpointInfoId'
+      responses:
+        200:
+          description: The EndpointInfo has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId.yaml
new file mode 100644
index 00000000000..0ea31587e72
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo-scopeId.yaml
@@ -0,0 +1,71 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - EndpointInfos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/endpointInfos:
+    get:
+      tags:
+        - Endpoint Info
+      summary: Get all the EndpointInfos
+      operationId: endpointInfoList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: usage
+          in: query
+          description: The endpointInfo usage to filter results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the EndpointInfos available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './endpointInfo.yaml#/components/schemas/endpointInfoListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Endpoint Info
+      summary: Create a new EndpointInfo
+      operationId: endpointInfoCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        description: An object containing the properties for the new EndpointInfo to be created
+        content:
+          application/json:
+            schema:
+              $ref: './endpointInfo.yaml#/components/schemas/endpointInfoCreator'
+        required: true
+      responses:
+        200:
+          description: The EndpointInfo that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './endpointInfo.yaml#/components/schemas/endpointInfo'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo.yaml b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo.yaml
new file mode 100644
index 00000000000..569d1498d86
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/endpointInfo/endpointInfo.yaml
@@ -0,0 +1,105 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - EndpointInfos
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    endpointInfoId:
+      name: endpointInfoId
+      in: path
+      description: The ID of the EndpointInfo on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    endpointInfo:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntity'
+        - $ref: '#/components/schemas/endpointInfoCreator'
+        - type: object
+          example:
+            type: endpointInfo
+            id: PEMf9sotlls
+            scopeId: AQ
+            createdOn: '2019-09-13T14:52:19.850Z'
+            createdBy: AQ
+            modifiedOn: '2019-09-13T14:52:19.850Z'
+            modifiedBy: AQ
+            optlock: 1
+            dns: 10.200.12.144
+            port: 1883
+            schema: mqtt
+            secure: false
+            usages:
+              - name: MESSAGE_BROKER
+              - name: PROVISION
+    endpointInfoCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaUpdatableEntityCreator'
+        - type: object
+          properties:
+            schema:
+              type: string
+            dns:
+              type: string
+            port:
+              type: integer
+            secure:
+              type: boolean
+            usages:
+              type: array
+              items:
+                $ref: '#/components/schemas/usage'
+          example:
+            schema: mqtt
+            dns: 10.200.12.148
+            port: '1883'
+            secure: false
+            usages:
+              - name: MESSAGE_BROKER
+              - name: PROVISION
+    endpointInfoListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/endpointInfo'
+          example:
+            type: endpointInfoListResult
+            limitExceeded: false
+            size: 1
+            items:
+              - type: endpointInfo
+                id: PEMf9sotlls
+                scopeId: AQ
+                createdOn: '2019-09-13T14:52:19.850Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-13T14:52:19.850Z'
+                modifiedBy: AQ
+                optlock: 1
+                dns: 10.200.12.148
+                port: 1883
+                schema: mqtt
+                secure: false
+                usages:
+                  - name: MESSAGE_BROKER
+                  - name: PROVISION
+    usage:
+      type: object
+      properties:
+        name:
+          type: string
diff --git a/rest-api/resources/src/main/resources/openapi/group/group-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/group/group-scopeId-_count.yaml
new file mode 100644
index 00000000000..d9391f5f68d
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/group/group-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Groups
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/groups/_count:
+    post:
+      tags:
+        - Group
+      summary: Count the Groups
+      operationId: groupCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/group/group-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/group/group-scopeId-_query.yaml
new file mode 100644
index 00000000000..581036eee0a
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/group/group-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Groups
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/groups/_query:
+    post:
+      tags:
+        - Group
+      summary: Query the Groups
+      operationId: groupQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './group.yaml#/components/schemas/groupListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/group/group-scopeId-groupId.yaml b/rest-api/resources/src/main/resources/openapi/group/group-scopeId-groupId.yaml
new file mode 100644
index 00000000000..818aca925b3
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/group/group-scopeId-groupId.yaml
@@ -0,0 +1,92 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Groups
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/groups/{groupId}:
+    get:
+      tags:
+        - Group
+      summary: Get a single Group
+      operationId: groupGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './group.yaml#/components/parameters/groupId'
+      responses:
+        200:
+          description: The details of the desired Group
+          content:
+            application/json:
+              schema:
+                $ref: './group.yaml#/components/schemas/group'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Group
+      summary: Update a single Group
+      operationId: groupUpdate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './group.yaml#/components/parameters/groupId'
+      requestBody:
+        description: An object containing the new properties for the Group to update
+        content:
+          application/json:
+            schema:
+              $ref: './group.yaml#/components/schemas/group'
+            example:
+              type: group
+              optlock: 1
+              name: group-1
+              description: An Access Group
+        required: true
+      responses:
+        200:
+          description: The details of the updated Group
+          content:
+            application/json:
+              schema:
+                $ref: './group.yaml#/components/schemas/group'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Group
+      summary: Delete a single Group
+      operationId: groupDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './group.yaml#/components/parameters/groupId'
+      responses:
+        200:
+          description: The Group has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/group/group-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/group/group-scopeId.yaml
new file mode 100644
index 00000000000..17598da3e5d
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/group/group-scopeId.yaml
@@ -0,0 +1,71 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Groups
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/groups:
+    get:
+      tags:
+        - Group
+      summary: Get all the Groups
+      operationId: groupList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: name
+          in: query
+          description: The group name to filter results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Groups available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './group.yaml#/components/schemas/groupListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Group
+      summary: Create a new Group
+      operationId: groupCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        description: An object containing the properties for the new Group to be created
+        content:
+          application/json:
+            schema:
+              $ref: './group.yaml#/components/schemas/groupCreator'
+        required: true
+      responses:
+        200:
+          description: The Group that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './group.yaml#/components/schemas/group'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/group/group.yaml b/rest-api/resources/src/main/resources/openapi/group/group.yaml
new file mode 100644
index 00000000000..d50461dabdf
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/group/group.yaml
@@ -0,0 +1,71 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Groups
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    groupId:
+      name: groupId
+      in: path
+      description: The ID of the Group on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    group:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntity'
+        - type: object
+          example:
+            type: group
+            id: Skm7PvmgOh0
+            scopeId: AQ
+            createdOn: '2019-09-13T15:16:09.174Z'
+            createdBy: AQ
+            modifiedOn: '2019-09-13T15:16:09.174Z'
+            modifiedBy: AQ
+            optlock: 1
+            name: group-1
+            description: An Access Group
+    groupCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntityCreator'
+        - type: object
+          example:
+            name: group-1
+            description: An Access Group
+    groupListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/group'
+          example:
+            type: groupListResult
+            limitExceeded: false
+            size: 1
+            items:
+              - type: group
+                id: Skm7PvmgOh0
+                scopeId: AQ
+                createdOn: '2019-09-13T15:16:09.174Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-13T15:16:09.174Z'
+                modifiedBy: AQ
+                optlock: 1
+                name: group-1
+                description: An Access Group
diff --git a/rest-api/resources/src/main/resources/openapi/openapi.yaml b/rest-api/resources/src/main/resources/openapi/openapi.yaml
new file mode 100644
index 00000000000..aa2add8c444
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/openapi.yaml
@@ -0,0 +1,534 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+  description: |
+    # Introduction
+    Eclipse Kapua exposes a comprehensive set of Web Service APIs for application integration purposes. The Eclipse Kapua REST API allows you to build applications that use Representational State Transfer HTTP calls to retrieve, modify, or publish platform data. For example through the APIs, you are able to access all the functionality of the Console or to control a device from your application built on top of Eclipse Kapua.
+
+    The Eclipse Kapua platform conforms to standard REpresentational State Transfer (REST) protocol to expose its Application Programming Interfaces (API). REST has emerged over the past few years as a predominant Web service design model. REST-style architectures consist of clients and servers. Clients initiate requests to servers, while servers process requests and return appropriate responses. Requests and responses are built around the transfer of representations of resources. A resource can be essentially any coherent and meaningful concept that may be addressed. A representation of a resource is typically a document that captures the current or intended state of a resource.
+
+    Eclipse Kapua RESTful APIs expose the standard action types (create, read, update, delete) over the platform objects. They are capable of retrieving a resource representation in XML or JSON format. You can use the REST HTTP Accept Header to specify the representation requested using the "application/xml" and "application/json" Media Types. As an alternative to the Accept header, you can specify the requested data representation by appending an ".xml" or ".json" suffix to the path part of your request URLs.
+
+    For more details on the Eclipse Kapua REST APIs, please refer to:
+    - [The Eclipse Kapua Documentation](https://www.eclipse.org/kapua/documentation.php)
+    - [The Eclipse Kapua Code on github](https://github.com/eclipse/kapua)
+
+    # Authentication
+    All Eclipse Kapua REST API, except the Authentication endpoints that performs an Authentication, need an Authentication Token to be executed. You will retrieve such token as a response of one of the Authentication calls, in the form of a [JWT](https://jwt.io) as the value of the property `tokenId`. For every subsequent call, you need to pass such token in the `Authorization` HTTP Header, with the `Bearer` type.
+
+servers:
+  - description: Kapua REST API Endpoint
+    url: "{scheme}://{host}:{port}/{basePath}"
+    variables:
+      scheme:
+        default: https
+        enum:
+          - http
+          - https
+      host:
+        description: Host name of the Kapua REST API Endpoint
+        default: api.your-kapua.com
+      port:
+        description: Port number of the Kapua REST API Endpoint
+        default: '8080'
+      basePath:
+        description: The Base path of the Kapua REST API Endpoint
+        default: v1
+  - description: Localhost Docker Compose
+    url: http://localhost:8081/v1
+
+paths:
+  ### Authentication ###
+  /authentication/user:
+    $ref: './authentication/authentication-user.yaml#/paths/~1authentication~1user'
+  /authentication/apikey:
+    $ref: './authentication/authentication-apikey.yaml#/paths/~1authentication~1apikey'
+  /authentication/refresh:
+    $ref: './authentication/authentication-refresh.yaml#/paths/~1authentication~1refresh'
+  /authentication/jwt:
+    $ref: './authentication/authentication-jwt.yaml#/paths/~1authentication~1jwt'
+  /authentication/info:
+    $ref: './authentication/authentication-info.yaml#/paths/~1authentication~1info'
+  /authentication/logout:
+    $ref: './authentication/authentication-logout.yaml#/paths/~1authentication~1logout'
+  ### Access Info ###
+  /{scopeId}/accessinfos:
+    $ref: './accessInfo/accessInfo-scopeId.yaml#/paths/~1{scopeId}~1accessinfos'
+  /{scopeId}/accessinfos/{accessInfoId}:
+    $ref: './accessInfo/accessInfo-scopeId-accessInfoId.yaml#/paths/~1{scopeId}~1accessinfos~1{accessInfoId}'
+  /{scopeId}/accessinfos/_count:
+    $ref: './accessInfo/accessInfo-scopeId-_count.yaml#/paths/~1{scopeId}~1accessinfos~1_count'
+  /{scopeId}/accessinfos/_query:
+    $ref: './accessInfo/accessInfo-scopeId-_query.yaml#/paths/~1{scopeId}~1accessinfos~1_query'
+  /{scopeId}/accessinfos/{accessInfoId}/permissions:
+    $ref: './accessInfo/accessInfo-scopeId-accessInfoId-permissions.yaml#/paths/~1{scopeId}~1accessinfos~1{accessInfoId}~1permissions'
+  /{scopeId}/accessinfos/{accessInfoId}/permissions/{accessPermissionId}:
+    $ref: './accessInfo/accessInfo-scopeId-accessInfoId-permissions-accessPermissionId.yaml#/paths/~1{scopeId}~1accessinfos~1{accessInfoId}~1permissions~1{accessPermissionId}'
+  /{scopeId}/accessinfos/{accessInfoId}/permissions/_count:
+    $ref: './accessInfo/accessInfo-scopeId-accessInfoId-permissions-_count.yaml#/paths/~1{scopeId}~1accessinfos~1{accessInfoId}~1permissions~1_count'
+  /{scopeId}/accessinfos/{accessInfoId}/permissions/_query:
+    $ref: './accessInfo/accessInfo-scopeId-accessInfoId-permissions-_query.yaml#/paths/~1{scopeId}~1accessinfos~1{accessInfoId}~1permissions~1_query'
+  /{scopeId}/accessinfos/{accessInfoId}/roles:
+    $ref: './accessInfo/accessInfo-scopeId-accessInfoId-roles.yaml#/paths/~1{scopeId}~1accessinfos~1{accessInfoId}~1roles'
+  /{scopeId}/accessinfos/{accessInfoId}/roles/{accessRoleId}:
+    $ref: './accessInfo/accessInfo-scopeId-accessInfoId-roles-accessRoleId.yaml#/paths/~1{scopeId}~1accessinfos~1{accessInfoId}~1roles~1{accessRoleId}'
+  /{scopeId}/accessinfos/{accessInfoId}/roles/_count:
+    $ref: './accessInfo/accessInfo-scopeId-accessInfoId-roles-_count.yaml#/paths/~1{scopeId}~1accessinfos~1{accessInfoId}~1roles~1_count'
+  /{scopeId}/accessinfos/{accessInfoId}/roles/_query:
+    $ref: './accessInfo/accessInfo-scopeId-accessInfoId-roles-_query.yaml#/paths/~1{scopeId}~1accessinfos~1{accessInfoId}~1roles~1_query'
+  ### Account ###
+  /{scopeId}/accounts:
+    $ref: './account/account-scopeId.yaml#/paths/~1{scopeId}~1accounts'
+  /{scopeId}/accounts/{accountId}:
+    $ref: './account/account-scopeId-accountId.yaml#/paths/~1{scopeId}~1accounts~1{accountId}'
+  /{scopeId}/accounts/_count:
+    $ref: './account/account-scopeId-_count.yaml#/paths/~1{scopeId}~1accounts~1_count'
+  /{scopeId}/accounts/_query:
+    $ref: './account/account-scopeId-_query.yaml#/paths/~1{scopeId}~1accounts~1_query'
+  ### Credential ###
+  /{scopeId}/credentials:
+    $ref: './credential/credential-scopeId.yaml#/paths/~1{scopeId}~1credentials'
+  /{scopeId}/credentials/{credentialId}:
+    $ref: './credential/credential-scopeId-credentialId.yaml#/paths/~1{scopeId}~1credentials~1{credentialId}'
+  /{scopeId}/credentials/_count:
+    $ref: './credential/credential-scopeId-_count.yaml#/paths/~1{scopeId}~1credentials~1_count'
+  /{scopeId}/credentials/_query:
+    $ref: './credential/credential-scopeId-_query.yaml#/paths/~1{scopeId}~1credentials~1_query'
+  /{scopeId}/credentials/{credentialId}/unlock:
+    $ref: './credential/credential-scopeId-credentialId-unlock.yaml#/paths/~1{scopeId}~1credentials~1{credentialId}~1unlock'
+  ### Data Channel ###
+  /{scopeId}/data/channels:
+    $ref: './dataChannel/dataChannel-scopeId.yaml#/paths/~1{scopeId}~1data~1channels'
+  /{scopeId}/data/channels/_count:
+    $ref: './dataChannel/dataChannel-scopeId-_count.yaml#/paths/~1{scopeId}~1data~1channels~1_count'
+  /{scopeId}/data/channels/{channelInfoId}:
+    $ref: './dataChannel/dataChannel-scopeId-channelInfoId.yaml#/paths/~1{scopeId}~1data~1channels~1{channelInfoId}'
+  ### Data Client ###
+  /{scopeId}/data/clients:
+    $ref: './dataClient/dataClient-scopeId.yaml#/paths/~1{scopeId}~1data~1clients'
+  /{scopeId}/data/clients/_count:
+    $ref: './dataClient/dataClient-scopeId-_count.yaml#/paths/~1{scopeId}~1data~1clients~1_count'
+  /{scopeId}/data/clients/{clientInfoId}:
+    $ref: './dataClient/dataClient-scopeId-clientInfoId.yaml#/paths/~1{scopeId}~1data~1clients~1{clientInfoId}'
+  ### Data Message ###
+  /{scopeId}/data/messages:
+    $ref: './dataMessage/dataMessage-scopeId.yaml#/paths/~1{scopeId}~1data~1messages'
+  /{scopeId}/data/messages/_count:
+    $ref: './dataMessage/dataMessage-scopeId-_count.yaml#/paths/~1{scopeId}~1data~1messages~1_count'
+  /{scopeId}/data/messages/{datastoreMessageId}:
+    $ref: './dataMessage/dataMessage-scopeId-datastoreMessageId.yaml#/paths/~1{scopeId}~1data~1messages~1{datastoreMessageId}'
+  ### Data Metric ###
+  /{scopeId}/data/metrics:
+    $ref: './dataMetric/dataMetric-scopeId.yaml#/paths/~1{scopeId}~1data~1metrics'
+  /{scopeId}/data/metrics/_count:
+    $ref: './dataMetric/dataMetric-scopeId-_count.yaml#/paths/~1{scopeId}~1data~1metrics~1_count'
+  /{scopeId}/data/metrics/{metricInfoId}:
+    $ref: './dataMetric/dataMetric-scopeId-metricInfoId.yaml#/paths/~1{scopeId}~1data~1metrics~1{metricInfoId}'
+  ### Device ###
+  /{scopeId}/devices:
+    $ref: './device/device-scopeId.yaml#/paths/~1{scopeId}~1devices'
+  /{scopeId}/devices/{deviceId}:
+    $ref: './device/device-scopeId-deviceId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}'
+  /{scopeId}/devices/_query:
+    $ref: './device/device-scopeId-_query.yaml#/paths/~1{scopeId}~1devices~1_query'
+  /{scopeId}/devices/_count:
+    $ref: './device/device-scopeId-_count.yaml#/paths/~1{scopeId}~1devices~1_count'
+  ### Device Asset ###
+  /{scopeId}/devices/{deviceId}/assets:
+    $ref: './deviceAsset/deviceAsset-scopeId-deviceId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1assets'
+  /{scopeId}/devices/{deviceId}/assets/_read:
+    $ref: './deviceAsset/deviceAsset-scopeId-deviceId-_read.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1assets~1_read'
+  /{scopeId}/devices/{deviceId}/assets/_write:
+    $ref: './deviceAsset/deviceAsset-scopeId-deviceId-_write.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1assets~1_write'
+  ### Device Bundle ###
+  /{scopeId}/devices/{deviceId}/bundles:
+    $ref: './deviceBundle/deviceBundle-scopeId-deviceId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1bundles'
+  /{scopeId}/devices/{deviceId}/bundles/{bundleId}/_start:
+    $ref: './deviceBundle/deviceBundle-scopeId-deviceId-_start.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1bundles~1_start'
+  /{scopeId}/devices/{deviceId}/bundles/{bundleId}/_stop:
+    $ref: './deviceBundle/deviceBundle-scopeId-deviceId-_stop.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1bundles~1_stop'
+  ### Device Command ###
+  /{scopeId}/devices/{deviceId}/commands/_execute:
+    $ref: './deviceCommand/deviceCommand-scopeId-deviceId-_execute.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1commands~1_execute'
+  ### Device Configuration ###
+  /{scopeId}/devices/{deviceId}/configurations:
+    $ref: './deviceConfiguration/deviceConfiguration-scopeId-deviceId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1configurations'
+  /{scopeId}/devices/{deviceId}/configurations/{componentId}:
+    $ref: './deviceConfiguration/deviceConfiguration-scopeId-deviceId-componentId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1configurations~1{componentId}'
+  ### Device Notification ###
+  /{scopeId}/devices/{deviceId}/operations/{operationId}/notifications:
+    $ref: './deviceNotification/deviceNotification-scopeId-deviceId-operationId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1operations~1{operationId}~1notifications'
+  /{scopeId}/devices/{deviceId}/operations/{operationId}/notifications/{notificationId}:
+    $ref: './deviceNotification/deviceNotification-scopeId-deviceId-operationId-notificationId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1operations~1{operationId}~1notifications~1{notificationId}'
+  /{scopeId}/devices/{deviceId}/operations/{operationId}/notifications/_query:
+    $ref: './deviceNotification/deviceNotification-scopeId-deviceId-operationId-_query.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1operations~1{operationId}~1notifications~1_query'
+  /{scopeId}/devices/{deviceId}/operations/{operationId}/notifications/_count:
+    $ref: './deviceNotification/deviceNotification-scopeId-deviceId-operationId-_count.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1operations~1{operationId}~1notifications~1_count'
+  ### Device Operation ###
+  /{scopeId}/devices/{deviceId}/operations:
+    $ref: './deviceOperation/deviceOperation-scopeId-deviceId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1operations'
+  /{scopeId}/devices/{deviceId}/operations/{operationId}:
+    $ref: './deviceOperation/deviceOperation-scopeId-deviceId-operationId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1operations~1{operationId}'
+  /{scopeId}/devices/{deviceId}/operations/_query:
+    $ref: './deviceOperation/deviceOperation-scopeId-deviceId-_query.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1operations~1_query'
+  /{scopeId}/devices/{deviceId}/operations/_count:
+    $ref: './deviceOperation/deviceOperation-scopeId-deviceId-_count.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1operations~1_count'
+  ### Device Package ###
+  /{scopeId}/devices/{deviceId}/packages:
+    $ref: './devicePackage/devicePackage-scopeId-deviceId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1packages'
+  /{scopeId}/devices/{deviceId}/packages/_download:
+    $ref: './devicePackage/devicePackage-scopeId-deviceId-_download.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1packages~1_download'
+  /{scopeId}/devices/{deviceId}/packages/_uninstall:
+    $ref: './devicePackage/devicePackage-scopeId-deviceId-_uninstall.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1packages~1_uninstall'
+  ### Device Request ###
+  /{scopeId}/devices/{deviceId}/requests:
+    $ref: './deviceRequest/deviceRequest-scopeId-deviceId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1requests'
+  ### Device Snapshot ###
+  /{scopeId}/devices/{deviceId}/snapshots:
+    $ref: './deviceSnapshot/deviceSnapshot-scopeId-deviceId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1snapshots'
+  /{scopeId}/devices/{deviceId}/snapshots/{snapshotId}/_rollback:
+    $ref: './deviceSnapshot/deviceSnapshotRollback-scopeId-deviceId-snapshotId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1snapshots~1{snapshotId}~1_rollback'
+  ### Device Connection ###
+  /{scopeId}/deviceconnections:
+    $ref: './deviceConnection/deviceConnection-scopeId.yaml#/paths/~1{scopeId}~1deviceconnections'
+  /{scopeId}/deviceconnections/{connectionId}:
+    $ref: './deviceConnection/deviceConnection-scopeId-connectionId.yaml#/paths/~1{scopeId}~1deviceconnections~1{connectionId}'
+  /{scopeId}/deviceconnections/{connectionId}/options:
+    $ref: './deviceConnection/deviceConnection-scopeId-connectionId-options.yaml#/paths/~1{scopeId}~1deviceconnections~1{connectionId}~1options'
+  /{scopeId}/deviceconnections/_count:
+    $ref: './deviceConnection/deviceConnection-scopeId-_count.yaml#/paths/~1{scopeId}~1deviceconnections~1_count'
+  /{scopeId}/deviceconnections/_query:
+    $ref: './deviceConnection/deviceConnection-scopeId-_query.yaml#/paths/~1{scopeId}~1deviceconnections~1_query'
+  ### Device Event ###
+  /{scopeId}/devices/{deviceId}/events:
+    $ref: './deviceEvent/deviceEvent-scopeId-deviceId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1events'
+  /{scopeId}/devices/{deviceId}/events/{deviceEventId}:
+    $ref: './deviceEvent/deviceEvent-scopeId-deviceId-deviceEventId.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1events~1{deviceEventId}'
+  /{scopeId}/devices/{deviceId}/events/_count:
+    $ref: './deviceEvent/deviceEvent-scopeId-deviceId-_count.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1events~1_count'
+  /{scopeId}/devices/{deviceId}/events/_query:
+    $ref: './deviceEvent/deviceEvent-scopeId-deviceId-_query.yaml#/paths/~1{scopeId}~1devices~1{deviceId}~1events~1_query'
+  ### Domain ###
+  /{scopeId}/domains:
+    $ref: './domain/domain-scopeId.yaml#/paths/~1{scopeId}~1domains'
+  /{scopeId}/domains/{domainId}:
+    $ref: './domain/domain-scopeId-domainId.yaml#/paths/~1{scopeId}~1domains~1{domainId}'
+  /{scopeId}/domains/_count:
+    $ref: './domain/domain-scopeId-_count.yaml#/paths/~1{scopeId}~1domains~1_count'
+  /{scopeId}/domains/_query:
+    $ref: './domain/domain-scopeId-_query.yaml#/paths/~1{scopeId}~1domains~1_query'
+  ### Endpoint Info ###
+  /{scopeId}/endpointInfos:
+    $ref: './endpointInfo/endpointInfo-scopeId.yaml#/paths/~1{scopeId}~1endpointInfos'
+  /{scopeId}/endpointInfos/{endpointInfoId}:
+    $ref: './endpointInfo/endpointInfo-scopeId-endpointInfoId.yaml#/paths/~1{scopeId}~1endpointInfos~1{endpointInfoId}'
+  /{scopeId}/endpointInfos/_count:
+    $ref: './endpointInfo/endpointInfo-scopeId-_count.yaml#/paths/~1{scopeId}~1endpointInfos~1_count'
+  /{scopeId}/endpointInfos/_query:
+    $ref: './endpointInfo/endpointInfo-scopeId-_query.yaml#/paths/~1{scopeId}~1endpointInfos~1_query'
+  ### Group ###
+  /{scopeId}/groups:
+    $ref: './group/group-scopeId.yaml#/paths/~1{scopeId}~1groups'
+  /{scopeId}/groups/{groupId}:
+    $ref: './group/group-scopeId-groupId.yaml#/paths/~1{scopeId}~1groups~1{groupId}'
+  /{scopeId}/groups/_count:
+    $ref: './group/group-scopeId-_count.yaml#/paths/~1{scopeId}~1groups~1_count'
+  /{scopeId}/groups/_query:
+    $ref: './group/group-scopeId-_query.yaml#/paths/~1{scopeId}~1groups~1_query'
+  ### Role ###
+  /{scopeId}/roles:
+    $ref: './role/role-scopeId.yaml#/paths/~1{scopeId}~1roles'
+  /{scopeId}/roles/{roleId}:
+    $ref: './role/role-scopeId-roleId.yaml#/paths/~1{scopeId}~1roles~1{roleId}'
+  /{scopeId}/roles/_count:
+    $ref: './role/role-scopeId-_count.yaml#/paths/~1{scopeId}~1roles~1_count'
+  /{scopeId}/roles/_query:
+    $ref: './role/role-scopeId-_query.yaml#/paths/~1{scopeId}~1roles~1_query'
+  /{scopeId}/roles/{roleId}/permissions:
+    $ref: './role/rolePermission-scopeId-roleId.yaml#/paths/~1{scopeId}~1roles~1{roleId}~1permissions'
+  /{scopeId}/roles/{roleId}/permissions/{rolePermissionId}:
+    $ref: './role/rolePermission-scopeId-roleId-permissionId.yaml#/paths/~1{scopeId}~1roles~1{roleId}~1permissions~1{permissionId}'
+  /{scopeId}/roles/{roleId}/permissions/_count:
+    $ref: './role/rolePermission-scopeId-roleId-_count.yaml#/paths/~1{scopeId}~1roles~1{roleId}~1permissions~1_count'
+  /{scopeId}/roles/{roleId}/permissions/_query:
+    $ref: './role/rolePermission-scopeId-roleId-_query.yaml#/paths/~1{scopeId}~1roles~1{roleId}~1permissions~1_query'
+  ### Service Configuration ###
+  /{scopeId}/serviceConfigurations:
+    $ref: './serviceConfiguration/serviceConfiguration-scopeId.yaml#/paths/~1{scopeId}~1serviceConfigurations'
+  /{scopeId}/serviceConfigurations/{componentId}:
+    $ref: './serviceConfiguration/serviceConfiguration-scopeId-componentId.yaml#/paths/~1{scopeId}~1serviceConfigurations~1{componentId}'
+  ### Stream ###
+  /{scopeId}/streams/messages:
+    $ref: './stream/stream-scopeId.yaml#/paths/~1{scopeId}~1streams~1messages'
+  ### Tag ###
+  /{scopeId}/tags:
+    $ref: './tag/tag-scopeId.yaml#/paths/~1{scopeId}~1tags'
+  /{scopeId}/tags/{tagId}:
+    $ref: './tag/tag-scopeId-tagId.yaml#/paths/~1{scopeId}~1tags~1{tagId}'
+  /{scopeId}/tags/_count:
+    $ref: './tag/tag-scopeId-_count.yaml#/paths/~1{scopeId}~1tags~1_count'
+  /{scopeId}/tags/_query:
+    $ref: './tag/tag-scopeId-_query.yaml#/paths/~1{scopeId}~1tags~1_query'
+  ### User ###
+  /{scopeId}/users:
+    $ref: './user/user-scopeId.yaml#/paths/~1{scopeId}~1users'
+  /{scopeId}/users/{userId}:
+    $ref: './user/user-scopeId-userId.yaml#/paths/~1{scopeId}~1users~1{userId}'
+  /{scopeId}/users/_count:
+    $ref: './user/user-scopeId-_count.yaml#/paths/~1{scopeId}~1users~1_count'
+  /{scopeId}/users/_query:
+    $ref: './user/user-scopeId-_query.yaml#/paths/~1{scopeId}~1users~1_query'
+
+components:
+  parameters:
+    scopeId:
+      name: scopeId
+      in: path
+      description: |
+        The ID of the Scope where to perform the operation.
+      schema:
+        allOf:
+          - $ref: '#/components/schemas/kapuaId'
+          - default: _
+      required: true
+    limit:
+      name: limit
+      in: query
+      description: A Limit on the result size. The result set will not contain more items than this number
+      schema:
+        type: integer
+        default: 50
+    offset:
+      name: offset
+      in: query
+      description: An Offset on the result size. Used to skip the first `n` items of a result set, with `n` equal to the value of `offset`
+      schema:
+        type: integer
+        default: 0
+  schemas:
+    kapuaId:
+      type: string
+      pattern: '[A-Za-z0-9-_=]+'
+      description: The standard format for any ID in Kapua. It's encoded as a [base64url URL- and filename-safe (RFC 4648 §5)](https://tools.ietf.org/html/rfc4648#section-5)
+    ### Entities ###
+    kapuaEntity:
+      description: A standard Entity, that doesn't support edits and versioning. All the objects (except for Datastore objects) in Kapua are Entities
+      type: object
+      properties:
+        id:
+          allOf:
+            - $ref: '#/components/schemas/kapuaId'
+            - description: The ID of the Entity
+              readOnly: true
+        scopeId:
+          allOf:
+            - $ref: '#/components/schemas/kapuaId'
+            - description: The ID of the Scope containing the Entity
+              readOnly: true
+        createdOn:
+          description: The date and time when this entity was created
+          type: string
+          format: 'date-time'
+          readOnly: true
+        createdBy:
+          allOf:
+            - $ref: '#/components/schemas/kapuaId'
+            - description: The ID of the Entity who created this Entity
+              readOnly: true
+    kapuaUpdatableEntity:
+      allOf:
+        - $ref: '#/components/schemas/kapuaEntity'
+        - description: An Entity that also supports edits and versioning
+          type: object
+          properties:
+            modifiedOn:
+              description: The date and time when this entity was modified
+              type: string
+              format: 'date-time'
+              readOnly: true
+            modifiedBy:
+              allOf:
+                - $ref: '#/components/schemas/kapuaId'
+                - description: The ID of the Entity who modified this Entity
+                  readOnly: true
+            optlock:
+              description: |
+                The optlock field is used to detect that this entity has not been modified by someone else. When updating an entity, first do a find to get the latest version of the entity and note the value of the optlock. Then in the update operation, set the optlock value to match the value that you found. If someone else has updated the entity between your find and update operations, the update will fail and the db/server will return an error.\
+                See this [StackOverflow question](http://stackoverflow.com/questions/129329/optimistic-vs-pessimistic-locking) for more information on optimistic locking
+              type: integer
+    kapuaNamedEntity:
+      allOf:
+        - $ref: '#/components/schemas/kapuaUpdatableEntity'
+        - description: An UpdatableEntity that also has a name and a description
+          type: object
+          properties:
+            name:
+              description: The name of the Entity
+              type: string
+            description:
+              description: The description of the Entity
+              type: string
+    kapuaQuery:
+      description: A base object for all Queries
+      type: object
+      properties:
+        limit:
+          description: A Limit on the result size. The result set will not contain more items than this number
+          type: integer
+          default: 50
+        offset:
+          description: An Offset on the result size. Used to skip the first `n` items of a result set, with `n` equal to the value of `offset`
+          type: integer
+          default: 0
+      example:
+        offset: 0
+        limit: 50
+    ### Creators ###
+    kapuaEntityCreator:
+      description: An object that contains the informations needed to create an Entity
+      type: object
+    kapuaUpdatableEntityCreator:
+      allOf:
+        - $ref: '#/components/schemas/kapuaEntityCreator'
+        - description: An object that contains the informations needed to create an Updatable Entity
+          type: object
+    kapuaNamedEntityCreator:
+      allOf:
+        - $ref: '#/components/schemas/kapuaUpdatableEntityCreator'
+        - description: An object that contains the informations needed to create a Named Entity
+          type: object
+          properties:
+            name:
+              description: The name of the Entity
+              type: string
+            description:
+              description: The description of the Entity
+              type: string
+          required:
+            - name
+    kapuaError:
+      description: The base object to represent an Error
+      properties:
+        message:
+          type: string
+          description: An extended description of the error that occurred when performing the operation
+        kapuaErrorCode:
+          type: string
+          description: An human readable error code that can be used to
+    kapuaListResult:
+      description: A container for all the Entities List
+      type: object
+      properties:
+        limitExceeded:
+          description: A flag indicating if more results are available but were not returned because of the limit imposed in the query
+          type: boolean
+        size:
+          description: The size of the list containing the items
+          type: integer
+    kapuaCountResult:
+      type: object
+      properties:
+        count:
+          type: integer
+          description: The total count of the Entities available in the Scope
+  requestBodies:
+    kapuaQuery:
+      description: An object to specify Query options
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/kapuaQuery'
+      required: true
+  responses:
+    countResult:
+      description: The count of the available Entities
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/kapuaCountResult'
+    ### Errors ###
+    kapuaError:
+      description: An error occurred while performing the request
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/kapuaError'
+    entityNotFound:
+      description: The desired entity could not be found
+      content:
+        application/json:
+          schema:
+            allOf:
+              - $ref: '#/components/responses/kapuaError/content/application~1json/schema'
+              - properties:
+                  entityType:
+                    description: The type of the entity that could not be found
+                    type: string
+                  entityId:
+                    description: The ID of the entity that could not be found
+                    type: string
+    illegalArgument:
+      description: An illegal value has been passes to the operation
+      content:
+        application/json:
+          schema:
+            allOf:
+              - $ref: '#/components/schemas/kapuaError'
+              - properties:
+                  argumentName:
+                    description: The name of the argument who holds an illegal value
+                    type: string
+                  argumentValue:
+                    description: The illegal value passed to the operation
+                    type: string
+    illegalNullArgument:
+      description: An illegal null argument has been passed to the operation
+      content:
+        application/json:
+          schema:
+            allOf:
+              - $ref: '#/components/schemas/kapuaError'
+              - properties:
+                  argumentName:
+                    type: string
+                    description: The name of the argument who holds an illegal null value
+    subjectUnauthorized:
+      description: The user performing the operation does not have the required permissions
+      content:
+        application/json:
+          schema:
+            allOf:
+              - $ref: '#/components/schemas/kapuaError'
+              - properties:
+                  permission:
+                    description: The permission that is required to perform the operation, and that the current user is missing
+                    type: string
+    unauthenticated:
+      description: The provided AccessToken could not be found, or no AccessToken has been provided
+  securitySchemes:
+    kapuaToken:
+      description: The default AccessToken Security Scheme. A [JWT](https://jwt.io) is used to represent the claims of a user
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+
+security:
+  - kapuaToken: []
+
+x-explorer-enabled: false
+x-samples-languages:
+  - java
+  - python
+  - node
+  - javascript
+  - ruby
+  - curl
diff --git a/rest-api/resources/src/main/resources/openapi/role/role-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/role/role-scopeId-_count.yaml
new file mode 100644
index 00000000000..1d92242c152
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/role/role-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Roles
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/roles/_count:
+    post:
+      tags:
+        - Role
+      summary: Count the Roles
+      operationId: roleCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/role/role-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/role/role-scopeId-_query.yaml
new file mode 100644
index 00000000000..eb959b72023
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/role/role-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Roles
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/roles/_query:
+    post:
+      tags:
+        - Role
+      summary: Query the Roles
+      operationId: roleQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './role.yaml#/components/schemas/roleListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/role/role-scopeId-roleId.yaml b/rest-api/resources/src/main/resources/openapi/role/role-scopeId-roleId.yaml
new file mode 100644
index 00000000000..0284287f4a1
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/role/role-scopeId-roleId.yaml
@@ -0,0 +1,102 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Roles
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/roles/{roleId}:
+    get:
+      tags:
+        - Role
+      summary: Get a single Role
+      operationId: roleGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './role.yaml#/components/parameters/roleId'
+      responses:
+        200:
+          description: The details of the desired Role
+          content:
+            application/json:
+              schema:
+                $ref: './role.yaml#/components/schemas/role'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Role
+      summary: Update a single Role
+      operationId: roleUpdate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './role.yaml#/components/parameters/roleId'
+      requestBody:
+        description: An object containing the new properties for the Role to update
+        content:
+          application/json:
+            schema:
+              $ref: './role.yaml#/components/schemas/role'
+            example:
+              optlock: 1
+              name: new-role-2
+              description: A new Description for a new Role
+        required: true
+      responses:
+        200:
+          description: The details of the updated Role
+          content:
+            application/json:
+              schema:
+                $ref: './role.yaml#/components/schemas/role'
+              example:
+                type: role
+                id: KmhOD4JHfwk
+                scopeId: AQ
+                createdOn: '2019-09-16T07:33:26.719Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-16T07:41:37.001Z'
+                modifiedBy: AQ
+                optlock: 2
+                name: new-role-2
+                description: A new Description for a new Role
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Role
+      summary: Delete a single Role
+      operationId: roleDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './role.yaml#/components/parameters/roleId'
+      responses:
+        200:
+          description: The Role has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/role/role-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/role/role-scopeId.yaml
new file mode 100644
index 00000000000..eb33df42b59
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/role/role-scopeId.yaml
@@ -0,0 +1,71 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Roles
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/roles:
+    get:
+      tags:
+        - Role
+      summary: Get all the roles
+      operationId: roleList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: name
+          in: query
+          description: The role name to filter results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Roles available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './role.yaml#/components/schemas/roleListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Role
+      summary: Create a new Role
+      operationId: roleCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        description: An object containing the properties for the new Role to be created
+        content:
+          application/json:
+            schema:
+              $ref: './role.yaml#/components/schemas/roleCreator'
+        required: true
+      responses:
+        200:
+          description: The Role that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './role.yaml#/components/schemas/role'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/role/role.yaml b/rest-api/resources/src/main/resources/openapi/role/role.yaml
new file mode 100644
index 00000000000..63ad98f10e9
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/role/role.yaml
@@ -0,0 +1,163 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Roles
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    roleId:
+      name: roleId
+      in: path
+      description: The ID of the Role on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+    rolePermissionId:
+      name: rolePermissionId
+      in: path
+      description: The ID of the RolePermission on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    role:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntity'
+        - type: object
+          example:
+            type: role
+            id: KmhOD4JHfwk
+            scopeId: AQ
+            createdOn: '2019-09-16T07:33:26.719Z'
+            createdBy: AQ
+            modifiedOn: '2019-09-16T07:33:26.719Z'
+            modifiedBy: AQ
+            optlock: 1
+            name: new-role
+            description: A new role
+    roleCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntityCreator'
+        - type: object
+          properties:
+            permissions:
+              type: array
+              items:
+                $ref: '../accessInfo/accessInfo.yaml#/components/schemas/permission'
+          example:
+            name: new-role
+            description: A new role
+            permissions:
+              - domain: broker
+                action: connect
+                forwardable: true
+    roleListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/role'
+          example:
+            type: roleListResult
+            limitExceeded: false
+            size: 2
+            items:
+              - type: role
+                id: AQ
+                scopeId: AQ
+                createdOn: '2019-09-10T15:08:50.701Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-10T15:08:50.701Z'
+                modifiedBy: AQ
+                optlock: 0
+                name: admin
+              - type: role
+                id: OYLRT30Z9sA
+                scopeId: AQ
+                createdOn: '2019-09-11T14:48:33.531Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-11T14:48:33.531Z'
+                modifiedBy: AQ
+                optlock: 1
+                name: role
+                description: desc
+    rolePermissionCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntityCreator'
+        - type: object
+          properties:
+            permission:
+              $ref: '../accessInfo/accessInfo.yaml#/components/schemas/permission'
+          example:
+            permission:
+              domain: account
+              action: read
+              forwardable: true
+    rolePermission:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaEntity'
+        - type: object
+          properties:
+            roleId:
+              allOf:
+                - $ref: '../openapi.yaml#/components/schemas/kapuaId'
+            permission:
+              $ref: '../accessInfo/accessInfo.yaml#/components/schemas/permission'
+          example:
+            type: rolePermission
+            id: BpbQqk31GLc
+            scopeId: AQ
+            createdOn: '2019-09-16T07:49:51.117Z'
+            createdBy: AQ
+            roleId: OYLRT30Z9sA
+            permission:
+              domain: domain
+              action: read
+              forwardable: true
+    rolePermissionListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/rolePermission'
+          example:
+            type: rolePermissionListResult
+            limitExceeded: false
+            size: 2
+            items:
+              - type: rolePermission
+                id: BPJyd1ObUK8
+                scopeId: AQ
+                createdOn: '2019-09-16T07:46:06.191Z'
+                createdBy: AQ
+                roleId: OYLRT30Z9sA
+                permission:
+                  domain: broker
+                  action: connect
+                  forwardable: true
+              - type: rolePermission
+                id: Zi4XYBuG7Xw
+                scopeId: AQ
+                createdOn: '2019-09-16T07:46:14.082Z'
+                createdBy: AQ
+                roleId: OYLRT30Z9sA
+                permission:
+                  domain: device
+                  action: read
+                  forwardable: true
diff --git a/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId-_count.yaml b/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId-_count.yaml
new file mode 100644
index 00000000000..4529977da77
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId-_count.yaml
@@ -0,0 +1,34 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - RolePermissions
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/roles/{roleId}/permissions/_count:
+    post:
+      tags:
+        - Role
+      summary: Count the RolePermissions
+      operationId: rolePermissionCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './role.yaml#/components/parameters/roleId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId-_query.yaml b/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId-_query.yaml
new file mode 100644
index 00000000000..6751a32fd16
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId-_query.yaml
@@ -0,0 +1,38 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - RolePermissions
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/roles/{roleId}/permissions/_query:
+    post:
+      tags:
+        - Role
+      summary: Query the RolePermissions
+      operationId: rolePermissionQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './role.yaml#/components/parameters/roleId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './role.yaml#/components/schemas/rolePermissionListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId-permissionId.yaml b/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId-permissionId.yaml
new file mode 100644
index 00000000000..93f26a33305
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId-permissionId.yaml
@@ -0,0 +1,59 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - RolePermissions
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/roles/{roleId}/permissions/{permissionId}:
+    get:
+      tags:
+        - Role
+      summary: Get a single RolePermission
+      operationId: rolePermissionGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './role.yaml#/components/parameters/roleId'
+        - $ref: './role.yaml#/components/parameters/rolePermissionId'
+      responses:
+        200:
+          description: The details of the desired RolePermission
+          content:
+            application/json:
+              schema:
+                $ref: './role.yaml#/components/schemas/rolePermission'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Role
+      summary: Delete a single RolePermission
+      operationId: rolePermissionDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './role.yaml#/components/parameters/roleId'
+        - $ref: './role.yaml#/components/parameters/rolePermissionId'
+      responses:
+        200:
+          description: The RolePermission has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId.yaml b/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId.yaml
new file mode 100644
index 00000000000..953dfe16b90
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/role/rolePermission-scopeId-roleId.yaml
@@ -0,0 +1,94 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Roles
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/roles/{roleId}/permissions:
+    get:
+      tags:
+        - Role
+      summary: Get all the Role Permissions
+      operationId: rolePermissionList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './role.yaml#/components/parameters/roleId'
+        - name: name
+          in: query
+          description: The domain name to filter results
+          schema:
+            type: string
+        - name: action
+          in: query
+          description: The action to filter results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the RolePermissions available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './role.yaml#/components/schemas/rolePermissionListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Role
+      summary: Create a new RolePermission
+      operationId: rolePermissionCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './role.yaml#/components/parameters/roleId'
+      requestBody:
+        description: An object containing the properties for the new RolePermission to be created
+        content:
+          application/json:
+            schema:
+              $ref: './role.yaml#/components/schemas/rolePermissionCreator'
+            example:
+              permission:
+                domain: account
+                action: read
+                forwardable: true
+        required: true
+      responses:
+        200:
+          description: The Role Permissionthat has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './role.yaml#/components/schemas/rolePermission'
+              example:
+                type: rolePermission
+                id: BpbQqk31GLc
+                scopeId: AQ
+                createdOn: '2019-09-16T07:49:51.117Z'
+                createdBy: AQ
+                roleId: OYLRT30Z9sA
+                permission:
+                  domain: domain
+                  action: read
+                  forwardable: true
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/serviceConfiguration/serviceConfiguration-scopeId-componentId.yaml b/rest-api/resources/src/main/resources/openapi/serviceConfiguration/serviceConfiguration-scopeId-componentId.yaml
new file mode 100644
index 00000000000..53ea0424d82
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/serviceConfiguration/serviceConfiguration-scopeId-componentId.yaml
@@ -0,0 +1,67 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Service Configuration
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/serviceConfigurations/{componentId}:
+    get:
+      tags:
+        - Service Configuration
+      summary: Read a single Configuration
+      operationId: serviceConfigurationRead
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './serviceConfiguration.yaml#/components/parameters/componentId'
+      responses:
+        200:
+          description: The Configuration details of a single Service
+          content:
+            application/json:
+              schema:
+                $ref: './serviceConfiguration.yaml#/components/schemas/componentConfigurations'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Service Configuration
+      summary: Update a single Configuration
+      operationId: serviceConfigurationWrite
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './serviceConfiguration.yaml#/components/parameters/componentId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './serviceConfiguration.yaml#/components/schemas/componentConfigurationInput'
+        required: true
+      responses:
+        200:
+          description: Updates the Configuration details of a single Service
+          content:
+            application/json:
+              schema:
+                $ref: './serviceConfiguration.yaml#/components/schemas/componentConfiguration'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/serviceConfiguration/serviceConfiguration-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/serviceConfiguration/serviceConfiguration-scopeId.yaml
new file mode 100644
index 00000000000..21eab3a93b1
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/serviceConfiguration/serviceConfiguration-scopeId.yaml
@@ -0,0 +1,61 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Service Configuration
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/serviceConfigurations:
+    get:
+      tags:
+        - Service Configuration
+      summary: Read multiple Configurations
+      operationId: serviceConfigurationsRead
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      responses:
+        200:
+          description: The list of the Configurations
+          content:
+            application/json:
+              schema:
+                $ref: './serviceConfiguration.yaml#/components/schemas/componentConfigurations'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Service Configuration
+      summary: Update multiple Configurations
+      operationId: serviceConfigurationsWrite
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: './serviceConfiguration.yaml#/components/schemas/componentConfigurationsInput'
+        required: true
+      responses:
+        200:
+          description: The list of the Configurations
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/serviceConfiguration/serviceConfiguration.yaml b/rest-api/resources/src/main/resources/openapi/serviceConfiguration/serviceConfiguration.yaml
new file mode 100644
index 00000000000..706e2d59fb8
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/serviceConfiguration/serviceConfiguration.yaml
@@ -0,0 +1,372 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Service Configuration
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    componentId:
+      name: componentId
+      in: path
+      description: The ID of the Component on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    attributeDefinition:
+      description: The definition for a single configuration value
+#      externalDocs:
+#        description: OSGi Compendium Release 7
+#        url: https://osgi.org/specification/osgi.cmpn/7.0.0/service.metatype.html#i1504333
+      type: object
+      properties:
+        Option:
+          type: array
+          items:
+            type: object
+            properties:
+              label:
+                type: string
+              value:
+                type: string
+        default:
+          description: The default value for this field
+          type: string
+        type:
+          description: The data type of this field
+          type: object
+        cardinality:
+          description: The cardinality of this field
+          type: integer
+        min:
+          description: The minimum allowed value for this field
+          type: string
+        max:
+          description: The maximum allowed value for this field
+          type: string
+        description:
+          description: The description of this field
+          type: string
+        id:
+          description: An unique ID for this field
+          type: string
+        required:
+          description: A flag indicating whether this field is required or not
+          type: boolean
+        name:
+          description: A human readable name for this field
+          type: string
+      example:
+        cardinality: 0
+        default: 'false'
+        description: Whether to allow infinite groups for this account or not.
+        id: infiniteChildEntities
+        name: infiniteChildGroups
+        required: true
+        type: Boolean
+        Option: []
+    propertyDefinition:
+      type: object
+      properties:
+        name:
+          description: The name of the field that is represented by this property
+          type: string
+        array:
+          description: A flag indicating whether this property has an array value or not
+          type: boolean
+        encrypted:
+          description: A flag indicating whether this property value is encrypted or not
+          type: boolean
+        type:
+          description: The data type of this property
+          type: string
+        value:
+          description: The value of this property
+          type: array
+          items:
+            type: string
+      example:
+        name: maxNumberChildEntities
+        array: false
+        encrypted: false
+        type: Integer
+        value:
+          - '0'
+    componentConfiguration:
+      type: object
+      properties:
+        name:
+          description: A name for the Service
+          type: string
+        id:
+          description: An ID for the Service
+          type: string
+        definition:
+          description: An object containing all the Property Definitions
+          type: object
+          properties:
+            id:
+              type: string
+            AD:
+              type: array
+              items:
+                $ref: '#/components/schemas/attributeDefinition'
+            Icon:
+              type: array
+              items:
+                type: object
+                properties:
+                  resource:
+                    type: string
+                  size:
+                    type: integer
+            name:
+              type: string
+            description:
+              type: string
+        properties:
+          description: An object containing all the Property Values
+          type: object
+          properties:
+            property:
+              type: array
+              items:
+                $ref: '#/components/schemas/propertyDefinition'
+      example:
+        name: AccountService
+        id: org.eclipse.kapua.service.account.AccountService
+        definition:
+          description: 'This is the configuration for the kapua AccountService. '
+          id: org.eclipse.kapua.service.account.AccountService
+          name: AccountService
+          AD:
+            - cardinality: 0
+              default: 'false'
+              description: Whether to allow infinite child accounts for this account or not.
+              id: infiniteChildEntities
+              name: infiniteChildAccounts
+              required: true
+              type: Boolean
+              Option: []
+            - cardinality: 0
+              default: '0'
+              description: Maximum number of child accounts that are allowed to be created for this account. Valid if infiniteChildAccounts set to false.
+              id: maxNumberChildEntities
+              min: '0'
+              name: maxNumberChildAccounts
+              required: true
+              type: Integer
+              Option: []
+          Icon:
+            - resource: OSGI-INF/account-service.png
+              size: 32
+        properties:
+          property:
+            - name: maxNumberChildEntities
+              array: false
+              encrypted: false
+              type: Integer
+              value:
+                - '0'
+            - name: infiniteChildEntities
+              array: false
+              encrypted: false
+              type: Boolean
+              value:
+                - 'true'
+    componentConfigurationInput:
+      type: object
+      properties:
+        id:
+          type: string
+        properties:
+          type: object
+          properties:
+            property:
+              type: array
+              items:
+                $ref: '#/components/schemas/propertyDefinition'
+      example:
+        id: org.eclipse.kapua.service.account.AccountService
+        properties:
+          property:
+            - name: maxNumberChildEntities
+              type: Integer
+              value:
+                - '7'
+            - name: infiniteChildEntities
+              type: Boolean
+              value:
+                - 'true'
+    componentConfigurations:
+      type: object
+      properties:
+        configuration:
+          type: array
+          items:
+            $ref: '#/components/schemas/componentConfiguration'
+      example:
+        type: serviceConfiguration
+        configuration:
+          - name: AccountService
+            id: org.eclipse.kapua.service.account.AccountService
+            definition:
+              description: 'This is the configuration for the kapua AccountService. '
+              id: org.eclipse.kapua.service.account.AccountService
+              name: AccountService
+              AD:
+                - cardinality: 0
+                  default: 'false'
+                  description: Whether to allow infinite child accounts for this account or not.
+                  id: infiniteChildEntities
+                  name: infiniteChildAccounts
+                  required: true
+                  type: Boolean
+                  Option: []
+                - cardinality: 0
+                  default: '0'
+                  description: Maximum number of child accounts that are allowed to be created for this account. Valid if infiniteChildAccounts set to false.
+                  id: maxNumberChildEntities
+                  min: '0'
+                  name: maxNumberChildAccounts
+                  required: true
+                  type: Integer
+                  Option: []
+              Icon:
+                - resource: OSGI-INF/account-service.png
+                  size: 32
+            properties:
+              property:
+                - name: maxNumberChildEntities
+                  array: false
+                  encrypted: false
+                  type: Integer
+                  value:
+                    - '0'
+                - name: infiniteChildEntities
+                  array: false
+                  encrypted: false
+                  type: Boolean
+                  value:
+                    - 'true'
+          - name: CredentialService
+            id: org.eclipse.kapua.service.authentication.credential.CredentialService
+            definition:
+              description: 'This is the configuration for the kapua CredentialService. '
+              id: org.eclipse.kapua.service.authentication.credential.CredentialService
+              name: CredentialService
+              AD:
+                - cardinality: 0
+                  default: 'true'
+                  description: User lockout policy enable.
+                  id: lockoutPolicy.enabled
+                  name: lockoutPolicy.enabled
+                  required: true
+                  type: Boolean
+                  Option: []
+                - cardinality: 0
+                  default: '3'
+                  description: Number of consecutive login failures before the user gets locked. Valid if lockout policy is enabled.
+                  id: lockoutPolicy.maxFailures
+                  min: '0'
+                  name: lockoutPolicy.maxFailures
+                  required: true
+                  type: Integer
+                  Option: []
+                - cardinality: 0
+                  default: '3600'
+                  description: The amount of time in seconds required after the last login failure to automatically reset the failure counter.
+                  id: lockoutPolicy.resetAfter
+                  min: '0'
+                  name: lockoutPolicy.resetAfter
+                  required: true
+                  type: Integer
+                  Option: []
+                - cardinality: 0
+                  default: '10800'
+                  description: For a locked user the amount of time in seconds required after the last login failure to automatically unlock the user.
+                  id: lockoutPolicy.lockDuration
+                  min: '0'
+                  name: lockoutPolicy.lockDuration
+                  required: true
+                  type: Integer
+                  Option: []
+              Icon:
+                - resource: OSGI-INF/user-service.png
+                  size: 32
+            properties:
+              property:
+                - name: lockoutPolicy.resetAfter
+                  array: false
+                  encrypted: false
+                  type: Integer
+                  value:
+                    - '3600'
+                - name: lockoutPolicy.lockDuration
+                  array: false
+                  encrypted: false
+                  type: Integer
+                  value:
+                    - '10800'
+                - name: lockoutPolicy.enabled
+                  array: false
+                  encrypted: false
+                  type: Boolean
+                  value:
+                    - 'true'
+                - name: lockoutPolicy.maxFailures
+                  array: false
+                  encrypted: false
+                  type: Integer
+                  value:
+                    - '3'
+    componentConfigurationsInput:
+      type: object
+      properties:
+        configuration:
+          type: array
+          items:
+            $ref: '#/components/schemas/componentConfigurationInput'
+      example:
+        type: serviceConfiguration
+        configuration:
+          - id: org.eclipse.kapua.service.account.AccountService
+            properties:
+              property:
+                - name: maxNumberChildEntities
+                  type: Integer
+                  value:
+                    - '15'
+                - name: infiniteChildEntities
+                  type: Boolean
+                  value:
+                    - false
+          - id: org.eclipse.kapua.service.authentication.credential.CredentialService
+            properties:
+              property:
+                - name: lockoutPolicy.resetAfter
+                  type: Integer
+                  value:
+                    - '36000'
+                - name: lockoutPolicy.lockDuration
+                  type: Integer
+                  value:
+                    - '108000'
+                - name: lockoutPolicy.enabled
+                  type: Boolean
+                  value:
+                    - 'false'
+                - name: lockoutPolicy.maxFailures
+                  type: Integer
+                  value:
+                    - '30'
diff --git a/rest-api/resources/src/main/resources/openapi/stream/stream-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/stream/stream-scopeId.yaml
new file mode 100644
index 00000000000..d9dabb5821d
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/stream/stream-scopeId.yaml
@@ -0,0 +1,63 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Streams
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/streams/messages:
+    post:
+      tags:
+        - Stream
+      summary: Publish a message
+      operationId: streamMessage
+      description: Publishes a fire-and-forget message to a topic composed of [account-name] / [client-id] / [semtantic-parts]
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '../dataMessage/dataMessage.yaml#/components/schemas/dataMessage'
+            example:
+              capturedOn: '2019-09-12T09:25:05.096Z'
+              channel:
+                type: kapuaDataChannel
+                semanticParts:
+                  - heater
+                  - data
+              clientId: Client-Id-1
+              deviceId: IaIA6xbNR7E
+              payload:
+                metrics:
+                  - valueType: string
+                    value: 5
+                    name: temperatureExternal
+                  - valueType: string
+                    value: 20
+                    name: temperatureInternal
+                  - valueType: string
+                    value: 30
+                    name: temperatureExhaust
+                  - valueType: string
+                    value: 0
+                    name: errorCode
+              receivedOn: '2019-09-12T09:25:05.102Z'
+              sentOn: '2019-09-12T09:25:05.096Z'
+              timestamp: '2019-09-12T09:25:05.096Z'
+      responses:
+        200:
+          description: The message has been sent successfully
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId-_count.yaml
new file mode 100644
index 00000000000..30d4aadc606
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Tags
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/tags/_count:
+    post:
+      tags:
+        - Tag
+      summary: Count the Tags
+      operationId: tagCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId-_query.yaml
new file mode 100644
index 00000000000..5b40466a97e
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Tags
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/tags/_query:
+    post:
+      tags:
+        - Tag
+      summary: Query the Tags
+      operationId: tagQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './tag.yaml#/components/schemas/tagListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId-tagId.yaml b/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId-tagId.yaml
new file mode 100644
index 00000000000..f5261616a8c
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId-tagId.yaml
@@ -0,0 +1,102 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Tags
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/tags/{tagId}:
+    get:
+      tags:
+        - Tag
+      summary: Get a single Tag
+      operationId: tagGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './tag.yaml#/components/parameters/tagId'
+      responses:
+        200:
+          description: The details of the desired Tag
+          content:
+            application/json:
+              schema:
+                $ref: './tag.yaml#/components/schemas/tag'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - Tag
+      summary: Update a single Tag
+      operationId: tagUpdate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './tag.yaml#/components/parameters/tagId'
+      requestBody:
+        description: An object containing the new properties for the Tag to update
+        content:
+          application/json:
+            schema:
+              $ref: './tag.yaml#/components/schemas/tag'
+            example:
+              optlock: 1
+              name: new-tag
+              description: A new Description for a new Tag
+        required: true
+      responses:
+        200:
+          description: The details of the updated Tag
+          content:
+            application/json:
+              schema:
+                $ref: './tag.yaml#/components/schemas/tag'
+              example:
+                type: tag
+                id: FJ6-FLuIcok
+                scopeId: AQ
+                createdOn: '2019-09-16T08:52:32.562Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-16T08:55:43.719Z'
+                modifiedBy: AQ
+                optlock: 2
+                name: new-tag
+                description: A new Description for a new Tag
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - Tag
+      summary: Delete a single Tag
+      operationId: tagDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './tag.yaml#/components/parameters/tagId'
+      responses:
+        200:
+          description: The Tag has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId.yaml
new file mode 100644
index 00000000000..bb1c47f9445
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/tag/tag-scopeId.yaml
@@ -0,0 +1,71 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Tags
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/tags:
+    get:
+      tags:
+        - Tag
+      summary: Get all the Tags
+      operationId: tagList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: name
+          in: query
+          description: The tag name to filter results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Tags available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './tag.yaml#/components/schemas/tagListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - Tag
+      summary: Create a new Tag
+      operationId: tagCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        description: An object containing the properties for the new Tag to be created
+        content:
+          application/json:
+            schema:
+              $ref: './tag.yaml#/components/schemas/tagCreator'
+        required: true
+      responses:
+        200:
+          description: The Tag that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './tag.yaml#/components/schemas/tag'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/tag/tag.yaml b/rest-api/resources/src/main/resources/openapi/tag/tag.yaml
new file mode 100644
index 00000000000..28b7b79bbb9
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/tag/tag.yaml
@@ -0,0 +1,71 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Tags
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    tagId:
+      name: tagId
+      in: path
+      description: The ID of the Tag on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    tag:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntity'
+        - type: object
+          example:
+            type: tag
+            id: FJ6-FLuIcok
+            scopeId: AQ
+            createdOn: '2019-09-16T08:52:32.562Z'
+            createdBy: AQ
+            modifiedOn: '2019-09-16T08:52:32.562Z'
+            modifiedBy: AQ
+            optlock: 1
+            name: tag-1
+            description: A new Tag
+    tagCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntityCreator'
+        - type: object
+          example:
+            name: tag-1
+            description: A new Tag
+    tagListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/tag'
+          example:
+            type: tagListResult
+            limitExceeded: false
+            size: 1
+            items:
+              - type: tag
+                id: FJ6-FLuIcok
+                scopeId: AQ
+                createdOn: '2019-09-16T08:52:32.562Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-16T08:52:32.562Z'
+                modifiedBy: AQ
+                optlock: 1
+                name: tag-1
+                description: A new Tag
diff --git a/rest-api/resources/src/main/resources/openapi/user/user-scopeId-_count.yaml b/rest-api/resources/src/main/resources/openapi/user/user-scopeId-_count.yaml
new file mode 100644
index 00000000000..d1a93022b1f
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/user/user-scopeId-_count.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Users
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/users/_count:
+    post:
+      tags:
+        - User
+      summary: Count the Users
+      operationId: userCount
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          $ref: '../openapi.yaml#/components/responses/countResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/user/user-scopeId-_query.yaml b/rest-api/resources/src/main/resources/openapi/user/user-scopeId-_query.yaml
new file mode 100644
index 00000000000..e07db6d2b64
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/user/user-scopeId-_query.yaml
@@ -0,0 +1,37 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Users
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/users/_query:
+    post:
+      tags:
+        - User
+      summary: Query the Users
+      operationId: userQuery
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        $ref: '../openapi.yaml#/components/requestBodies/kapuaQuery'
+      responses:
+        200:
+          description: The result of the query
+          content:
+            application/json:
+              schema:
+                $ref: './user.yaml#/components/schemas/userListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/user/user-scopeId-userId.yaml b/rest-api/resources/src/main/resources/openapi/user/user-scopeId-userId.yaml
new file mode 100644
index 00000000000..e66d00eed31
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/user/user-scopeId-userId.yaml
@@ -0,0 +1,96 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Users
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/users/{userId}:
+    get:
+      tags:
+        - User
+      summary: Get a single User
+      operationId: userGet
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './user.yaml#/components/parameters/userId'
+      responses:
+        200:
+          description: The details of the desired User
+          content:
+            application/json:
+              schema:
+                $ref: './user.yaml#/components/schemas/user'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    put:
+      tags:
+        - User
+      summary: Update a single User
+      operationId: userUpdate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './user.yaml#/components/parameters/userId'
+      requestBody:
+        description: An object containing the new properties for the User to update
+        content:
+          application/json:
+            schema:
+              $ref: './user.yaml#/components/schemas/user'
+            example:
+              type: user
+              optlock: 2
+              name: donald-duck
+              displayName: Donald Duck
+              email: donald.duck@duckburg.org
+              phoneNumber: +1 (555) 816 1851
+              status: ENABLED
+              userType: INTERNAL
+        required: true
+      responses:
+        200:
+          description: The details of the updated User
+          content:
+            application/json:
+              schema:
+                $ref: './user.yaml#/components/schemas/user'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    delete:
+      tags:
+        - User
+      summary: Delete a single User
+      operationId: userDelete
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - $ref: './user.yaml#/components/parameters/userId'
+      responses:
+        200:
+          description: The User has been deleted
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/user/user-scopeId.yaml b/rest-api/resources/src/main/resources/openapi/user/user-scopeId.yaml
new file mode 100644
index 00000000000..c48be4b63ae
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/user/user-scopeId.yaml
@@ -0,0 +1,99 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Users
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths:
+  /{scopeId}/users:
+    get:
+      tags:
+        - User
+      summary: Get all the Users
+      operationId: userList
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+        - name: name
+          in: query
+          description: The user name to filter results
+          schema:
+            type: string
+        - $ref: '../openapi.yaml#/components/parameters/limit'
+        - $ref: '../openapi.yaml#/components/parameters/offset'
+      responses:
+        200:
+          description: The list of the Users available in the Scope
+          content:
+            application/json:
+              schema:
+                $ref: './user.yaml#/components/schemas/userListResult'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
+    post:
+      tags:
+        - User
+      summary: Create a new User
+      operationId: userCreate
+      parameters:
+        - $ref: '../openapi.yaml#/components/parameters/scopeId'
+      requestBody:
+        description: An object containing the properties for the new User to be created
+        content:
+          application/json:
+            schema:
+              $ref: './user.yaml#/components/schemas/userCreator'
+            examples:
+              minimal:
+                description: Create an User providing only the required information (name)
+                value:
+                  name: new-user
+              complete:
+                description: Create an User providing all the information
+                value:
+                  $ref: './user.yaml#/components/schemas/userCreator'
+        required: true
+      responses:
+        200:
+          description: The User that has just been created
+          content:
+            application/json:
+              schema:
+                $ref: './user.yaml#/components/schemas/user'
+              examples:
+                minimal:
+                  description: An User created with only the required information (username)
+                  value:
+                      type: user
+                      id: TvnAZL6Zzu0
+                      scopeId: AQ
+                      createdOn: '2019-09-11T09:07:09.853Z'
+                      createdBy: AQ
+                      modifiedOn: '2019-09-11T09:07:09.853Z'
+                      modifiedBy: AQ
+                      optlock: 1
+                      name: new-user
+                      status: ENABLED
+                      userType: INTERNAL
+                complete:
+                  description: An User created providing all the information
+                  value:
+                    $ref: './user.yaml#/components/examples/user/value'
+        401:
+          $ref: '../openapi.yaml#/components/responses/unauthenticated'
+        403:
+          $ref: '../openapi.yaml#/components/responses/subjectUnauthorized'
+        404:
+          $ref: '../openapi.yaml#/components/responses/entityNotFound'
+        500:
+          $ref: '../openapi.yaml#/components/responses/kapuaError'
diff --git a/rest-api/resources/src/main/resources/openapi/user/user.yaml b/rest-api/resources/src/main/resources/openapi/user/user.yaml
new file mode 100644
index 00000000000..fc4da16a5c4
--- /dev/null
+++ b/rest-api/resources/src/main/resources/openapi/user/user.yaml
@@ -0,0 +1,130 @@
+openapi: 3.0.2
+
+info:
+  title: Eclipse Kapua REST API - Users
+  version: '1.0'
+  contact:
+    name: Eclipse Kapua Dev Team
+    url: https://eclipse.org/kapua
+    email: kapua-dev@eclipse.org
+  license:
+    name: Eclipse Public License 2.0
+    url: https://www.eclipse.org/legal/epl-2.0
+
+paths: {}
+
+components:
+  parameters:
+    userId:
+      name: userId
+      in: path
+      description: The ID of the User on which to perform the operation
+      schema:
+        $ref: '../openapi.yaml#/components/schemas/kapuaId'
+      required: true
+  schemas:
+    user:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntity'
+        - $ref: '#/components/schemas/userCreator'
+        - type: object
+          example:
+            $ref: '#/components/examples/user/value'
+    userCreator:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaNamedEntityCreator'
+        - type: object
+          properties:
+            status:
+              type: string
+              enum:
+                - ENABLED
+                - DISABLED
+            displayName:
+              type: string
+            email:
+              type: string
+              format: email
+            phoneNumber:
+              type: string
+            userType:
+              type: string
+              enum:
+                - DEVICE
+                - INTERNAL
+                - EXTERNAL
+            externalId:
+              type: string
+            expirationDate:
+              type: string
+              format: 'date-time'
+          example:
+            $ref: '#/components/examples/userCreator/value'
+    userListResult:
+      allOf:
+        - $ref: '../openapi.yaml#/components/schemas/kapuaListResult'
+        - type: object
+          properties:
+            items:
+              type: array
+              items:
+                $ref: '#/components/schemas/user'
+          example:
+            type: userListResult
+            limitExceeded: false
+            size: 2
+            users:
+              - type: user
+                id: AQ
+                scopeId: AQ
+                createdOn: '2019-09-10T15:08:54.781Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-10T15:08:54.781Z'
+                modifiedBy: AQ
+                optlock: 0
+                name: kapua-sys
+                displayName: Kapua Sysadmin
+                email: kapua-sys@eclipse.org
+                phoneNumber: '+1 555 123 4567'
+                status: ENABLED
+                userType: INTERNAL
+              - type: user
+                id: Ag
+                scopeId: AQ
+                createdOn: '2019-09-10T15:08:54.781Z'
+                createdBy: AQ
+                modifiedOn: '2019-09-10T15:08:54.781Z'
+                modifiedBy: AQ
+                optlock: 0
+                name: kapua-broker
+                displayName: Kapua Broker
+                email: kapua-broker@eclipse.org
+                phoneNumber: '+1 555 123 4567'
+                status: ENABLED
+                userType: INTERNAL
+  examples:
+    user:
+      value:
+        type: user
+        id: AQ
+        scopeId: AQ
+        createdOn: '2019-09-10T15:08:54.781Z'
+        createdBy: AQ
+        modifiedOn: '2019-09-10T15:08:54.781Z'
+        modifiedBy: AQ
+        optlock: 0
+        name: kapua-sys
+        displayName: Kapua Sysadmin
+        email: kapua-sys@eclipse.org
+        phoneNumber: '+1 555 123 4567'
+        status: ENABLED
+        userType: INTERNAL
+    userCreator:
+      value:
+        name: donald-duck
+        status: ENABLED
+        displayName: Donald Duck
+        email: donald.duck@duckburg.org
+        phoneNumber: '+1 (555) 816 1851'
+        userType: INTERNAL
+        expirationDate: '2019-31-12T00:00:00.000Z'
diff --git a/rest-api/web/pom.xml b/rest-api/web/pom.xml
index d07d46b1208..e26eb05948f 100644
--- a/rest-api/web/pom.xml
+++ b/rest-api/web/pom.xml
@@ -129,13 +129,6 @@
             <version>${jersey.version}</version>
         </dependency>
 
-        <!-- Swagger for apidoc -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-jersey2-jaxrs</artifactId>
-            <version>${swagger.version}</version>
-        </dependency>
-
         <!-- Moxy for object marshalling unmarshalling -->
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
diff --git a/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApisApplication.java b/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApisApplication.java
index ef298ee27f9..6fbc20c3964 100644
--- a/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApisApplication.java
+++ b/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApisApplication.java
@@ -20,10 +20,8 @@
 import org.eclipse.kapua.app.api.core.KapuaSerializableBodyWriter;
 import org.eclipse.kapua.app.api.core.ListBodyWriter;
 import org.eclipse.kapua.app.api.core.MoxyJsonConfigContextResolver;
-import org.eclipse.kapua.app.api.core.SwaggerDefinition;
 import org.eclipse.kapua.commons.util.xml.XmlUtil;
 
-import io.swagger.jaxrs.config.BeanConfig;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.server.ServerProperties;
@@ -49,7 +47,6 @@ public RestApisApplication() throws JAXBException {
         register(KapuaSerializableBodyWriter.class);
         register(ListBodyWriter.class);
         register(CORSResponseFilter.class);
-        register(SwaggerDefinition.class);
         register(MoxyJsonConfigContextResolver.class);
 
         register(new ContainerLifecycleListener() {
@@ -76,22 +73,6 @@ public void onReload(Container container) {
             public void onShutdown(Container container) {
             }
         });
-
-        initSwagger();
     }
 
-    private void initSwagger() {
-        final String apiVersion = "1.0";
-        final String basePath = "/v1";
-        final String apiResourcePackage = "org.eclipse.kapua.app.api";
-        final String apiTitle = "Eclipse Kapua REST API";
-
-        BeanConfig beanConfig = new BeanConfig();
-        beanConfig.setVersion(apiVersion);
-        beanConfig.setBasePath(basePath);
-        beanConfig.setTitle(apiTitle);
-        beanConfig.setSchemes(new String[] { "http" });
-        beanConfig.setResourcePackage(apiResourcePackage);
-        beanConfig.setScan(true);
-    }
 }
diff --git a/rest-api/web/src/main/webapp/WEB-INF/web.xml b/rest-api/web/src/main/webapp/WEB-INF/web.xml
index 7463ded85ef..c90106d9120 100644
--- a/rest-api/web/src/main/webapp/WEB-INF/web.xml
+++ b/rest-api/web/src/main/webapp/WEB-INF/web.xml
@@ -11,7 +11,7 @@
         Eurotech - initial API and implementation
  -->
 
-<!-- This web.xml file is not required when using Servlet 3.0 container, 
+<!-- This web.xml file is not required when using Servlet 3.0 container,
     see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://java.sun.com/xml/ns/javaee"
@@ -62,7 +62,6 @@
         <init-param>
             <param-name>jersey.config.server.provider.packages</param-name>
             <param-value>
-                io.swagger.jaxrs.listing,
                 org.eclipse.kapua.app.api
             </param-value>
         </init-param>
diff --git a/service/api/pom.xml b/service/api/pom.xml
index 03e6d44094b..07ee65c8364 100644
--- a/service/api/pom.xml
+++ b/service/api/pom.xml
@@ -23,10 +23,6 @@
     <artifactId>kapua-service-api</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntity.java b/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntity.java
index ba5fe3b1550..d301c24fce2 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntity.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntity.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.model;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.KapuaSerializable;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -48,7 +47,6 @@ public interface KapuaEntity extends KapuaSerializable {
      */
     @XmlElement(name = "id")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getId();
 
     /**
@@ -67,7 +65,6 @@ public interface KapuaEntity extends KapuaSerializable {
      */
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getScopeId();
 
     /**
@@ -96,6 +93,5 @@ public interface KapuaEntity extends KapuaSerializable {
      */
     @XmlElement(name = "createdBy")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getCreatedBy();
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntityCreator.java b/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntityCreator.java
index 3a773be2353..fdfcb82f3be 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntityCreator.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/KapuaEntityCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.model;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
 
@@ -36,7 +35,6 @@ public interface KapuaEntityCreator<E extends KapuaEntity> {
      */
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getScopeId();
 
     /**
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/KapuaUpdatableEntity.java b/service/api/src/main/java/org/eclipse/kapua/model/KapuaUpdatableEntity.java
index d3714876732..75a7761824a 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/KapuaUpdatableEntity.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/KapuaUpdatableEntity.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.model;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.entity.EntityPropertiesReadException;
 import org.eclipse.kapua.entity.EntityPropertiesWriteException;
 import org.eclipse.kapua.model.id.KapuaId;
@@ -55,7 +54,6 @@ public interface KapuaUpdatableEntity extends KapuaEntity {
      */
     @XmlElement(name = "modifiedBy")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getModifiedBy();
 
     /**
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/query/KapuaQuery.java b/service/api/src/main/java/org/eclipse/kapua/model/query/KapuaQuery.java
index 48472f3562d..58a623019d8 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/query/KapuaQuery.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/query/KapuaQuery.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.query;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -69,7 +68,6 @@ public interface KapuaQuery<E extends KapuaEntity> {
      */
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getScopeId();
 
     /**
diff --git a/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/ChannelInfo.java b/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/ChannelInfo.java
index eeabd310e86..1a9aa63f26c 100644
--- a/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/ChannelInfo.java
+++ b/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/ChannelInfo.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.datastore.model;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
 import org.eclipse.kapua.model.xml.DateXmlAdapter;
@@ -71,7 +70,6 @@ public interface ChannelInfo extends Storable {
      */
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getScopeId();
 
     /**
diff --git a/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/ClientInfo.java b/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/ClientInfo.java
index 1c914b84c22..0eb7e69b2d4 100644
--- a/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/ClientInfo.java
+++ b/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/ClientInfo.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.datastore.model;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
 import org.eclipse.kapua.model.xml.DateXmlAdapter;
@@ -70,7 +69,6 @@ public interface ClientInfo extends Storable {
      */
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getScopeId();
 
     /**
diff --git a/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/DatastoreMessage.java b/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/DatastoreMessage.java
index e0bb293b06c..5af76925b98 100644
--- a/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/DatastoreMessage.java
+++ b/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/DatastoreMessage.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.datastore.model;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.message.KapuaPayload;
 import org.eclipse.kapua.message.KapuaPosition;
 import org.eclipse.kapua.message.device.data.KapuaDataChannel;
@@ -99,7 +98,6 @@ public interface DatastoreMessage extends Storable {
      */
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getScopeId();
 
     /**
diff --git a/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/MetricInfo.java b/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/MetricInfo.java
index 7be5ddc8510..50c580cfdef 100644
--- a/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/MetricInfo.java
+++ b/service/datastore/api/src/main/java/org/eclipse/kapua/service/datastore/model/MetricInfo.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.datastore.model;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
 import org.eclipse.kapua.model.xml.DateXmlAdapter;
@@ -73,7 +72,6 @@ public interface MetricInfo extends Storable {
      */
     @XmlElement(name = "scopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getScopeId();
 
     /**
diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperation.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperation.java
index f8bcb4decf3..f27e654ccfd 100644
--- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperation.java
+++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperation.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.management.registry.operation;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaUpdatableEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -78,7 +77,6 @@ default String getType() {
      */
     @XmlElement(name = "deviceId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getDeviceId();
 
     /**
@@ -93,7 +91,6 @@ default String getType() {
      */
     @XmlElement(name = "operationId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getOperationId();
 
     /**
diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationCreator.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationCreator.java
index 5c9c7392943..f72d57c16cd 100644
--- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationCreator.java
+++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/DeviceManagementOperationCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.management.registry.operation;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -42,7 +41,6 @@ public interface DeviceManagementOperationCreator extends KapuaEntityCreator<Dev
 
     @XmlElement(name = "deviceId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getDeviceId();
 
     void setDeviceId(KapuaId deviceId);
@@ -50,7 +48,6 @@ public interface DeviceManagementOperationCreator extends KapuaEntityCreator<Dev
 
     @XmlElement(name = "operationId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getOperationId();
 
     void setOperationId(KapuaId operationId);
diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotification.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotification.java
index dbd5c9dd650..6818c1e9dd7 100644
--- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotification.java
+++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotification.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.management.registry.operation.notification;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -52,7 +51,6 @@ default String getType() {
      */
     @XmlElement(name = "operationId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getOperationId();
 
     /**
diff --git a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationCreator.java b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationCreator.java
index f83d87ec8b2..6a7eb9b582a 100644
--- a/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationCreator.java
+++ b/service/device/management/registry/api/src/main/java/org/eclipse/kapua/service/device/management/registry/operation/notification/ManagementOperationNotificationCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.management.registry.operation.notification;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -45,7 +44,6 @@ public interface ManagementOperationNotificationCreator extends KapuaEntityCreat
      */
     @XmlElement(name = "operationId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getOperationId();
 
     /**
diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/Device.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/Device.java
index 2c91046487e..2cc71dedb82 100644
--- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/Device.java
+++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/Device.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.registry;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaUpdatableEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -94,7 +93,6 @@ default String getType() {
     @XmlElementWrapper(name = "tagIds")
     @XmlElement(name = "tagId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     Set<KapuaId> getTagIds();
 
     /**
@@ -104,7 +102,6 @@ default String getType() {
      */
     @XmlElement(name = "groupId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getGroupId();
 
     /**
@@ -136,7 +133,6 @@ default String getType() {
      */
     @XmlElement(name = "connectionId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getConnectionId();
 
     /**
@@ -191,7 +187,6 @@ default String getType() {
      */
     @XmlElement(name = "lastEventId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getLastEventId();
 
     /**
diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceCreator.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceCreator.java
index 6b4bdfd310f..7ffeb95fa15 100644
--- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceCreator.java
+++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/DeviceCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.registry;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaUpdatableEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -75,7 +74,6 @@ public interface DeviceCreator extends KapuaUpdatableEntityCreator<Device> {
      */
     @XmlElement(name = "groupId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getGroupId();
 
     /**
@@ -122,7 +120,6 @@ public interface DeviceCreator extends KapuaUpdatableEntityCreator<Device> {
      */
     @XmlElement(name = "connectionId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getConnectionId();
 
     /**
@@ -139,7 +136,6 @@ public interface DeviceCreator extends KapuaUpdatableEntityCreator<Device> {
      */
     @XmlElement(name = "lastEventId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getLastEventId();
 
     /**
diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnection.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnection.java
index 73cfb8f31f7..45d0e80c602 100644
--- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnection.java
+++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/connection/DeviceConnection.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.registry.connection;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaUpdatableEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -89,7 +88,6 @@ default String getType() {
      */
     @XmlElement(name = "userId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getUserId();
 
     /**
@@ -136,7 +134,6 @@ default String getType() {
      */
     @XmlElement(name = "reservedUserId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getReservedUserId();
 
     /**
diff --git a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEvent.java b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEvent.java
index 741cf1ccdc9..a4a1e70c716 100644
--- a/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEvent.java
+++ b/service/device/registry/api/src/main/java/org/eclipse/kapua/service/device/registry/event/DeviceEvent.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.registry.event;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.message.KapuaPosition;
 import org.eclipse.kapua.model.KapuaEntity;
 import org.eclipse.kapua.model.id.KapuaId;
@@ -64,7 +63,6 @@ default String getType() {
      */
     @XmlElement(name = "deviceId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getDeviceId();
 
     /**
diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecution.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecution.java
index 9df15e266c6..9223f6db5b3 100644
--- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecution.java
+++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecution.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.job.execution;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaUpdatableEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -84,7 +83,6 @@ default String getType() {
      */
     @XmlElement(name = "targetIds")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     <I extends KapuaId> Set<I> getTargetIds();
 
     /**
diff --git a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionCreator.java b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionCreator.java
index 1f661e07da9..b3b66bde324 100644
--- a/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionCreator.java
+++ b/service/job/api/src/main/java/org/eclipse/kapua/service/job/execution/JobExecutionCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.job.execution;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaUpdatableEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -65,7 +64,6 @@ public interface JobExecutionCreator extends KapuaUpdatableEntityCreator<JobExec
      */
     @XmlElement(name = "targetIds")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     <I extends KapuaId> Set<I> getTargetIds();
 
     /**
diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/Credential.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/Credential.java
index 0a1cce1d77e..0a4b4c7ece3 100644
--- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/Credential.java
+++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/Credential.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authentication.credential;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaUpdatableEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -60,7 +59,6 @@ default String getType() {
      */
     @XmlElement(name = "userId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getUserId();
 
     /**
diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialCreator.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialCreator.java
index c51080ca206..8f14c40dc25 100644
--- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialCreator.java
+++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/credential/CredentialCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authentication.credential;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -46,7 +45,6 @@ public interface CredentialCreator extends KapuaEntityCreator<Credential> {
      */
     @XmlElement(name = "userId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getUserId();
 
     /**
@@ -85,7 +83,6 @@ public interface CredentialCreator extends KapuaEntityCreator<Credential> {
      *
      * @param plainKey
      */
-    @ApiModelProperty(name = "credentialKey")
     void setCredentialPlainKey(String plainKey);
 
     @XmlElement(name = "expirationDate")
diff --git a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessToken.java b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessToken.java
index 242c31e413a..0ed27879396 100644
--- a/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessToken.java
+++ b/service/security/authentication/api/src/main/java/org/eclipse/kapua/service/authentication/token/AccessToken.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authentication.token;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaUpdatableEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -78,7 +77,6 @@ default String getType() {
      */
     @XmlElement(name = "userId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getUserId();
 
     /**
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfo.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfo.java
index 48378c7ee62..1397d0fb31d 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfo.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfo.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.access;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaUpdatableEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -62,6 +61,5 @@ default String getType() {
      */
     @XmlElement(name = "userId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getUserId();
 }
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoCreator.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoCreator.java
index 6e161fa6af3..e35d0fd13f6 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoCreator.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessInfoCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.access;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -60,7 +59,6 @@ public interface AccessInfoCreator extends KapuaEntityCreator<AccessInfo> {
      */
     @XmlElement(name = "userId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getUserId();
 
     /**
@@ -82,7 +80,6 @@ public interface AccessInfoCreator extends KapuaEntityCreator<AccessInfo> {
     @XmlElementWrapper(name = "roleIds")
     @XmlElement(name = "roleId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     Set<KapuaId> getRoleIds();
 
     /**
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermission.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermission.java
index ec6cbf6cea1..270457aae11 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermission.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermission.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.access;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -65,7 +64,6 @@ default String getType() {
      */
     @XmlElement(name = "accessInfoId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getAccessInfoId();
 
     /**
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionCreator.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionCreator.java
index e0fbc1af76b..8d964fa2848 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionCreator.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessPermissionCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.access;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -52,7 +51,6 @@ public interface AccessPermissionCreator extends KapuaEntityCreator<AccessPermis
      */
     @XmlElement(name = "accessInfoId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getAccessInfoId();
 
     /**
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRole.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRole.java
index af9d26e9ebe..6ef964f795c 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRole.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRole.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.access;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.model.KapuaEntity;
 import org.eclipse.kapua.model.id.KapuaId;
@@ -69,7 +68,6 @@ default String getType() {
      */
     @XmlElement(name = "accessInfoId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getAccessInfoId();
 
     /**
@@ -88,6 +86,5 @@ default String getType() {
      */
     @XmlElement(name = "roleId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getRoleId();
 }
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleCreator.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleCreator.java
index b2bc6e19005..252fe31db51 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleCreator.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/access/AccessRoleCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.access;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -52,7 +51,6 @@ public interface AccessRoleCreator extends KapuaEntityCreator<AccessRole> {
      */
     @XmlElement(name = "accessInfoId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getAccessInfoId();
 
     /**
@@ -72,6 +70,5 @@ public interface AccessRoleCreator extends KapuaEntityCreator<AccessRole> {
      */
     @XmlElement(name = "roleId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getRoleId();
 }
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/Groupable.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/Groupable.java
index 1eb943eaec1..935e0e45427 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/Groupable.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/group/Groupable.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.group;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
 
@@ -39,7 +38,6 @@ public interface Groupable {
      */
     @XmlElement(name = "groupId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getGroupId();
 
 }
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/permission/Permission.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/permission/Permission.java
index d7825f8815c..b80ac76870f 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/permission/Permission.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/permission/Permission.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.permission;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.domain.Actions;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -100,7 +99,6 @@ public interface Permission {
      */
     @XmlElement(name = "targetScopeId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getTargetScopeId();
 
     /**
@@ -119,7 +117,6 @@ public interface Permission {
      */
     @XmlElement(name = "groupId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getGroupId();
 
     /**
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermission.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermission.java
index 157aec8fb30..8cdbb514e74 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermission.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermission.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.role;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -67,7 +66,6 @@ default String getType() {
      */
     @XmlElement(name = "roleId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getRoleId();
 
     /**
diff --git a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionCreator.java b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionCreator.java
index b29c570cf6c..61e429343cb 100644
--- a/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionCreator.java
+++ b/service/security/authorization/api/src/main/java/org/eclipse/kapua/service/authorization/role/RolePermissionCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.role;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -52,7 +51,6 @@ public interface RolePermissionCreator extends KapuaEntityCreator<RolePermission
      */
     @XmlElement(name = "roleId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getRoleId();
 
     /**
diff --git a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/CertificateCreator.java b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/CertificateCreator.java
index c4e1a955799..f8f9ca07b81 100644
--- a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/CertificateCreator.java
+++ b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/CertificateCreator.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.certificate;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaNamedEntityCreator;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -53,7 +52,6 @@ public interface CertificateCreator extends KapuaNamedEntityCreator<Certificate>
 
     @XmlElement(name = "caId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getCaId();
 
     void setCaId(KapuaId caId);
diff --git a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfo.java b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfo.java
index 762f24d89a2..473cede91c6 100644
--- a/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfo.java
+++ b/service/security/certificate/api/src/main/java/org/eclipse/kapua/service/certificate/info/CertificateInfo.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.certificate.info;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.KapuaNamedEntity;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
@@ -69,7 +68,6 @@ default String getType() {
 
     @XmlElement(name = "signature")
     @XmlJavaTypeAdapter(BinaryXmlAdapter.class)
-    @ApiModelProperty(dataType = "string")
     byte[] getSignature();
 
     void setSignature(byte[] signature);
@@ -108,7 +106,6 @@ default String getType() {
 
     @XmlElement(name = "caId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     KapuaId getCaId();
 
     void setCaId(KapuaId caId);
diff --git a/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/Taggable.java b/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/Taggable.java
index 76fcfceb547..aeb6bb16000 100644
--- a/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/Taggable.java
+++ b/service/tag/api/src/main/java/org/eclipse/kapua/service/tag/Taggable.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.tag;
 
-import io.swagger.annotations.ApiModelProperty;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdAdapter;
 
@@ -43,7 +42,6 @@ public interface Taggable {
      */
     @XmlElement(name = "tagId")
     @XmlJavaTypeAdapter(KapuaIdAdapter.class)
-    @ApiModelProperty(dataType = "string")
     <I extends KapuaId> Set<I> getTagIds();
 
 }