Index: modules/dnet-parthenos/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/TransformationRuleDSResources/TransformationRuleDSResourceType/ariadne_dataset_377_mapping.xml
===================================================================
--- modules/dnet-parthenos/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/TransformationRuleDSResources/TransformationRuleDSResourceType/ariadne_dataset_377_mapping.xml	(revision 49364)
+++ modules/dnet-parthenos/trunk/src/main/resources/eu/dnetlib/bootstrap/profiles/TransformationRuleDSResources/TransformationRuleDSResourceType/ariadne_dataset_377_mapping.xml	(revision 49365)
@@ -12,13 +12,16 @@
 			<SCRIPT>
 				<TITLE>Ariadne Dataset 377 Mapping</TITLE>
 				<CODE> <![CDATA[
-<x3ml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" source_type="xpath" version="1.0" xsi:noNamespaceSchemaLocation="x3ml_v1.0.xsd">
+				<x3ml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" source_type="xpath" version="1.0" xsi:noNamespaceSchemaLocation="x3ml_v1.0.xsd">
     <info>
-        <title>ACDM 2 PE without XSD (part 2)</title>
+        <title>ACDM 2 PE without XSD (part2)</title>
         <general_description>acdm:dataset</general_description>
         <source>
             <source_info>
                 <source_schema schema_file="ACDM_Example_For_3M___25-11-2016115336___9469.xml" type="xsd" version="6.9">acdm</source_schema>
+                <namespaces>
+                    <namespace prefix="" uri=""/>
+                </namespaces>
             </source_info>
             <source_collection>Ariadne</source_collection>
         </source>
@@ -42,9 +45,9 @@
                 </namespaces>
             </target_info>
             <target_info>
-                <target_schema schema_file="crmpe1.11___30-03-2017104444___6320.rdfs" type="rdfs" version="1.11">CRMpe</target_schema>
+                <target_schema schema_file="crmpe_2.rdfs" type="rdfs" version="2.0">CRMpe</target_schema>
                 <namespaces>
-                    <namespace prefix="crmpe" uri="http://www.ics.forth.gr/isl/CRMext/CRMpe.rdfs/"/>
+                    <namespace prefix="crmpe" uri="http://parthenos.d4science.org/CRMext/CRMpe.rdfs/"/>
                 </namespaces>
             </target_info>
             <target_info>
@@ -59,33 +62,27 @@
                     <namespace prefix="crm" uri="http://www.cidoc-crm.org/cidoc-crm/"/>
                 </namespaces>
             </target_info>
-            <target_info>
-                <target_schema schema_file="skos___28-04-2017090912___7229.rdf" type="" version="">skos</target_schema>
-                <namespaces>
-                    <namespace prefix="skos" uri="http://www.w3.org/2004/02/skos/core#"/>
-                </namespaces>
-            </target_info>
             <target_collection/>
         </target>
         <mapping_info>
             <mapping_created_by_org>ISTI - CNR/PIN</mapping_created_by_org>
-            <mapping_created_by_person>Nicola Aloia, Ilenia Galluccio, Achille Felicetti</mapping_created_by_person>
-            <in_collaboration_with>George Bruseker; Maria Theodoridou</in_collaboration_with>
+            <mapping_created_by_person>Nicola Aloia, Ilenia Galluccio</mapping_created_by_person>
+            <in_collaboration_with>Achille Felicetti</in_collaboration_with>
         </mapping_info>
         <example_data_info>
             <example_data_from>Oxygen</example_data_from>
-            <example_data_contact_person>Nicola</example_data_contact_person>
-            <example_data_source_record xml_link="acdm-dataset___03-05-2017121231___11097.xml"/>
-            <generator_policy_info generator_link="PARTHENOS-GeneratorPolicy_v1.0___22-03-2017152151___13573.xml"/>
-            <example_data_target_record/>
+            <example_data_contact_person>Nicola Aloia</example_data_contact_person>
+            <example_data_source_record xml_link="new-10304740___06-02-2017164704___2891___27-03-2017124304___4619.xml"/>
+            <generator_policy_info generator_link="Generator_new___16-06-2017134907___5863.xml"/>
+            <example_data_target_record rdf_link="Mapping377.ttl"/>
         </example_data_info>
     </info>
     <namespaces>
         <namespace prefix="acdm" uri="http://registry.ariadne-infrastructure.eu/"/>
         <namespace prefix="dcterms" uri="http://purl.org/dc/terms/"/>
-        <namespace prefix="foaf" uri="http://xmlns.com/foaf/0.1/"/>
+        <namespace prefix="foaf" uri="http://xmlns.com/foaf/"/>
         <namespace prefix="dc" uri="http://purl.org/dc/elements/1.1/"/>
-        <namespace prefix="parthenos" uri="http://parthenos-project.eu"/>
+        <namespace prefix="parthenos" uri="http://parthenos.d4science.org/handle/Ariadne/AriadnePortal/"/>
         <namespace prefix="dcat" uri="http://www.w3.org/ns/dcat#"/>
         <namespace prefix="owl" uri="http://www.w3.org/2002/07/owl#"/>
         <namespace prefix="dbpedia-owl" uri="http://dbpedia.org/ontology/"/>
@@ -99,21 +96,21 @@
         <namespace prefix="edm" uri="http://www.europeana.eu/schemas/edm/"/>
         <namespace prefix="adms" uri="http://www.w3.org/ns/adms#"/>
         <namespace prefix="xsi" uri="http://www.w3.org/2001/XMLSchema-instance"/>
-        <namespace prefix="parthenos" uri="http://www.parthenos-project.eu/ARIADNE/ARIADNECatalog/"/>
+        <namespace prefix="reg" uri="http://parthenos.d4science.org/handle/Parthenos/REG/"/>
     </namespaces>
     <mappings>
         <mapping>
             <domain>
-                <source_node>//acdm:dataset</source_node>
+                <source_node>/acdm:ariadne/acdm:ariadneArchaeologicalResource/acdm:dataset</source_node>
                 <target_node>
                     <entity>
                         <type>crmpe:PE22_Persistent_Dataset</type>
                         <type>crm:E33_Linguistic_Object</type>
-                        <instance_generator name="DatasetURI">
-                            <arg name="term" type="xpath">dcterms:identifier/text()</arg>
+                        <instance_generator name="URIorUUID">
+                            <arg name="text" type="xpath">dcterms:identifier/text()</arg>
                         </instance_generator>
                         <label_generator name="SimpleLabel">
-                            <arg name="label" type="xpath">dcterms:identifier/text()</arg>
+                            <arg name="label" type="xpath">dcterms:title/text()</arg>
                         </label_generator>
                     </entity>
                 </target_node>
@@ -132,8 +129,8 @@
                     <target_node>
                         <entity>
                             <type>crmpe:PE22_Persistent_Dataset</type>
-                            <instance_generator name="DatasetURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="URIorUUID">
+                                <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">text()</arg>
@@ -148,10 +145,14 @@
                         <relation>acdm:publisher</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P12i_was_present_at</relationship>
-                        <entity>
-                            <type>crm:E7_Activity</type>
+                        <relationship>crmdig:L10i_was_input_of</relationship>
+                        <entity variable="contentprovision">
+                            <type>crmdig:D7_Digital_Machine_Event</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Content Provision of Record </arg>
+                                <arg name="text" type="xpath">../dcterms:identifier/text()</arg>
+                            </label_generator>
                             <additional>
                                 <relationship>crm:P2_has_type</relationship>
                                 <entity>
@@ -164,7 +165,7 @@
                                         <arg name="level1" type="constant">contentprovision</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">ARIADNE Content Provision</arg>
+                                        <arg name="label" type="constant">Content Provision</arg>
                                     </label_generator>
                                 </entity>
                             </additional>
@@ -218,6 +219,10 @@
                         <entity variable="create1">
                             <type>crm:E65_Creation</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Creation Event of Record </arg>
+                                <arg name="text" type="xpath">../dcterms:identifier/text()</arg>
+                            </label_generator>
                             <additional>
                                 <relationship>crm:P2_has_type</relationship>
                                 <entity>
@@ -230,7 +235,7 @@
                                         <arg name="level1" type="constant">contentcreation</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">ARIADNE Content Contribution</arg>
+                                        <arg name="label" type="constant">Content Creation</arg>
                                     </label_generator>
                                 </entity>
                             </additional>
@@ -293,10 +298,10 @@
                                     </instance_info>
                                     <instance_generator name="ConceptURI">
                                         <arg name="term" type="constant">activitytype</arg>
-                                        <arg name="level1" type="constant">ariadnecontentcreation</arg>
+                                        <arg name="level1" type="constant">contentcreation</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">ARIADNE Content Creation</arg>
+                                        <arg name="label" type="constant">Content Creation</arg>
                                     </label_generator>
                                 </entity>
                             </additional>
@@ -350,6 +355,10 @@
                         <entity>
                             <type>crm:E30_Right</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Ownership Right of </arg>
+                                <arg name="text" type="xpath">../dcterms:identifier/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P75i_is_possessed_by</relationship>
                     </target_relation>
@@ -375,26 +384,10 @@
                         <relation>acdm:legalResponsible</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P12i_was_present_at</relationship>
-                        <entity>
-                            <type>crm:E7_Activity</type>
+                        <relationship>crmdig:L10i_was_input_of</relationship>
+                        <entity variable="contentprovision">
+                            <type>crmdig:D7_Digital_Machine_Event</type>
                             <instance_generator name="UUID"/>
-                            <additional>
-                                <relationship>crm:P2_has_type</relationship>
-                                <entity>
-                                    <type>crm:E55_Type</type>
-                                    <instance_info>
-                                        <constant>ARIADNE Content Legal Responsibility</constant>
-                                    </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">activitytype</arg>
-                                        <arg name="level1" type="constant">legalresponsibility</arg>
-                                    </instance_generator>
-                                    <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">ARIADNE Content Legal Responsibility</arg>
-                                    </label_generator>
-                                </entity>
-                            </additional>
                         </entity>
                         <relationship>crm:P01i_is_domain_of</relationship>
                         <entity>
@@ -441,16 +434,11 @@
                         <relation>acdm:scientificResponsible</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crmpe:PP24i_is_dataset_snapshot_of</relationship>
-                        <entity>
-                            <type>crmpe:PE24_Volatile_Dataset</type>
+                        <relationship>crmdig:L10i_was_input_of</relationship>
+                        <entity variable="contentprovision">
+                            <type>crmdig:D7_Digital_Machine_Event</type>
                             <instance_generator name="UUID"/>
                         </entity>
-                        <relationship>crmpe:PP13i_was_volatile_dataset_curated_by</relationship>
-                        <entity>
-                            <type>crmpe:PE12_Data_Curating_Service</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
                         <relationship>crm:P01i_is_domain_of</relationship>
                         <entity>
                             <type>crm:PC14_carried_out_by</type>
@@ -496,9 +484,9 @@
                         <relation>acdm:technicalResponsible</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crmpe:PP8i_is_dataset_hosted_by</relationship>
-                        <entity>
-                            <type>crmpe:PE15_Data_E-Service</type>
+                        <relationship>crmdig:L10i_was_input_of</relationship>
+                        <entity variable="contentprovision">
+                            <type>crmdig:D7_Digital_Machine_Event</type>
                             <instance_generator name="UUID"/>
                         </entity>
                         <relationship>crm:P01i_is_domain_of</relationship>
@@ -605,9 +593,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -622,11 +607,19 @@
                         <entity>
                             <type>frbr:F30_Publication_Event</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Publication of Dataset: </arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P4_has_time-span</relationship>
                         <entity>
                             <type>crm:E52_Time-Span</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Timespan for the Publication of Dataset: </arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P82_at_some_time_within</relationship>
                     </target_relation>
@@ -639,9 +632,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Publication of Dataset</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -656,11 +646,19 @@
                         <entity>
                             <type>crmdig:D7_Digital_Machine_Event</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Last Modification of:</arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P4_has_time-span</relationship>
                         <entity>
                             <type>crm:E52_Time-Span</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Timespan of Last Modification of: </arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P82_at_some_time_within</relationship>
                     </target_relation>
@@ -673,9 +671,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Last Modification of Dataset</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -698,7 +693,7 @@
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">Original ID</arg>
+                                <arg name="label" type="xpath">text()</arg>
                             </label_generator>
                             <additional>
                                 <relationship>crm:P2_has_type</relationship>
@@ -707,7 +702,7 @@
                                     <instance_info>
                                         <constant>OriginalID</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">idtype</arg>
                                         <arg name="level1" type="constant">originalid</arg>
                                     </instance_generator>
@@ -734,9 +729,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E56_Language</type>
-                            <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="xpath">languagetype</arg>
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="ConceptURI_2step">
+                                <arg name="term" type="constant">languagetype</arg>
+                                <arg name="level1" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">text()</arg>
@@ -755,6 +750,10 @@
                         <entity>
                             <type>crm:E30_Right</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Access Policy for: </arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P2_has_type</relationship>
                     </target_relation>
@@ -799,6 +798,10 @@
                         <entity>
                             <type>crm:E30_Right</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Access Rights for: </arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P2_has_type</relationship>
                     </target_relation>
@@ -848,7 +851,7 @@
                         <entity>
                             <type>crm:E30_Right</type>
                             <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="constant">rights</arg>
+                                <arg name="level1" type="constant">Rights</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -872,8 +875,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="">
+                                <arg name="term" type="constant">subject</arg>
+                                <arg name="level1" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">text()</arg>
@@ -892,6 +896,10 @@
                         <entity variable="datserv1">
                             <type>crmpe:PE15_Data_E-Service</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Data Hosting Service for: </arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crmpe:PP49_provides_access_point</relationship>
                     </target_relation>
@@ -921,6 +929,10 @@
                         <entity variable="datserv1">
                             <type>crmpe:PE15_Data_E-Service</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Data Hosting Service for: </arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P11_had_participant</relationship>
                         <entity>
@@ -935,8 +947,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E51_Contact_Point</type>
-                            <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="constant">contactpoint</arg>
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">thing</arg>
+                                <arg name="level2" type="constant">appellation</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -962,10 +975,10 @@
                             <type>crm:E4_Period</type>
                             <instance_generator name="OneLevelCustomURI">
                                 <arg name="level1" type="constant">period</arg>
-                                <arg name="term" type="xpath">acdm:periodName/text()</arg>
+                                <arg name="term" type="xpath">acdm:periodName/skos:Concept/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">acdm:periodName/text()</arg>
+                                <arg name="label" type="xpath">acdm:periodName/skos:Concept/text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -986,10 +999,10 @@
                         <entity>
                             <type>crm:E53_Place</type>
                             <instance_generator name="PlaceURI">
-                                <arg name="term" type="xpath">acdm:country/text()</arg>
+                                <arg name="term" type="xpath">acdm:periodName/skos:Concept/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">acdm:country/text()</arg>
+                                <arg name="label" type="xpath">acdm:placeName/text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -1105,8 +1118,7 @@
                     <target_node>
                         <entity>
                             <type>crmpe:PE38_Schema</type>
-                            <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="constant">schematype</arg>
+                            <instance_generator name="SoftwareURI">
                                 <arg name="term" type="xpath">acdm:xsd/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -1214,6 +1226,7 @@
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">skos:Concept/skos:prefLabel/text()</arg>
                             </label_generator>
+                            <label_generator name=""/>
                             <additional>
                                 <relationship>crm:P2_has_type</relationship>
                                 <entity>
@@ -1285,7 +1298,7 @@
         </mapping>
         <mapping>
             <domain>
-                <source_node>//acdm:publisher</source_node>
+                <source_node>//acdm:publisher | //acdm:contributor | acdm:creator | acdm:owner | acdm:legalResponsible | acdm:technicalResponsible</source_node>
                 <target_node>
                     <entity>
                         <type>crm:E39_Actor</type>
@@ -1336,7 +1349,8 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="ConceptURI_2step">
+                                <arg name="term" type="constant">actortype</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -1375,8 +1389,9 @@
                                     <instance_info>
                                         <constant>Email</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">email</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">contacttype</arg>
+                                        <arg name="level1" type="constant">email</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Email</arg>
@@ -1416,8 +1431,9 @@
                                     <instance_info>
                                         <constant>Phone</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">phone</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">contacttype</arg>
+                                        <arg name="level1" type="constant">phone</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Phone</arg>
@@ -1457,8 +1473,9 @@
                                     <instance_info>
                                         <constant>SkypeID</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">skypeid</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">contacttype</arg>
+                                        <arg name="level1" type="constant">skypeid</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Skype ID</arg>
@@ -1501,7 +1518,7 @@
                     <entity>
                         <type>crm:E4_Period</type>
                         <instance_generator name="OneLevelCustomURI">
-                            <arg name="level1" type="xpath">period</arg>
+                            <arg name="level1" type="constant">period</arg>
                             <arg name="term" type="xpath">acdm:periodName/text()</arg>
                         </instance_generator>
                         <label_generator name="SimpleLabel">
@@ -1513,7 +1530,7 @@
             <link>
                 <path>
                     <source_relation>
-                        <relation>acdm:periodName</relation>
+                        <relation>acdm:periodName/skos:Concept</relation>
                     </source_relation>
                     <target_relation>
                         <relationship>crm:P1_is_identified_by</relationship>
@@ -1520,7 +1537,7 @@
                     </target_relation>
                 </path>
                 <range>
-                    <source_node>acdm:periodName</source_node>
+                    <source_node>acdm:periodName/skos:Concept</source_node>
                     <target_node>
                         <entity>
                             <type>crm:E41_Appellation</type>
@@ -1593,67 +1610,21 @@
                     </target_node>
                 </range>
             </link>
-        </mapping>
-        <mapping>
-            <domain>
-                <source_node>//acdm:periodName</source_node>
-                <target_node>
-                    <entity>
-                        <type>crm:E41_Appellation</type>
-                        <instance_generator name="OneLevelCustomURI">
-                            <arg name="level1" type="xpath">periodname</arg>
-                            <arg name="term" type="xpath">text()</arg>
-                        </instance_generator>
-                        <label_generator name="SimpleLabel">
-                            <arg name="label" type="xpath">text()</arg>
-                        </label_generator>
-                    </entity>
-                </target_node>
-            </domain>
             <link>
                 <path>
                     <source_relation>
-                        <relation>skos:Concept</relation>
+                        <relation>acdm:periodName/skos:Concept/skos:broadMatch</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P2_has_type</relationship>
+                        <relationship>crm:P10_falls_within</relationship>
                     </target_relation>
                 </path>
                 <range>
-                    <source_node>skos:Concept</source_node>
+                    <source_node>acdm:periodName/skos:Concept/skos:broadMatch</source_node>
                     <target_node>
-                        <entity variable="periodtype1">
-                            <type>http://www.w3.org/2004/02/skos/core#Concept</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">text()</arg>
-                            </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
-                        </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
-                        <relation>skos:Concept/skos:broadMatch</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P2_has_type</relationship>
-                        <entity variable="periodtype1">
-                            <type>http://www.w3.org/2004/02/skos/core#Concept</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
-                        <relationship>crm:P127_has_broader_term</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>skos:Concept/skos:broadMatch</source_node>
-                    <target_node>
                         <entity>
-                            <type>http://www.w3.org/2004/02/skos/core#Concept</type>
-                            <instance_generator name="ConceptURI">
+                            <type>crm:E4_Period</type>
+                            <instance_generator name="EventURI">
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -1696,6 +1667,9 @@
                             <instance_generator name="PlaceAppellationURI">
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
+                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -1706,12 +1680,12 @@
                         <relation>acdm:coordinateSystem</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P1_is_identified_by</relationship>
-                        <entity>
-                            <type>crm:E47_Spatial_Coordinates</type>
+                        <relationship>crm:P140i_was_attributed_by</relationship>
+                        <entity variable="asi1">
+                            <type>crm:E13_Attribute_Assignment</type>
                             <instance_generator name="UUID"/>
                         </entity>
-                        <relationship>crm:P2_has_type</relationship>
+                        <relationship>crm:P33_used_specific_technique</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -1718,8 +1692,8 @@
                     <source_node>acdm:coordinateSystem</source_node>
                     <target_node>
                         <entity>
-                            <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <type>crm:E29_Design_or_Procedure</type>
+                            <instance_generator name="ThingURI">
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -1735,54 +1709,26 @@
                         <relation>acdm:lat</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P1_is_identified_by</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>acdm:lat</source_node>
-                    <target_node>
-                        <entity>
-                            <type>crm:E47_Spatial_Coordinates</type>
+                        <relationship>crm:P140i_was_attributed_by</relationship>
+                        <entity variable="asi1">
+                            <type>crm:E13_Attribute_Assignment</type>
                             <instance_generator name="UUID"/>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
-                            <additional>
-                                <relationship>crm:P2_has_type</relationship>
-                                <entity>
-                                    <type>crm:E55_Type</type>
-                                    <instance_info>
-                                        <constant>lat</constant>
-                                    </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">latitude</arg>
-                                    </instance_generator>
-                                    <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">Latitude</arg>
-                                    </label_generator>
-                                </entity>
-                            </additional>
                         </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
-                        <relation>acdm:lon</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P1_is_identified_by</relationship>
+                        <relationship>crm:P141_assigned</relationship>
                     </target_relation>
                 </path>
                 <range>
-                    <source_node>acdm:lon</source_node>
+                    <source_node>acdm:lat</source_node>
                     <target_node>
                         <entity>
                             <type>crm:E47_Spatial_Coordinates</type>
-                            <instance_generator name="UUID"/>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
+                            <instance_generator name="PlaceAppLatLong">
+                                <arg name="lat" type="xpath">text()</arg>
+                                <arg name="long" type="xpath">../acdm:lon/text()</arg>
+                            </instance_generator>
+                            <label_generator name="LatLong">
+                                <arg name="lat" type="xpath">text()</arg>
+                                <arg name="long" type="xpath">../acdm:lon/text()</arg>
                             </label_generator>
                             <additional>
                                 <relationship>crm:P2_has_type</relationship>
@@ -1789,13 +1735,14 @@
                                 <entity>
                                     <type>crm:E55_Type</type>
                                     <instance_info>
-                                        <constant>lon</constant>
+                                        <constant>exact coordinate</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">longitude</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">coordinatetype</arg>
+                                        <arg name="level1" type="constant">exact</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">Longitude</arg>
+                                        <arg name="label" type="constant">Exact Coordinate</arg>
                                     </label_generator>
                                 </entity>
                             </additional>
@@ -1817,9 +1764,13 @@
                     <target_node>
                         <entity>
                             <type>crm:E47_Spatial_Coordinates</type>
-                            <instance_generator name="UUID"/>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
+                            <instance_generator name="PlaceAppLatLong">
+                                <arg name="lat" type="xpath">text()</arg>
+                                <arg name="long" type="xpath">../acdm:boundingBoxMinLong/text()</arg>
+                            </instance_generator>
+                            <label_generator name="LatLong">
+                                <arg name="lat" type="xpath">text()</arg>
+                                <arg name="long" type="xpath">../acdm:boundingBoxMinLong/text()</arg>
                             </label_generator>
                             <additional>
                                 <relationship>crm:P2_has_type</relationship>
@@ -1826,13 +1777,14 @@
                                 <entity>
                                     <type>crm:E55_Type</type>
                                     <instance_info>
-                                        <constant>minLat</constant>
+                                        <constant>Min Bounding Box</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">minlat</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">coordinatetype</arg>
+                                        <arg name="level1" type="constant">minboundingbox</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">Bounding Box Min Lat</arg>
+                                        <arg name="label" type="constant">Bounding Box Minimum</arg>
                                     </label_generator>
                                 </entity>
                             </additional>
@@ -1843,43 +1795,6 @@
             <link>
                 <path>
                     <source_relation>
-                        <relation>acdm:boundingBoxMinLon</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P1_is_identified_by</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>acdm:boundingBoxMinLon</source_node>
-                    <target_node>
-                        <entity>
-                            <type>crm:E47_Spatial_Coordinates</type>
-                            <instance_generator name="UUID"/>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
-                            <additional>
-                                <relationship>crm:P2_has_type</relationship>
-                                <entity>
-                                    <type>crm:E55_Type</type>
-                                    <instance_info>
-                                        <constant>minLon</constant>
-                                    </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">minlon</arg>
-                                    </instance_generator>
-                                    <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">Bounding Box Min Lon</arg>
-                                    </label_generator>
-                                </entity>
-                            </additional>
-                        </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
                         <relation>acdm:boundingBoxMaxLat</relation>
                     </source_relation>
                     <target_relation>
@@ -1891,9 +1806,13 @@
                     <target_node>
                         <entity>
                             <type>crm:E47_Spatial_Coordinates</type>
-                            <instance_generator name="UUID"/>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
+                            <instance_generator name="PlaceAppLatLong">
+                                <arg name="lat" type="xpath">text()</arg>
+                                <arg name="long" type="xpath">../acdm:boundingBoxMaxLat/text()</arg>
+                            </instance_generator>
+                            <label_generator name="LatLong">
+                                <arg name="lat" type="xpath">text()</arg>
+                                <arg name="long" type="xpath">../acdm:boundingBoxMaxLon/text()</arg>
                             </label_generator>
                             <additional>
                                 <relationship>crm:P2_has_type</relationship>
@@ -1900,13 +1819,14 @@
                                 <entity>
                                     <type>crm:E55_Type</type>
                                     <instance_info>
-                                        <constant>maxLat</constant>
+                                        <constant>Max Bounding Box</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">maxlat</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">coordinatetype</arg>
+                                        <arg name="level1" type="constant">maxboundingbox</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">Bounding Box Max Lat</arg>
+                                        <arg name="label" type="constant">Bounding Box Max</arg>
                                     </label_generator>
                                 </entity>
                             </additional>
@@ -1917,43 +1837,6 @@
             <link>
                 <path>
                     <source_relation>
-                        <relation>acdm:boundingBoxMaxLon</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P1_is_identified_by</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>acdm:boundingBoxMaxLon</source_node>
-                    <target_node>
-                        <entity>
-                            <type>crm:E47_Spatial_Coordinates</type>
-                            <instance_generator name="UUID"/>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
-                            <additional>
-                                <relationship>crm:P2_has_type</relationship>
-                                <entity>
-                                    <type>crm:E55_Type</type>
-                                    <instance_info>
-                                        <constant>maxLon</constant>
-                                    </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">maxlon</arg>
-                                    </instance_generator>
-                                    <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">Bounding Box Max Lon</arg>
-                                    </label_generator>
-                                </entity>
-                            </additional>
-                        </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
                         <relation>acdm:address</relation>
                     </source_relation>
                     <target_relation>
@@ -1965,48 +1848,17 @@
                     <target_node>
                         <entity>
                             <type>crm:E45_Address</type>
-                            <instance_generator name="PlaceURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="PlaceAppellationAddressURI">
+                                <arg name="mainaddress" type="xpath">text()</arg>
+                                <arg name="postcode" type="xpath">../acdm:postcode/text()</arg>
+                                <arg name="country" type="xpath">../acdm:country/text()</arg>
                             </instance_generator>
-                        </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
-                        <relation>acdm:numberInRoad</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P1_is_identified_by</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>acdm:numberInRoad</source_node>
-                    <target_node>
-                        <entity>
-                            <type>crm:E45_Address</type>
-                            <instance_generator name="PlaceURI">
+                            <label_generator name="AddressLabel">
                                 <arg name="term" type="xpath">text()</arg>
-                            </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
+                                <arg name="term2" type="xpath">../acdm:numberInRoad/text()</arg>
+                                <arg name="term3" type="xpath">../acdm:postcode/text()</arg>
+                                <arg name="term4" type="xpath">../acdm:country/text()</arg>
                             </label_generator>
-                            <additional>
-                                <relationship>crm:P2_has_type</relationship>
-                                <entity>
-                                    <type>crm:E55_Type</type>
-                                    <instance_info>
-                                        <constant>numberInRoad</constant>
-                                    </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">numberinroad</arg>
-                                    </instance_generator>
-                                    <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">Number in Road</arg>
-                                    </label_generator>
-                                </entity>
-                            </additional>
                         </entity>
                     </target_node>
                 </range>
@@ -2014,49 +1866,10 @@
             <link>
                 <path>
                     <source_relation>
-                        <relation>acdm:postcode</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P1_is_identified_by</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>acdm:postcode</source_node>
-                    <target_node>
-                        <entity>
-                            <type>crm:E45_Address</type>
-                            <instance_generator name="PlaceURI">
-                                <arg name="term" type="xpath">text()</arg>
-                            </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
-                            <additional>
-                                <relationship>crm:P2_has_type</relationship>
-                                <entity>
-                                    <type>crm:E55_Type</type>
-                                    <instance_info>
-                                        <constant>postcode</constant>
-                                    </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">postcode</arg>
-                                    </instance_generator>
-                                    <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">Postcode</arg>
-                                    </label_generator>
-                                </entity>
-                            </additional>
-                        </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
                         <relation>acdm:country</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P1_is_identified_by</relationship>
+                        <relationship>crm:P89_falls_within</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -2063,8 +1876,8 @@
                     <source_node>acdm:country</source_node>
                     <target_node>
                         <entity>
-                            <type>crm:E44_Place_Appellation</type>
-                            <instance_generator name="PlaceAppellationURI">
+                            <type>crm:E53_Place</type>
+                            <instance_generator name="PlaceURI">
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -2131,9 +1944,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -2148,11 +1958,19 @@
                         <entity>
                             <type>frbr:F30_Publication_Event</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Publication of Dataset</arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P4_has_time-span</relationship>
                         <entity>
                             <type>crm:E52_Time-Span</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="CompositeLabel">
+                                <arg name="label" type="constant">Timespan of Publication of Dataset: </arg>
+                                <arg name="text" type="xpath">../dcterms:title/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P82_at_some_time_within</relationship>
                     </target_relation>
@@ -2165,9 +1983,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Publication of Dataset</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -2182,6 +1997,9 @@
                         <entity>
                             <type>crmdig:D7_Digital_Machine_Event</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="constant">Last Modification of Dataset</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P4_has_time-span</relationship>
                         <entity>
@@ -2199,9 +2017,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Modification of Dataset</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -2245,8 +2060,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="ConceptURI_2step">
+                                <arg name="term" type="constant">format</arg>
+                                <arg name="level1" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">text()</arg>
@@ -2265,28 +2081,16 @@
                         <entity>
                             <type>crm:E54_Dimension</type>
                             <instance_generator name="UUID"/>
-                        </entity>
-                        <relationship>crm:P91_has_unit</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>dcat:byteSize</source_node>
-                    <target_node>
-                        <entity>
-                            <type>crm:E58_Measurement_Unit</type>
-                            <instance_generator name="UUID"/>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                             <additional>
-                                <relationship>crm:P2_has_type</relationship>
+                                <relationship>crm:P91_has_unit</relationship>
                                 <entity>
-                                    <type>crm:E55_Type</type>
+                                    <type>crm:E58_Measurement_Unit</type>
                                     <instance_info>
                                         <constant>Byte Size</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">bytesize</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">measurementunit</arg>
+                                        <arg name="level1" type="constant">bytesize</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Byte Size</arg>
@@ -2294,6 +2098,18 @@
                                 </entity>
                             </additional>
                         </entity>
+                        <relationship>crm:P90_has_value</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>dcat:byteSize</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
                     </target_node>
                 </range>
             </link>
@@ -2303,39 +2119,39 @@
                         <relation>acdm:numOfRecords</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P106_is_composed_of</relationship>
-                        <entity>
-                            <type>crm:E73_Information_Object</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
                         <relationship>crm:P43_has_dimension</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>acdm:numOfRecords</source_node>
-                    <target_node>
                         <entity>
                             <type>crm:E54_Dimension</type>
                             <instance_generator name="UUID"/>
-                            <label_generator name="ConceptURI">
-                                <arg name="term" type="xpath">text()</arg>
-                            </label_generator>
                             <additional>
-                                <relationship>crm:P2_has_type</relationship>
+                                <relationship>crm:P91_has_unit</relationship>
                                 <entity>
-                                    <type>crm:E55_Type</type>
+                                    <type>crm:E58_Measurement_Unit</type>
                                     <instance_info>
                                         <constant>Number of Records</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">numberofrecords</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">measurementunit</arg>
+                                        <arg name="level1" type="constant">numrecords</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
-                                        <arg name="label" type="constant">Number Of Records</arg>
+                                        <arg name="label" type="constant">Number of Records</arg>
                                     </label_generator>
                                 </entity>
                             </additional>
                         </entity>
+                        <relationship>crm:P90_has_value</relationship>
+                    </target_relation>
+                </path>
+                <range>
+                    <source_node>acdm:numOfRecords</source_node>
+                    <target_node>
+                        <entity>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
+                            <instance_generator name="Literal">
+                                <arg name="text" type="xpath">text()</arg>
+                            </instance_generator>
+                        </entity>
                     </target_node>
                 </range>
             </link>
@@ -2361,9 +2177,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -2387,8 +2200,24 @@
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Licence</arg>
+                                <arg name="label" type="xpath">text()</arg>
                             </label_generator>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>License</constant>
+                                    </instance_info>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">righttype</arg>
+                                        <arg name="level1" type="constant">license</arg>
+                                    </instance_generator>
+                                    <label_generator name="SimpleLabel">
+                                        <arg name="label" type="constant">License</arg>
+                                    </label_generator>
+                                </entity>
+                            </additional>
                         </entity>
                     </target_node>
                 </range>
@@ -2410,7 +2239,7 @@
                                     <instance_info>
                                         <constant>Content Provision</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
                                         <arg name="level1" type="constant">content provision</arg>
                                     </instance_generator>
@@ -2431,8 +2260,8 @@
                                     <instance_info>
                                         <constant>Publisher</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">Role</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">role</arg>
                                         <arg name="level1" type="constant">publisher</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
@@ -2465,7 +2294,12 @@
                         <relation>acdm:accessibleVia</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crmpe:PP50_accessible_at</relationship>
+                        <relationship>crmpe:PP8i_is_dataset_hosted_by</relationship>
+                        <entity variable="dataserv2">
+                            <type>crmpe:PE15_Data_E-Service</type>
+                            <instance_generator name="UUID"/>
+                        </entity>
+                        <relationship>crmpe:PP49_provides_access_point</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -2494,7 +2328,7 @@
                             <arg name="term" type="xpath">acdm:name/text()</arg>
                         </instance_generator>
                         <label_generator name="SimpleLabel">
-                            <arg name="label" type="constant">acdm:name/text()</arg>
+                            <arg name="label" type="xpath">acdm:name/text()</arg>
                         </label_generator>
                     </entity>
                 </target_node>
@@ -2513,9 +2347,14 @@
                     <target_node>
                         <entity>
                             <type>crm:E41_Appellation</type>
-                            <instance_generator name="ConceptAppellationURI">
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">appellation</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">text()</arg>
+                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -2537,9 +2376,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -2557,7 +2393,7 @@
                     <source_node>acdm:URI</source_node>
                     <target_node>
                         <entity>
-                            <type>crm:E42_Identifier</type>
+                            <type>crmpe:PE29_Access_Point</type>
                             <instance_generator name="URIorUUID">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
@@ -2601,9 +2437,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -2622,8 +2455,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="ConceptURI_2step">
+                                <arg name="term" type="constant">characterset</arg>
+                                <arg name="level1" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">text()</arg>
@@ -2647,7 +2481,7 @@
                         <entity>
                             <type>crm:E31_Document</type>
                             <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="constant">Document</arg>
+                                <arg name="level1" type="constant">document</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                         </entity>
@@ -2660,7 +2494,7 @@
                         <relation>acdm:usesVocabulary</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
+                        <relationship>crm:P67_refers_to</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -2751,7 +2585,7 @@
                                     <instance_info>
                                         <constant>Content provision</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
                                         <arg name="level1" type="constant">contentprovision</arg>
                                     </instance_generator>
@@ -2772,9 +2606,9 @@
                                     <instance_info>
                                         <constant>Publisher</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">roles</arg>
-                                        <arg name="level1" type="constant">Publisher</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">role</arg>
+                                        <arg name="level1" type="constant">publisher</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Publisher</arg>
@@ -2817,7 +2651,7 @@
                                     <instance_info>
                                         <constant>Content Creation</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
                                         <arg name="level1" type="constant">contentcreation</arg>
                                     </instance_generator>
@@ -2838,7 +2672,7 @@
                                     <instance_info>
                                         <constant>Contributor</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">role</arg>
                                         <arg name="level1" type="constant">contributor</arg>
                                     </instance_generator>
@@ -2883,9 +2717,9 @@
                                     <instance_info>
                                         <constant>Content Creation</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
-                                        <arg name="level 1" type="constant">contentcreation</arg>
+                                        <arg name="level1" type="constant">contentcreation</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Content Creation</arg>
@@ -2904,7 +2738,7 @@
                                     <instance_info>
                                         <constant>Creator</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">role</arg>
                                         <arg name="level1" type="constant">contributor</arg>
                                     </instance_generator>
@@ -2978,7 +2812,7 @@
                                     <instance_info>
                                         <constant>Content Legal Responsibility</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
                                         <arg name="level1" type="constant">contentlegalresponsibility</arg>
                                     </instance_generator>
@@ -2999,7 +2833,7 @@
                                     <instance_info>
                                         <constant>Legal Responsible</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">role</arg>
                                         <arg name="level1" type="constant">legalresponsible</arg>
                                     </instance_generator>
@@ -3054,7 +2888,7 @@
                                     <instance_info>
                                         <constant>Scientific Responsible</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">role</arg>
                                         <arg name="level1" type="constant">scientificresponsible</arg>
                                     </instance_generator>
@@ -3104,9 +2938,9 @@
                                     <instance_info>
                                         <constant>Technical Responsible</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">role</arg>
-                                        <arg name="" type="xpath">technicalresponsible</arg>
+                                        <arg name="level1" type="constant">technicalresponsible</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Technical Responsible</arg>
@@ -3146,7 +2980,7 @@
                     <target_node>
                         <entity>
                             <type>crm:E35_Title</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="DatasetAppellationURI">
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -3173,9 +3007,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -3190,6 +3021,9 @@
                         <entity>
                             <type>frbr:F30_Publication_Event</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="constant">Publication of Dataset</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P4_has_time-span</relationship>
                         <entity>
@@ -3207,9 +3041,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Publication of dataset</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -3224,6 +3055,9 @@
                         <entity>
                             <type>crmdig:D7_Digital_Machine_Event</type>
                             <instance_generator name="UUID"/>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="constant">Modification of Dataset</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P4_has_time-span</relationship>
                         <entity>
@@ -3241,9 +3075,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Modification of Dataset</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -3275,8 +3106,9 @@
                                     <instance_info>
                                         <constant>OriginalID</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">originalid</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">identifiertype</arg>
+                                        <arg name="level1" type="constant">originalid</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Original ID</arg>
@@ -3301,8 +3133,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="ConceptURI_2step">
+                                <arg name="term" type="constant">subject</arg>
+                                <arg name="level1" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">text()</arg>
@@ -3325,8 +3158,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E56_Language</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="ConceptURI_2step">
+                                <arg name="term" type="constant">languagetype</arg>
+                                <arg name="level1" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">text()</arg>
@@ -3378,7 +3212,12 @@
                         <relationship>crm:P11_had_participant</relationship>
                         <entity>
                             <type>crm:E39_Actor</type>
-                            <instance_generator name="UUID"/>
+                            <instance_generator name="ActorURI">
+                                <arg name="term" type="xpath">foaf:name/text()</arg>
+                            </instance_generator>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">foaf:name/text()</arg>
+                            </label_generator>
                         </entity>
                         <relationship>crm:P76_has_contact_point</relationship>
                     </target_relation>
@@ -3524,8 +3363,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">acdm:derivedSubject/skos:prefLabel/text()</arg>
+                            <instance_generator name="ConceptURI_2step">
+                                <arg name="term" type="constant">subject</arg>
+                                <arg name="level1" type="xpath">acdm:derivedSubject/skos:prefLabel/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">acdm:derivedSubject/skos:prefLabel/text()</arg>
@@ -3548,8 +3388,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">skos:Concept/@rdf:about</arg>
+                            <instance_generator name="ConceptURI_2step">
+                                <arg name="term" type="constant">subject</arg>
+                                <arg name="level1" type="xpath">skos:Concept/@rdf:about</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">skos:Concept/@rdf:about</arg>
@@ -3601,8 +3442,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">skos:prefLabel/text()</arg>
+                            <instance_generator name="ConceptURI_2step">
+                                <arg name="term" type="constant">subject</arg>
+                                <arg name="level1" type="xpath">skos:prefLabel/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">skos:prefLabel/text()</arg>
@@ -3617,12 +3459,7 @@
                         <relation>acdm:hasVersion</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P94i_was_created_by</relationship>
-                        <entity>
-                            <type>frbr:F30_Publication_Event</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
-                        <relationship>crm:P2_has_type</relationship>
+                        <relationship>crm:P1_is_identified_by</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -3629,13 +3466,30 @@
                     <source_node>acdm:hasVersion</source_node>
                     <target_node>
                         <entity>
-                            <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <type>crm:E42_Identifier</type>
+                            <instance_generator name="DatasetAppellationURI">
                                 <arg name="term" type="xpath">dcterms:title/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">dcterms:title/text()</arg>
                             </label_generator>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>Version Number</constant>
+                                    </instance_info>
+                                    <instance_generator name="TwoLevelCustomURI">
+                                        <arg name="level1" type="constant">concept</arg>
+                                        <arg name="level2" type="constant">identifiertype</arg>
+                                        <arg name="term" type="constant">versionnumber</arg>
+                                    </instance_generator>
+                                    <label_generator name="SimpleLabel">
+                                        <arg name="label" type="constant">Version Number</arg>
+                                    </label_generator>
+                                </entity>
+                            </additional>
                         </entity>
                     </target_node>
                 </range>
@@ -3646,12 +3500,7 @@
                         <relation>acdm:status</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P94i_was_created_by</relationship>
-                        <entity>
-                            <type>frbr:F30_Publication_Event</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
-                        <relationship>crm:P3_has_note</relationship>
+                        <relationship>crm:P2_has_type</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -3658,13 +3507,28 @@
                     <source_node>acdm:status</source_node>
                     <target_node>
                         <entity>
-                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
-                            <instance_generator name="Literal">
-                                <arg name="text" type="xpath">text()</arg>
+                            <type>crm:E55_Type</type>
+                            <instance_generator name="ConceptURI">
+                                <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">text()</arg>
                             </label_generator>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>Status</constant>
+                                    </instance_info>
+                                    <instance_generator name="ConceptURI">
+                                        <arg name="term" type="constant">status</arg>
+                                    </instance_generator>
+                                    <label_generator name="SimpleLabel">
+                                        <arg name="label" type="constant">Status</arg>
+                                    </label_generator>
+                                </entity>
+                            </additional>
                         </entity>
                     </target_node>
                 </range>
@@ -3707,14 +3571,8 @@
                         <type>crm:E55_Type</type>
                         <type>http://www.w3.org/2004/02/skos/core#Concept</type>
                         <instance_generator name="URIorUUID">
-                            <arg name="term" type="xpath">skos:Concept/@rdf:about</arg>
+                            <arg name="text" type="xpath">skos:Concept/@rdf:about</arg>
                         </instance_generator>
-                        <label_generator name="prefLabel">
-                            <arg name="text" type="xpath">skos:Concept/skos:prefLabel/text()</arg>
-                        </label_generator>
-                        <label_generator name="Literal">
-                            <arg name="text" type="xpath">skos:Concept/skos:prefLabel/text()</arg>
-                        </label_generator>
                     </entity>
                 </target_node>
             </domain>
@@ -3858,34 +3716,10 @@
             <link>
                 <path>
                     <source_relation>
-                        <relation>skos:prefLabel</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P2_has_type</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>skos:prefLabel</source_node>
-                    <target_node>
-                        <entity>
-                            <type>http://www.w3.org/2004/02/skos/core#Concept</type>
-                            <instance_generator name="Literal">
-                                <arg name="text" type="xpath">text()</arg>
-                            </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
-                        </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
                         <relation>dc:source</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
+                        <relationship>crm:P71i_is_listed_in</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -3892,7 +3726,7 @@
                     <source_node>dc:source</source_node>
                     <target_node>
                         <entity>
-                            <type>crm:E73_Information_Object</type>
+                            <type>crm:E32_Authority_Document</type>
                             <instance_generator name="URIorUUID">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
@@ -3930,9 +3764,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -3951,7 +3782,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E56_Language</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">Concept</arg>
+                                <arg name="level2" type="constant">Language</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -4051,7 +3884,9 @@
                                     <instance_info>
                                         <constant>Email</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="TwoLevelCustomURI">
+                                        <arg name="level1" type="constant">concept</arg>
+                                        <arg name="level2" type="constant">contactpointtype</arg>
                                         <arg name="term" type="constant">email</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
@@ -4107,52 +3942,27 @@
             <link>
                 <path>
                     <source_relation>
-                        <relation>acdm:xmlDoc</relation>
+                        <relation>acdm:conformsTo</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P70i_is_documented_in</relationship>
+                        <relationship>crmdig:L11i_was_output_of</relationship>
                         <entity>
-                            <type>crm:E31_Document</type>
+                            <type>crmdig:D7_Digital_Machine_Event</type>
                             <instance_generator name="UUID"/>
                         </entity>
-                        <relationship>crm:P2_has_type</relationship>
+                        <relationship>crmdig:L10_had_input</relationship>
                     </target_relation>
                 </path>
                 <range>
-                    <source_node>acdm:xmlDoc</source_node>
-                    <target_node>
-                        <entity>
-                            <type>crm:E55_Type</type>
-                            <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="constant">documenttype</arg>
-                                <arg name="term" type="xpath">text()</arg>
-                            </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
-                        </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
-                        <relation>acdm:conformsTo</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
-                    </target_relation>
-                </path>
-                <range>
                     <source_node>acdm:conformsTo</source_node>
                     <target_node>
                         <entity>
                             <type>crmpe:PE38_Schema</type>
-                            <instance_generator name="DatasetURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="SoftwareURI">
+                                <arg name="term" type="xpath">acdm:xsd/text()</arg>
                             </instance_generator>
-                            <label_generator name="ConceptURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <label_generator name="SimpleLabel">
+                                <arg name="label" type="xpath">acdm:xsd/text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -4209,8 +4019,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="constant">charachterset</arg>
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">characterset</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                         </entity>
@@ -4220,32 +4031,10 @@
             <link>
                 <path>
                     <source_relation>
-                        <relation>acdm:xsd</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>acdm:xsd</source_node>
-                    <target_node>
-                        <entity>
-                            <type>crm:E31_Document</type>
-                            <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="constant">documenttype</arg>
-                                <arg name="term" type="xpath">text()</arg>
-                            </instance_generator>
-                        </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
                         <relation>acdm:usesVocabulary</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
+                        <relationship>crm:P148_has_component</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -4269,7 +4058,7 @@
                         <relation>acdm:hasAttachedObject</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
+                        <relationship>crm:P148_has_component</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -4279,10 +4068,10 @@
                             <type>crmpe:PE19_Persistent_Digital_Object</type>
                             <instance_generator name="OneLevelCustomURI">
                                 <arg name="level1" type="constant">object</arg>
-                                <arg name="term" type="xpath">text()</arg>
+                                <arg name="term" type="xpath">acdm:name/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
+                                <arg name="label" type="xpath">acdm:name/text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -4294,11 +4083,6 @@
                         <relation>acdm:hasSimpleDigitalType</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
-                        <entity>
-                            <type>crmpe:PE19_Persistent_Digital_Object</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
                         <relationship>crm:P2_has_type</relationship>
                     </target_relation>
                 </path>
@@ -4307,12 +4091,13 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="constant">simpledigitaltype</arg>
-                                <arg name="term" type="xpath">acdm:originalId/text()</arg>
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">dataformat</arg>
+                                <arg name="term" type="xpath">acdm:persistentIdentifier/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">acdm:originalId/text()</arg>
+                                <arg name="label" type="xpath">acdm:persistentIdentifier/text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -4332,7 +4117,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">dataformat</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -4392,16 +4179,14 @@
                 <target_node>
                     <entity>
                         <type>crm:E55_Type</type>
-                        <type>http://www.w3.org/2004/02/skos/core#Concept</type>
+                        <type>skos:Concept</type>
+                        <type>crm:E33_Linguistic_Object</type>
                         <instance_generator name="URIorUUID">
-                            <arg name="text" type="xpath">skos:Concept/@rdf:about</arg>
+                            <arg name="text" type="xpath">skos:prefLabel/text()</arg>
                         </instance_generator>
                         <label_generator name="prefLabel">
-                            <arg name="text" type="xpath">skos:Concept/skos:prefLabel/text()</arg>
+                            <arg name="text" type="xpath">skos:prefLabel/text()</arg>
                         </label_generator>
-                        <label_generator name="Literal">
-                            <arg name="text" type="xpath">skos:Concept/skos:prefLabel/text()</arg>
-                        </label_generator>
                     </entity>
                 </target_node>
             </domain>
@@ -4435,7 +4220,7 @@
                         <relation>dc:source</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
+                        <relationship>crm:P71i_is_listed_in</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -4442,7 +4227,7 @@
                     <source_node>dc:source</source_node>
                     <target_node>
                         <entity>
-                            <type>crm:E73_Information_Object</type>
+                            <type>crm:E32_Authority_Document</type>
                             <instance_generator name="URIorUUID">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
@@ -4518,8 +4303,7 @@
                 <target_node>
                     <entity>
                         <type>crmpe:PE19_Persistent_Digital_Object</type>
-                        <instance_generator name="OneLevelCustomURI">
-                            <arg name="level1" type="constant">object</arg>
+                        <instance_generator name="DatasetURI">
                             <arg name="term" type="xpath">acdm:name/text()</arg>
                         </instance_generator>
                         <label_generator name="SimpleLabel">
@@ -4542,8 +4326,7 @@
                     <target_node>
                         <entity>
                             <type>crm:E35_Title</type>
-                            <instance_generator name="OneLevelCustomURI">
-                                <arg name="level1" type="constant">objecttitle</arg>
+                            <instance_generator name="DatasetAppellationURI">
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -4567,7 +4350,8 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="OneLevelCustomURI">
+                                <arg name="level1" type="constant">format</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -4610,9 +4394,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -4647,11 +4428,6 @@
                         <relation>acdm:originalId</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
-                        <entity>
-                            <type>crmpe:PE19_Persistent_Digital_Object</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
                         <relationship>crm:P1_is_identified_by</relationship>
                     </target_relation>
                 </path>
@@ -4673,7 +4449,9 @@
                                     <instance_info>
                                         <constant>Original ID</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="TwoLevelCustomURI">
+                                        <arg name="level1" type="constant">concept</arg>
+                                        <arg name="level2" type="constant">identifiertype</arg>
                                         <arg name="term" type="constant">originalid</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
@@ -4691,11 +4469,6 @@
                         <relation>acdm:persistentIdentifier</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
-                        <entity>
-                            <type>crmpe:PE19_Persistent_Digital_Object</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
                         <relationship>crm:P1_is_identified_by</relationship>
                     </target_relation>
                 </path>
@@ -4702,7 +4475,7 @@
                 <range>
                     <source_node>acdm:persistentIdentifier</source_node>
                     <target_node>
-                        <entity>
+                        <entity variable="id123">
                             <type>crm:E42_Identifier</type>
                             <instance_generator name="URIorUUID">
                                 <arg name="text" type="xpath">text()</arg>
@@ -4720,13 +4493,8 @@
                         <relation>acdm:identifierType</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
-                        <entity>
-                            <type>crmpe:PE19_Persistent_Digital_Object</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
                         <relationship>crm:P1_is_identified_by</relationship>
-                        <entity>
+                        <entity variable="id123">
                             <type>crm:E42_Identifier</type>
                             <instance_generator name="UUID"/>
                         </entity>
@@ -4738,7 +4506,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">identifiertype</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -4754,8 +4524,8 @@
                 <source_node>/acdm:ariadne/acdm:ariadneArchaeologicalResource/acdm:dataset/acdm:hasRecordStructure</source_node>
                 <target_node>
                     <entity>
-                        <type>crm:E55_Type</type>
-                        <instance_generator name="ConceptURI">
+                        <type>crmpe:PE38_Schema</type>
+                        <instance_generator name="SoftwareURI">
                             <arg name="term" type="xpath">acdm:xsd/text()</arg>
                         </instance_generator>
                         <label_generator name="SimpleLabel">
@@ -4781,9 +4551,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -4802,7 +4569,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">characterset</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -4815,34 +4584,10 @@
             <link>
                 <path>
                     <source_relation>
-                        <relation>acdm:xsd</relation>
-                    </source_relation>
-                    <target_relation>
-                        <relationship>crm:P70i_is_documented_in</relationship>
-                    </target_relation>
-                </path>
-                <range>
-                    <source_node>acdm:xsd</source_node>
-                    <target_node>
-                        <entity>
-                            <type>crm:E31_Document</type>
-                            <instance_generator name="URIorUUID">
-                                <arg name="text" type="xpath">text()</arg>
-                            </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
-                        </entity>
-                    </target_node>
-                </range>
-            </link>
-            <link>
-                <path>
-                    <source_relation>
                         <relation>acdm:usesVocabulary</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
+                        <relationship>crm:P148_has_component</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -4851,10 +4596,10 @@
                         <entity>
                             <type>crmpe:PE22_Persistent_Dataset</type>
                             <instance_generator name="DatasetURI">
-                                <arg name="term" type="xpath">text()</arg>
+                                <arg name="term" type="xpath">dcterms:title/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
+                                <arg name="label" type="xpath">dcterms:title/text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -4866,7 +4611,7 @@
                         <relation>acdm:hasAttachedObject</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
+                        <relationship>crm:P148_has_component</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -4875,10 +4620,10 @@
                         <entity>
                             <type>crmpe:PE19_Persistent_Digital_Object</type>
                             <instance_generator name="URIorUUID">
-                                <arg name="text" type="xpath">text()</arg>
+                                <arg name="text" type="xpath">dcterms:identifier/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
+                                <arg name="label" type="xpath">dcterms:identifier/text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -4890,11 +4635,6 @@
                         <relation>acdm:hasSimpleDigitalType</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
-                        <entity>
-                            <type>crmpe:PE19_Persistent_Digital_Object</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
                         <relationship>crm:P2_has_type</relationship>
                     </target_relation>
                 </path>
@@ -4903,11 +4643,13 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">text()</arg>
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">dataformat</arg>
+                                <arg name="term" type="xpath">acdm:persistentIdentifier/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
+                                <arg name="label" type="xpath">acdm:persistentIdentifier/text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -4971,7 +4713,7 @@
                                     <instance_info>
                                         <constant>Content Provision</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
                                         <arg name="level1" type="constant">contentprovision</arg>
                                     </instance_generator>
@@ -4992,8 +4734,8 @@
                                     <instance_info>
                                         <constant>Publisher</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">Role</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">role</arg>
                                         <arg name="level1" type="constant">publisher</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
@@ -5037,9 +4779,9 @@
                                     <instance_info>
                                         <constant>Content Creation</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
-                                        <arg name="level1" type="constant">Content Creation</arg>
+                                        <arg name="level1" type="constant">contentcreation</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Content Creation</arg>
@@ -5058,9 +4800,9 @@
                                     <instance_info>
                                         <constant>Contributor</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">roles</arg>
-                                        <arg name="level1" type="constant">Contributor</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">role</arg>
+                                        <arg name="level1" type="constant">contributor</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Contributor</arg>
@@ -5103,9 +4845,9 @@
                                     <instance_info>
                                         <constant>Content Creation</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
-                                        <arg name="level1" type="constant">Content Creation</arg>
+                                        <arg name="level1" type="constant">contentcreation</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Content Creation</arg>
@@ -5124,8 +4866,8 @@
                                     <instance_info>
                                         <constant>Creator</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">roles</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">role</arg>
                                         <arg name="level1" type="constant">Creator</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
@@ -5198,9 +4940,9 @@
                                     <instance_info>
                                         <constant>Content Legal Responsibility</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
-                                        <arg name="level1" type="constant">Content Legal Responsibility</arg>
+                                        <arg name="level1" type="constant">legalresponsibility</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Content Legal Responsibility</arg>
@@ -5219,9 +4961,9 @@
                                     <instance_info>
                                         <constant>Legal Responsible</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">roles</arg>
-                                        <arg name="level1" type="constant">Legal Responsible</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">role</arg>
+                                        <arg name="level1" type="constant">legalresponsible</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Legal Responsible</arg>
@@ -5274,9 +5016,9 @@
                                     <instance_info>
                                         <constant>Scientific Responsible</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">roles</arg>
-                                        <arg name="level1" type="constant">Scientific Responsible</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">role</arg>
+                                        <arg name="level1" type="constant">scientificresponsible</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Scientific Responsible</arg>
@@ -5319,9 +5061,9 @@
                                     <instance_info>
                                         <constant>Content Technical Responsibility</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
-                                        <arg name="level1" type="constant">Content Technical Responsibility</arg>
+                                        <arg name="level1" type="constant">technicalresponsible</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Content Technical Responsibility</arg>
@@ -5340,9 +5082,9 @@
                                     <instance_info>
                                         <constant>Technical Responsible</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
-                                        <arg name="term" type="constant">roles</arg>
-                                        <arg name="level1" type="constant">Technical Responsible</arg>
+                                    <instance_generator name="ConceptURI_2step">
+                                        <arg name="term" type="constant">role</arg>
+                                        <arg name="level1" type="constant">technicalresponsible</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
                                         <arg name="label" type="constant">Technical Responsible</arg>
@@ -5382,7 +5124,7 @@
                     <target_node>
                         <entity>
                             <type>crm:E35_Title</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="DatasetAppellationURI">
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -5409,9 +5151,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -5443,9 +5182,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Publication of Dataset</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -5477,9 +5213,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Modification of Dataset</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -5508,7 +5241,9 @@
                                     <instance_info>
                                         <constant>OriginalID</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="TwoLevelCustomURI">
+                                        <arg name="level1" type="constant">concept</arg>
+                                        <arg name="level2" type="constant">identifiertype</arg>
                                         <arg name="term" type="constant">originalid</arg>
                                     </instance_generator>
                                     <label_generator name="SimpleLabel">
@@ -5534,7 +5269,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">subject</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -5558,7 +5295,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E56_Language</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">language</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -5611,12 +5350,7 @@
                         <relationship>crm:P11_had_participant</relationship>
                         <entity>
                             <type>crm:E39_Actor</type>
-                            <instance_generator name="ActorURI">
-                                <arg name="term" type="xpath">foaf:name/text()</arg>
-                            </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">foaf:name/text()</arg>
-                            </label_generator>
+                            <instance_generator name="UUID"/>
                         </entity>
                         <relationship>crm:P76_has_contact_point</relationship>
                     </target_relation>
@@ -5627,10 +5361,10 @@
                         <entity>
                             <type>crm:E51_Contact_Point</type>
                             <instance_generator name="URIorUUID">
-                                <arg name="text" type="xpath">text()</arg>
+                                <arg name="text" type="xpath">vcard/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
+                                <arg name="label" type="xpath">vcard/text()</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -5762,12 +5496,7 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">acdm:derivedSubject/skos:prefLabel/text()</arg>
-                            </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">acdm:derivedSubject/skos:prefLabel/text()</arg>
-                            </label_generator>
+                            <instance_generator name="UUID"/>
                         </entity>
                     </target_node>
                 </range>
@@ -5786,11 +5515,13 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
-                                <arg name="term" type="xpath">skos:Concept/text()</arg>
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">subject</arg>
+                                <arg name="term" type="xpath">skos:Concept/@rdf:about</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">skos:Concept/text()</arg>
+                                <arg name="label" type="xpath">skos:Concept/@rdf:about</arg>
                             </label_generator>
                         </entity>
                     </target_node>
@@ -5839,7 +5570,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">subject</arg>
                                 <arg name="term" type="xpath">skos:prefLabel/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -5855,12 +5588,7 @@
                         <relation>acdm:hasVersion</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P94i_was_created_by</relationship>
-                        <entity>
-                            <type>frbr:F30_Publication_Event</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
-                        <relationship>crm:P2_has_type</relationship>
+                        <relationship>crm:P1_is_identified_by</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -5867,13 +5595,30 @@
                     <source_node>acdm:hasVersion</source_node>
                     <target_node>
                         <entity>
-                            <type>crm:E55_Type</type>
-                            <instance_generator name="ConceptURI">
+                            <type>crm:E42_Identifier</type>
+                            <instance_generator name="DatasetAppellationURI">
                                 <arg name="term" type="xpath">dcterms:title/text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">dcterms:title/text()</arg>
                             </label_generator>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>Version Number</constant>
+                                    </instance_info>
+                                    <instance_generator name="TwoLevelCustomURI">
+                                        <arg name="level1" type="constant">concept</arg>
+                                        <arg name="level2" type="constant">identifiertype</arg>
+                                        <arg name="term" type="constant">versionnumber</arg>
+                                    </instance_generator>
+                                    <label_generator name="SimpleLabel">
+                                        <arg name="label" type="constant">Version Number</arg>
+                                    </label_generator>
+                                </entity>
+                            </additional>
                         </entity>
                     </target_node>
                 </range>
@@ -5884,12 +5629,7 @@
                         <relation>acdm:status</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P94i_was_created_by</relationship>
-                        <entity>
-                            <type>frbr:F30_Publication_Event</type>
-                            <instance_generator name="UUID"/>
-                        </entity>
-                        <relationship>crm:P3_has_note</relationship>
+                        <relationship>crm:P2_has_type</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -5896,13 +5636,28 @@
                     <source_node>acdm:status</source_node>
                     <target_node>
                         <entity>
-                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
-                            <instance_generator name="Literal">
-                                <arg name="text" type="xpath">text()</arg>
+                            <type>crm:E55_Type</type>
+                            <instance_generator name="ConceptURI">
+                                <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
                                 <arg name="label" type="xpath">text()</arg>
                             </label_generator>
+                            <additional>
+                                <relationship>crm:P2_has_type</relationship>
+                                <entity>
+                                    <type>crm:E55_Type</type>
+                                    <instance_info>
+                                        <constant>Status</constant>
+                                    </instance_info>
+                                    <instance_generator name="ConceptURI">
+                                        <arg name="term" type="constant">status</arg>
+                                    </instance_generator>
+                                    <label_generator name="SimpleLabel">
+                                        <arg name="label" type="constant">Status</arg>
+                                    </label_generator>
+                                </entity>
+                            </additional>
                         </entity>
                     </target_node>
                 </range>
@@ -5948,11 +5703,8 @@
                             <arg name="text" type="xpath">skos:Concept/@rdf:about</arg>
                         </instance_generator>
                         <label_generator name="prefLabel">
-                            <arg name="text" type="xpath">skos:Concept/skos:prefLabel/text()</arg>
+                            <arg name="text" type="xpath">skos:prefLabel/text()</arg>
                         </label_generator>
-                        <label_generator name="Literal">
-                            <arg name="text" type="xpath">skos:Concept/skos:prefLabel/text()</arg>
-                        </label_generator>
                     </entity>
                 </target_node>
             </domain>
@@ -5962,7 +5714,7 @@
                         <relation>skos:prefLabel</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P2_has_type</relationship>
+                        <relationship>skos:prefLabel</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -5969,13 +5721,10 @@
                     <source_node>skos:prefLabel</source_node>
                     <target_node>
                         <entity>
-                            <type>http://www.w3.org/2004/02/skos/core#Concept</type>
+                            <type>http://www.w3.org/2000/01/rdf-schema#Literal</type>
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="xpath">text()</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -5986,7 +5735,7 @@
                         <relation>dc:source</relation>
                     </source_relation>
                     <target_relation>
-                        <relationship>crm:P67i_is_referred_to_by</relationship>
+                        <relationship>crm:P71i_is_listed_in</relationship>
                     </target_relation>
                 </path>
                 <range>
@@ -5993,7 +5742,7 @@
                     <source_node>dc:source</source_node>
                     <target_node>
                         <entity>
-                            <type>crm:E73_Information_Object</type>
+                            <type>crm:E32_Authority_Document</type>
                             <instance_generator name="URIorUUID">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
@@ -6031,9 +5780,6 @@
                             <instance_generator name="Literal">
                                 <arg name="text" type="xpath">text()</arg>
                             </instance_generator>
-                            <label_generator name="SimpleLabel">
-                                <arg name="label" type="constant">Publication of Dataset</arg>
-                            </label_generator>
                         </entity>
                     </target_node>
                 </range>
@@ -6052,7 +5798,9 @@
                     <target_node>
                         <entity>
                             <type>crm:E56_Language</type>
-                            <instance_generator name="ConceptURI">
+                            <instance_generator name="TwoLevelCustomURI">
+                                <arg name="level1" type="constant">concept</arg>
+                                <arg name="level2" type="constant">language</arg>
                                 <arg name="term" type="xpath">text()</arg>
                             </instance_generator>
                             <label_generator name="SimpleLabel">
@@ -6153,7 +5901,7 @@
                                     <instance_info>
                                         <constant>Content Provision</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">activitytype</arg>
                                         <arg name="level1" type="constant">contentprovision</arg>
                                     </instance_generator>
@@ -6174,7 +5922,7 @@
                                     <instance_info>
                                         <constant>Publisher</constant>
                                     </instance_info>
-                                    <instance_generator name="ConceptURI">
+                                    <instance_generator name="ConceptURI_2step">
                                         <arg name="term" type="constant">Role</arg>
                                         <arg name="level1" type="constant">publisher</arg>
                                     </instance_generator>
@@ -6204,12 +5952,12 @@
             </link>
         </mapping>
     </mappings>
+
 </x3ml>
-]]>
+
+					]]>
 				</CODE>
 			</SCRIPT>
 		</CONFIGURATION>
-		<STATUS/>
-		<SECURITY_PARAMETERS/>
 	</BODY>
-</RESOURCE_PROFILE>
+</RESOURCE_PROFILE>
\ No newline at end of file
