diff --git a/src/main/resources/type.ucls b/src/main/resources/type.ucls
index 570081b..2b8a2d3 100644
--- a/src/main/resources/type.ucls
+++ b/src/main/resources/type.ucls
@@ -3,88 +3,6 @@
   generalizations="true" realizations="true" associations="true" dependencies="true" nesting-relationships="true" 
   router="FAN">  
   <interface id="1" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE3_Curating_Service" project="parthenos-entities" 
-    
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE3_Curating_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="138" x="472" y="179"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="2" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE10_Digital_Curating_Service" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE10_Digital_Curating_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="511" y="268"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="3" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE5_Digital_Hosting_Service" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE5_Digital_Hosting_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="176" x="700" y="240"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="4" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE13_Software_Computing_EService" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE13_Software_Computing_EService.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="224" x="1157" y="362"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="5" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E19_Physical_Object" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E19_Physical_Object.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="954" y="533"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="6" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E7_Activity.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="74" x="716" y="57"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="7" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE11_Software_Curating_Service" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE11_Software_Curating_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="593" y="370"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="8" language="java" 
     name="org.gcube.informationsystem.model.entity.resource.parthenos.PE36_Competency_Type" project="parthenos-entities" 
     
     file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE36_Competency_Type.java" 
@@ -96,19 +14,7 @@
       <operations public="false" package="false" protected="false" private="false" static="false"/>    
     </display>  
   </interface>  
-  <interface id="9" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE21_Persistent_Software" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE21_Persistent_Software.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1225" y="655"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="10" language="java" 
+  <interface id="2" language="java" 
     name="org.gcube.informationsystem.model.entity.resource.parthenos.PE37_Protocol_Type" project="parthenos-entities" 
     file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE37_Protocol_Type.java" 
     binary="false" corner="BOTTOM_RIGHT">    
@@ -119,258 +25,7 @@
       <operations public="false" package="false" protected="false" private="false" static="false"/>    
     </display>  
   </interface>  
-  <interface id="11" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE22_Persistent_Dataset" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE22_Persistent_Dataset.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1026" y="655"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="12" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.cidoc.E29_Design_or_Procedure" project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E29_Design_or_Procedure.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="163" x="1194" y="57"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="13" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE17_Curated_Data_EService" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE17_Curated_Data_EService.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="184" x="505" y="423"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="14" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE2_Hosting_Service" project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE2_Hosting_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="133" x="708" y="179"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="15" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE25_RI_Consortium" project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE25_RI_Consortium.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="131" x="1082" y="240"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="16" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE16_Curated_Software_EService" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE16_Curated_Software_EService.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="208" x="907" y="423"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="17" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE28_Curation_Plan" project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE28_Curation_Plan.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="126" x="1194" y="118"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="18" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E21_Person" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E21_Person.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="78" x="964" y="118"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="19" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE14_Software_Delivery_EService" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE14_Software_Delivery_EService.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="210" x="907" y="362"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="20" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE15_Data_EService" project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE15_Data_EService.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="131" x="736" y="362"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="21" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE32_Curated_Thing" project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE32_Curated_Thing.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="784" y="533"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="22" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE33_EAccess_Brokering_Service" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE33_EAccess_Brokering_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1384" y="420"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="23" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E39_Actor" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="69" x="1023" y="57"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="24" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE23_Volatile_Software" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE23_Volatile_Software.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="835" y="655"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="25" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE24_Volatile_Dataset" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE24_Volatile_Dataset.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="653" y="655"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="26" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E74_Group" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E74_Group.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="72" x="1082" y="118"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="27" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE7_Data_Hosting_Service" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE7_Data_Hosting_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="167" x="700" y="301"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="28" language="java" name="org.gcube.informationsystem.model.entity.resource.parthenos.PE18_Dataset" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE18_Dataset.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="979" y="594"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="29" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E65_Creation" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E65_Creation.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="86" x="590" y="118"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="30" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE6_Software_Hosting_Service" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE6_Software_Hosting_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="191" x="907" y="301"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="31" language="java" name="org.gcube.informationsystem.model.entity.resource.parthenos.PE34_Team" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE34_Team.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="77" x="1082" y="179"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="32" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.D1_Digital_Object" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/D1_Digital_Object.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1114" y="533"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="33" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E55_Type" 
+  <interface id="3" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E55_Type" 
     project="parthenos-entities" 
     file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E55_Type.java" 
     binary="false" corner="BOTTOM_RIGHT">    
