diff --git a/enunciate.xml b/enunciate.xml
index 415d571..4f38725 100644
--- a/enunciate.xml
+++ b/enunciate.xml
@@ -3,16 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.14.0.xsd">
 	<api-classes>
-		<exclude pattern="org.gcube.gcat.annotation.*" />
-		<exclude pattern="org.gcube.gcat.configuration.*" />
-		<exclude pattern="org.gcube.gcat.moderation.*" />
-		<exclude pattern="org.gcube.gcat.oldutils.*" />
-		<exclude pattern="org.gcube.gcat.persistence.*" />
-		<exclude pattern="org.gcube.gcat.profile.*" />
+		<include pattern="org.gcube.gcat.rest.*" />
+		<exclude pattern="org.gcube.gcat.*" />
 		<exclude pattern="org.gcube.gcat.rest.Docs" />
-		<exclude pattern="org.gcube.gcat.social.*" />
-		<exclude pattern="org.gcube.gcat.utils.*" />
-		<exclude pattern="org.gcube.gcat.workspace.*" />
 	</api-classes>
 	<modules>
 		<gwt-json-overlay disabled="true " />
diff --git a/pom.xml b/pom.xml
index 02de090..e71ab2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
    			<artifactId>uri-resolver-manager</artifactId>
-   			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+   			<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>