diff --git a/src/main/java/org/gcube/informationsystem/model/embedded/AccessPolicy.java b/src/main/java/org/gcube/informationsystem/model/embedded/AccessPolicy.java
index 11513bc..495d7bb 100644
--- a/src/main/java/org/gcube/informationsystem/model/embedded/AccessPolicy.java
+++ b/src/main/java/org/gcube/informationsystem/model/embedded/AccessPolicy.java
@@ -1,17 +1,18 @@
 package org.gcube.informationsystem.model.embedded;
 
-
-
+import org.gcube.informationsystem.model.annotations.ISProperty;
 
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
  */
 public interface AccessPolicy extends Embedded {
 
+	@ISProperty
 	public ValueSchema getPolicy();
 
 	public void setPolicy(ValueSchema policy);
 	
+	@ISProperty
 	public String getNote();
 	
 	public void setNote(String note);
diff --git a/src/main/java/org/gcube/informationsystem/model/embedded/Header.java b/src/main/java/org/gcube/informationsystem/model/embedded/Header.java
index 10ef6c8..6c6d90f 100644
--- a/src/main/java/org/gcube/informationsystem/model/embedded/Header.java
+++ b/src/main/java/org/gcube/informationsystem/model/embedded/Header.java
@@ -3,20 +3,24 @@
  */
 package org.gcube.informationsystem.model.embedded;
 
-
+import org.gcube.informationsystem.model.annotations.ISProperty;
 
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
  * https://redmine.d4science.org/projects/bluebridge/wiki/Facets#Facet-Header
  */
 public interface Header extends Embedded {
-
+	
+	@ISProperty
 	public String getID();
 	
+	@ISProperty
 	public String getCreator();
 	
+	@ISProperty
 	public Long getCreationTime();
 	
+	@ISProperty
 	public Long getLastUpdateTime();
 	
 	
diff --git a/src/main/java/org/gcube/informationsystem/model/embedded/RelationProperty.java b/src/main/java/org/gcube/informationsystem/model/embedded/RelationProperty.java
index 9b5d19a..9936976 100644
--- a/src/main/java/org/gcube/informationsystem/model/embedded/RelationProperty.java
+++ b/src/main/java/org/gcube/informationsystem/model/embedded/RelationProperty.java
@@ -1,5 +1,7 @@
 package org.gcube.informationsystem.model.embedded;
 
+import org.gcube.informationsystem.model.annotations.ISProperty;
+
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
  */
@@ -33,10 +35,12 @@ public interface RelationProperty extends Embedded {
 		
 	}
 
+	@ISProperty
 	public ReferentiaIntegrity getReferentialIntegrity();
 	
 	public void setReferentialIntegrity(ReferentiaIntegrity referentialIntegrity);
 	
+	@ISProperty
 	public AccessPolicy getPolicy();
 	
 	public void setPolicy(AccessPolicy accessPolicy);
diff --git a/src/main/java/org/gcube/informationsystem/model/embedded/ValueSchema.java b/src/main/java/org/gcube/informationsystem/model/embedded/ValueSchema.java
index 76360ca..3a8a4ac 100644
--- a/src/main/java/org/gcube/informationsystem/model/embedded/ValueSchema.java
+++ b/src/main/java/org/gcube/informationsystem/model/embedded/ValueSchema.java
@@ -5,6 +5,8 @@ package org.gcube.informationsystem.model.embedded;
 
 import java.net.URI;
 
+import org.gcube.informationsystem.model.annotations.ISProperty;
+
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
  * Base Interface for all type described by a value and a schema retrieved 
@@ -12,10 +14,12 @@ import java.net.URI;
  */
 public interface ValueSchema extends Embedded {
 
+	@ISProperty
 	public String getValue();
 	
 	public void setValue(String value);
 
+	@ISProperty
 	public URI getSchema();
 	
 	public void setSchema(URI schema);
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/Entity.java b/src/main/java/org/gcube/informationsystem/model/entity/Entity.java
index 1b7322c..0c26e52 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/Entity.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/Entity.java
@@ -4,6 +4,7 @@
 package org.gcube.informationsystem.model.entity;
 
 import org.gcube.informationsystem.model.annotations.Abstract;
+import org.gcube.informationsystem.model.annotations.ISProperty;
 import org.gcube.informationsystem.model.embedded.Header;
 
 
@@ -13,6 +14,7 @@ import org.gcube.informationsystem.model.embedded.Header;
 @Abstract
 public interface Entity {
 	
+	@ISProperty
 	public Header getHeader();
 	
 }