diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/ResourceRegistryContextListener.java b/src/main/java/org/gcube/informationsystem/resourceregistry/ResourceRegistryContextListener.java
index c6fb5d2..b9e21d0 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/ResourceRegistryContextListener.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/ResourceRegistryContextListener.java
@@ -6,6 +6,9 @@ import javax.servlet.ServletContextListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class ResourceRegistryContextListener implements ServletContextListener {
 
 	private static Logger logger = LoggerFactory.getLogger(ResourceRegistryContextListener.class);
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java
index ff7b0c0..339e34a 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java
@@ -41,7 +41,6 @@ import com.orientechnologies.orient.core.record.OEdge;
 import com.orientechnologies.orient.core.record.OVertex;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/BaseRest.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/BaseRest.java
index e056d55..5f5a397 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/BaseRest.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/BaseRest.java
@@ -10,6 +10,9 @@ import org.gcube.informationsystem.resourceregistry.contexts.ContextUtility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class BaseRest {
 	
 	protected Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManager.java b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManager.java
index a9930b2..a7f800b 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManager.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/rest/SharingManager.java
@@ -24,6 +24,9 @@ import org.gcube.informationsystem.resourceregistry.instances.base.ElementManage
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 @Path(SharingPath.SHARING_PATH_PART)
 public class SharingManager {
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/OrientDBTypeMapping.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/OrientDBTypeMapping.java
index 122b81d..5999542 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/OrientDBTypeMapping.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/OrientDBTypeMapping.java
@@ -9,6 +9,7 @@ import com.orientechnologies.orient.core.metadata.schema.OType;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
+ * 
  * Create a mapping between OrientDB {@link OType} 
  * https://orientdb.gitbooks.io/orientdb-manual/content/orientdb.wiki/Types.html
  * and {@link BaseType} 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java
index 89f8194..e34a7f8 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/EntityTypeDefinitionManagement.java
@@ -28,6 +28,9 @@ import com.orientechnologies.orient.core.record.OVertex;
 import com.orientechnologies.orient.core.sql.executor.OResult;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public abstract class EntityTypeDefinitionManagement<E extends EntityType> extends EntityElementManagement<E> {
 	
 	private static Logger logger = LoggerFactory.getLogger(EntityTypeDefinitionManagement.class);
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/FacetTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/FacetTypeDefinitionManagement.java
index 868e6dc..05e5475 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/FacetTypeDefinitionManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/FacetTypeDefinitionManagement.java
@@ -6,6 +6,9 @@ import org.gcube.informationsystem.types.reference.entities.FacetType;
 
 import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class FacetTypeDefinitionManagement extends EntityTypeDefinitionManagement<FacetType> {
 	
 	public FacetTypeDefinitionManagement() {
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/ResourceTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/ResourceTypeDefinitionManagement.java
index 57c668d..37fd25d 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/ResourceTypeDefinitionManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/entities/ResourceTypeDefinitionManagement.java
@@ -6,6 +6,9 @@ import org.gcube.informationsystem.types.reference.entities.ResourceType;
 
 import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class ResourceTypeDefinitionManagement extends EntityTypeDefinitionManagement<ResourceType> {
 	
 	public ResourceTypeDefinitionManagement() {
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java
index 326d4fd..d5c3ceb 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/properties/PropertyTypeDefinitionManagement.java
@@ -27,6 +27,9 @@ import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.sql.executor.OResult;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class PropertyTypeDefinitionManagement extends ElementManagement<OElement> {
 	
 	private static Logger logger = LoggerFactory.getLogger(PropertyTypeDefinitionManagement.class);
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/ConsistsOfTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/ConsistsOfTypeDefinitionManagement.java
index eaf236b..c993bec 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/ConsistsOfTypeDefinitionManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/ConsistsOfTypeDefinitionManagement.java
@@ -8,6 +8,9 @@ import org.gcube.informationsystem.types.reference.relations.ConsistsOfType;
 
 import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class ConsistsOfTypeDefinitionManagement
 		extends RelationTypeDefinitionManagement<FacetTypeDefinitionManagement,FacetType> {
 	
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/IsRelatedToTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/IsRelatedToTypeDefinitionManagement.java
index 2aa890e..78abe18 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/IsRelatedToTypeDefinitionManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/IsRelatedToTypeDefinitionManagement.java
@@ -8,6 +8,9 @@ import org.gcube.informationsystem.types.reference.relations.IsRelatedToType;
 
 import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class IsRelatedToTypeDefinitionManagement
 		extends RelationTypeDefinitionManagement<ResourceTypeDefinitionManagement,ResourceType> {
 	
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java
index 944ecfc..0479b51 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/types/relations/RelationTypeDefinitionManagement.java
@@ -30,6 +30,9 @@ import com.orientechnologies.orient.core.record.OVertex;
 import com.orientechnologies.orient.core.sql.executor.OResult;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public abstract class RelationTypeDefinitionManagement<T extends EntityTypeDefinitionManagement<TT>, TT extends EntityType>
 		extends RelationElementManagement<ResourceTypeDefinitionManagement, T> {
 	
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
index b0213ad..ded295e 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/ContextTest.java
@@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
- *
  */
 public class ContextTest {
 	
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java
index e34768a..f3b2963 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextManagementTest.java
@@ -33,6 +33,9 @@ import com.orientechnologies.orient.core.metadata.security.ORole;
 import com.orientechnologies.orient.core.metadata.security.OSecurity;
 import com.orientechnologies.orient.core.metadata.security.OUser;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class ContextManagementTest extends ContextTest {
 	
 	private static Logger logger = LoggerFactory.getLogger(ContextManagementTest.class);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironmentTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironmentTest.java
index 169640d..8c84543 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironmentTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironmentTest.java
@@ -12,6 +12,9 @@ import org.slf4j.LoggerFactory;
 import com.orientechnologies.orient.core.db.ODatabase.ATTRIBUTES;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocument;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class DatabaseEnvironmentTest {
 	
 	private static Logger logger = LoggerFactory.getLogger(DatabaseEnvironmentTest.class);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/AbstractERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/AbstractERManagementTest.java
index f4c0c86..c874bb7 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/AbstractERManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/AbstractERManagementTest.java
@@ -3,6 +3,9 @@ package org.gcube.informationsystem.resourceregistry.instances;
 import org.gcube.informationsystem.base.reference.IdentifiableElement;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public abstract class AbstractERManagementTest<Er extends IdentifiableElement> {
 
 	public abstract Er create(Er er) throws ResourceRegistryException;
@@ -12,4 +15,5 @@ public abstract class AbstractERManagementTest<Er extends IdentifiableElement> {
 	public abstract Er read(Er er) throws ResourceRegistryException;
 	
 	public abstract boolean delete(Er er) throws ResourceRegistryException;
+	
 }
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/DiscoveryTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/DiscoveryTest.java
index dafaf07..5b2b5f0 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/DiscoveryTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/DiscoveryTest.java
@@ -13,6 +13,9 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class DiscoveryTest {
 	
 	private static Logger logger = LoggerFactory.getLogger(DiscoveryTest.class);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java
index 6bfdbee..5ee528d 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java
@@ -81,7 +81,6 @@ import com.orientechnologies.orient.core.record.ODirection;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
- * 
  */
 public class ERManagementTest extends ContextTest {
 
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/EncryptionTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/EncryptionTest.java
index 31d03ef..1f9d3ca 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/EncryptionTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/EncryptionTest.java
@@ -9,6 +9,9 @@ import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnv
 import org.junit.Assert;
 import org.junit.Test;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class EncryptionTest extends ContextTest {
 	
 	public static final String PLAIN_VALUE = "my-test";
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/SmartgearResourcesTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/SmartgearResourcesTest.java
index 655cfb2..e21d2bc 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/SmartgearResourcesTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/SmartgearResourcesTest.java
@@ -74,7 +74,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
- * 
  */
 public class SmartgearResourcesTest extends ContextTest {
 
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/ResourceManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/ResourceManagementTest.java
index 67f03ec..4c0810c 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/ResourceManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/model/entity/ResourceManagementTest.java
@@ -38,6 +38,9 @@ import org.slf4j.LoggerFactory;
 
 import com.orientechnologies.orient.core.record.ODirection;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class ResourceManagementTest extends ContextTest {
 
 	private static Logger logger = LoggerFactory.getLogger(ResourceManagementTest.class);
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java
index 62ab22e..8057d9e 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/BasicTest.java
@@ -78,7 +78,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
- * 
  */
 public class BasicTest extends ContextTest {
 
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/RuleTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/RuleTest.java
index 4755bd5..cc7cfbf 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/RuleTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/multicontext/RuleTest.java
@@ -20,6 +20,9 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class RuleTest extends ContextTest {
 
 	private static Logger logger = LoggerFactory
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/query/QueryTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/query/QueryTest.java
index 53e2b24..32aa5b6 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/query/QueryTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/query/QueryTest.java
@@ -12,7 +12,6 @@ import org.slf4j.LoggerFactory;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
- *
  */
 public class QueryTest extends ContextTest {
 
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet.java b/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet.java
index e4bd3e6..80826ef 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet.java
@@ -12,15 +12,6 @@ import org.gcube.informationsystem.utils.TypeVersion;
 import org.gcube.resourcemanagement.model.impl.entities.facets.SimpleFacetImpl;
 
 /**
- * A sort of catch all.
- * It does not define any property.
- * It is mainly used to one or more arbitrary properties to the resource.  
- * Before using SimpleFacet a developer should evaluate if it is possible to identify a specific Facet 
- * to capture the particular aspect of the resource. 
- * The usage of SimpleFacet should be reduced to the maximum.
- * 
- * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Simple_Property_Facet
- * 
  * @author Luca Frosini (ISTI - CNR)
  */
 @JsonDeserialize(as=SimpleFacetImpl.class)
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet1_0_1.java b/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet1_0_1.java
index 25ec8b1..a06382e 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet1_0_1.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet1_0_1.java
@@ -12,15 +12,6 @@ import org.gcube.informationsystem.utils.TypeVersion;
 import org.gcube.resourcemanagement.model.impl.entities.facets.SimpleFacetImpl;
 
 /**
- * A sort of catch all.
- * It does not define any property.
- * It is mainly used to one or more arbitrary properties to the resource.  
- * Before using SimpleFacet a developer should evaluate if it is possible to identify a specific Facet 
- * to capture the particular aspect of the resource. 
- * The usage of SimpleFacet should be reduced to the maximum.
- * 
- * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Simple_Property_Facet
- * 
  * @author Luca Frosini (ISTI - CNR)
  */
 @JsonDeserialize(as=SimpleFacetImpl.class)
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet1_0_2.java b/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet1_0_2.java
index 35d14c5..91fd129 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet1_0_2.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/types/TestFacet1_0_2.java
@@ -12,15 +12,6 @@ import org.gcube.informationsystem.utils.TypeVersion;
 import org.gcube.resourcemanagement.model.impl.entities.facets.SimpleFacetImpl;
 
 /**
- * A sort of catch all.
- * It does not define any property.
- * It is mainly used to one or more arbitrary properties to the resource.  
- * Before using SimpleFacet a developer should evaluate if it is possible to identify a specific Facet 
- * to capture the particular aspect of the resource. 
- * The usage of SimpleFacet should be reduced to the maximum.
- * 
- * https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#Simple_Property_Facet
- * 
  * @author Luca Frosini (ISTI - CNR)
  */
 @JsonDeserialize(as=SimpleFacetImpl.class)