@@ -381,380 +36,29 @@
       <operations public="false" package="false" protected="false" private="false" static="false"/>    
     </display>  
   </interface>  
-  <interface id="34" language="java" name="org.gcube.informationsystem.model.entity.resource.parthenos.PE1_Service" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="82" x="716" y="118"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="35" language="java" name="org.gcube.informationsystem.model.entity.resource.parthenos.PE26_RI_Project" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE26_RI_Project.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="105" x="937" y="179"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="36" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE19_Persistent_Digital_Object" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE19_Persistent_Digital_Object.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1159" y="594"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="37" language="java" name="org.gcube.informationsystem.model.entity.resource.parthenos.PE38_Schema" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE38_Schema.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1392" y="655"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="38" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE20_Volatile_Digital_Object" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE20_Volatile_Digital_Object.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="807" y="594"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="39" language="java" name="org.gcube.informationsystem.model.entity.resource.parthenos.PE35_Project" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE35_Project.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="86" x="838" y="118"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="40" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E70_Thing" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E70_Thing.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="872" y="472"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="41" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.D14_Software" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/D14_Software.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="1339" y="594"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="42" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E78_Curated_Holding" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E78_Curated_Holding.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="613" y="594"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="43" language="java" 
-    name="org.gcube.informationsystem.model.entity.resource.parthenos.PE12_Data_Curating_Service" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE12_Data_Curating_Service.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="439" y="337"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="44" language="java" name="org.gcube.informationsystem.model.entity.resource.parthenos.PE8_EService" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE8_EService.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="90" x="1138" y="301"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="45" language="java" name="org.gcube.informationsystem.model.entity.resource.cidoc.E40_Legal_Body" 
-    project="parthenos-entities" 
-    file="/parthenos-entities/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E40_Legal_Body.java" 
-    binary="false" corner="BOTTOM_RIGHT">    
-    <position height="21" width="105" x="1199" y="179"/>    
-    <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
-      sort-features="false" accessors="true" visibility="false">      
-      <attributes public="false" package="false" protected="false" private="false" static="false"/>      
-      <operations public="false" package="false" protected="false" private="false" static="false"/>    
-    </display>  
-  </interface>  
-  <interface id="46" language="java" name="org.gcube.informationsystem.model.entity.Resource" 
+  <interface id="4" language="java" name="org.gcube.informationsystem.model.entity.Resource" 
     project="information-system-model" 
     file="/information-system-model/src/main/java/org/gcube/informationsystem/model/entity/Resource.java" binary="false" 
     corner="BOTTOM_RIGHT">    
-    <position height="21" width="64" x="878" y="1"/>    
+    <position height="-1" width="-1" x="488" y="398"/>    
     <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
       sort-features="false" accessors="true" visibility="false">      
       <attributes public="false" package="false" protected="false" private="false" static="false"/>      
       <operations public="false" package="false" protected="false" private="false" static="false"/>    
     </display>  
   </interface>  
-  <generalization id="47">    
-    <end type="SOURCE" refId="14"/>    
-    <end type="TARGET" refId="34"/>  
+  <generalization id="5">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="3"/>  
   </generalization>  
-  <generalization id="48">    
-    <end type="SOURCE" refId="35"/>    
-    <end type="TARGET" refId="39"/>  
-  </generalization>  
-  <generalization id="49">    
-    <end type="SOURCE" refId="40"/>    
-    <end type="TARGET" refId="46"/>  
-  </generalization>  
-  <generalization id="50">    
-    <end type="SOURCE" refId="16"/>    
-    <end type="TARGET" refId="19"/>  
-  </generalization>  
-  <generalization id="51">    
-    <end type="SOURCE" refId="38"/>    
-    <end type="TARGET" refId="21"/>  
-  </generalization>  
-  <generalization id="52">    
-    <end type="SOURCE" refId="16"/>    
-    <end type="TARGET" refId="7"/>  
-  </generalization>  
-  <generalization id="53">    
-    <end type="SOURCE" refId="25"/>    
-    <end type="TARGET" refId="28"/>  
-  </generalization>  
-  <generalization id="54">    
-    <end type="SOURCE" refId="36"/>    
-    <end type="TARGET" refId="32"/>  
-  </generalization>  
-  <generalization id="55">    
-    <end type="SOURCE" refId="16"/>    
+  <generalization id="6">    
+    <end type="SOURCE" refId="3"/>    
     <end type="TARGET" refId="4"/>  
   </generalization>  
