diff --git a/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
index 95a8ba4..3d3fd3c 100644
--- a/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
+++ b/src/main/java/org/gcube/gcat/configuration/isproxies/FacetBasedISConfigurationProxy.java
@@ -25,12 +25,12 @@ import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
 import org.gcube.informationsystem.model.impl.properties.PropagationConstraintImpl;
 import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl;
 import org.gcube.informationsystem.model.reference.entities.Entity;
-import org.gcube.informationsystem.model.reference.properties.Encrypted;
 import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.AddConstraint;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.DeleteConstraint;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint.RemoveConstraint;
+import org.gcube.informationsystem.model.reference.properties.Vault;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.queries.templates.reference.entities.QueryTemplate;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;
@@ -386,8 +386,8 @@ public class FacetBasedISConfigurationProxy extends ISConfigurationProxy<SimpleF
 	public ServiceCatalogueConfiguration setCkanServiceInfo(ServiceCatalogueConfiguration catalogueConfiguration) throws Exception {
 		AccessPointFacet ckanServiceAccessPointFacet = queryCkanServiceAccessPointFacet();
 		catalogueConfiguration.setCkanURL(ckanServiceAccessPointFacet.getEndpoint().toString());
-		Encrypted encrypted = (Encrypted) ckanServiceAccessPointFacet.getAdditionalProperty(CatalogueConfiguration.SYS_ADMIN_TOKEN_KEY);
-		String encryptedPassword = encrypted.getEncryptedValue();
+		Vault vault = (Vault) ckanServiceAccessPointFacet.getAdditionalProperty(CatalogueConfiguration.SYS_ADMIN_TOKEN_KEY);
+		String encryptedPassword = vault.getValue();
 		catalogueConfiguration.setSysAdminToken(encryptedPassword);
 		return catalogueConfiguration;
 	}
@@ -397,8 +397,8 @@ public class FacetBasedISConfigurationProxy extends ISConfigurationProxy<SimpleF
 		ServiceCKANDB ckanDB = new ServiceCKANDB();
 		String ckanDbURL = postgresCkanDBAccessPointFacet.getEndpoint().toString(); 
 		ckanDB.setUrl(ckanDbURL);
-		Encrypted encrypted = (Encrypted) postgresCkanDBAccessPointFacet.getAdditionalProperty(ServiceCKANDB.PASSWORD_KEY);
-		String encryptedPassword = encrypted.getEncryptedValue();
+		Vault vault = (Vault) postgresCkanDBAccessPointFacet.getAdditionalProperty(ServiceCKANDB.PASSWORD_KEY);
+		String encryptedPassword = vault.getValue();
 		ckanDB.setEncryptedPassword(encryptedPassword);
 		String username = (String) postgresCkanDBAccessPointFacet.getAdditionalProperty(ServiceCKANDB.USERNAME_KEY);
 		ckanDB.setUsername(username);
diff --git a/src/test/java/org/gcube/gcat/oldutils/ValidatorTest.java b/src/test/java/org/gcube/gcat/oldutils/ValidatorTest.java
index 94b77f4..8a8f3a2 100644
--- a/src/test/java/org/gcube/gcat/oldutils/ValidatorTest.java
+++ b/src/test/java/org/gcube/gcat/oldutils/ValidatorTest.java
@@ -1,18 +1,10 @@
 package org.gcube.gcat.oldutils;
 
 import org.gcube.gcat.ContextTest;
-import org.gcube.informationsystem.model.impl.properties.EncryptedImpl;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class ValidatorTest extends ContextTest {
 	
-	@Test
-	public void testPWd() throws Exception {
-		String pwd = EncryptedImpl.decrypt("");
-		Assert.assertTrue(true);
-	}
-	
 	@Test
 	public void createGroupAsSysAdmin() throws Exception {
 		String groupName = "Italian";