diff --git a/.classpath b/.classpath
index 510cf3c..5fe0d51 100644
--- a/.classpath
+++ b/.classpath
@@ -6,7 +6,13 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/pom.xml b/pom.xml
index 0b8b895..cbf524e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,48 +121,40 @@
 			<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library</artifactId>
-			<version>[2.5.0,)</version>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>asm-all</artifactId>
-					<groupId>asm</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library-jcr</artifactId>
-			<version>[2.5.0,)</version>
-			<scope>provided</scope>
+			<artifactId>storagehub-client-wrapper</artifactId>
+			<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
+			<scope>compile</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
 			<artifactId>usermanagement-core</artifactId>
 			<version>[2.0.0,)</version>
 			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
-			<groupId>org.gcube.data-catalogue</groupId>
-			<artifactId>ckan-util-library</artifactId>
-			<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
+			<groupId>org.gcube.datacatalogue</groupId>
+			<artifactId>catalogue-util-library</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0)</version>
 			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.gcube.data-catalogue</groupId>
-					<artifactId>gcubedatacatalogue-metadata-discovery</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
+
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
 			<scope>provided</scope>
 			<!-- put at provided for deploying -->
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.portlets.widgets</groupId>
+			<artifactId>workspace-explorer</artifactId>
+			<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
+			<scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>