diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc7586f..829e226 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for Resource Registry Handlers
 
+## [v2.2.0-SNAPSHOT]
+
+- Enhanced gcube-smartgears-bom version
+
+
 ## [v2.1.0]
 
 - Aligned model with the model defined in Luca Frosini PhD dissertation [#20367]
diff --git a/pom.xml b/pom.xml
index 52709d9..5142a8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 	
 	<groupId>org.gcube.smartgears.handlers</groupId>
 	<artifactId>resource-registry-handlers</artifactId>
-	<version>2.1.0</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<name>Resource Registry Handlers</name>
 	<description>Smartgears Handler to publish HostingNode and EService on Resource Registry</description>
 
@@ -29,7 +29,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.2.0</version>
+				<version>2.3.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
index ffba9cf..8bdb9b3 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/EServiceManager.java
@@ -22,7 +22,6 @@ import org.gcube.informationsystem.model.reference.properties.PropagationConstra
 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.resourceregistry.api.contexts.ContextCache;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
@@ -32,7 +31,7 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien
 import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory;
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher;
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory;
-import org.gcube.informationsystem.utils.ElementMapper;
+import org.gcube.informationsystem.serialization.ElementMapper;
 import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl;
@@ -43,14 +42,11 @@ import org.gcube.resourcemanagement.model.impl.relations.consistsof.IsIdentified
 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.EventFacet;
-import org.gcube.resourcemanagement.model.reference.entities.facets.MemoryFacet;
 import org.gcube.resourcemanagement.model.reference.entities.facets.SoftwareFacet;
 import org.gcube.resourcemanagement.model.reference.entities.facets.StateFacet;
 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.HasPersistentMemory;
-import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasVolatileMemory;
 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;
diff --git a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
index 9b768eb..01503b7 100644
--- a/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
+++ b/src/main/java/org/gcube/smartgears/handler/resourceregistry/resourcemanager/HostingNodeManager.java
@@ -39,7 +39,6 @@ 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.resourceregistry.api.contexts.ContextCache;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
@@ -49,7 +48,7 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien
 import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory;
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher;
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory;
-import org.gcube.informationsystem.utils.ElementMapper;
+import org.gcube.informationsystem.serialization.ElementMapper;
 import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.LocationFacetImpl;
@@ -80,7 +79,6 @@ import org.gcube.smartgears.configuration.container.Site;
 import org.gcube.smartgears.configuration.library.SmartGearsConfiguration;
 import org.gcube.smartgears.context.container.ContainerContext;
 import org.gcube.smartgears.handler.resourceregistry.ContextUtility;
-import org.gcube.smartgears.lifecycle.container.ContainerState;
 import org.gcube.smartgears.provider.ProviderFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;