diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 9fb1bc0..3960506 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -10,9 +10,6 @@
         <dependent-module archiveName="information-system-model-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/information-system-model/information-system-model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="information-system-model-orientdb-binding-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/information-system-model-orientdb-binding/information-system-model-orientdb-binding">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="resource-registry"/>
         <property name="java-output-path" value="/resource-registry/target/classes"/>
     </wb-module>
diff --git a/pom.xml b/pom.xml
index 561befc..349d43a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,11 +78,6 @@
 			<groupId>org.gcube.information-system</groupId>
 			<artifactId>information-system-model</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.information-system</groupId>
-			<artifactId>information-system-model-orientdb-binding</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-		</dependency>
 
 		<dependency>
 			<groupId>com.orientechnologies</groupId>
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/HeaderOrient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/HeaderOrient.java
new file mode 100644
index 0000000..e8dc57f
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/HeaderOrient.java
@@ -0,0 +1,63 @@
+/**
+ * 
+ */
+package org.gcube.informationsystem.resourceregistry.resources.utils;
+
+import java.util.Date;
+import java.util.UUID;
+
+import org.gcube.informationsystem.model.embedded.Header;
+
+import com.orientechnologies.orient.core.record.impl.ODocument;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+@SuppressWarnings("unchecked")
+public class HeaderOrient extends ODocument implements org.gcube.informationsystem.model.embedded.Header {
+
+	public HeaderOrient(){
+		super(Header.NAME);
+	}
+	
+	protected HeaderOrient(String iClassName){
+		super(iClassName);
+	}
+	
+	@Override
+	public UUID getUUID() {
+		return UUID.fromString((String) this.field(Header.UUID_PROPERTY));
+	}
+	
+	public void setUUID(UUID uuid){
+		this.field(Header.UUID_PROPERTY, uuid.toString());
+	}
+
+	@Override
+	public String getCreator() {
+		return this.field(Header.CREATOR_PROPERTY);
+	}
+	
+	public void setCreator(String creator){
+		this.field(Header.CREATOR_PROPERTY, creator);
+	}
+	
+	@Override
+	public Date getCreationTime() {
+		return this.field(Header.CREATION_TIME_PROPERTY);
+	}
+	
+	public void setCreationTime(Date creationTime){
+		this.field(Header.CREATION_TIME_PROPERTY, creationTime);
+	}
+	
+	@Override
+	public Date getLastUpdateTime() {
+		return this.field(Header.LAST_UPDATE_TIME_PROPERTY);
+	}
+	
+	public void setLastUpdateTime(Date lastUpdateTime){
+		this.field(Header.LAST_UPDATE_TIME_PROPERTY, lastUpdateTime);
+	}
+
+}
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/HeaderUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/HeaderUtility.java
index 642b0a2..cf33d65 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/HeaderUtility.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/HeaderUtility.java
@@ -11,7 +11,7 @@ import java.util.UUID;
 import org.gcube.common.authorization.library.provider.AuthorizationProvider;
 import org.gcube.common.authorization.library.provider.ClientInfo;
 import org.gcube.common.authorization.library.utils.Caller;
-import org.gcube.informationsystem.model.orientdb.impl.embedded.Header;
+import org.gcube.informationsystem.model.embedded.Header;
 import org.gcube.informationsystem.model.entity.Entity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +29,7 @@ public class HeaderUtility {
 			.getLogger(HeaderUtility.class);
 
 	public static Header createHeader(UUID uuid) {
-		Header header = new Header();
+		HeaderOrient header = new HeaderOrient();
 
 		if (uuid == null) {
 			uuid = UUID.randomUUID();