diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/INP/ordered_sparql_insert_INP.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/INP/ordered_sparql_insert_INP.sparql
deleted file mode 100644
index 1d29a52..0000000
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/INP/ordered_sparql_insert_INP.sparql
+++ /dev/null
@@ -1,381 +0,0 @@
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-      ?s	aocat:has_ARIADNE_subject <https://ariadne-infrastructure.eu/aocat/Concept/AO_Subject/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Concept/AO_Subject/NOTPROVIDED> skos:prefLabel "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?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_ARIADNE_subject ?ariadneSubject .
-        }
-    }
-};
-
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-      ?s	aocat:has_temporal_coverage <https://ariadne-infrastructure.eu/aocat/Time-Span/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Time-Span/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Temporal_Region> .
-      <https://ariadne-infrastructure.eu/aocat/Time-Span/NOTPROVIDED> rdfs:label "Not provided" .
-
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?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_temporal_coverage ?tc .
-        }
-    }
-};
-
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-      ?s	aocat:has_access_rights "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?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_access_rights ?ar .
-        }
-    }
-};
-
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-      ?s	aocat:has_publisher <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?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_publisher ?agent .
-        }
-    }
-};
-
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-      ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?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_owner ?agent .
-        }
-    }
-};
-
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-      ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?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_responsible ?agent .
-        }
-    }
-};
-
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-      ?s	aocat:has_contributor <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?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_contributor ?agent .
-        }
-    }
-};
-
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-          ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
-          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
-          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
-        }
-    }
-    WHERE {
-        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-            ?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_creator ?agent .
-            }
-        }
-};
-
-
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-          ?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::inp::test> {
-            ?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 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::inp::test> {
-        ?s aocat:was_issued "2022-01-01"^^xsd:dateTime .
-        ?s aocat:was_modified "2022-01-01"^^xsd:dateTime .
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test>
-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 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::inp::test> {
-          ?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::inp::test> {
-            ?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 skos: <http://www.w3.org/2004/02/skos/core#>
-PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?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::inp::test> {
-        ?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_language ?ns .
-        }
-    }
-};
-
-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::inp::test> {
-        ?s aocat:has_original_id "INP_TEST" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-            ?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_original_id ?tc .
-            }
-        }
-};
-
-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::inp::test> {
-        ?s	aocat:has_title "Title not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?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_title ?title .
-        }
-    }
-};
-
-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::inp::test> {
-        ?record aocat:was_issued ?issued .
-        ?record aocat:was_modified ?modified .
-        ?record aocat:has_contributor ?contributor .
-        ?contributor aocat:has_name ?contrib .
-        ?record aocat:has_responsible ?legalResponsible .
-        ?legalResponsible aocat:has_name ?resp .
-        ?record aocat:has_owner ?owner .
-        ?owner aocat:has_name ?own .
-        ?record aocat:has_publisher ?publisher .
-        ?publisher aocat:has_name ?pub .
-        ?record aocat:has_access_rights ?accessRights .
-        ?record aocat:has_language ?lang .
-        ?lang skos:prefLabel ?langL
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test>
-WHERE {
-	?record aocat:is_part_of ?collection .
-    ?collection aocat:was_issued ?issued .
-    ?collection aocat:was_modified ?modified .
-    ?collection aocat:has_contributor ?contributor .
-    ?contributor aocat:has_name ?contrib .
-    ?collection aocat:has_responsible ?legalResponsible .
-    ?legalResponsible aocat:has_name ?resp .
-    ?collection aocat:has_owner ?owner .
-    ?owner aocat:has_name ?own .
-    ?collection aocat:has_publisher ?publisher .
-    ?publisher aocat:has_name ?pub .
-    ?collection aocat:has_access_rights ?accessRights .
-    ?collection aocat:has_language ?lang .
-    ?lang skos:prefLabel ?langL
-};
-
-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#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?s	aocat:has_original_id "Original Id not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_original_id ?id .
-        }
-    }
-};
-
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
-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::inp::test> {
-          ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
-          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
-          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
-        }
-    }
-    WHERE {
-        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            MINUS {
-                ?s rdf:type aocat:AO_Individual_Data_Resource .
-                ?s	aocat:has_creator ?agent .
-            }
-        }
-};
-
-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::inp::test> {
-        ?s	aocat:has_title "Title not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::test> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_title ?title .
-        }
-    }
-};
\ No newline at end of file