diff --git a/pom.xml b/pom.xml
index e3fcc6e..26387b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,11 +57,11 @@
 			<groupId>org.gcube.resources.discovery</groupId>
 			<artifactId>ic-client</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT]</version>
-		</dependency>		
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
-			<artifactId>common-utils-encryption</artifactId>
-			<version>[1.0.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<artifactId>common-encryption</artifactId>
+			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resources</groupId>
@@ -73,17 +73,17 @@
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>1.6.4</version>
 			<scope>test</scope>
-		</dependency>		
+		</dependency>
 		<dependency>
- 			<groupId>com.thoughtworks.xstream</groupId>
+			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
 			<version>1.4.4</version>
 		</dependency>
 		<dependency>
-  <groupId>org.gcube.resources</groupId>
-  <artifactId>common-gcore-resources</artifactId>
-  <version>[1.1.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-</dependency>
+			<groupId>org.gcube.resources</groupId>
+			<artifactId>common-gcore-resources</artifactId>
+			<version>[1.1.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+		</dependency>
 	</dependencies>
 	<repositories>
 		<repository>
diff --git a/src/main/java/org/gcube/spatial/data/geonetwork/configuration/DefaultConfiguration.java b/src/main/java/org/gcube/spatial/data/geonetwork/configuration/DefaultConfiguration.java
index eeb1a56..97b9b36 100644
--- a/src/main/java/org/gcube/spatial/data/geonetwork/configuration/DefaultConfiguration.java
+++ b/src/main/java/org/gcube/spatial/data/geonetwork/configuration/DefaultConfiguration.java
@@ -8,11 +8,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import org.gcube.common.encryption.StringEncrypter;
 import org.gcube.common.resources.gcore.ServiceEndpoint;
 import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
 import org.gcube.common.resources.gcore.ServiceEndpoint.Property;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.common.utils.encryption.StringEncrypter;
 import org.gcube.resources.discovery.client.api.DiscoveryClient;
 import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
 import org.gcube.spatial.data.geonetwork.LoginLevel;