diff --git a/pom.xml b/pom.xml
index daede1c..fba637e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,11 +72,23 @@
 			<version>2.2.5</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<!-- FWS -->
 		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>gcf</artifactId>
+			<groupId>org.gcube.resources.discovery</groupId>
+			<artifactId>ic-client</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-scope-maps</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+<!-- 			UNCOMMENT THIS FOR RELEASE -->
+<!-- 			<scope>provided</scope> -->
+		</dependency>
+		<!-- END FWS -->
+
+
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
@@ -160,12 +172,12 @@
 			<version>[6.0.0-SNAPSHOT, 7.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.gcube.contentmanagement</groupId> -->
-<!-- 			<artifactId>storage-resource-link-plugin</artifactId> -->
-<!-- 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
-<!-- 			<scope>provided</scope> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.gcube.contentmanagement</groupId> -->
+		<!-- <artifactId>storage-resource-link-plugin</artifactId> -->
+		<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
+		<!-- <scope>provided</scope> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>wsmail-widget</artifactId>