-  <generalization id="56">    
-    <end type="SOURCE" refId="38"/>    
-    <end type="TARGET" refId="32"/>  
-  </generalization>  
-  <generalization id="57">    
-    <end type="SOURCE" refId="34"/>    
-    <end type="TARGET" refId="6"/>  
-  </generalization>  
-  <generalization id="58">    
-    <end type="SOURCE" refId="11"/>    
-    <end type="TARGET" refId="28"/>  
-  </generalization>  
-  <generalization id="59">    
-    <bendpoint x="482" y="402"/>    
-    <end type="SOURCE" refId="13"/>    
-    <end type="TARGET" refId="43"/>  
-  </generalization>  
-  <generalization id="60">    
-    <bendpoint x="906" y="240"/>    
-    <bendpoint x="906" y="179"/>    
-    <end type="SOURCE" refId="44"/>    
-    <end type="TARGET" refId="34"/>  
-  </generalization>  
-  <generalization id="61">    
-    <end type="SOURCE" refId="7"/>    
-    <end type="TARGET" refId="2"/>  
-  </generalization>  
-  <generalization id="62">    
-    <end type="SOURCE" refId="1"/>    
-    <end type="TARGET" refId="34"/>  
-  </generalization>  
-  <generalization id="63">    
-    <end type="SOURCE" refId="45"/>    
-    <end type="TARGET" refId="26"/>  
-  </generalization>  
-  <generalization id="64">    
-    <end type="SOURCE" refId="43"/>    
-    <end type="TARGET" refId="2"/>  
-  </generalization>  
-  <generalization id="65">    
-    <end type="SOURCE" refId="31"/>    
-    <end type="TARGET" refId="26"/>  
-  </generalization>  
-  <generalization id="66">    
-    <end type="SOURCE" refId="5"/>    
-    <end type="TARGET" refId="40"/>  
-  </generalization>  
-  <generalization id="67">    
-    <end type="SOURCE" refId="6"/>    
-    <end type="TARGET" refId="46"/>  
-  </generalization>  
-  <generalization id="68">    
-    <end type="SOURCE" refId="29"/>    
-    <end type="TARGET" refId="6"/>  
-  </generalization>  
-  <generalization id="69">    
-    <end type="SOURCE" refId="32"/>    
-    <end type="TARGET" refId="40"/>  
-  </generalization>  
-  <generalization id="70">    
-    <end type="SOURCE" refId="18"/>    
-    <end type="TARGET" refId="23"/>  
-  </generalization>  
-  <generalization id="71">    
-    <end type="SOURCE" refId="3"/>    
-    <end type="TARGET" refId="14"/>  
-  </generalization>  
-  <generalization id="72">    
-    <end type="SOURCE" refId="10"/>    
-    <end type="TARGET" refId="33"/>  
-  </generalization>  
-  <generalization id="73">    
-    <end type="SOURCE" refId="15"/>    
-    <end type="TARGET" refId="31"/>  
-  </generalization>  
-  <generalization id="74">    
-    <end type="SOURCE" refId="20"/>    
-    <end type="TARGET" refId="44"/>  
-  </generalization>  
-  <generalization id="75">    
-    <bendpoint x="1398" y="354"/>    
-    <end type="SOURCE" refId="22"/>    
-    <end type="TARGET" refId="44"/>  
-  </generalization>  
-  <generalization id="76">    
-    <end type="SOURCE" refId="21"/>    
-    <end type="TARGET" refId="40"/>  
-  </generalization>  
-  <generalization id="77">    
-    <end type="SOURCE" refId="41"/>    
-    <end type="TARGET" refId="32"/>  
-  </generalization>  
-  <generalization id="78">    
-    <end type="SOURCE" refId="20"/>    
-    <end type="TARGET" refId="27"/>  
-  </generalization>  
-  <generalization id="79">    
-    <end type="SOURCE" refId="19"/>    
-    <end type="TARGET" refId="44"/>  
-  </generalization>  
-  <generalization id="80">    
-    <end type="SOURCE" refId="37"/>    
-    <end type="TARGET" refId="41"/>  
-  </generalization>  
-  <generalization id="81">    
-    <end type="SOURCE" refId="24"/>    
-    <end type="TARGET" refId="38"/>  
-  </generalization>  
-  <generalization id="82">    
-    <end type="SOURCE" refId="9"/>    
-    <end type="TARGET" refId="36"/>  
-  </generalization>  
-  <generalization id="83">    
-    <end type="SOURCE" refId="11"/>    
-    <end type="TARGET" refId="36"/>  
-  </generalization>  
-  <generalization id="84">    
-    <end type="SOURCE" refId="23"/>    
-    <end type="TARGET" refId="46"/>  
-  </generalization>  
-  <generalization id="85">    
-    <end type="SOURCE" refId="4"/>    
-    <end type="TARGET" refId="44"/>  
-  </generalization>  
-  <generalization id="86">    
-    <end type="SOURCE" refId="9"/>    
-    <end type="TARGET" refId="41"/>  
-  </generalization>  
-  <generalization id="87">    
-    <end type="SOURCE" refId="39"/>    
-    <end type="TARGET" refId="6"/>  
-  </generalization>  
-  <generalization id="88">    
-    <end type="SOURCE" refId="17"/>    
-    <end type="TARGET" refId="12"/>  
-  </generalization>  
-  <generalization id="89">    
-    <end type="SOURCE" refId="12"/>    
-    <end type="TARGET" refId="46"/>  
-  </generalization>  
-  <generalization id="90">    
-    <end type="SOURCE" refId="24"/>    
-    <end type="TARGET" refId="41"/>  
-  </generalization>  
-  <generalization id="91">    
-    <end type="SOURCE" refId="30"/>    
-    <end type="TARGET" refId="3"/>  
-  </generalization>  
-  <generalization id="92">    
-    <end type="SOURCE" refId="8"/>    
-    <end type="TARGET" refId="33"/>  
-  </generalization>  
-  <generalization id="93">    
-    <end type="SOURCE" refId="28"/>    
-    <end type="TARGET" refId="32"/>  
-  </generalization>  
-  <generalization id="94">    
+  <generalization id="7">    
     <end type="SOURCE" refId="2"/>    
