diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/MetadataOrient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/MetadataOrient.java
index 7b9eff7..c2bb2c1 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/MetadataOrient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/MetadataOrient.java
@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.Map;
 
 import org.gcube.informationsystem.model.reference.properties.Metadata;
+import org.gcube.informationsystem.utils.TypeUtility;
 
 import com.orientechnologies.orient.core.record.impl.ODocument;
 
@@ -85,4 +86,9 @@ public class MetadataOrient extends ODocument implements Metadata {
 		return ret;
 	}
 	
+	@Override
+	public String getTypeName() {
+		return TypeUtility.getTypeName(this.getClass());
+	}
+	
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/PropagationConstraintOrient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/PropagationConstraintOrient.java
index 8158156..77dfd07 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/PropagationConstraintOrient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/PropagationConstraintOrient.java
@@ -3,6 +3,7 @@ package org.gcube.informationsystem.resourceregistry.utils;
 import java.util.Map;
 
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
+import org.gcube.informationsystem.utils.TypeUtility;
 
 import com.orientechnologies.orient.core.record.impl.ODocument;
 
@@ -76,4 +77,9 @@ public class PropagationConstraintOrient extends ODocument implements org.gcube.
 		return ret;
 	}
 	
+	@Override
+	public String getTypeName() {
+		return TypeUtility.getTypeName(this.getClass());
+	}
+	
 }
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java
index 587f56f..b0809b0 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/ERManagementTest.java
@@ -36,7 +36,6 @@ import org.gcube.informationsystem.resourceregistry.instances.model.relations.Co
 import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement;
 import org.gcube.informationsystem.resourceregistry.utils.MetadataUtility;
 import org.gcube.informationsystem.serialization.ElementMapper;
-import org.gcube.informationsystem.utils.TypeUtility;
 import org.gcube.resourcemanagement.model.impl.entities.facets.AccessPointFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl;
@@ -328,7 +327,7 @@ public class ERManagementTest extends ContextTest {
 	
 	public static <R extends Resource> ResourceManagement getResourceManagement(R r) throws Exception {
 		ResourceManagement resourceManagement = new ResourceManagement();
-		resourceManagement.setElementType(TypeUtility.getTypeName(r));
+		resourceManagement.setElementType(r.getTypeName());
 		resourceManagement.setJson(ElementMapper.marshal(r));
 		if(r.getUUID()!=null) {
 			resourceManagement.setUUID(r.getUUID());
@@ -338,7 +337,7 @@ public class ERManagementTest extends ContextTest {
 
 	public static <R extends Resource> IsRelatedToManagement getIsRelatedToManagement(IsRelatedTo<? extends Resource, ? extends Resource> isRelatedTo) throws Exception {
 		IsRelatedToManagement isRelatedToManagement = new IsRelatedToManagement();
-		isRelatedToManagement.setElementType(TypeUtility.getTypeName(isRelatedTo));
+		isRelatedToManagement.setElementType(isRelatedTo.getTypeName());
 		isRelatedToManagement.setJson(ElementMapper.marshal(isRelatedTo));
 		if(isRelatedTo.getUUID()!=null) {
 			isRelatedToManagement.setUUID(isRelatedTo.getUUID());
@@ -472,7 +471,7 @@ public class ERManagementTest extends ContextTest {
 			ConsistsOf<EService, CPUFacet> consistsOf = new ConsistsOfImpl<EService, CPUFacet>(eService, cpuFacet);
 			
 			ConsistsOfManagement consistsOfManagement = new ConsistsOfManagement();
-			consistsOfManagement.setElementType(TypeUtility.getTypeName(consistsOf));
+			consistsOfManagement.setElementType(consistsOf.getTypeName());
 			consistsOfManagement.setJson(ElementMapper.marshal(consistsOf));
 			String createdConsistsOfString = consistsOfManagement.create();
 			
@@ -488,7 +487,7 @@ public class ERManagementTest extends ContextTest {
 			UUID uuid = createdCpuFacet.getUUID();
 	
 			FacetManagement facetManagement = new FacetManagement();
-			facetManagement.setElementType(TypeUtility.getTypeName(createdCpuFacet));
+			facetManagement.setElementType(createdCpuFacet.getTypeName());
 			facetManagement.setUUID(uuid);
 	
 			String readJson = facetManagement.read().toString();
@@ -509,7 +508,7 @@ public class ERManagementTest extends ContextTest {
 			readCpuFacet.setAdditionalProperty(additionPropertyKey, additionPropertyValue);
 	
 			facetManagement = new FacetManagement();
-			facetManagement.setElementType(TypeUtility.getTypeName(readCpuFacet));
+			facetManagement.setElementType(readCpuFacet.getTypeName());
 			facetManagement.setUUID(uuid);
 			facetManagement.setJson(ElementMapper.marshal(readCpuFacet));
 	
@@ -526,7 +525,7 @@ public class ERManagementTest extends ContextTest {
 			Assert.assertTrue(updatedCpuFacet.getMetadata().getLastUpdateBy().compareTo(user) == 0);
 	
 			facetManagement = new FacetManagement();
-			facetManagement.setElementType(TypeUtility.getTypeName(updatedCpuFacet));
+			facetManagement.setElementType(updatedCpuFacet.getTypeName());
 			facetManagement.setUUID(uuid);
 	
 			String readUpdatedJson = facetManagement.read().toString();
@@ -540,7 +539,7 @@ public class ERManagementTest extends ContextTest {
 			Assert.assertTrue(uuid.compareTo(updatedCpuFacet.getUUID()) == 0);
 	
 			facetManagement = new FacetManagement();
-			facetManagement.setElementType(TypeUtility.getTypeName(readCpuFacet));
+			facetManagement.setElementType(readCpuFacet.getTypeName());
 			facetManagement.setUUID(uuid);
 	
 			facetManagement.delete();
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/InvalidOperationTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/InvalidOperationTest.java
index c1a9e49..0e6a008 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/instances/InvalidOperationTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/instances/InvalidOperationTest.java
@@ -16,7 +16,6 @@ import org.gcube.informationsystem.resourceregistry.instances.model.entities.Res
 import org.gcube.informationsystem.resourceregistry.instances.model.relations.ConsistsOfManagement;
 import org.gcube.informationsystem.resourceregistry.instances.model.relations.IsRelatedToManagement;
 import org.gcube.informationsystem.serialization.ElementMapper;
-import org.gcube.informationsystem.utils.TypeUtility;
 import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.SimpleFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.SoftwareFacetImpl;
@@ -167,7 +166,7 @@ public class InvalidOperationTest extends ERManagementTest {
 			IsIdentifiedBy<EService, SoftwareFacet> isIdentifiedBy = (IsIdentifiedBy<EService, SoftwareFacet>) eService.getConsistsOf(IsIdentifiedBy.class).get(0);
 			
 			ConsistsOfManagement consistsOfManagement = new ConsistsOfManagement();
-			consistsOfManagement.setElementType(TypeUtility.getTypeName(isIdentifiedBy));
+			consistsOfManagement.setElementType(isIdentifiedBy.getTypeName());
 			consistsOfManagement.setUUID(isIdentifiedBy.getUUID());
 			consistsOfManagement.delete();
 		}finally {