diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/ContextManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/ContextManagement.java
index d68e799..4cbd2fd 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/ContextManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/ContextManagement.java
@@ -5,7 +5,7 @@ package org.gcube.informationsystem.resourceregistry.api;
 
 import java.util.UUID;
 
-import org.gcube.informationsystem.resourceregistry.api.exceptions.InternalException;
+import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextCreationException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
@@ -15,7 +15,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.context.Conte
  */
 public interface ContextManagement {
 
-	public String create(UUID parentContext, String name) throws ContextCreationException, InternalException;
+	public String create(UUID parentContext, String name) throws ContextCreationException, ResourceRegistryException;
 	
 	public String read(UUID context) throws ContextNotFoundException, ContextException;
 	
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/InternalException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/InternalException.java
deleted file mode 100644
index 4e72ace..0000000
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/InternalException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions;
-
-import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- * 
- */
-public class InternalException extends ResourceRegistryException {
-
-	/**
-	 * Generated Serial Version UID
-	 */
-	private static final long serialVersionUID = 1785473902200354712L;
-
-
-	public InternalException(String message) {
-		super(message);
-	}
-
-	public InternalException(Throwable cause) {
-		super(cause);
-	}
-	
-	public InternalException(String message, Throwable cause) {
-		super(message, cause);
-	}
-	
-	
-}
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/NotAllowedException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/NotAllowedException.java
deleted file mode 100644
index 267df07..0000000
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/NotAllowedException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions;
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- * 
- */
-public interface NotAllowedException {
-	
-}
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAlreadyPresentException.java
index d97b296..4cd80e9 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAlreadyPresentException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAlreadyPresentException.java
@@ -16,5 +16,13 @@ public class EntityAlreadyPresentException extends EntityException implements El
 	public EntityAlreadyPresentException(String message) {
 		super(message);
 	}
+	
+	public EntityAlreadyPresentException(Throwable cause) {
+		super(cause);
+	}
+	
+	public EntityAlreadyPresentException(String message, Throwable cause) {
+		super(message, cause);
+	}
 
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityNotFoundException.java
index c0243e2..2dc5db2 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityNotFoundException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityNotFoundException.java
@@ -17,4 +17,11 @@ public class EntityNotFoundException extends EntityException implements ElementN
 		super(message);
 	}
 
+	public EntityNotFoundException(Throwable cause) {
+		super(cause);
+	}
+	
+	public EntityNotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetNotFoundException.java
index 3d6f92d..5a98201 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetNotFoundException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetNotFoundException.java
@@ -18,4 +18,12 @@ public class FacetNotFoundException extends EntityNotFoundException {
 		super(message);
 	}
 
+	public FacetNotFoundException(Throwable cause) {
+		super(cause);
+	}
+	
+	public FacetNotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAlreadyPresentException.java
index c0b4b39..661e9f0 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAlreadyPresentException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAlreadyPresentException.java
@@ -18,4 +18,11 @@ public class ResourceAlreadyPresentException extends EntityAlreadyPresentExcepti
 		super(message);
 	}
 
+	public ResourceAlreadyPresentException(Throwable cause) {
+		super(cause);
+	}
+	
+	public ResourceAlreadyPresentException(String message, Throwable cause) {
+		super(message, cause);
+	}
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceNotFoundException.java
index 0981880..f0fa61d 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceNotFoundException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceNotFoundException.java
@@ -18,4 +18,12 @@ public class ResourceNotFoundException extends EntityNotFoundException {
 		super(message);
 	}
 
+	public ResourceNotFoundException(Throwable cause) {
+		super(cause);
+	}
+	
+	public ResourceNotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAlreadyPresentException.java
index e67dcc9..b6fb9e3 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAlreadyPresentException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAlreadyPresentException.java
@@ -17,4 +17,12 @@ public class RelationAlreadyPresentException extends RelationException implement
 		super(message);
 	}
 
+	public RelationAlreadyPresentException(Throwable cause) {
+		super(cause);
+	}
+	
+	public RelationAlreadyPresentException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationException.java
index 73c72cf..b458e1c 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationException.java
@@ -25,5 +25,4 @@ public class RelationException extends ResourceRegistryException {
 		super(message, cause);
 	}
 	
-	
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationNotFoundException.java
index 7b046bb..1d33c7b 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationNotFoundException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationNotFoundException.java
@@ -18,4 +18,12 @@ public class RelationNotFoundException extends RelationException implements Elem
 		super(message);
 	}
 
+	public RelationNotFoundException(Throwable cause) {
+		super(cause);
+	}
+	
+	public RelationNotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaException.java
index b7faad5..2296f21 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaException.java
@@ -25,5 +25,4 @@ public class SchemaException extends ResourceRegistryException {
 		super(message, cause);
 	}
 	
-	
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaNotFoundException.java
index da31683..d054559 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaNotFoundException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaNotFoundException.java
@@ -24,4 +24,5 @@ public class SchemaNotFoundException extends SchemaException implements ElementN
 	public SchemaNotFoundException(String message, Throwable cause) {
 		super(message, cause);
 	}
+	
 }