diff --git a/pom.xml b/pom.xml
index 1804d9b..35ef5be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,10 +35,11 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<!-- https://mvnrepository.com/artifact/org.glassfish.jersey/jersey-bom -->
 			<dependency>
 				<groupId>org.glassfish.jersey</groupId>
 				<artifactId>jersey-bom</artifactId>
-				<version>2.26-b03</version>
+				<version>2.25.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -55,7 +56,7 @@
 
 		<dependency>
 			<groupId>org.gcube.information-system</groupId>
-			<artifactId>resource-registry-client</artifactId>	
+			<artifactId>resource-registry-client</artifactId>
 		</dependency>
 
 		<dependency>
@@ -75,9 +76,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.gcube.information-system</groupId>
-			<artifactId>gcube-resources</artifactId>
-			<version>1.7.1-SNAPSHOT</version>
+			<groupId>org.gcube.resource-management</groupId>
+			<artifactId>gcube-model</artifactId>
 		</dependency>
 
 		<dependency>
@@ -85,11 +85,11 @@
 			<artifactId>resource-registry-context-client</artifactId>
 			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>gxJRS</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- jersey -->
@@ -125,13 +125,12 @@
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.test-framework.providers/jersey-test-framework-provider-simple -->
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
 			<artifactId>jersey-test-framework-provider-simple</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index c1592a8..f97bec8 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -91,22 +91,17 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.gcube.information-system</groupId>
-			<artifactId>gcube-resources</artifactId>
+			<groupId>org.gcube.resource-management</groupId>
+			<artifactId>gcube-model</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
-			<artifactId>gxRest</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<artifactId>gxJRS</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- jersey -->
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.1</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
@@ -137,12 +132,11 @@
 			<artifactId>resource-registry-context-client</artifactId>
 			<version>2.0.0-SNAPSHOT</version>
 		</dependency>
-	
-		<!-- Test Dependency -->
+
+		<!-- Runtime Dependency -->
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
-			<scope>runtime</scope>
 		</dependency>
 
 		<!-- Test Dependency -->
@@ -152,7 +146,7 @@
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.test-framework.providers/jersey-test-framework-provider-simple -->
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
 			<artifactId>jersey-test-framework-provider-simple</artifactId>
diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/ContextHolder.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/ContextHolder.java
index 564f5ad..dbe95e9 100644
--- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/ContextHolder.java
+++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/ContextHolder.java
@@ -1,8 +1,8 @@
 package org.gcube.resourcemanagement.manager.webapp.context;
 
 