-    <end type="TARGET" refId="1"/>  
-  </generalization>  
-  <generalization id="95">    
-    <end type="SOURCE" refId="42"/>    
-    <end type="TARGET" refId="21"/>  
-  </generalization>  
-  <generalization id="96">    
-    <end type="SOURCE" refId="4"/>    
-    <end type="TARGET" refId="30"/>  
-  </generalization>  
-  <generalization id="97">    
-    <end type="SOURCE" refId="26"/>    
-    <end type="TARGET" refId="23"/>  
-  </generalization>  
-  <generalization id="98">    
-    <end type="SOURCE" refId="19"/>    
-    <end type="TARGET" refId="30"/>  
-  </generalization>  
-  <generalization id="99">    
-    <end type="SOURCE" refId="13"/>    
-    <end type="TARGET" refId="20"/>  
-  </generalization>  
-  <generalization id="100">    
-    <end type="SOURCE" refId="27"/>    
     <end type="TARGET" refId="3"/>  
   </generalization>  
-  <generalization id="101">    
-    <end type="SOURCE" refId="33"/>    
-    <end type="TARGET" refId="46"/>  
-  </generalization>  
-  <generalization id="102">    
-    <end type="SOURCE" refId="25"/>    
-    <end type="TARGET" refId="38"/>  
-  </generalization>  
   <classifier-display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" 
     sort-features="false" accessors="true" visibility="false">    
     <attributes public="false" package="false" protected="false" private="false" static="false"/>