diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cidoc/D14_Software.java b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cidoc/D14_Software.java
index 3f6cfae..1a6569a 100644
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cidoc/D14_Software.java
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/entity/resource/cidoc/D14_Software.java
@@ -6,6 +6,6 @@ import org.gcube.informationsystem.model.entity.resource.Software;
  * @author Luca Frosini (ISTI - CNR)
  * TODO check if can be removed
  */
-public interface D14_Software extends Software {
+public interface D14_Software extends D1_Digital_Object, Software {
 
 }
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18_has_digital_object_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18_has_digital_object_part.java
deleted file mode 100644
index e7dc167..0000000
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18_has_digital_object_part.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.gcube.informationsystem.parthenos.model.relation;
-
-import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.P106_is_composed_of;
-
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface PP18_has_digital_object_part extends P106_is_composed_of {
-
-}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18i_is_digital_object_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18i_is_digital_object_part_of.java
deleted file mode 100644
index 432248e..0000000
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP18i_is_digital_object_part_of.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.gcube.informationsystem.parthenos.model.relation;
-
-import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse.P106i_forms_part_of;
-
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface PP18i_is_digital_object_part_of extends P106i_forms_part_of {
-
-}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19_has_persistent_software_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19_has_persistent_software_part.java
deleted file mode 100644
index fd0ab20..0000000
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19_has_persistent_software_part.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.gcube.informationsystem.parthenos.model.relation;
-
-import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.PP16_has_persistent_digital_object_part;
-
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface PP19_has_persistent_software_part extends
-		PP16_has_persistent_digital_object_part {
-
-}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19i_is_persistent_software_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19i_is_persistent_software_part_of.java
deleted file mode 100644
index 5f4d2ac..0000000
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP19i_is_persistent_software_part_of.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.gcube.informationsystem.parthenos.model.relation;
-
-import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse.PP16i_is_persistent_digital_object_part_of;
-
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface PP19i_is_persistent_software_part_of extends
-		PP16i_is_persistent_digital_object_part_of {
-
-}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20_has_persistent_dataset_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20_has_persistent_dataset_part.java
deleted file mode 100644
index 060e88e..0000000
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20_has_persistent_dataset_part.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.gcube.informationsystem.parthenos.model.relation;
-
-import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.PP16_has_persistent_digital_object_part;
-
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface PP20_has_persistent_dataset_part extends
-		PP16_has_persistent_digital_object_part {
-
-}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20i_is_persistent_dataset_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20i_is_persistent_dataset_part_of.java
deleted file mode 100644
index ecd8530..0000000
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP20i_is_persistent_dataset_part_of.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.gcube.informationsystem.parthenos.model.relation;
-
-import org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse.PP16i_is_persistent_digital_object_part_of;
-
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface PP20i_is_persistent_dataset_part_of extends
-		PP16i_is_persistent_digital_object_part_of {
-
-}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP21_has_software_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP21_has_software_part.java
deleted file mode 100644
index e19b2b4..0000000
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP21_has_software_part.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.gcube.informationsystem.parthenos.model.relation;
-
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface PP21_has_software_part extends PP18_has_digital_object_part {
-
-}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP23_has_dataset_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP23_has_dataset_part.java
deleted file mode 100644
index 6088310..0000000
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP23_has_dataset_part.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.gcube.informationsystem.parthenos.model.relation;
-
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public interface PP23_has_dataset_part extends PP18_has_digital_object_part {
-
-
-}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP18_has_digital_object_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP18_has_digital_object_part.java
new file mode 100644
index 0000000..dd39a7c
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP18_has_digital_object_part.java
@@ -0,0 +1,12 @@
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto;
+
+import org.gcube.informationsystem.parthenos.model.entity.resource.PE20_Volatile_Digital_Object;
+import org.gcube.informationsystem.parthenos.model.entity.resource.cidoc.D1_Digital_Object;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface PP18_has_digital_object_part<Out extends PE20_Volatile_Digital_Object, In extends D1_Digital_Object>
+		extends P106_is_composed_of<Out, In> {
+
+}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP19_has_persistent_software_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP19_has_persistent_software_part.java
new file mode 100644
index 0000000..341a838
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP19_has_persistent_software_part.java
@@ -0,0 +1,12 @@
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto;
+
+import org.gcube.informationsystem.parthenos.model.entity.resource.PE21_Persistent_Software;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface PP19_has_persistent_software_part
+	<Out extends PE21_Persistent_Software, In extends PE21_Persistent_Software>
+		extends PP16_has_persistent_digital_object_part<Out, In> {
+
+}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP20_has_persistent_dataset_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP20_has_persistent_dataset_part.java
new file mode 100644
index 0000000..d02b177
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP20_has_persistent_dataset_part.java
@@ -0,0 +1,12 @@
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto;
+
+import org.gcube.informationsystem.parthenos.model.entity.resource.PE22_Persistent_Dataset;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface PP20_has_persistent_dataset_part
+	<Out extends PE22_Persistent_Dataset, In extends PE22_Persistent_Dataset>
+		extends PP16_has_persistent_digital_object_part<Out, In> {
+
+}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP21_has_software_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP21_has_software_part.java
new file mode 100644
index 0000000..f185af6
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP21_has_software_part.java
@@ -0,0 +1,14 @@
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto;
+
+import org.gcube.informationsystem.parthenos.model.entity.resource.PE23_Volatile_Software;
+import org.gcube.informationsystem.parthenos.model.entity.resource.cidoc.D14_Software;
+
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface PP21_has_software_part
+	<Out extends PE23_Volatile_Software, In extends D14_Software> 
+		extends PP18_has_digital_object_part<Out, In> {
+
+}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP23_has_dataset_part.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP23_has_dataset_part.java
new file mode 100644
index 0000000..b2478b3
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/PP23_has_dataset_part.java
@@ -0,0 +1,12 @@
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto;
+
+import org.gcube.informationsystem.parthenos.model.entity.resource.PE18_Dataset;
+import org.gcube.informationsystem.parthenos.model.entity.resource.PE24_Volatile_Dataset;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface PP23_has_dataset_part<Out extends PE24_Volatile_Dataset, In extends PE18_Dataset>
+		extends PP18_has_digital_object_part<Out, In> {
+
+}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP18i_is_digital_object_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP18i_is_digital_object_part_of.java
new file mode 100644
index 0000000..7642ecc
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP18i_is_digital_object_part_of.java
@@ -0,0 +1,10 @@
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse;
+
+
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface PP18i_is_digital_object_part_of extends P106i_forms_part_of {
+
+}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP19i_is_persistent_software_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP19i_is_persistent_software_part_of.java
new file mode 100644
index 0000000..697f7fd
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP19i_is_persistent_software_part_of.java
@@ -0,0 +1,11 @@
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse;
+
+
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface PP19i_is_persistent_software_part_of extends
+		PP16i_is_persistent_digital_object_part_of {
+
+}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP20i_is_persistent_dataset_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP20i_is_persistent_dataset_part_of.java
new file mode 100644
index 0000000..9068a43
--- /dev/null
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP20i_is_persistent_dataset_part_of.java
@@ -0,0 +1,11 @@
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse;
+
+
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public interface PP20i_is_persistent_dataset_part_of extends
+		PP16i_is_persistent_digital_object_part_of {
+
+}
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP21i_is_software_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP21i_is_software_part_of.java
similarity index 62%
rename from src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP21i_is_software_part_of.java
rename to src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP21i_is_software_part_of.java
index 958b1d5..f30a5ca 100644
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP21i_is_software_part_of.java
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP21i_is_software_part_of.java
@@ -1,4 +1,5 @@
-package org.gcube.informationsystem.parthenos.model.relation;
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse;
+
 
 
 /**
diff --git a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP23i_is_dataset_part_of.java b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP23i_is_dataset_part_of.java
similarity index 62%
rename from src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP23i_is_dataset_part_of.java
rename to src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP23i_is_dataset_part_of.java
index ac256c9..ece3bcc 100644
--- a/src/main/java/org/gcube/informationsystem/parthenos/model/relation/PP23i_is_dataset_part_of.java
+++ b/src/main/java/org/gcube/informationsystem/parthenos/model/relation/isrelatedto/inverse/PP23i_is_dataset_part_of.java
@@ -1,4 +1,5 @@
-package org.gcube.informationsystem.parthenos.model.relation;
+package org.gcube.informationsystem.parthenos.model.relation.isrelatedto.inverse;
+
 
 
 /**