diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu.dnetlib.ariadneplus.sparql.enrich.FI/ordered_sparql_insert_FI_Isleif.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu.dnetlib.ariadneplus.sparql.enrich.FI/ordered_sparql_insert_FI_Isleif.sparql
index eea855e..f58e44d 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu.dnetlib.ariadneplus.sparql.enrich.FI/ordered_sparql_insert_FI_Isleif.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu.dnetlib.ariadneplus.sparql.enrich.FI/ordered_sparql_insert_FI_Isleif.sparql
@@ -34,28 +34,6 @@ 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#>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-      ?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 "Place not provided" .
-      <https://ariadne-infrastructure.eu/aocat/Place/NOTPROVIDED> aocat:has_place_name "Place not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_spatial_coverage ?spatialRegion .
-            ?spatialRegion  aocat:has_place_name ?placeName .
-        }
-    }
-};
-
 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#>
@@ -81,111 +59,45 @@ 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::fi::isleif_sites> {
-        ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/FI_ISLEIF/NOT_PROVIDED> .
-        <https://ariadne-infrastructure.eu/aocat/Agent/FI_ISLEIF/NOT_PROVIDED> aocat:has_name "Not provided" .
+        ?s	?rel ?agent .
+        ?agent ?p ?o .
     }
 }
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif>
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites>
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
         ?s rdf:type aocat:AO_Individual_Data_Resource .
+        ?s aocat:is_part_of ?coll .
+        ?coll ?rel ?agent .
+        ?agent rdf:type aocat:AO_Agent .
+        ?agent ?p ?o .
         MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_creator ?creator .
+            ?s	?rel ?relAgent .
         }
-    }
-};
-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#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?s	aocat:has_contributor <https://ariadne-infrastructure.eu/aocat/Agent/FI_ISLEIF/NOT_PROVIDED> .
-        <https://ariadne-infrastructure.eu/aocat/Agent/FI_ISLEIF/NOT_PROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_contributor ?c .
-        }
-    }
-};
-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#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/FI_ISLEIF/NOT_PROVIDED> .
-        <https://ariadne-infrastructure.eu/aocat/Agent/FI_ISLEIF/NOT_PROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_responsible ?r .
-        }
-    }
 };
 
+
 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#>
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?s	aocat:has_publisher <https://ariadne-infrastructure.eu/aocat/Agent/FI/FI> .
-        <https://ariadne-infrastructure.eu/aocat/Agent/FI/FI> aocat:has_name "Fornleifastofnun Íslands" .
+        ?s	aocat:has_language ?lang .
+        ?lang skos:prefLabel ?label .
     }
 }
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif>
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites>
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_publisher ?p .
-        }
-    }
-};
-
-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#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/FI_ISLEIF/NOT_PROVIDED> .
-        <https://ariadne-infrastructure.eu/aocat/Agent/FI_ISLEIF/NOT_PROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_owner ?o .
-        }
-    }
-};
-
-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#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
-        ?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::fi::isleif_sites> {
         ?s rdf:type aocat:AO_Individual_Data_Resource .
+        ?s aocat:is_part_of ?coll .
+        ?coll aocat:has_language ?lang .
+        ?lang skos:prefLabel ?label .
         MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
             ?s	aocat:has_language ?ns .
         }
-    }
 };
 
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
@@ -229,19 +141,48 @@ 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::fi::isleif_sites> {
-          ?s	aocat:has_access_rights "Not provided"
+          ?s aocat:has_access_rights ?ar .
         }
     }
-    WHERE {
+WHERE {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        ?s aocat:is_part_of ?c .
+        MINUS {
+        ?s aocat:has_access_rights ?x
+        }
+    }
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif> {
+        ?c aocat:has_access_rights ?ar.
+    }
+
+};
+
+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::fi::isleif_sites> {
+          ?s	aocat:has_access_policy ?ap .
+          ?ap ?p ?o .
+        }
+    }
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif>
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::fi::isleif_sites>
+WHERE {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        ?s aocat:is_part_of ?coll .
+        ?coll aocat:has_access_policy ?ap .
+        ?ap ?p ?o .
+        MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
-            MINUS{
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_access_rights ?smt .
-            }
+            ?s	aocat:has_access_policy ?thePolicy .
         }
 };
 
+
+
 PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX owl: <http://www.w3.org/2002/07/owl#>