diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/FASTI/ordered_sparql_insert_collection_fasti.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/FASTI/ordered_sparql_insert_collection_fasti.sparql
new file mode 100644
index 0000000..874ee1d
--- /dev/null
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/FASTI/ordered_sparql_insert_collection_fasti.sparql
@@ -0,0 +1,41 @@
+PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::CollectionInfo> {
+        ?s aocat:was_issued ?date .
+        ?s aocat:was_modified ?date .
+    }
+}
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::CollectionInfo>
+WHERE {
+    ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+    ?s aocat:was_created_on ?date .
+    MINUS {
+        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+        ?s aocat:was_issued ?issued .
+        ?s aocat:was_modified ?modified .
+    }
+};
+
+PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::CollectionInfo> {
+          ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> .
+          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Concept> .
+          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> skos:prefLabel "collection"
+        }
+    }
+    WHERE {
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::CollectionInfo> {
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            MINUS {
+                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+                ?s	aocat:has_type ?t .
+            }
+        }
+};
+
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/FASTI/ordered_sparql_insert_fasti.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/FASTI/ordered_sparql_insert_fasti.sparql
index 0cc4802..b84034a 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/FASTI/ordered_sparql_insert_fasti.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/FASTI/ordered_sparql_insert_fasti.sparql
@@ -1,48 +1,8 @@
-PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
-PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::CollectionInfo> {
-        ?s aocat:was_issued "2020-10-16"^^xsd:dateTime .
-        ?s aocat:was_modified "2020-10-16"^^xsd:dateTime .
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::CollectionInfo>
-WHERE {
-    ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-    MINUS {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-        ?s aocat:was_issued ?issued .
-        ?s aocat:was_modified ?modified .
-    }
-};
-
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::CollectionInfo> {
-          ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> .
-          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Concept> .
-          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> skos:prefLabel "collection"
-        }
-    }
-    WHERE {
-        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::CollectionInfo> {
-            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-            MINUS {
-                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-                ?s	aocat:has_type ?t .
-            }
-        }
-};
-
-PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?coll ?p ?value
     }
 }
@@ -56,14 +16,14 @@ PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?record aocat:has_contributor ?contributor .
         ?record aocat:has_responsible ?legalResponsible .
         ?record aocat:has_access_rights ?accessRights .
         ?record aocat:has_ARIADNE_subject ?archeologicalResourceType .
     }
 }
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0>
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork>
 WHERE {
 	?record aocat:is_part_of ?collection .
     ?collection aocat:has_contributor ?contributor .
@@ -75,12 +35,12 @@ WHERE {
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s aocat:was_issued ?collectionIssued .
     }
 }
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s rdf:type aocat:AO_Individual_Data_Resource .
         ?s aocat:is_part_of ?collection .
         ?collection aocat:was_issued ?collectionIssued .
@@ -93,12 +53,12 @@ WHERE {
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s aocat:was_modified ?collectionModified .
     }
 }
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s rdf:type aocat:AO_Individual_Data_Resource .
         ?s aocat:is_part_of ?collection .
         ?collection aocat:was_modified ?collectionModified .
@@ -112,7 +72,7 @@ PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
       ?s	aocat:has_spatial_coverage <https://ariadne-infrastructure.eu/aocat/Place/NOTPROVIDED> .
       <https://ariadne-infrastructure.eu/aocat/Place/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Spatial_Region> .
       <https://ariadne-infrastructure.eu/aocat/Place/NOTPROVIDED> rdfs:label "Name not provided" .
@@ -120,7 +80,7 @@ INSERT {
     }
 }
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s rdf:type aocat:AO_Individual_Data_Resource .
         MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
@@ -133,13 +93,13 @@ WHERE {
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s	aocat:has_language <http://lexvo.org/id/iso639-3/und> .
         <http://lexvo.org/id/iso639-3/und> skos:prefLabel "und" .
     }
 }
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s rdf:type aocat:AO_Individual_Data_Resource .
         MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
@@ -153,14 +113,14 @@ PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
           ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/provided%20record> .
           <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/provided%20record> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Concept> .
           <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/provided%20record> skos:prefLabel "provided record"
         }
     }
     WHERE {
-        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
             MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
@@ -171,14 +131,34 @@ INSERT {
 
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
+          ?s	aocat:has_original_id ?lp
+        }
+    }
+    WHERE {
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s aocat:has_landing_page ?lp .
+            MINUS {
+                ?s rdf:type aocat:AO_Individual_Data_Resource .
+                ?s	aocat:has_original_id ?id
+            }
+        }
+};
+
+PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/fasti/NOT_PROVIDED> .
         <https://ariadne-infrastructure.eu/aocat/Agent/fasti/NOT_PROVIDED> aocat:has_name "Not provided" .
     }
 }
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s rdf:type aocat:AO_Individual_Data_Resource .
         MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
@@ -192,13 +172,13 @@ PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
       ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/fasti/NOT_PROVIDED> .
       <https://ariadne-infrastructure.eu/aocat/Concept/fasti/NOT_PROVIDED> skos:prefLabel "Not provided" .
     }
 }
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s rdf:type aocat:AO_Individual_Data_Resource .
         MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
@@ -210,12 +190,12 @@ WHERE {
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s	aocat:has_title "Title not provided" .
     }
 }
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
         ?s rdf:type aocat:AO_Individual_Data_Resource .
         MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
@@ -235,7 +215,7 @@ WHERE {
      }
  }
  WHERE {
- 	GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::0> {
+ 	GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fasti::fieldwork> {
        ?temporal aocat:has_native_period ?native_period .
        ?native_period skos:prefLabel ?native_label .
        ?temporal aocat:from ?from .