-import org.gcube.informationsystem.impl.utils.ISMapper;
-import org.gcube.informationsystem.model.entity.Context;
+import org.gcube.informationsystem.model.impl.utils.ISMapper;
+import org.gcube.informationsystem.model.reference.entity.Context;
 
 
 /**
diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/CreateRequest.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/CreateRequest.java
index 220932f..a1178f6 100644
--- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/CreateRequest.java
+++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/CreateRequest.java
@@ -3,8 +3,8 @@ package org.gcube.resourcemanagement.manager.webapp.context;
 import java.util.Objects;
 
 import org.gcube.common.gxrest.response.outbound.LocalCodeException;
-import org.gcube.informationsystem.model.entity.Context;
-import org.gcube.informationsystem.model.relation.IsParentOf;
+import org.gcube.informationsystem.model.reference.entity.Context;
+import org.gcube.informationsystem.model.reference.relation.IsParentOf;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException;
 import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode;
diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/Queries.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/Queries.java
index 5ce15e2..e220d93 100644
--- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/Queries.java
+++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/Queries.java
@@ -2,8 +2,8 @@ package org.gcube.resourcemanagement.manager.webapp.context;
 
 import java.util.UUID;
 
-import org.gcube.informationsystem.model.entity.Context;
-import org.gcube.informationsystem.model.entity.Resource;
+import org.gcube.informationsystem.model.reference.entity.Context;
+import org.gcube.informationsystem.model.reference.entity.Resource;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient;
 import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory;
diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContexts.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContexts.java
index ca46f28..29bbdf7 100644
--- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContexts.java
+++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContexts.java
@@ -12,7 +12,8 @@ import javax.ws.rs.core.Response;
 import org.gcube.common.authorization.library.provider.CalledMethodProvider;
 import org.gcube.common.gxrest.response.outbound.GXOutboundErrorResponse;
 import org.gcube.common.gxrest.response.outbound.GXOutboundSuccessResponse;
-import org.gcube.informationsystem.model.entity.Context;
+import org.gcube.informationsystem.model.reference.entity.Context;
+
 import static org.gcube.resourcemanagement.manager.io.rs.RMContextsAccess.*;
 import org.gcube.resourcemanagement.manager.webapp.ResourceInitializer;
 import org.gcube.resourcemanagement.manager.webapp.context.CreateRequest;
diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMTestForGXRest.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMTestForGXRest.java
index 9837d90..388889f 100644
--- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMTestForGXRest.java
+++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMTestForGXRest.java
@@ -22,9 +22,9 @@ import javax.xml.bind.Unmarshaller;
 import org.gcube.common.authorization.library.provider.CalledMethodProvider;
 import org.gcube.common.gxrest.response.outbound.GXOutboundErrorResponse;
 import org.gcube.common.gxrest.response.outbound.GXOutboundSuccessResponse;
-import org.gcube.informationsystem.impl.entity.ContextImpl;
-import org.gcube.informationsystem.impl.utils.ISMapper;
-import org.gcube.informationsystem.model.entity.Context;
+import org.gcube.informationsystem.model.impl.entity.ContextImpl;
+import org.gcube.informationsystem.model.impl.utils.ISMapper;
+import org.gcube.informationsystem.model.reference.entity.Context;
 import org.gcube.resourcemanagement.manager.io.rs.RMContextDoesNotExistException;
 import org.gcube.resourcemanagement.manager.webapp.ResourceInitializer;
 import org.gcube.resourcemanagement.manager.webapp.context.ContextHolder;
diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java
index c289e54..b775027 100644
--- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java
+++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java
@@ -1,36 +1,24 @@
 package org.gcube.resourcemanagement.manager.webapp.context;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 import java.util.UUID;
 
-import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Application;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.Response.StatusType;
 
 import org.gcube.common.authorization.client.Constants;
 import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
 import org.gcube.common.authorization.library.AuthorizationEntry;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.common.gxrest.response.inbound.GXInboundResponse;
-import org.gcube.common.gxrest.response.outbound.CodeFinder;
-import org.gcube.common.gxrest.response.outbound.ErrorCode;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.informationsystem.impl.entity.ContextImpl;
-import org.gcube.informationsystem.impl.utils.ISMapper;
-import org.gcube.informationsystem.model.entity.Context;
-import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient;
-import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientImpl;
-import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode;
-import org.gcube.resourcemanagement.manager.io.rs.RMContextDoesNotExistException;
 import org.gcube.resourcemanagement.manager.io.rs.RMContextsAccess;
-import org.gcube.resourcemanagement.manager.webapp.rs.RMContexts;
 import org.gcube.resourcemanagement.manager.webapp.rs.RMTestForGXRest;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
@@ -44,8 +32,6 @@ import org.junit.runners.MethodSorters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-
 /**
  * Test cases for the Context methods.
  * 
diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java
index 9acc9a9..34c7ad9 100644
--- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java
+++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/QueriesTest.java
@@ -16,7 +16,7 @@ import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
 import org.gcube.common.authorization.library.AuthorizationEntry;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.informationsystem.model.entity.Context;
+import org.gcube.informationsystem.model.reference.entity.Context;
 import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClient;
 import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientImpl;
 import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient;
diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java
index 8379ef3..4b74111 100644
--- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java
+++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java
@@ -21,9 +21,9 @@ import org.gcube.common.gxrest.response.inbound.GXInboundResponse;
 import org.gcube.common.gxrest.response.outbound.CodeFinder;
 import org.gcube.common.gxrest.response.outbound.ErrorCode;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.informationsystem.impl.entity.ContextImpl;
-import org.gcube.informationsystem.impl.utils.ISMapper;
-import org.gcube.informationsystem.model.entity.Context;
+import org.gcube.informationsystem.model.impl.entity.ContextImpl;
+import org.gcube.informationsystem.model.impl.utils.ISMapper;
+import org.gcube.informationsystem.model.reference.entity.Context;
 import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient;
 import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientImpl;
 import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode;