diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java
index 5c5ee8b..1ea829a 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/EnumStringPropertyImpl.java
@@ -15,13 +15,14 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 @JsonTypeName(value=EnumStringProperty.NAME)
 public class EnumStringPropertyImpl extends GCubePropertyImpl implements EnumStringProperty {
 
-	private Set<String> type;
-	private String value;
 	/**
-	 * 
+	 * Generated Serial Version UID
 	 */
 	private static final long serialVersionUID = 5453875438782091672L;
-
+	
+	private Set<String> type;
+	private String value;
+	
 	@Override
 	public String getValue() {
 		return this.value;
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java
index c75888c..c4f803f 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/properties/RegexPropertyImpl.java
@@ -13,6 +13,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 @JsonTypeName(value=RegexProperty.NAME)
 public class RegexPropertyImpl extends GCubePropertyImpl implements RegexProperty {
 
+	/**
+	 * Generated Serial Version UID
+	 */
 	private static final long serialVersionUID = -8279692341196771526L;
 
 	private String value;
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasActionImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasActionImpl.java
index f72b541..fb526a4 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasActionImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasActionImpl.java
@@ -18,6 +18,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasActionImpl<Out extends Service, In extends ActionFacet> 
 	extends ConsistsOfImpl<Out, In> implements HasAction<Out, In> {
 	 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -1028958506776410453L;
+
 	protected HasActionImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasAddActionImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasAddActionImpl.java
index a26c5c3..a77377b 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasAddActionImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasAddActionImpl.java
@@ -17,6 +17,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasAddActionImpl<Out extends Service, In extends ActionFacet>
 	extends HasActionImpl<Out, In> implements HasAddAction<Out, In>{
 	
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -1255378439187531889L;
+
 	protected HasAddActionImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContactImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContactImpl.java
index 70cc5a8..d36e8fa 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContactImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContactImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public abstract class HasContactImpl<Out extends Resource, In extends ContactFacet>
 		extends ConsistsOfImpl<Out, In> implements HasContact<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 6576049793532371473L;
+
 	protected HasContactImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContributorImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContributorImpl.java
index 650f9e5..461a202 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContributorImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasContributorImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasContributorImpl<Out extends Resource, In extends ContactFacet>
 		extends HasContactImpl<Out, In> implements HasContributor<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -3024614025389570960L;
+
 	protected HasContributorImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCoverageImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCoverageImpl.java
index 87f77f5..ab0e794 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCoverageImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCoverageImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public abstract class HasCoverageImpl<Out extends Resource, In extends CoverageFacet>
 		extends ConsistsOfImpl<Out, In> implements HasCoverage<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 4822679979500182850L;
+
 	protected HasCoverageImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCreatorImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCreatorImpl.java
index 1e10725..1b796f0 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCreatorImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCreatorImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasCreatorImpl<Out extends Resource, In extends ContactFacet>
 		extends HasContactImpl<Out, In> implements HasCreator<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -7216613965814407960L;
+
 	protected HasCreatorImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCuratorImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCuratorImpl.java
index b42a98c..4328a92 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCuratorImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasCuratorImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasCuratorImpl<Out extends Resource, In extends ContactFacet>
 		extends HasContactImpl<Out, In> implements HasCurator<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 3557928110486108164L;
+
 	protected HasCuratorImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasDeveloperImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasDeveloperImpl.java
index 2da84bc..a530a4e 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasDeveloperImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasDeveloperImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasDeveloperImpl<Out extends Resource, In extends ContactFacet>
 		extends HasContactImpl<Out, In> implements HasDeveloper<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -4206418259355685096L;
+
 	protected HasDeveloperImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMaintainerImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMaintainerImpl.java
index 59156f8..6df0c41 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMaintainerImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMaintainerImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasMaintainerImpl<Out extends Resource, In extends ContactFacet>
 		extends HasContactImpl<Out, In> implements HasMaintainer<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 3529906340392722967L;
+
 	protected HasMaintainerImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasManagerImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasManagerImpl.java
index 0974a0a..bd4a0b5 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasManagerImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasManagerImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasManagerImpl<Out extends Resource, In extends ContactFacet>
 		extends HasContactImpl<Out, In> implements HasManager<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -7136048435035542411L;
+
 	protected HasManagerImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMemoryImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMemoryImpl.java
index 97547ee..0a1b725 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMemoryImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasMemoryImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public abstract class HasMemoryImpl<Out extends Resource, In extends MemoryFacet>
 		extends ConsistsOfImpl<Out, In> implements HasMemory<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 1950184335132510402L;
+
 	protected HasMemoryImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasOwnerImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasOwnerImpl.java
index 68f7b28..5398ee6 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasOwnerImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasOwnerImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasOwnerImpl<Out extends Resource, In extends ContactFacet>
 		extends HasContactImpl<Out, In> implements HasOwner<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -7980790874053216568L;
+
 	protected HasOwnerImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasPersistentMemoryImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasPersistentMemoryImpl.java
index 392340f..61b4903 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasPersistentMemoryImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasPersistentMemoryImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasPersistentMemoryImpl<Out extends Resource, In extends MemoryFacet>
 		extends HasMemoryImpl<Out, In> implements HasPersistentMemory<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 1964884925310764638L;
+
 	protected HasPersistentMemoryImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasRemoveActionImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasRemoveActionImpl.java
index ad99783..b70b390 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasRemoveActionImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasRemoveActionImpl.java
@@ -14,6 +14,11 @@ import org.gcube.resourcemanagement.model.reference.relations.consistsof.HasAddA
 public class HasRemoveActionImpl<Out extends Service, In extends ActionFacet>
 	extends HasActionImpl<Out, In> implements HasAddAction<Out, In>{
 	
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 5038048537520695788L;
+
 	protected HasRemoveActionImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasSpatialCoverageImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasSpatialCoverageImpl.java
index bae0352..b0350cb 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasSpatialCoverageImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasSpatialCoverageImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasSpatialCoverageImpl<Out extends Resource, In extends CoverageFacet>
 		extends HasCoverageImpl<Out, In> implements HasSpatialCoverage<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -6379008183604723927L;
+
 	protected HasSpatialCoverageImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasTemporalCoverageImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasTemporalCoverageImpl.java
index 7fb1612..6002028 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasTemporalCoverageImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasTemporalCoverageImpl.java
@@ -15,6 +15,11 @@ public class HasTemporalCoverageImpl<Out extends Resource, In extends CoverageFa
 		extends HasCoverageImpl<Out, In> implements
 		HasTemporalCoverage<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -2842361366214219615L;
+
 	protected HasTemporalCoverageImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasVolatileMemoryImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasVolatileMemoryImpl.java
index 4ed7530..90851fa 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasVolatileMemoryImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/consistsof/HasVolatileMemoryImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HasVolatileMemoryImpl<Out extends Resource, In extends MemoryFacet>
 		extends HasMemoryImpl<Out, In> implements HasVolatileMemory<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -3419282968469134859L;
+
 	protected HasVolatileMemoryImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ActivatesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ActivatesImpl.java
index 45880b7..9efe39d 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ActivatesImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ActivatesImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class ActivatesImpl<Out extends Service, In extends Service> extends
 		IsRelatedToImpl<Out, In> implements Activates<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -2770215400873228920L;
+
 	protected ActivatesImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/BelongsToImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/BelongsToImpl.java
index bfc3593..765277a 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/BelongsToImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/BelongsToImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class BelongsToImpl<Out extends Person, In extends LegalBody> extends
 		IsRelatedToImpl<Out, In> implements BelongsTo<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -656383853602099681L;
+
 	protected BelongsToImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/CallsForImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/CallsForImpl.java
index 40a42ce..c6301e3 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/CallsForImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/CallsForImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class CallsForImpl<Out extends Service, In extends Service> extends
 		IsRelatedToImpl<Out, In> implements CallsFor<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 1207199725579272666L;
+
 	protected CallsForImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DemandsImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DemandsImpl.java
index 618bcc6..1bfd33b 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DemandsImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DemandsImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class DemandsImpl<Out extends VirtualService, In extends Software>
 		extends IsRelatedToImpl<Out, In> implements Demands<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 3303237315961154863L;
+
 	protected DemandsImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DependsOnImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DependsOnImpl.java
index c182e75..a991746 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DependsOnImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DependsOnImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class DependsOnImpl<Out extends Software, In extends Software> extends
 		IsRelatedToImpl<Out, In> implements DependsOn<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 6518567937425809896L;
+
 	protected DependsOnImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DiscoversImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DiscoversImpl.java
index efc28a6..77665cb 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DiscoversImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/DiscoversImpl.java
@@ -13,6 +13,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class DiscoversImpl<Out extends EService, In extends EService> extends
 		CallsForImpl<Out, In> implements Discovers<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -1457307319196528691L;
+
 	protected DiscoversImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/EnablesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/EnablesImpl.java
index 94ebd88..0bb78ab 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/EnablesImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/EnablesImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class EnablesImpl<Out extends Service, In extends Software> extends
 		IsRelatedToImpl<Out, In> implements Enables<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 3528290328413872086L;
+
 	protected EnablesImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/HostsImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/HostsImpl.java
index bd0c8f8..f644a61 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/HostsImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/HostsImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class HostsImpl<Out extends Site, In extends Service> extends
 		IsRelatedToImpl<Out, In> implements Hosts<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 9214228861851071392L;
+
 	protected HostsImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/InvolvesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/InvolvesImpl.java
index d5d12cb..9e8c24c 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/InvolvesImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/InvolvesImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class InvolvesImpl<Out extends Dataset, In extends Actor> extends
 		IsRelatedToImpl<Out, In> implements Involves<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 9146386734851684864L;
+
 	protected InvolvesImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCompliantWithImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCompliantWithImpl.java
index bbc19b4..5e31a1d 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCompliantWithImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCompliantWithImpl.java
@@ -18,6 +18,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsCompliantWithImpl<Out extends Dataset, In extends Schema>
 		extends IsRelatedToImpl<Out, In> implements IsCompliantWith<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -3940951202209802935L;
+
 	protected IsCompliantWithImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsConfiguredByImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsConfiguredByImpl.java
index 242f74e..c24d003 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsConfiguredByImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsConfiguredByImpl.java
@@ -18,6 +18,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsConfiguredByImpl<Out extends Software, In extends ConfigurationTemplate>
 		extends IsRelatedToImpl<Out, In> implements IsConfiguredBy<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -1819083557550259454L;
+
 	protected IsConfiguredByImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCorrelatedToImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCorrelatedToImpl.java
index 18f3379..72b174a 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCorrelatedToImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCorrelatedToImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsCorrelatedToImpl<Out extends Dataset, In extends Dataset>
 		extends IsRelatedToImpl<Out, In> implements IsCorrelatedTo<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -794936403415195012L;
+
 	protected IsCorrelatedToImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCustomizedByImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCustomizedByImpl.java
index 598b6a2..722de79 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCustomizedByImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsCustomizedByImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsCustomizedByImpl<Out extends Service, In extends ConfigurationTemplate>
 		extends IsRelatedToImpl<Out, In> implements IsCustomizedBy<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 1240330292571521L;
+
 	protected IsCustomizedByImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsDerivationOfImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsDerivationOfImpl.java
index a385770..b968c8c 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsDerivationOfImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsDerivationOfImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsDerivationOfImpl<Out extends Configuration, In extends ConfigurationTemplate>
 		extends IsRelatedToImpl<Out, In> implements IsDerivationOf<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 1249832537598284450L;
+
 	protected IsDerivationOfImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsOwnedByImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsOwnedByImpl.java
index d01719f..d20bc53 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsOwnedByImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsOwnedByImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsOwnedByImpl<Out extends Site, In extends Actor> extends
 		IsRelatedToImpl<Out, In> implements IsOwnedBy<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 8322983678141617096L;
+
 	protected IsOwnedByImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPartOfImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPartOfImpl.java
index 7b8e080..428d532 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPartOfImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPartOfImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsPartOfImpl<Out extends ConcreteDataset, In extends Dataset>
 		extends IsCorrelatedToImpl<Out, In> implements IsPartOf<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 322461779749769277L;
+
 	protected IsPartOfImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPluginOfImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPluginOfImpl.java
index c10df2c..4362f32 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPluginOfImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/IsPluginOfImpl.java
@@ -14,6 +14,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class IsPluginOfImpl<Out extends Plugin, In extends Software> extends DependsOnImpl<Out,In>
 		implements IsPluginOf<Out,In> {
 	
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 6552488952251949334L;
+
 	protected IsPluginOfImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ManagesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ManagesImpl.java
index 8c6a382..bf5454f 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ManagesImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/ManagesImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class ManagesImpl<Out extends Service, In extends Dataset> extends
 		IsRelatedToImpl<Out, In> implements Manages<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -6919183339684717044L;
+
 	protected ManagesImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/RequiresImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/RequiresImpl.java
index ce854da..671dade 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/RequiresImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/RequiresImpl.java
@@ -15,6 +15,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class RequiresImpl<Out extends Software, In extends Service> extends
 		IsRelatedToImpl<Out, In> implements Requires<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -8258259681079991928L;
+
 	protected RequiresImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/UsesImpl.java b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/UsesImpl.java
index 6def93f..a51f9a9 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/UsesImpl.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/impl/relations/isrelatedto/UsesImpl.java
@@ -13,6 +13,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 public class UsesImpl<Out extends EService, In extends EService> extends
 	CallsForImpl<Out, In> implements Uses<Out, In> {
 
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 6454443849562485949L;
+
 	protected UsesImpl() {
 		super();
 	}
diff --git a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/EventFacet.java b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/EventFacet.java
index e048d54..800256f 100644
--- a/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/EventFacet.java
+++ b/src/main/java/org/gcube/resourcemanagement/model/reference/entities/facets/EventFacet.java
@@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.model.reference.entities.facets;
 import java.net.URI;
 import java.util.Date;
 
-import org.gcube.informationsystem.model.reference.ISConstants;
+import org.gcube.informationsystem.base.reference.ISConstants;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 import org.gcube.resourcemanagement.model.impl.entities.facets.EventFacetImpl;
diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/PolymorphismTest.java b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/PolymorphismTest.java
index 19a584a..1006c50 100644
--- a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/PolymorphismTest.java
+++ b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/PolymorphismTest.java
@@ -6,10 +6,10 @@ package org.gcube.resourcemanagement.model.reference.entities.facets;
 import java.util.List;
 import java.util.UUID;
 
-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.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.utils.ISMapper;
 import org.gcube.resourcemanagement.model.impl.entities.resources.EServiceImpl;
diff --git a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/Serializer.java b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/Serializer.java
index cbe9dd4..88267b7 100644
--- a/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/Serializer.java
+++ b/src/test/java/org/gcube/resourcemanagement/model/reference/entities/facets/Serializer.java
@@ -6,8 +6,8 @@ import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.gcube.informationsystem.context.reference.entities.Context;
 import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl;
-import org.gcube.informationsystem.model.reference.entities.Context;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
@@ -16,9 +16,6 @@ import org.gcube.informationsystem.utils.ISMapper;
 import org.gcube.resourcemanagement.model.impl.entities.facets.CPUFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.facets.ContactFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entities.resources.HostingNodeImpl;
-import org.gcube.resourcemanagement.model.reference.entities.facets.AccessPointFacet;
-import org.gcube.resourcemanagement.model.reference.entities.facets.CPUFacet;
-import org.gcube.resourcemanagement.model.reference.entities.facets.ContactFacet;
 import org.gcube.resourcemanagement.model.reference.entities.resources.HostingNode;
 import org.junit.Test;
 import org.slf4j.Logger;