diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
index 0b91091..3b2d9a1 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
@@ -25,17 +25,15 @@ import org.gcube.common.authorization.client.proxy.AuthorizationProxy;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.common.events.Observes;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
+import org.gcube.informationsystem.base.impl.properties.HeaderImpl;
+import org.gcube.informationsystem.base.reference.properties.Header;
 import org.gcube.informationsystem.model.impl.properties.PropagationConstraintImpl;
 import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl;
-import org.gcube.informationsystem.model.impl.relations.IsIdentifiedByImpl;
 import org.gcube.informationsystem.model.reference.entities.Resource;
-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.RemoveConstraint;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
-import org.gcube.informationsystem.model.reference.relations.IsIdentifiedBy;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
@@ -48,6 +46,7 @@ import org.gcube.resourcemanagement.model.impl.entities.facets.ServiceStateFacet
 import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.resources.EServiceImpl;
 import org.gcube.resourcemanagement.model.impl.properties.ValueSchemaImpl;
+import org.gcube.resourcemanagement.model.impl.relations.consistsof.IsIdentifiedByImpl;
 import org.gcube.resourcemanagement.model.impl.relations.isrelatedto.ActivatesImpl;
 import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet;
 import org.gcube.resourcemanagement.model.reference.entities.facets.ServiceStateFacet;
@@ -55,6 +54,7 @@ import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFace
 import org.gcube.resourcemanagement.model.reference.entities.resources.EService;
 import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode;
 import org.gcube.resourcemanagement.model.reference.properties.ValueSchema;
+import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy;
 import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Activates;
 import org.gcube.smartgears.configuration.application.ApplicationConfiguration;
 import org.gcube.smartgears.configuration.container.ContainerConfiguration;
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java
index 7f90265..ac5754b 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/HostingNodeManager.java
@@ -40,13 +40,11 @@ import org.gcube.common.authorization.client.proxy.AuthorizationProxy;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.common.events.Observes;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
-import org.gcube.informationsystem.model.impl.relations.IsIdentifiedByImpl;
+import org.gcube.informationsystem.base.impl.properties.HeaderImpl;
+import org.gcube.informationsystem.base.reference.properties.Header;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
-import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
-import org.gcube.informationsystem.model.reference.relations.IsIdentifiedBy;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresentException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;
@@ -64,6 +62,7 @@ import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl
 import org.gcube.resourcemanagement.model.impl.entities.resources.HostingNodeImpl;
 import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasPersistentMemoryImpl;
 import org.gcube.resourcemanagement.model.impl.relations.consistsof.HasVolatileMemoryImpl;
+import org.gcube.resourcemanagement.model.impl.relations.consistsof.IsIdentifiedByImpl;
 import org.gcube.resourcemanagement.model.reference.entities.facets.CPUFacet;
 import org.gcube.resourcemanagement.model.reference.entities.facets.ContainerStateFacet;
 import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet;
@@ -74,6 +73,7 @@ import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFace
 import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode;
 import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasPersistentMemory;
 import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory;
+import org.gcube.resourcemanagement.model.reference.relations.consistsof.IsIdentifiedBy;
 import org.gcube.smartgears.configuration.container.ContainerConfiguration;
 import org.gcube.smartgears.configuration.library.SmartGearsConfiguration;
 import org.gcube.smartgears.context.Property;
@@ -606,7 +606,6 @@ public class HostingNodeManager extends ContainerHandler {
 		return memoryFacet;
 	}
 
-	@SuppressWarnings("restriction")
 	private MemoryFacet getRamInfo(MemoryFacet memoryFacet) {
 		if (memoryFacet == null) {
 			memoryFacet = new MemoryFacetImpl();