diff --git a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-134c38baeaae4aeea789a8abeadf047d.xml b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-134c38baeaae4aeea789a8abeadf047d.xml
index af57524e..a215771a 100644
--- a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-134c38baeaae4aeea789a8abeadf047d.xml
+++ b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-134c38baeaae4aeea789a8abeadf047d.xml
@@ -2,4 +2,4 @@
     xmlns:archimate="http://www.archimatetool.com/archimate"
     name="Inzage geven in autorisaties"
     id="id-134c38baeaae4aeea789a8abeadf047d"
-    documentation="Het ontsluiten van informatie over autorisaties, inclusief de koppeling met diensten, dienstverleners, rollen, resources en digitale identiteiten."/>
+    documentation="Het ontsluiten van informatie over bevoegdheden, inclusief de koppeling met diensten, dienstverleners, resources en digitale identiteiten."/>
diff --git a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-20416dada168474dbe954403e7624a09.xml b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-20416dada168474dbe954403e7624a09.xml
index 789ef41e..7c9f0eea 100644
--- a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-20416dada168474dbe954403e7624a09.xml
+++ b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-20416dada168474dbe954403e7624a09.xml
@@ -2,4 +2,4 @@
     xmlns:archimate="http://www.archimatetool.com/archimate"
     name="Beheren autorisatieregels"
     id="id-20416dada168474dbe954403e7624a09"
-    documentation="Het creëren, vastleggen, beschikbaarstellen, wijzigen en verwijderen van gegevens over autorisatieregels, die aangeven welke rollen of attributen onder welke condities toegang hebben tot welke resources."/>
+    documentation="Het creëren, vastleggen, beschikbaarstellen, wijzigen en verwijderen van gegevens over autorisatieregels, die aangeven onder welke condities digitale identiteiten toegang hebben tot welke resources."/>
diff --git a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-25010f0e0b01416b811bfe0416463f02.xml b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-25010f0e0b01416b811bfe0416463f02.xml
deleted file mode 100644
index 53477aa7..00000000
--- a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-25010f0e0b01416b811bfe0416463f02.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<archimate:ApplicationFunction
-    xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="Beheren rollen bij digitale identiteit"
-    id="id-25010f0e0b01416b811bfe0416463f02"
-    documentation="Het creëren, vastleggen, beschikbaarstellen, wijzigen en verwijderen van gegevens over de koppeling van rollen aan digitale identiteiten."/>
diff --git a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-91420e2b073a402ea5c437e9fe3a1422.xml b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-91420e2b073a402ea5c437e9fe3a1422.xml
index c55ce7b5..1bc1e985 100644
--- a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-91420e2b073a402ea5c437e9fe3a1422.xml
+++ b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-91420e2b073a402ea5c437e9fe3a1422.xml
@@ -2,4 +2,4 @@
     xmlns:archimate="http://www.archimatetool.com/archimate"
     name="Beheren resources"
     id="id-91420e2b073a402ea5c437e9fe3a1422"
-    documentation="Het creëren, vastleggen, beschikbaarstellen, wijzigen en verwijderen van gegevens over resources."/>
+    documentation="Het creëren, vastleggen, beschikbaarstellen, wijzigen en verwijderen van gegevens over resources (anders dan diensten)."/>
diff --git a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-96f541deda2f4ede86942209459d6057.xml b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-96f541deda2f4ede86942209459d6057.xml
deleted file mode 100644
index be38d9b6..00000000
--- a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-96f541deda2f4ede86942209459d6057.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<archimate:ApplicationFunction
-    xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="Beheren rollen"
-    id="id-96f541deda2f4ede86942209459d6057"
-    documentation="Het creëren, vastleggen, beschikbaarstellen, wijzigen en verwijderen van gegevens over rollen."/>
diff --git a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-b9dddc4beb144b50a4f8ffe120193607.xml b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-b9dddc4beb144b50a4f8ffe120193607.xml
index b1a879a8..1e8ec5be 100644
--- a/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-b9dddc4beb144b50a4f8ffe120193607.xml
+++ b/model/application/id-0d831ce224b64a788406db7e189b71aa/ApplicationFunction_id-b9dddc4beb144b50a4f8ffe120193607.xml
@@ -1,5 +1,5 @@
 <archimate:ApplicationFunction
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="Toevoegen bevoegdheden"
+    name="Creëren bevoegdheidsverklaring"
     id="id-b9dddc4beb144b50a4f8ffe120193607"
-    documentation="Het toevoegen van gegevens over bevoegdheden van digitale identiteiten na het uitvoeren van authenticatie."/>
+    documentation="Het creëren van een bewijs dat een digitale identiteit een bepaalde vertegenwoordigingsbevoegdheid heeft."/>
diff --git a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-0e6a68545b2d470d841b82aa5e05d4a5.xml b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-0e6a68545b2d470d841b82aa5e05d4a5.xml
new file mode 100644
index 00000000..555f1a08
--- /dev/null
+++ b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-0e6a68545b2d470d841b82aa5e05d4a5.xml
@@ -0,0 +1,5 @@
+<archimate:BusinessObject
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="Autorisatiebeslissing"
+    id="id-0e6a68545b2d470d841b82aa5e05d4a5"
+    documentation="Uitkomst van een autorisatie."/>
diff --git a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml
new file mode 100644
index 00000000..199aebb4
--- /dev/null
+++ b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml
@@ -0,0 +1,5 @@
+<archimate:BusinessObject
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="Bevoegdheidsverklaring"
+    id="id-1cb3ac18cb83432ebe33dacfbd3d2832"
+    documentation="Een bewijs dat de geauthenticeerde digitale identiteit een bepaalde vertegenwoordigingsbevoegdheid heeft."/>
diff --git a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-89c65a70db1b44d198856566c5d012be.xml b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-89c65a70db1b44d198856566c5d012be.xml
new file mode 100644
index 00000000..914407f8
--- /dev/null
+++ b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-89c65a70db1b44d198856566c5d012be.xml
@@ -0,0 +1,5 @@
+<archimate:BusinessObject
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="Zaak"
+    id="id-89c65a70db1b44d198856566c5d012be"
+    documentation="Aanduiding voor digitale object binnen een dienst waarop bevoegdheden worden vastgelegd. (bron: NORA)"/>
diff --git a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-b1f831bda0454c3ab6095b279b1c0df8.xml b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-b1f831bda0454c3ab6095b279b1c0df8.xml
deleted file mode 100644
index c2be044a..00000000
--- a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-b1f831bda0454c3ab6095b279b1c0df8.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<archimate:BusinessObject
-    xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="Rol"
-    id="id-b1f831bda0454c3ab6095b279b1c0df8"
-    documentation="Een attribuut die betrekking heeft op wat een entiteit kan doen."/>
diff --git a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-c966b7c6c0794f66a8dc96a3835b0d2f.xml b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-c966b7c6c0794f66a8dc96a3835b0d2f.xml
deleted file mode 100644
index 5e4734c8..00000000
--- a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-c966b7c6c0794f66a8dc96a3835b0d2f.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<archimate:BusinessObject
-    xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="Digitale bronidentiteit"
-    id="id-c966b7c6c0794f66a8dc96a3835b0d2f"
-    documentation="Een door de overheid uitgegeven, erkende en in de wet en regelgeving verankerde, digitale identiteit voor gebruik in de publieke en private sector. (bron: Onderzoeksrapport Digitale bronidentiteit)"/>
diff --git a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-d766d65c0ea14ecc9e01f99938d0b61b.xml b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-d766d65c0ea14ecc9e01f99938d0b61b.xml
index dbcea851..a0ab6504 100644
--- a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-d766d65c0ea14ecc9e01f99938d0b61b.xml
+++ b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-d766d65c0ea14ecc9e01f99938d0b61b.xml
@@ -2,4 +2,4 @@
     xmlns:archimate="http://www.archimatetool.com/archimate"
     name="Attribuut"
     id="id-d766d65c0ea14ecc9e01f99938d0b61b"
-    documentation="Een eigenschap, kenmerk of kwaliteit van een natuurlijke of rechtspersoon of een entiteit, in elektronisch formaat. (bron: Onderzoeksrapport Digitale Bronidentiteit)"/>
+    documentation="Een enkelvoudig of samengesteld informatie element dat onderdeel is van een Digitale Identiteit; is de digitale representatie van een eigenschap van een Entiteit."/>
diff --git a/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-f51d4497b87b4751842effe518b903d5.xml b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-f51d4497b87b4751842effe518b903d5.xml
new file mode 100644
index 00000000..293ef27d
--- /dev/null
+++ b/model/business/id-1ca7f5222bf94a9ba45bfebd9ff8d6e4/BusinessObject_id-f51d4497b87b4751842effe518b903d5.xml
@@ -0,0 +1,5 @@
+<archimate:BusinessObject
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="Identiteitsverklaring"
+    id="id-f51d4497b87b4751842effe518b903d5"
+    documentation="Uitkomst van een authenticatie die is uitgevoerd door een onafhankelijke partij."/>
diff --git a/model/diagrams/ArchimateDiagramModel_id-08c765dc4dea4790a2a37c17bfbe69aa.xml b/model/diagrams/ArchimateDiagramModel_id-08c765dc4dea4790a2a37c17bfbe69aa.xml
index 89e0ca9c..17efe4d1 100644
--- a/model/diagrams/ArchimateDiagramModel_id-08c765dc4dea4790a2a37c17bfbe69aa.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-08c765dc4dea4790a2a37c17bfbe69aa.xml
@@ -418,15 +418,6 @@
     <features
         name="iconVisible"
         value="2"/>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-82a987fe96de4d6a9ad456fe579e8f19"
-        source="id-3d57fb41ef7b4b9e96128fecd26ad475"
-        target="id-1c97ce74aeda4ab3a8c0b592cd28c101">
-      <archimateRelationship
-          xsi:type="archimate:CompositionRelationship"
-          href="CompositionRelationship_id-9eab8cdead43402c8c0322faaec748e6.xml#id-9eab8cdead43402c8c0322faaec748e6"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-4750d232776a4d0097f91198768cd1f2"
@@ -436,15 +427,6 @@
           xsi:type="archimate:CompositionRelationship"
           href="CompositionRelationship_id-b9a9b468e704437f91095b6db323578c.xml#id-b9a9b468e704437f91095b6db323578c"/>
     </sourceConnections>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-a02948885d734bafa5056e1acef10464"
-        source="id-3d57fb41ef7b4b9e96128fecd26ad475"
-        target="id-6b90db50063c4c30b3c7a90e0404aaf6">
-      <archimateRelationship
-          xsi:type="archimate:CompositionRelationship"
-          href="CompositionRelationship_id-919fb12f4b64443cbdb4d185a5305d79.xml#id-919fb12f4b64443cbdb4d185a5305d79"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-3ede4fb0dd0a4682972d43ba648f7eaa"
@@ -468,24 +450,6 @@
         y="132"
         width="181"
         height="529"/>
-    <children
-        xsi:type="archimate:DiagramModelArchimateObject"
-        id="id-1c97ce74aeda4ab3a8c0b592cd28c101"
-        targetConnections="id-82a987fe96de4d6a9ad456fe579e8f19 id-ed8663421b174344a5bc4b5d567a1290"
-        fillColor="#ffffff"
-        textPosition="1">
-      <features
-          name="iconVisible"
-          value="2"/>
-      <bounds
-          x="12"
-          y="36"
-          width="157"
-          height="55"/>
-      <archimateElement
-          xsi:type="archimate:ApplicationFunction"
-          href="ApplicationFunction_id-96f541deda2f4ede86942209459d6057.xml#id-96f541deda2f4ede86942209459d6057"/>
-    </children>
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
         id="id-7c305ac8029d4b959650e3a236d51359"
@@ -497,31 +461,13 @@
           value="2"/>
       <bounds
           x="12"
-          y="156"
+          y="96"
           width="157"
           height="55"/>
       <archimateElement
           xsi:type="archimate:ApplicationFunction"
           href="ApplicationFunction_id-20416dada168474dbe954403e7624a09.xml#id-20416dada168474dbe954403e7624a09"/>
     </children>
-    <children
-        xsi:type="archimate:DiagramModelArchimateObject"
-        id="id-6b90db50063c4c30b3c7a90e0404aaf6"
-        targetConnections="id-a02948885d734bafa5056e1acef10464 id-1c519e2b05e444ab92a957f39299f2c9"
-        fillColor="#ffffff"
-        textPosition="1">
-      <features
-          name="iconVisible"
-          value="2"/>
-      <bounds
-          x="12"
-          y="216"
-          width="157"
-          height="55"/>
-      <archimateElement
-          xsi:type="archimate:ApplicationFunction"
-          href="ApplicationFunction_id-25010f0e0b01416b811bfe0416463f02.xml#id-25010f0e0b01416b811bfe0416463f02"/>
-    </children>
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
         id="id-c2d62de422f74254aa7034cb559edd53"
@@ -533,7 +479,7 @@
           value="2"/>
       <bounds
           x="12"
-          y="276"
+          y="156"
           width="157"
           height="55"/>
       <archimateElement
@@ -543,7 +489,7 @@
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
         id="id-eacffe14cc66461bbce7ec99c37b23a7"
-        targetConnections="id-19ba81d922fd44c9851d6beafe0cbb01"
+        targetConnections="id-19ba81d922fd44c9851d6beafe0cbb01 id-3b0f921cc73a4188aa5c19f1306fd269"
         fillColor="#ffffff"
         textPosition="1">
       <features
@@ -551,7 +497,7 @@
           value="2"/>
       <bounds
           x="12"
-          y="96"
+          y="36"
           width="157"
           height="55"/>
       <archimateElement
@@ -1602,16 +1548,6 @@
       xsi:type="archimate:DiagramModelArchimateObject"
       id="id-0635612404ed4d5dbf69821cfc2bb933"
       textPosition="1">
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-ed8663421b174344a5bc4b5d567a1290"
-        lineColor="#808080"
-        source="id-0635612404ed4d5dbf69821cfc2bb933"
-        target="id-1c97ce74aeda4ab3a8c0b592cd28c101">
-      <archimateRelationship
-          xsi:type="archimate:AssignmentRelationship"
-          href="AssignmentRelationship_id-af12df6be6da43e7ae230f98e50cef7e.xml#id-af12df6be6da43e7ae230f98e50cef7e"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-2fc8ae9845344766ada937890226789a"
@@ -1622,16 +1558,6 @@
           xsi:type="archimate:AssignmentRelationship"
           href="AssignmentRelationship_id-e3eab60509264676965ba83d8bec9d7a.xml#id-e3eab60509264676965ba83d8bec9d7a"/>
     </sourceConnections>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-1c519e2b05e444ab92a957f39299f2c9"
-        lineColor="#808080"
-        source="id-0635612404ed4d5dbf69821cfc2bb933"
-        target="id-6b90db50063c4c30b3c7a90e0404aaf6">
-      <archimateRelationship
-          xsi:type="archimate:AssignmentRelationship"
-          href="AssignmentRelationship_id-73ce4355eb204c6088a94770940a1ae1.xml#id-73ce4355eb204c6088a94770940a1ae1"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-e95de226020a4f558b5ff197fd1ef992"
@@ -1682,6 +1608,16 @@
           xsi:type="archimate:AssignmentRelationship"
           href="AssignmentRelationship_id-a41d9e25258a49dabde865b06b3a438f.xml#id-a41d9e25258a49dabde865b06b3a438f"/>
     </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-3b0f921cc73a4188aa5c19f1306fd269"
+        lineColor="#808080"
+        source="id-0635612404ed4d5dbf69821cfc2bb933"
+        target="id-eacffe14cc66461bbce7ec99c37b23a7">
+      <archimateRelationship
+          xsi:type="archimate:AssignmentRelationship"
+          href="AssignmentRelationship_id-d280d37bacc2467c89ba8dd4d1afb9eb.xml#id-d280d37bacc2467c89ba8dd4d1afb9eb"/>
+    </sourceConnections>
     <bounds
         x="1279"
         y="588"
diff --git a/model/diagrams/ArchimateDiagramModel_id-6b127e72ba554982a8ade48d06e2286c.xml b/model/diagrams/ArchimateDiagramModel_id-6b127e72ba554982a8ade48d06e2286c.xml
index 5919a37d..5de0f916 100644
--- a/model/diagrams/ArchimateDiagramModel_id-6b127e72ba554982a8ade48d06e2286c.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-6b127e72ba554982a8ade48d06e2286c.xml
@@ -297,7 +297,7 @@
           startX="-540"
           startY="3"
           endX="180"
-          endY="279"/>
+          endY="327"/>
       <bendpoints
           startX="-540"
           startY="-297"
@@ -714,6 +714,9 @@
         id="id-85855fa5bc0f44bcbbf2fd8db103e2da"
         source="id-59d00cb28d6d4ab7bffd5a62ed8423ab"
         target="id-75617e92adfb4822837cd5b39180c140">
+      <features
+          name="labelExpression"
+          value="KvK nummer,&#xD;&#xA;vestigingsnummer"/>
       <archimateRelationship
           xsi:type="archimate:FlowRelationship"
           href="FlowRelationship_id-568a63a028f14942a34f2bd30e386aed.xml#id-568a63a028f14942a34f2bd30e386aed"/>
diff --git a/model/diagrams/ArchimateDiagramModel_id-d24214a9135947e980983cea632143d2.xml b/model/diagrams/ArchimateDiagramModel_id-d24214a9135947e980983cea632143d2.xml
index 846c47fd..a7d34b7a 100644
--- a/model/diagrams/ArchimateDiagramModel_id-d24214a9135947e980983cea632143d2.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-d24214a9135947e980983cea632143d2.xml
@@ -1,7 +1,7 @@
 <archimate:ArchimateDiagramModel
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="Functiemodel met begrippen"
+    name="Functiemodel met bedrijfsobjecten"
     id="id-d24214a9135947e980983cea632143d2">
   <children
       xsi:type="archimate:DiagramModelArchimateObject"
@@ -51,11 +51,71 @@
     <features
         name="iconVisible"
         value="2"/>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-b6ff22187d4540e9b1c6f2700e2510bc"
+        source="id-180e9a8023044f11992a37f46c93c892"
+        target="id-28458e2608244275acf93ccd817247ef">
+      <archimateRelationship
+          xsi:type="archimate:AccessRelationship"
+          href="AccessRelationship_id-db8d8874dd684331b3cbeec6e3a3becf.xml#id-db8d8874dd684331b3cbeec6e3a3becf"/>
+    </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-890f6fdee20d476186378a29ea1ba75d"
+        source="id-180e9a8023044f11992a37f46c93c892"
+        target="id-055ed6da75e54cab923d3e31823bba25">
+      <archimateRelationship
+          xsi:type="archimate:AccessRelationship"
+          href="AccessRelationship_id-2e6b1d5640a940cf8c2cb94bd3b5da8c.xml#id-2e6b1d5640a940cf8c2cb94bd3b5da8c"/>
+    </sourceConnections>
     <bounds
         x="12"
         y="552"
         width="372"
-        height="61"/>
+        height="109"/>
+    <children
+        xsi:type="archimate:DiagramModelArchimateObject"
+        id="id-28458e2608244275acf93ccd817247ef"
+        targetConnections="id-b6ff22187d4540e9b1c6f2700e2510bc"
+        fillColor="#ffffff"
+        textPosition="1">
+      <features
+          name="labelExpression"
+          value="Identiteits&#xD;&#xA;verklaring"/>
+      <features
+          name="iconVisible"
+          value="2"/>
+      <bounds
+          x="24"
+          y="36"
+          width="120"
+          height="55"/>
+      <archimateElement
+          xsi:type="archimate:BusinessObject"
+          href="BusinessObject_id-f51d4497b87b4751842effe518b903d5.xml#id-f51d4497b87b4751842effe518b903d5"/>
+    </children>
+    <children
+        xsi:type="archimate:DiagramModelArchimateObject"
+        id="id-055ed6da75e54cab923d3e31823bba25"
+        targetConnections="id-890f6fdee20d476186378a29ea1ba75d"
+        fillColor="#ffffff"
+        textPosition="1">
+      <features
+          name="labelExpression"
+          value="Bevoegdheids&#xD;&#xA;verklaring"/>
+      <features
+          name="iconVisible"
+          value="2"/>
+      <bounds
+          x="228"
+          y="36"
+          width="120"
+          height="55"/>
+      <archimateElement
+          xsi:type="archimate:BusinessObject"
+          href="BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml#id-1cb3ac18cb83432ebe33dacfbd3d2832"/>
+    </children>
     <archimateElement
         xsi:type="archimate:ApplicationFunction"
         href="ApplicationFunction_id-a6e65e269b3e48cf91d4aa32473a6040.xml#id-a6e65e269b3e48cf91d4aa32473a6040"/>
@@ -66,15 +126,6 @@
     <features
         name="iconVisible"
         value="2"/>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-17393575b71c421a9ee14ff790336076"
-        source="id-36ecaa4c63eb41fd93e91db4c33a4525"
-        target="id-566723ea31564cfe981f016bb50b4bbc">
-      <archimateRelationship
-          xsi:type="archimate:AccessRelationship"
-          href="AccessRelationship_id-fb8a8180a1ea40e58acae3f378542b5d.xml#id-fb8a8180a1ea40e58acae3f378542b5d"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-128a7fe3ecec4f25804445d7a5024203"
@@ -93,6 +144,15 @@
           xsi:type="archimate:AccessRelationship"
           href="AccessRelationship_id-2f20e54a1de8402dac146628ec3620fa.xml#id-2f20e54a1de8402dac146628ec3620fa"/>
     </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-943714a987b94ac1a00d703aec6bca11"
+        source="id-36ecaa4c63eb41fd93e91db4c33a4525"
+        target="id-68837d016a7a49ed8fb55c354e4faa73">
+      <archimateRelationship
+          xsi:type="archimate:AccessRelationship"
+          href="AccessRelationship_id-50a44c84fc17480ea2d9ea602d90a79b.xml#id-50a44c84fc17480ea2d9ea602d90a79b"/>
+    </sourceConnections>
     <bounds
         x="588"
         y="12"
@@ -127,7 +187,7 @@
           value="2"/>
       <bounds
           x="36"
-          y="120"
+          y="48"
           width="120"
           height="55"/>
       <archimateElement
@@ -136,8 +196,8 @@
     </children>
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
-        id="id-566723ea31564cfe981f016bb50b4bbc"
-        targetConnections="id-17393575b71c421a9ee14ff790336076"
+        id="id-68837d016a7a49ed8fb55c354e4faa73"
+        targetConnections="id-943714a987b94ac1a00d703aec6bca11"
         fillColor="#ffffff"
         textPosition="1">
       <features
@@ -145,12 +205,12 @@
           value="2"/>
       <bounds
           x="36"
-          y="48"
+          y="120"
           width="120"
           height="55"/>
       <archimateElement
           xsi:type="archimate:BusinessObject"
-          href="BusinessObject_id-b1f831bda0454c3ab6095b279b1c0df8.xml#id-b1f831bda0454c3ab6095b279b1c0df8"/>
+          href="BusinessObject_id-89c65a70db1b44d198856566c5d012be.xml#id-89c65a70db1b44d198856566c5d012be"/>
     </children>
     <archimateElement
         xsi:type="archimate:ApplicationFunction"
@@ -166,7 +226,7 @@
         x="588"
         y="552"
         width="372"
-        height="61"/>
+        height="109"/>
     <archimateElement
         xsi:type="archimate:ApplicationFunction"
         href="ApplicationFunction_id-5d0f3ca532db4486b85185a6b134e142.xml#id-5d0f3ca532db4486b85185a6b134e142"/>
@@ -177,15 +237,6 @@
     <features
         name="iconVisible"
         value="2"/>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-cdaa8d2a02864315b0d4df3e23cde6f2"
-        source="id-c7e852703cd44cfc98bd89dbcbb747a6"
-        target="id-3413e6d1373e4d54962b33f90bddd5a3">
-      <archimateRelationship
-          xsi:type="archimate:AccessRelationship"
-          href="AccessRelationship_id-4e7f644a22a145c7a047ede0bf6b124e.xml#id-4e7f644a22a145c7a047ede0bf6b124e"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-7fe0e80052ac4f0da8f51ee2fc2dc567"
@@ -200,24 +251,6 @@
         y="12"
         width="181"
         height="409"/>
-    <children
-        xsi:type="archimate:DiagramModelArchimateObject"
-        id="id-3413e6d1373e4d54962b33f90bddd5a3"
-        targetConnections="id-cdaa8d2a02864315b0d4df3e23cde6f2"
-        fillColor="#ffffff"
-        textPosition="1">
-      <features
-          name="iconVisible"
-          value="2"/>
-      <bounds
-          x="24"
-          y="120"
-          width="120"
-          height="55"/>
-      <archimateElement
-          xsi:type="archimate:BusinessObject"
-          href="BusinessObject_id-c966b7c6c0794f66a8dc96a3835b0d2f.xml#id-c966b7c6c0794f66a8dc96a3835b0d2f"/>
-    </children>
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
         id="id-d546414deed5445b818c1479199a1fdd"
@@ -228,7 +261,7 @@
           name="iconVisible"
           value="2"/>
       <bounds
-          x="24"
+          x="36"
           y="48"
           width="120"
           height="55"/>
@@ -246,11 +279,38 @@
     <features
         name="iconVisible"
         value="2"/>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-f153402bbc184222bd02716b51dda6d2"
+        source="id-b409f0532fa74ad4a1bd6b321fe126c4"
+        target="id-fbe3ff1cefe048d7beba459449ee6327">
+      <archimateRelationship
+          xsi:type="archimate:AccessRelationship"
+          href="AccessRelationship_id-8957c5ed61d64db183a7c10a47802c1d.xml#id-8957c5ed61d64db183a7c10a47802c1d"/>
+    </sourceConnections>
     <bounds
         x="396"
         y="552"
         width="180"
-        height="61"/>
+        height="109"/>
+    <children
+        xsi:type="archimate:DiagramModelArchimateObject"
+        id="id-fbe3ff1cefe048d7beba459449ee6327"
+        targetConnections="id-f153402bbc184222bd02716b51dda6d2"
+        fillColor="#ffffff"
+        textPosition="1">
+      <features
+          name="iconVisible"
+          value="2"/>
+      <bounds
+          x="24"
+          y="36"
+          width="120"
+          height="55"/>
+      <archimateElement
+          xsi:type="archimate:BusinessObject"
+          href="BusinessObject_id-0e6a68545b2d470d841b82aa5e05d4a5.xml#id-0e6a68545b2d470d841b82aa5e05d4a5"/>
+    </children>
     <archimateElement
         xsi:type="archimate:ApplicationFunction"
         href="ApplicationFunction_id-7814d0d49e494a30be225815d468ef90.xml#id-7814d0d49e494a30be225815d468ef90"/>
@@ -453,7 +513,7 @@
           name="iconVisible"
           value="2"/>
       <bounds
-          x="420"
+          x="408"
           y="36"
           width="120"
           height="55"/>
diff --git a/model/diagrams/ArchimateDiagramModel_id-d43a21de1f8f4320a22ee4a1a46d660b.xml b/model/diagrams/ArchimateDiagramModel_id-d43a21de1f8f4320a22ee4a1a46d660b.xml
index 8276b5f9..81c19ea4 100644
--- a/model/diagrams/ArchimateDiagramModel_id-d43a21de1f8f4320a22ee4a1a46d660b.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-d43a21de1f8f4320a22ee4a1a46d660b.xml
@@ -1,12 +1,12 @@
 <archimate:ArchimateDiagramModel
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="Begrippenmodel"
+    name="Bedrijfsobjectenmodel"
     id="id-d43a21de1f8f4320a22ee4a1a46d660b">
   <children
       xsi:type="archimate:DiagramModelArchimateObject"
       id="id-0faf685e7f27459082c5b42df1a369e5"
-      targetConnections="id-344b4f081fef404c86aeaa2690a8c5a7 id-b2368aca600e446cb4bdb49987217b72"
+      targetConnections="id-344b4f081fef404c86aeaa2690a8c5a7"
       fillColor="#ffffff"
       textPosition="1">
     <features
@@ -14,19 +14,61 @@
         value="2"/>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-bddd9ba3491746479f5281bdd366051d"
+        id="id-4f79f7989d5d4c07bd5274c7c666e2ef"
         source="id-0faf685e7f27459082c5b42df1a369e5"
-        target="id-e3d369fdc83a4ab48269b2bd34866757">
+        target="id-b4efcfb0325b487ca7f45f3c66b8923c">
       <bendpoints
-          startY="276"
-          endX="-238"/>
+          startX="-24"
+          startY="72"
+          endX="-24"
+          endY="-75"/>
+      <archimateRelationship
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-3900eb02a5cc494c99890f19511531ce.xml#id-3900eb02a5cc494c99890f19511531ce"/>
+    </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-9cf8cc45f3b9452aa8c857e5b9baac78"
+        source="id-0faf685e7f27459082c5b42df1a369e5"
+        target="id-73d120556ba440378292ea1eca437fcb">
+      <features
+          name="labelExpression"
+          value="is opgenomen in"/>
+      <bendpoints
+          startX="24"
+          startY="60"
+          endX="-216"
+          endY="-87"/>
+      <bendpoints
+          startX="84"
+          startY="60"
+          endX="-156"
+          endY="-87"/>
+      <bendpoints
+          startX="84"
+          startY="156"
+          endX="-156"
+          endY="9"/>
+      <archimateRelationship
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-20e13a0e82b948258905b2dd76fafc21.xml#id-20e13a0e82b948258905b2dd76fafc21"/>
+    </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-ddde65e23316439b9bec619fad1166f4"
+        textPosition="0"
+        source="id-0faf685e7f27459082c5b42df1a369e5"
+        target="id-e3d369fdc83a4ab48269b2bd34866757">
+      <features
+          name="labelExpression"
+          value="wordt&#xD;&#xA;gebruikt in"/>
       <archimateRelationship
           xsi:type="archimate:AssociationRelationship"
-          href="AssociationRelationship_id-d91a1bb632c34e06b0083772a61312bf.xml#id-d91a1bb632c34e06b0083772a61312bf"/>
+          href="AssociationRelationship_id-669f13fc5e7c4d798ed19ef43a3ed0cf.xml#id-669f13fc5e7c4d798ed19ef43a3ed0cf"/>
     </sourceConnections>
     <bounds
         x="276"
-        y="436"
+        y="453"
         width="120"
         height="55"/>
     <archimateElement
@@ -36,7 +78,7 @@
   <children
       xsi:type="archimate:DiagramModelArchimateObject"
       id="id-cd8b2eda73594658be7823d911f441a3"
-      targetConnections="id-484dd7ff798d44c08d7fceda54a4f105 id-a83235ff94094dd88039122c7ea22127 id-6914cda7496047a2aedc495aca8a8e4b id-7410c3ed23a64a44ba9bbb5cfb0ddb7d"
+      targetConnections="id-a83235ff94094dd88039122c7ea22127 id-6914cda7496047a2aedc495aca8a8e4b id-7410c3ed23a64a44ba9bbb5cfb0ddb7d"
       fillColor="#ffffff"
       textPosition="1">
     <features
@@ -63,7 +105,7 @@
   <children
       xsi:type="archimate:DiagramModelArchimateObject"
       id="id-89da747fc64748089cf8d1ee7d3483fa"
-      targetConnections="id-dc2bd5dd109e449ea4b2947fbd4ecbd3 id-9fa1b68dfc6245c1b8e5b347788ecad2"
+      targetConnections="id-dc2bd5dd109e449ea4b2947fbd4ecbd3"
       fillColor="#ffffff"
       textPosition="1">
     <features
@@ -87,9 +129,77 @@
           xsi:type="archimate:AssociationRelationship"
           href="AssociationRelationship_id-34eb7f0fc6be464e80ca03b3f6348988.xml#id-34eb7f0fc6be464e80ca03b3f6348988"/>
     </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-a9819413447b4d8984678d5cc1e322bd"
+        source="id-89da747fc64748089cf8d1ee7d3483fa"
+        target="id-b4efcfb0325b487ca7f45f3c66b8923c">
+      <bendpoints
+          startX="-24"
+          startY="81"
+          endX="-24"
+          endY="-207"/>
+      <bendpoints
+          startX="-120"
+          startY="81"
+          endX="-120"
+          endY="-207"/>
+      <bendpoints
+          startX="-120"
+          startY="285"
+          endX="-120"
+          endY="-3"/>
+      <archimateRelationship
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-8990f91df1c940f99f1271f3e2cd6635.xml#id-8990f91df1c940f99f1271f3e2cd6635"/>
+    </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-c366a9f8d4d4489d80bbc2b027e6fc58"
+        source="id-89da747fc64748089cf8d1ee7d3483fa"
+        target="id-3b7e87e89d0a47e788d6de4de1348233">
+      <features
+          name="labelExpression"
+          value="is belang-&#xD;&#xA;hebbende bij"/>
+      <bendpoints
+          startX="84"
+          startY="-15"
+          endX="-156"
+          endY="141"/>
+      <bendpoints
+          startX="84"
+          startY="-171"
+          endX="-156"
+          endY="-15"/>
+      <archimateRelationship
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-a460ce6a84ab4b6dbc5a857e13f4ce26.xml#id-a460ce6a84ab4b6dbc5a857e13f4ce26"/>
+    </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-56bbe30e026c4fb8a9acb245576e6896"
+        source="id-89da747fc64748089cf8d1ee7d3483fa"
+        target="id-3b7e87e89d0a47e788d6de4de1348233">
+      <features
+          name="labelExpression"
+          value="vertegen-&#xD;&#xA;woordigt"/>
+      <bendpoints
+          startX="132"
+          startY="9"
+          endX="-108"
+          endY="165"/>
+      <bendpoints
+          startX="132"
+          startY="-135"
+          endX="-108"
+          endY="21"/>
+      <archimateRelationship
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-1c7dd45a8c774af09354cdbd8619ca4e.xml#id-1c7dd45a8c774af09354cdbd8619ca4e"/>
+    </sourceConnections>
     <bounds
         x="276"
-        y="289"
+        y="312"
         width="120"
         height="55"/>
     <archimateElement
@@ -99,24 +209,15 @@
   <children
       xsi:type="archimate:DiagramModelArchimateObject"
       id="id-6fa72f4f350d4692bf8bfde14ac24aaa"
-      targetConnections="id-151036d05f534a0eb398c7909f76c9eb id-a44aba0d2054461bb441652b96e132ed id-e3006fd608ea4b1b96575651d6fb7f42"
+      targetConnections="id-151036d05f534a0eb398c7909f76c9eb id-a44aba0d2054461bb441652b96e132ed id-feaf61d2c37f449b9c6f882ed39279a1 id-3cc35b15c309466f8730b116cbf7b9c4 id-5017d9282a6640fa962bc8af99251958"
       fillColor="#ffffff"
       textPosition="1">
     <features
         name="iconVisible"
         value="2"/>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-99964616182a4796a185f81c48ee5580"
-        source="id-6fa72f4f350d4692bf8bfde14ac24aaa"
-        target="id-e3d369fdc83a4ab48269b2bd34866757">
-      <archimateRelationship
-          xsi:type="archimate:AssociationRelationship"
-          href="AssociationRelationship_id-87bab4026c7748d095f890907ad4bf83.xml#id-87bab4026c7748d095f890907ad4bf83"/>
-    </sourceConnections>
     <bounds
-        x="768"
-        y="697"
+        x="766"
+        y="309"
         width="120"
         height="55"/>
     <archimateElement
@@ -138,10 +239,15 @@
         source="id-b30522b174cd4b1ebd873c6f7c6062d3"
         target="id-6fa72f4f350d4692bf8bfde14ac24aaa">
       <bendpoints
-          startX="-24"
-          startY="69"
-          endX="-24"
-          endY="-60"/>
+          startX="-34"
+          startY="-48"
+          endX="206"
+          endY="96"/>
+      <bendpoints
+          startX="-238"
+          startY="-48"
+          endX="2"
+          endY="96"/>
       <archimateRelationship
           xsi:type="archimate:SpecializationRelationship"
           href="SpecializationRelationship_id-b73a84bafdeb464182124bc87f30652f.xml#id-b73a84bafdeb464182124bc87f30652f"/>
@@ -152,17 +258,22 @@
         source="id-b30522b174cd4b1ebd873c6f7c6062d3"
         target="id-6fa72f4f350d4692bf8bfde14ac24aaa">
       <bendpoints
-          startX="24"
-          startY="69"
-          endX="24"
-          endY="-60"/>
+          startX="2"
+          startY="-72"
+          endX="242"
+          endY="72"/>
+      <bendpoints
+          startX="-202"
+          startY="-72"
+          endX="38"
+          endY="72"/>
       <archimateRelationship
           xsi:type="archimate:AggregationRelationship"
           href="AggregationRelationship_id-772b11af403f429b91058443562d4d3b.xml#id-772b11af403f429b91058443562d4d3b"/>
     </sourceConnections>
     <bounds
-        x="768"
-        y="568"
+        x="1006"
+        y="453"
         width="120"
         height="55"/>
     <archimateElement
@@ -172,24 +283,7 @@
   <children
       xsi:type="archimate:DiagramModelArchimateObject"
       id="id-e3d369fdc83a4ab48269b2bd34866757"
-      targetConnections="id-99964616182a4796a185f81c48ee5580 id-bddd9ba3491746479f5281bdd366051d"
-      fillColor="#ffffff"
-      textPosition="1">
-    <features
-        name="iconVisible"
-        value="2"/>
-    <bounds
-        x="514"
-        y="697"
-        width="120"
-        height="55"/>
-    <archimateElement
-        xsi:type="archimate:BusinessObject"
-        href="BusinessObject_id-7a15da44f51b45d0b7b2d1449ea8def3.xml#id-7a15da44f51b45d0b7b2d1449ea8def3"/>
-  </children>
-  <children
-      xsi:type="archimate:DiagramModelArchimateObject"
-      id="id-2ba5c2d8eb7a4bd78855353364c41197"
+      targetConnections="id-8d5ab2f0a8c9451ea9ea4e87a06b1e14 id-ddde65e23316439b9bec619fad1166f4"
       fillColor="#ffffff"
       textPosition="1">
     <features
@@ -197,47 +291,24 @@
         value="2"/>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-b2368aca600e446cb4bdb49987217b72"
-        source="id-2ba5c2d8eb7a4bd78855353364c41197"
-        target="id-0faf685e7f27459082c5b42df1a369e5">
-      <archimateRelationship
-          xsi:type="archimate:SpecializationRelationship"
-          href="SpecializationRelationship_id-b94a1a019cf14659b54f18aed31da869.xml#id-b94a1a019cf14659b54f18aed31da869"/>
-    </sourceConnections>
-    <bounds
-        x="36"
-        y="435"
-        width="120"
-        height="55"/>
-    <archimateElement
-        xsi:type="archimate:BusinessObject"
-        href="BusinessObject_id-b1f831bda0454c3ab6095b279b1c0df8.xml#id-b1f831bda0454c3ab6095b279b1c0df8"/>
-  </children>
-  <children
-      xsi:type="archimate:DiagramModelArchimateObject"
-      id="id-552b3379cde34342bd4c3fb7a40c7c23"
-      fillColor="#ffffff"
-      textPosition="1">
-    <features
-        name="iconVisible"
-        value="2"/>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-9fa1b68dfc6245c1b8e5b347788ecad2"
-        source="id-552b3379cde34342bd4c3fb7a40c7c23"
-        target="id-89da747fc64748089cf8d1ee7d3483fa">
+        id="id-5017d9282a6640fa962bc8af99251958"
+        source="id-e3d369fdc83a4ab48269b2bd34866757"
+        target="id-6fa72f4f350d4692bf8bfde14ac24aaa">
+      <bendpoints
+          startY="-147"
+          endX="-250"/>
       <archimateRelationship
-          xsi:type="archimate:SpecializationRelationship"
-          href="SpecializationRelationship_id-038cac172d2c49c0a004dc635058fedd.xml#id-038cac172d2c49c0a004dc635058fedd"/>
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-139400e4f6bb42c69517ad4d1aeb6de9.xml#id-139400e4f6bb42c69517ad4d1aeb6de9"/>
     </sourceConnections>
     <bounds
-        x="36"
-        y="289"
+        x="516"
+        y="456"
         width="120"
         height="55"/>
     <archimateElement
         xsi:type="archimate:BusinessObject"
-        href="BusinessObject_id-c966b7c6c0794f66a8dc96a3835b0d2f.xml#id-c966b7c6c0794f66a8dc96a3835b0d2f"/>
+        href="BusinessObject_id-7a15da44f51b45d0b7b2d1449ea8def3.xml#id-7a15da44f51b45d0b7b2d1449ea8def3"/>
   </children>
   <children
       xsi:type="archimate:DiagramModelArchimateObject"
@@ -253,13 +324,18 @@
         id="id-81e6c33b2e674bdab80840d7b8133c58"
         source="id-9cf24f628ce14322a7a045993fdb87d2"
         target="id-b30522b174cd4b1ebd873c6f7c6062d3">
+      <bendpoints
+          startX="38"
+          startY="72"
+          endX="38"
+          endY="-72"/>
       <archimateRelationship
           xsi:type="archimate:AggregationRelationship"
           href="AggregationRelationship_id-894bcb5440e945c5b047962c5170f864.xml#id-894bcb5440e945c5b047962c5170f864"/>
     </sourceConnections>
     <bounds
-        x="768"
-        y="436"
+        x="1006"
+        y="309"
         width="120"
         height="55"/>
     <archimateElement
@@ -287,8 +363,8 @@
           href="SpecializationRelationship_id-6d22edd5d1e34575a08863f2790c32ce.xml#id-6d22edd5d1e34575a08863f2790c32ce"/>
     </sourceConnections>
     <bounds
-        x="514"
-        y="436"
+        x="1006"
+        y="156"
         width="120"
         height="55"/>
     <archimateElement
@@ -303,13 +379,13 @@
       textPosition="1">
     <features
         name="labelExpression"
-        value="Digitaal identificatie&#xD;&#xA;middel"/>
+        value="Digitaal identificatiemiddel"/>
     <features
         name="iconVisible"
         value="2"/>
     <bounds
-        x="509"
-        y="289"
+        x="36"
+        y="309"
         width="120"
         height="55"/>
     <archimateElement
@@ -334,20 +410,8 @@
           xsi:type="archimate:SpecializationRelationship"
           href="SpecializationRelationship_id-a03a9aef1cf744ca86d73bb8319389e1.xml#id-a03a9aef1cf744ca86d73bb8319389e1"/>
     </sourceConnections>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-e3006fd608ea4b1b96575651d6fb7f42"
-        source="id-72276c4a1cb54174b07fef6ba9030687"
-        target="id-6fa72f4f350d4692bf8bfde14ac24aaa">
-      <bendpoints
-          startY="537"
-          endX="240"/>
-      <archimateRelationship
-          xsi:type="archimate:AssociationRelationship"
-          href="AssociationRelationship_id-ba3d239e7ae24515a7d453f23f5d41ae.xml#id-ba3d239e7ae24515a7d453f23f5d41ae"/>
-    </sourceConnections>
     <bounds
-        x="1008"
+        x="766"
         y="156"
         width="120"
         height="55"/>
@@ -373,8 +437,8 @@
           href="SpecializationRelationship_id-6f07d7d2c14f43e981c75fa732747f0c.xml#id-6f07d7d2c14f43e981c75fa732747f0c"/>
     </sourceConnections>
     <bounds
-        x="768"
-        y="12"
+        x="766"
+        y="16"
         width="120"
         height="55"/>
     <archimateElement
@@ -394,13 +458,23 @@
         id="id-d1acab40f30a429a94ef8879ab1c73a2"
         source="id-0acea2cec6234509b13ddf4fd7b10de8"
         target="id-72276c4a1cb54174b07fef6ba9030687">
+      <bendpoints
+          startX="2"
+          startY="65"
+          endX="242"
+          endY="-75"/>
+      <bendpoints
+          startX="-214"
+          startY="65"
+          endX="26"
+          endY="-75"/>
       <archimateRelationship
           xsi:type="archimate:SpecializationRelationship"
           href="SpecializationRelationship_id-e757b928f60e417ca5b502d23c2c57eb.xml#id-e757b928f60e417ca5b502d23c2c57eb"/>
     </sourceConnections>
     <bounds
-        x="1008"
-        y="12"
+        x="1006"
+        y="16"
         width="120"
         height="55"/>
     <archimateElement
@@ -425,8 +499,8 @@
           href="SpecializationRelationship_id-a60676cf36344c7d9ba602054322bbab.xml#id-a60676cf36344c7d9ba602054322bbab"/>
     </sourceConnections>
     <bounds
-        x="768"
-        y="289"
+        x="516"
+        y="16"
         width="120"
         height="55"/>
     <archimateElement
@@ -436,7 +510,7 @@
   <children
       xsi:type="archimate:DiagramModelArchimateObject"
       id="id-3b7e87e89d0a47e788d6de4de1348233"
-      targetConnections="id-23c2684862d54097b6f8905d814a3cb8 id-25e57f97849144ce930abb73b7d7a90c"
+      targetConnections="id-23c2684862d54097b6f8905d814a3cb8 id-25e57f97849144ce930abb73b7d7a90c id-c366a9f8d4d4489d80bbc2b027e6fc58 id-56bbe30e026c4fb8a9acb245576e6896"
       fillColor="#ffffff"
       textPosition="1">
     <features
@@ -444,15 +518,54 @@
         value="2"/>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-484dd7ff798d44c08d7fceda54a4f105"
+        id="id-3cc35b15c309466f8730b116cbf7b9c4"
         source="id-3b7e87e89d0a47e788d6de4de1348233"
-        target="id-cd8b2eda73594658be7823d911f441a3">
+        target="id-6fa72f4f350d4692bf8bfde14ac24aaa">
+      <features
+          name="labelExpression"
+          value="kan betrekking&#xD;&#xA;hebben op"/>
+      <bendpoints
+          startY="81"
+          endX="-250"
+          endY="-72"/>
+      <bendpoints
+          startX="252"
+          startY="81"
+          endX="2"
+          endY="-72"/>
+      <archimateRelationship
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-cc0457e292b44586aa95b0778542dec0.xml#id-cc0457e292b44586aa95b0778542dec0"/>
+    </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-3932575eaf3e4c508930eb7c4b1779a7"
+        source="id-3b7e87e89d0a47e788d6de4de1348233"
+        target="id-73d120556ba440378292ea1eca437fcb">
+      <bendpoints
+          startX="-24"
+          startY="129"
+          endX="-24"
+          endY="-315"/>
+      <bendpoints
+          startX="-84"
+          startY="129"
+          endX="-84"
+          endY="-315"/>
+      <bendpoints
+          startX="-84"
+          startY="393"
+          endX="-84"
+          endY="-51"/>
+      <bendpoints
+          startY="393"
+          endY="-51"/>
       <archimateRelationship
           xsi:type="archimate:AssociationRelationship"
-          href="AssociationRelationship_id-6c86ec24816e4c29bc460094b32bbb51.xml#id-6c86ec24816e4c29bc460094b32bbb51"/>
+          href="AssociationRelationship_id-f920610ad6df4de5b46ef0782f6b9a1c.xml#id-f920610ad6df4de5b46ef0782f6b9a1c"/>
     </sourceConnections>
     <bounds
-        x="768"
+        x="516"
         y="156"
         width="120"
         height="55"/>
@@ -479,7 +592,7 @@
     </sourceConnections>
     <bounds
         x="36"
-        y="12"
+        y="156"
         width="120"
         height="55"/>
     <archimateElement
@@ -499,13 +612,22 @@
         id="id-a83235ff94094dd88039122c7ea22127"
         source="id-4e1cca880c58431f89880b1260800cca"
         target="id-cd8b2eda73594658be7823d911f441a3">
+      <bendpoints
+          startY="69"
+          endX="-240"
+          endY="-75"/>
+      <bendpoints
+          startX="216"
+          startY="69"
+          endX="-24"
+          endY="-75"/>
       <archimateRelationship
           xsi:type="archimate:SpecializationRelationship"
           href="SpecializationRelationship_id-10cfee86f4dc4f70b3dd733c61c77b8d.xml#id-10cfee86f4dc4f70b3dd733c61c77b8d"/>
     </sourceConnections>
     <bounds
-        x="276"
-        y="13"
+        x="36"
+        y="12"
         width="120"
         height="55"/>
     <archimateElement
@@ -530,7 +652,7 @@
           href="SpecializationRelationship_id-3c3ebe93320846edbde7eb0591394911.xml#id-3c3ebe93320846edbde7eb0591394911"/>
     </sourceConnections>
     <bounds
-        x="506"
+        x="276"
         y="16"
         width="120"
         height="55"/>
@@ -538,4 +660,147 @@
         xsi:type="archimate:BusinessObject"
         href="BusinessObject_id-202b003ac7d149efbd8a7248b58b744f.xml#id-202b003ac7d149efbd8a7248b58b744f"/>
   </children>
+  <children
+      xsi:type="archimate:DiagramModelArchimateObject"
+      id="id-f69b909b0c004e7f9837a45ff0d02a2c"
+      fillColor="#ffffff"
+      textPosition="1">
+    <features
+        name="iconVisible"
+        value="2"/>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-feaf61d2c37f449b9c6f882ed39279a1"
+        source="id-f69b909b0c004e7f9837a45ff0d02a2c"
+        target="id-6fa72f4f350d4692bf8bfde14ac24aaa">
+      <bendpoints
+          startX="-34"
+          startY="-75"
+          endX="-34"
+          endY="72"/>
+      <archimateRelationship
+          xsi:type="archimate:SpecializationRelationship"
+          href="SpecializationRelationship_id-f97b745c207045be9513f2d5459f65d0.xml#id-f97b745c207045be9513f2d5459f65d0"/>
+    </sourceConnections>
+    <bounds
+        x="766"
+        y="456"
+        width="120"
+        height="55"/>
+    <archimateElement
+        xsi:type="archimate:BusinessObject"
+        href="BusinessObject_id-89c65a70db1b44d198856566c5d012be.xml#id-89c65a70db1b44d198856566c5d012be"/>
+  </children>
+  <children
+      xsi:type="archimate:DiagramModelArchimateObject"
+      id="id-b4efcfb0325b487ca7f45f3c66b8923c"
+      targetConnections="id-4f79f7989d5d4c07bd5274c7c666e2ef id-a9819413447b4d8984678d5cc1e322bd"
+      fillColor="#ffffff"
+      textPosition="1">
+    <features
+        name="iconVisible"
+        value="2"/>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-37496ab2933b4011ad51a3431bcc26d3"
+        source="id-b4efcfb0325b487ca7f45f3c66b8923c"
+        target="id-73d120556ba440378292ea1eca437fcb">
+      <bendpoints
+          startY="69"
+          endX="-240"
+          endY="69"/>
+      <bendpoints
+          startX="216"
+          startY="69"
+          endX="-24"
+          endY="69"/>
+      <archimateRelationship
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-e8f14d425db449a195762d35136b623e.xml#id-e8f14d425db449a195762d35136b623e"/>
+    </sourceConnections>
+    <bounds
+        x="276"
+        y="600"
+        width="120"
+        height="55"/>
+    <archimateElement
+        xsi:type="archimate:BusinessObject"
+        href="BusinessObject_id-f51d4497b87b4751842effe518b903d5.xml#id-f51d4497b87b4751842effe518b903d5"/>
+  </children>
+  <children
+      xsi:type="archimate:DiagramModelArchimateObject"
+      id="id-73d120556ba440378292ea1eca437fcb"
+      targetConnections="id-9cf8cc45f3b9452aa8c857e5b9baac78 id-37496ab2933b4011ad51a3431bcc26d3 id-3932575eaf3e4c508930eb7c4b1779a7"
+      fillColor="#ffffff"
+      textPosition="1">
+    <features
+        name="iconVisible"
+        value="2"/>
+    <features
+        name="labelExpression"
+        value="Bevoegdheids&#xD;&#xA;verklaring"/>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-108039b9b39346d4b0813104aa7a88c3"
+        source="id-73d120556ba440378292ea1eca437fcb"
+        target="id-d6ab4e8ad8124737a66f72f956daae99">
+      <bendpoints
+          startX="36"
+          startY="69"
+          endX="-214"
+          endY="69"/>
+      <bendpoints
+          startX="252"
+          startY="69"
+          endX="2"
+          endY="69"/>
+      <archimateRelationship
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-8cc61827e0494b4c9a5466806bd5fd7d.xml#id-8cc61827e0494b4c9a5466806bd5fd7d"/>
+    </sourceConnections>
+    <bounds
+        x="516"
+        y="600"
+        width="120"
+        height="55"/>
+    <archimateElement
+        xsi:type="archimate:BusinessObject"
+        href="BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml#id-1cb3ac18cb83432ebe33dacfbd3d2832"/>
+  </children>
+  <children
+      xsi:type="archimate:DiagramModelArchimateObject"
+      id="id-d6ab4e8ad8124737a66f72f956daae99"
+      targetConnections="id-108039b9b39346d4b0813104aa7a88c3"
+      fillColor="#ffffff"
+      textPosition="1">
+    <features
+        name="iconVisible"
+        value="2"/>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-8d5ab2f0a8c9451ea9ea4e87a06b1e14"
+        source="id-d6ab4e8ad8124737a66f72f956daae99"
+        target="id-e3d369fdc83a4ab48269b2bd34866757">
+      <bendpoints
+          startX="2"
+          startY="-75"
+          endX="252"
+          endY="69"/>
+      <bendpoints
+          startX="-250"
+          startY="-75"
+          endY="69"/>
+      <archimateRelationship
+          xsi:type="archimate:AssociationRelationship"
+          href="AssociationRelationship_id-4da3d3f23f9647748af8a8450f886a43.xml#id-4da3d3f23f9647748af8a8450f886a43"/>
+    </sourceConnections>
+    <bounds
+        x="766"
+        y="600"
+        width="120"
+        height="55"/>
+    <archimateElement
+        xsi:type="archimate:BusinessObject"
+        href="BusinessObject_id-0e6a68545b2d470d841b82aa5e05d4a5.xml#id-0e6a68545b2d470d841b82aa5e05d4a5"/>
+  </children>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/ArchimateDiagramModel_id-d87b04d2bc5640e99880cbefb656ffde.xml b/model/diagrams/ArchimateDiagramModel_id-d87b04d2bc5640e99880cbefb656ffde.xml
index 65812c90..bb788413 100644
--- a/model/diagrams/ArchimateDiagramModel_id-d87b04d2bc5640e99880cbefb656ffde.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-d87b04d2bc5640e99880cbefb656ffde.xml
@@ -417,15 +417,6 @@
     <features
         name="iconVisible"
         value="2"/>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-cc6e398281dc44d89893d0a9de2f567d"
-        source="id-43ecba309eda486ea25e07f93999acd3"
-        target="id-663c9d2843d94f30a1458994808acf9d">
-      <archimateRelationship
-          xsi:type="archimate:CompositionRelationship"
-          href="CompositionRelationship_id-919fb12f4b64443cbdb4d185a5305d79.xml#id-919fb12f4b64443cbdb4d185a5305d79"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-0c4878224f564519a6afa569fa4988a9"
@@ -444,15 +435,6 @@
           xsi:type="archimate:CompositionRelationship"
           href="CompositionRelationship_id-a3eab9c3811e447fbcab433aa96467e9.xml#id-a3eab9c3811e447fbcab433aa96467e9"/>
     </sourceConnections>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-a7c3a8757cd245c7bf53806d5fde03f9"
-        source="id-43ecba309eda486ea25e07f93999acd3"
-        target="id-ede1fe7bac0943aca54a5559587a4a2e">
-      <archimateRelationship
-          xsi:type="archimate:CompositionRelationship"
-          href="CompositionRelationship_id-9eab8cdead43402c8c0322faaec748e6.xml#id-9eab8cdead43402c8c0322faaec748e6"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-e97aeb29d7d349d5b752ccf75b913d50"
@@ -467,24 +449,6 @@
         y="180"
         width="181"
         height="529"/>
-    <children
-        xsi:type="archimate:DiagramModelArchimateObject"
-        id="id-ede1fe7bac0943aca54a5559587a4a2e"
-        targetConnections="id-a7c3a8757cd245c7bf53806d5fde03f9 id-5943b25efc30499ca0715eec4556a4b9"
-        fillColor="#ffffff"
-        textPosition="1">
-      <features
-          name="iconVisible"
-          value="2"/>
-      <bounds
-          x="12"
-          y="36"
-          width="157"
-          height="55"/>
-      <archimateElement
-          xsi:type="archimate:ApplicationFunction"
-          href="ApplicationFunction_id-96f541deda2f4ede86942209459d6057.xml#id-96f541deda2f4ede86942209459d6057"/>
-    </children>
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
         id="id-fcd1f6de8bba424e9fae700a0d634baa"
@@ -496,31 +460,13 @@
           value="2"/>
       <bounds
           x="12"
-          y="156"
+          y="96"
           width="157"
           height="55"/>
       <archimateElement
           xsi:type="archimate:ApplicationFunction"
           href="ApplicationFunction_id-20416dada168474dbe954403e7624a09.xml#id-20416dada168474dbe954403e7624a09"/>
     </children>
-    <children
-        xsi:type="archimate:DiagramModelArchimateObject"
-        id="id-663c9d2843d94f30a1458994808acf9d"
-        targetConnections="id-cc6e398281dc44d89893d0a9de2f567d id-f21b924195e44b87b3195696aaafbf1e"
-        fillColor="#ffffff"
-        textPosition="1">
-      <features
-          name="iconVisible"
-          value="2"/>
-      <bounds
-          x="12"
-          y="216"
-          width="157"
-          height="55"/>
-      <archimateElement
-          xsi:type="archimate:ApplicationFunction"
-          href="ApplicationFunction_id-25010f0e0b01416b811bfe0416463f02.xml#id-25010f0e0b01416b811bfe0416463f02"/>
-    </children>
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
         id="id-c645a4dea08a49f1945c8af06c76fb70"
@@ -532,7 +478,7 @@
           value="2"/>
       <bounds
           x="12"
-          y="276"
+          y="156"
           width="157"
           height="55"/>
       <archimateElement
@@ -542,7 +488,7 @@
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
         id="id-84286dfe092241ea9e94f45108a4dc03"
-        targetConnections="id-e97aeb29d7d349d5b752ccf75b913d50"
+        targetConnections="id-e97aeb29d7d349d5b752ccf75b913d50 id-dcb228a270aa4713b93bb608457b3282"
         fillColor="#ffffff"
         textPosition="1">
       <features
@@ -550,7 +496,7 @@
           value="2"/>
       <bounds
           x="12"
-          y="96"
+          y="36"
           width="157"
           height="55"/>
       <archimateElement
@@ -1466,16 +1412,6 @@
       xsi:type="archimate:DiagramModelArchimateObject"
       id="id-0eb4d9930fe94fa387d9c80144dbed31"
       textPosition="1">
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-5943b25efc30499ca0715eec4556a4b9"
-        lineColor="#808080"
-        source="id-0eb4d9930fe94fa387d9c80144dbed31"
-        target="id-ede1fe7bac0943aca54a5559587a4a2e">
-      <archimateRelationship
-          xsi:type="archimate:AssignmentRelationship"
-          href="AssignmentRelationship_id-20703e17d7ff43cdb9409a4c0cc32fc9.xml#id-20703e17d7ff43cdb9409a4c0cc32fc9"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-127d0fdaafcf4253a6e6e0fd4fb1515d"
@@ -1486,16 +1422,6 @@
           xsi:type="archimate:AssignmentRelationship"
           href="AssignmentRelationship_id-489d3b91a969467db254f3d342be857f.xml#id-489d3b91a969467db254f3d342be857f"/>
     </sourceConnections>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-f21b924195e44b87b3195696aaafbf1e"
-        lineColor="#808080"
-        source="id-0eb4d9930fe94fa387d9c80144dbed31"
-        target="id-663c9d2843d94f30a1458994808acf9d">
-      <archimateRelationship
-          xsi:type="archimate:AssignmentRelationship"
-          href="AssignmentRelationship_id-42e13f4641dc4b61acd61a8aedd3a72e.xml#id-42e13f4641dc4b61acd61a8aedd3a72e"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-3953da499e984dd89aece644f6f1146e"
@@ -1546,6 +1472,16 @@
           xsi:type="archimate:AssignmentRelationship"
           href="AssignmentRelationship_id-9f97bffd85da49858eef493eb81e9d2f.xml#id-9f97bffd85da49858eef493eb81e9d2f"/>
     </sourceConnections>
+    <sourceConnections
+        xsi:type="archimate:DiagramModelArchimateConnection"
+        id="id-dcb228a270aa4713b93bb608457b3282"
+        lineColor="#808080"
+        source="id-0eb4d9930fe94fa387d9c80144dbed31"
+        target="id-84286dfe092241ea9e94f45108a4dc03">
+      <archimateRelationship
+          xsi:type="archimate:AssignmentRelationship"
+          href="AssignmentRelationship_id-8033d73d38f0445888d841e087a000f7.xml#id-8033d73d38f0445888d841e087a000f7"/>
+    </sourceConnections>
     <bounds
         x="1320"
         y="636"
diff --git a/model/diagrams/ArchimateDiagramModel_id-e1cf58e0b07f4907bdce34ba561b9a18.xml b/model/diagrams/ArchimateDiagramModel_id-e1cf58e0b07f4907bdce34ba561b9a18.xml
index 972cfa3f..410bf528 100644
--- a/model/diagrams/ArchimateDiagramModel_id-e1cf58e0b07f4907bdce34ba561b9a18.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-e1cf58e0b07f4907bdce34ba561b9a18.xml
@@ -417,24 +417,6 @@
     <features
         name="iconVisible"
         value="2"/>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-2353c2ab3fd64d76aeb455a4ed6a33f9"
-        source="id-6726222ae3c8476fbd9374c6b7343204"
-        target="id-36cb72f7a4784196a1d2bb99dc8fa134">
-      <archimateRelationship
-          xsi:type="archimate:CompositionRelationship"
-          href="CompositionRelationship_id-919fb12f4b64443cbdb4d185a5305d79.xml#id-919fb12f4b64443cbdb4d185a5305d79"/>
-    </sourceConnections>
-    <sourceConnections
-        xsi:type="archimate:DiagramModelArchimateConnection"
-        id="id-d071bd4066694c81817d9ee7d2020e90"
-        source="id-6726222ae3c8476fbd9374c6b7343204"
-        target="id-0cf5fbb340234b9d9d0f25e63f801b5d">
-      <archimateRelationship
-          xsi:type="archimate:CompositionRelationship"
-          href="CompositionRelationship_id-9eab8cdead43402c8c0322faaec748e6.xml#id-9eab8cdead43402c8c0322faaec748e6"/>
-    </sourceConnections>
     <sourceConnections
         xsi:type="archimate:DiagramModelArchimateConnection"
         id="id-d33c832b33964ecb97a3475edc2d39a7"
@@ -467,24 +449,6 @@
         y="12"
         width="181"
         height="529"/>
-    <children
-        xsi:type="archimate:DiagramModelArchimateObject"
-        id="id-0cf5fbb340234b9d9d0f25e63f801b5d"
-        targetConnections="id-d071bd4066694c81817d9ee7d2020e90"
-        fillColor="#ffffff"
-        textPosition="1">
-      <features
-          name="iconVisible"
-          value="2"/>
-      <bounds
-          x="12"
-          y="36"
-          width="157"
-          height="55"/>
-      <archimateElement
-          xsi:type="archimate:ApplicationFunction"
-          href="ApplicationFunction_id-96f541deda2f4ede86942209459d6057.xml#id-96f541deda2f4ede86942209459d6057"/>
-    </children>
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
         id="id-f88be1d498ce45f3aa6ba1c3be2e9d45"
@@ -496,31 +460,13 @@
           value="2"/>
       <bounds
           x="12"
-          y="156"
+          y="96"
           width="157"
           height="55"/>
       <archimateElement
           xsi:type="archimate:ApplicationFunction"
           href="ApplicationFunction_id-20416dada168474dbe954403e7624a09.xml#id-20416dada168474dbe954403e7624a09"/>
     </children>
-    <children
-        xsi:type="archimate:DiagramModelArchimateObject"
-        id="id-36cb72f7a4784196a1d2bb99dc8fa134"
-        targetConnections="id-2353c2ab3fd64d76aeb455a4ed6a33f9"
-        fillColor="#ffffff"
-        textPosition="1">
-      <features
-          name="iconVisible"
-          value="2"/>
-      <bounds
-          x="12"
-          y="216"
-          width="157"
-          height="55"/>
-      <archimateElement
-          xsi:type="archimate:ApplicationFunction"
-          href="ApplicationFunction_id-25010f0e0b01416b811bfe0416463f02.xml#id-25010f0e0b01416b811bfe0416463f02"/>
-    </children>
     <children
         xsi:type="archimate:DiagramModelArchimateObject"
         id="id-81ff3186fe804448866ac4bcf8005e27"
@@ -532,7 +478,7 @@
           value="2"/>
       <bounds
           x="12"
-          y="276"
+          y="156"
           width="157"
           height="55"/>
       <archimateElement
@@ -550,7 +496,7 @@
           value="2"/>
       <bounds
           x="12"
-          y="96"
+          y="36"
           width="157"
           height="55"/>
       <archimateElement
diff --git a/model/relations/AccessRelationship_id-4e7f644a22a145c7a047ede0bf6b124e.xml b/model/relations/AccessRelationship_id-2e6b1d5640a940cf8c2cb94bd3b5da8c.xml
similarity index 52%
rename from model/relations/AccessRelationship_id-4e7f644a22a145c7a047ede0bf6b124e.xml
rename to model/relations/AccessRelationship_id-2e6b1d5640a940cf8c2cb94bd3b5da8c.xml
index 4f117d5a..2ebd3ea9 100644
--- a/model/relations/AccessRelationship_id-4e7f644a22a145c7a047ede0bf6b124e.xml
+++ b/model/relations/AccessRelationship_id-2e6b1d5640a940cf8c2cb94bd3b5da8c.xml
@@ -1,11 +1,11 @@
 <archimate:AccessRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-4e7f644a22a145c7a047ede0bf6b124e">
+    id="id-2e6b1d5640a940cf8c2cb94bd3b5da8c">
   <source
       xsi:type="archimate:ApplicationFunction"
-      href="ApplicationFunction_id-e21e17d1c67d432b982d11323b3919d0.xml#id-e21e17d1c67d432b982d11323b3919d0"/>
+      href="ApplicationFunction_id-a6e65e269b3e48cf91d4aa32473a6040.xml#id-a6e65e269b3e48cf91d4aa32473a6040"/>
   <target
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-c966b7c6c0794f66a8dc96a3835b0d2f.xml#id-c966b7c6c0794f66a8dc96a3835b0d2f"/>
+      href="BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml#id-1cb3ac18cb83432ebe33dacfbd3d2832"/>
 </archimate:AccessRelationship>
diff --git a/model/relations/AccessRelationship_id-fb8a8180a1ea40e58acae3f378542b5d.xml b/model/relations/AccessRelationship_id-50a44c84fc17480ea2d9ea602d90a79b.xml
similarity index 72%
rename from model/relations/AccessRelationship_id-fb8a8180a1ea40e58acae3f378542b5d.xml
rename to model/relations/AccessRelationship_id-50a44c84fc17480ea2d9ea602d90a79b.xml
index a588086c..265d0676 100644
--- a/model/relations/AccessRelationship_id-fb8a8180a1ea40e58acae3f378542b5d.xml
+++ b/model/relations/AccessRelationship_id-50a44c84fc17480ea2d9ea602d90a79b.xml
@@ -1,11 +1,11 @@
 <archimate:AccessRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-fb8a8180a1ea40e58acae3f378542b5d">
+    id="id-50a44c84fc17480ea2d9ea602d90a79b">
   <source
       xsi:type="archimate:ApplicationFunction"
       href="ApplicationFunction_id-f2ceecc4528847d599ad006163029943.xml#id-f2ceecc4528847d599ad006163029943"/>
   <target
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-b1f831bda0454c3ab6095b279b1c0df8.xml#id-b1f831bda0454c3ab6095b279b1c0df8"/>
+      href="BusinessObject_id-89c65a70db1b44d198856566c5d012be.xml#id-89c65a70db1b44d198856566c5d012be"/>
 </archimate:AccessRelationship>
diff --git a/model/relations/AccessRelationship_id-8957c5ed61d64db183a7c10a47802c1d.xml b/model/relations/AccessRelationship_id-8957c5ed61d64db183a7c10a47802c1d.xml
new file mode 100644
index 00000000..c99272e0
--- /dev/null
+++ b/model/relations/AccessRelationship_id-8957c5ed61d64db183a7c10a47802c1d.xml
@@ -0,0 +1,11 @@
+<archimate:AccessRelationship
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    id="id-8957c5ed61d64db183a7c10a47802c1d">
+  <source
+      xsi:type="archimate:ApplicationFunction"
+      href="ApplicationFunction_id-7814d0d49e494a30be225815d468ef90.xml#id-7814d0d49e494a30be225815d468ef90"/>
+  <target
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-0e6a68545b2d470d841b82aa5e05d4a5.xml#id-0e6a68545b2d470d841b82aa5e05d4a5"/>
+</archimate:AccessRelationship>
diff --git a/model/relations/AccessRelationship_id-db8d8874dd684331b3cbeec6e3a3becf.xml b/model/relations/AccessRelationship_id-db8d8874dd684331b3cbeec6e3a3becf.xml
new file mode 100644
index 00000000..ad519fff
--- /dev/null
+++ b/model/relations/AccessRelationship_id-db8d8874dd684331b3cbeec6e3a3becf.xml
@@ -0,0 +1,11 @@
+<archimate:AccessRelationship
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    id="id-db8d8874dd684331b3cbeec6e3a3becf">
+  <source
+      xsi:type="archimate:ApplicationFunction"
+      href="ApplicationFunction_id-a6e65e269b3e48cf91d4aa32473a6040.xml#id-a6e65e269b3e48cf91d4aa32473a6040"/>
+  <target
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-f51d4497b87b4751842effe518b903d5.xml#id-f51d4497b87b4751842effe518b903d5"/>
+</archimate:AccessRelationship>
diff --git a/model/relations/AssignmentRelationship_id-42e13f4641dc4b61acd61a8aedd3a72e.xml b/model/relations/AssignmentRelationship_id-42e13f4641dc4b61acd61a8aedd3a72e.xml
deleted file mode 100644
index 50e8378b..00000000
--- a/model/relations/AssignmentRelationship_id-42e13f4641dc4b61acd61a8aedd3a72e.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<archimate:AssignmentRelationship
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-42e13f4641dc4b61acd61a8aedd3a72e">
-  <source
-      xsi:type="archimate:ApplicationComponent"
-      href="ApplicationComponent_id-baa0a1a458e54436813047815a6a1ac6.xml#id-baa0a1a458e54436813047815a6a1ac6"/>
-  <target
-      xsi:type="archimate:ApplicationFunction"
-      href="ApplicationFunction_id-25010f0e0b01416b811bfe0416463f02.xml#id-25010f0e0b01416b811bfe0416463f02"/>
-</archimate:AssignmentRelationship>
diff --git a/model/relations/AssignmentRelationship_id-20703e17d7ff43cdb9409a4c0cc32fc9.xml b/model/relations/AssignmentRelationship_id-8033d73d38f0445888d841e087a000f7.xml
similarity index 72%
rename from model/relations/AssignmentRelationship_id-20703e17d7ff43cdb9409a4c0cc32fc9.xml
rename to model/relations/AssignmentRelationship_id-8033d73d38f0445888d841e087a000f7.xml
index ea691638..cd08af73 100644
--- a/model/relations/AssignmentRelationship_id-20703e17d7ff43cdb9409a4c0cc32fc9.xml
+++ b/model/relations/AssignmentRelationship_id-8033d73d38f0445888d841e087a000f7.xml
@@ -1,11 +1,11 @@
 <archimate:AssignmentRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-20703e17d7ff43cdb9409a4c0cc32fc9">
+    id="id-8033d73d38f0445888d841e087a000f7">
   <source
       xsi:type="archimate:ApplicationComponent"
       href="ApplicationComponent_id-baa0a1a458e54436813047815a6a1ac6.xml#id-baa0a1a458e54436813047815a6a1ac6"/>
   <target
       xsi:type="archimate:ApplicationFunction"
-      href="ApplicationFunction_id-96f541deda2f4ede86942209459d6057.xml#id-96f541deda2f4ede86942209459d6057"/>
+      href="ApplicationFunction_id-91420e2b073a402ea5c437e9fe3a1422.xml#id-91420e2b073a402ea5c437e9fe3a1422"/>
 </archimate:AssignmentRelationship>
diff --git a/model/relations/AssignmentRelationship_id-af12df6be6da43e7ae230f98e50cef7e.xml b/model/relations/AssignmentRelationship_id-af12df6be6da43e7ae230f98e50cef7e.xml
deleted file mode 100644
index 70e0ccf7..00000000
--- a/model/relations/AssignmentRelationship_id-af12df6be6da43e7ae230f98e50cef7e.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<archimate:AssignmentRelationship
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-af12df6be6da43e7ae230f98e50cef7e">
-  <source
-      xsi:type="archimate:ApplicationComponent"
-      href="ApplicationComponent_id-b666322db6e64dd98a41a38e9aeb9119.xml#id-b666322db6e64dd98a41a38e9aeb9119"/>
-  <target
-      xsi:type="archimate:ApplicationFunction"
-      href="ApplicationFunction_id-96f541deda2f4ede86942209459d6057.xml#id-96f541deda2f4ede86942209459d6057"/>
-</archimate:AssignmentRelationship>
diff --git a/model/relations/AssignmentRelationship_id-73ce4355eb204c6088a94770940a1ae1.xml b/model/relations/AssignmentRelationship_id-d280d37bacc2467c89ba8dd4d1afb9eb.xml
similarity index 72%
rename from model/relations/AssignmentRelationship_id-73ce4355eb204c6088a94770940a1ae1.xml
rename to model/relations/AssignmentRelationship_id-d280d37bacc2467c89ba8dd4d1afb9eb.xml
index 4b940cb3..7b9fc058 100644
--- a/model/relations/AssignmentRelationship_id-73ce4355eb204c6088a94770940a1ae1.xml
+++ b/model/relations/AssignmentRelationship_id-d280d37bacc2467c89ba8dd4d1afb9eb.xml
@@ -1,11 +1,11 @@
 <archimate:AssignmentRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-73ce4355eb204c6088a94770940a1ae1">
+    id="id-d280d37bacc2467c89ba8dd4d1afb9eb">
   <source
       xsi:type="archimate:ApplicationComponent"
       href="ApplicationComponent_id-b666322db6e64dd98a41a38e9aeb9119.xml#id-b666322db6e64dd98a41a38e9aeb9119"/>
   <target
       xsi:type="archimate:ApplicationFunction"
-      href="ApplicationFunction_id-25010f0e0b01416b811bfe0416463f02.xml#id-25010f0e0b01416b811bfe0416463f02"/>
+      href="ApplicationFunction_id-91420e2b073a402ea5c437e9fe3a1422.xml#id-91420e2b073a402ea5c437e9fe3a1422"/>
 </archimate:AssignmentRelationship>
diff --git a/model/relations/AssociationRelationship_id-87bab4026c7748d095f890907ad4bf83.xml b/model/relations/AssociationRelationship_id-139400e4f6bb42c69517ad4d1aeb6de9.xml
similarity index 87%
rename from model/relations/AssociationRelationship_id-87bab4026c7748d095f890907ad4bf83.xml
rename to model/relations/AssociationRelationship_id-139400e4f6bb42c69517ad4d1aeb6de9.xml
index 3ed30916..12642b8d 100644
--- a/model/relations/AssociationRelationship_id-87bab4026c7748d095f890907ad4bf83.xml
+++ b/model/relations/AssociationRelationship_id-139400e4f6bb42c69517ad4d1aeb6de9.xml
@@ -1,11 +1,12 @@
 <archimate:AssociationRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-87bab4026c7748d095f890907ad4bf83">
+    name="geeft toegang tot"
+    id="id-139400e4f6bb42c69517ad4d1aeb6de9">
   <source
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-276320a6bad14e10a39ac2bcfcd13178.xml#id-276320a6bad14e10a39ac2bcfcd13178"/>
+      href="BusinessObject_id-7a15da44f51b45d0b7b2d1449ea8def3.xml#id-7a15da44f51b45d0b7b2d1449ea8def3"/>
   <target
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-7a15da44f51b45d0b7b2d1449ea8def3.xml#id-7a15da44f51b45d0b7b2d1449ea8def3"/>
+      href="BusinessObject_id-276320a6bad14e10a39ac2bcfcd13178.xml#id-276320a6bad14e10a39ac2bcfcd13178"/>
 </archimate:AssociationRelationship>
diff --git a/model/relations/AssociationRelationship_id-1c7dd45a8c774af09354cdbd8619ca4e.xml b/model/relations/AssociationRelationship_id-1c7dd45a8c774af09354cdbd8619ca4e.xml
new file mode 100644
index 00000000..80850eb1
--- /dev/null
+++ b/model/relations/AssociationRelationship_id-1c7dd45a8c774af09354cdbd8619ca4e.xml
@@ -0,0 +1,12 @@
+<archimate:AssociationRelationship
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="is vertegenwoordiger bij"
+    id="id-1c7dd45a8c774af09354cdbd8619ca4e">
+  <source
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-9e14841bf7a34845a4465fb9aa96cc53.xml#id-9e14841bf7a34845a4465fb9aa96cc53"/>
+  <target
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-19881848ccce47c9974cf7bc005393e8.xml#id-19881848ccce47c9974cf7bc005393e8"/>
+</archimate:AssociationRelationship>
diff --git a/model/relations/SpecializationRelationship_id-b94a1a019cf14659b54f18aed31da869.xml b/model/relations/AssociationRelationship_id-20e13a0e82b948258905b2dd76fafc21.xml
similarity index 56%
rename from model/relations/SpecializationRelationship_id-b94a1a019cf14659b54f18aed31da869.xml
rename to model/relations/AssociationRelationship_id-20e13a0e82b948258905b2dd76fafc21.xml
index 5c0125dc..472aa862 100644
--- a/model/relations/SpecializationRelationship_id-b94a1a019cf14659b54f18aed31da869.xml
+++ b/model/relations/AssociationRelationship_id-20e13a0e82b948258905b2dd76fafc21.xml
@@ -1,11 +1,12 @@
-<archimate:SpecializationRelationship
+<archimate:AssociationRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-b94a1a019cf14659b54f18aed31da869">
+    name="is opgenomen in"
+    id="id-20e13a0e82b948258905b2dd76fafc21">
   <source
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-b1f831bda0454c3ab6095b279b1c0df8.xml#id-b1f831bda0454c3ab6095b279b1c0df8"/>
+      href="BusinessObject_id-d766d65c0ea14ecc9e01f99938d0b61b.xml#id-d766d65c0ea14ecc9e01f99938d0b61b"/>
   <target
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-d766d65c0ea14ecc9e01f99938d0b61b.xml#id-d766d65c0ea14ecc9e01f99938d0b61b"/>
-</archimate:SpecializationRelationship>
+      href="BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml#id-1cb3ac18cb83432ebe33dacfbd3d2832"/>
+</archimate:AssociationRelationship>
diff --git a/model/relations/AssociationRelationship_id-34eb7f0fc6be464e80ca03b3f6348988.xml b/model/relations/AssociationRelationship_id-34eb7f0fc6be464e80ca03b3f6348988.xml
index 3953e096..74f808db 100644
--- a/model/relations/AssociationRelationship_id-34eb7f0fc6be464e80ca03b3f6348988.xml
+++ b/model/relations/AssociationRelationship_id-34eb7f0fc6be464e80ca03b3f6348988.xml
@@ -1,6 +1,7 @@
 <archimate:AssociationRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="is gekoppeld aan"
     id="id-34eb7f0fc6be464e80ca03b3f6348988">
   <source
       xsi:type="archimate:BusinessObject"
diff --git a/model/relations/AssociationRelationship_id-3900eb02a5cc494c99890f19511531ce.xml b/model/relations/AssociationRelationship_id-3900eb02a5cc494c99890f19511531ce.xml
new file mode 100644
index 00000000..4b2d9f04
--- /dev/null
+++ b/model/relations/AssociationRelationship_id-3900eb02a5cc494c99890f19511531ce.xml
@@ -0,0 +1,12 @@
+<archimate:AssociationRelationship
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="is opgenomen in"
+    id="id-3900eb02a5cc494c99890f19511531ce">
+  <source
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-d766d65c0ea14ecc9e01f99938d0b61b.xml#id-d766d65c0ea14ecc9e01f99938d0b61b"/>
+  <target
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-f51d4497b87b4751842effe518b903d5.xml#id-f51d4497b87b4751842effe518b903d5"/>
+</archimate:AssociationRelationship>
diff --git a/model/relations/AssociationRelationship_id-4da3d3f23f9647748af8a8450f886a43.xml b/model/relations/AssociationRelationship_id-4da3d3f23f9647748af8a8450f886a43.xml
new file mode 100644
index 00000000..e51d6413
--- /dev/null
+++ b/model/relations/AssociationRelationship_id-4da3d3f23f9647748af8a8450f886a43.xml
@@ -0,0 +1,12 @@
+<archimate:AssociationRelationship
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="bepaalt"
+    id="id-4da3d3f23f9647748af8a8450f886a43">
+  <source
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-0e6a68545b2d470d841b82aa5e05d4a5.xml#id-0e6a68545b2d470d841b82aa5e05d4a5"/>
+  <target
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-7a15da44f51b45d0b7b2d1449ea8def3.xml#id-7a15da44f51b45d0b7b2d1449ea8def3"/>
+</archimate:AssociationRelationship>
diff --git a/model/relations/AssociationRelationship_id-52423eab315f443cbdc38ec5cbff516b.xml b/model/relations/AssociationRelationship_id-52423eab315f443cbdc38ec5cbff516b.xml
index 70a5752a..6493d110 100644
--- a/model/relations/AssociationRelationship_id-52423eab315f443cbdc38ec5cbff516b.xml
+++ b/model/relations/AssociationRelationship_id-52423eab315f443cbdc38ec5cbff516b.xml
@@ -1,6 +1,7 @@
 <archimate:AssociationRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="heeft"
     id="id-52423eab315f443cbdc38ec5cbff516b">
   <source
       xsi:type="archimate:BusinessObject"
diff --git a/model/relations/AssociationRelationship_id-d91a1bb632c34e06b0083772a61312bf.xml b/model/relations/AssociationRelationship_id-669f13fc5e7c4d798ed19ef43a3ed0cf.xml
similarity index 87%
rename from model/relations/AssociationRelationship_id-d91a1bb632c34e06b0083772a61312bf.xml
rename to model/relations/AssociationRelationship_id-669f13fc5e7c4d798ed19ef43a3ed0cf.xml
index e790c79c..0707bf59 100644
--- a/model/relations/AssociationRelationship_id-d91a1bb632c34e06b0083772a61312bf.xml
+++ b/model/relations/AssociationRelationship_id-669f13fc5e7c4d798ed19ef43a3ed0cf.xml
@@ -1,7 +1,8 @@
 <archimate:AssociationRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-d91a1bb632c34e06b0083772a61312bf">
+    name="wordt gebruikt in"
+    id="id-669f13fc5e7c4d798ed19ef43a3ed0cf">
   <source
       xsi:type="archimate:BusinessObject"
       href="BusinessObject_id-d766d65c0ea14ecc9e01f99938d0b61b.xml#id-d766d65c0ea14ecc9e01f99938d0b61b"/>
diff --git a/model/relations/SpecializationRelationship_id-038cac172d2c49c0a004dc635058fedd.xml b/model/relations/AssociationRelationship_id-8990f91df1c940f99f1271f3e2cd6635.xml
similarity index 56%
rename from model/relations/SpecializationRelationship_id-038cac172d2c49c0a004dc635058fedd.xml
rename to model/relations/AssociationRelationship_id-8990f91df1c940f99f1271f3e2cd6635.xml
index cb6a17af..66142aa4 100644
--- a/model/relations/SpecializationRelationship_id-038cac172d2c49c0a004dc635058fedd.xml
+++ b/model/relations/AssociationRelationship_id-8990f91df1c940f99f1271f3e2cd6635.xml
@@ -1,11 +1,12 @@
-<archimate:SpecializationRelationship
+<archimate:AssociationRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-038cac172d2c49c0a004dc635058fedd">
+    name="wordt gerefereerd in"
+    id="id-8990f91df1c940f99f1271f3e2cd6635">
   <source
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-c966b7c6c0794f66a8dc96a3835b0d2f.xml#id-c966b7c6c0794f66a8dc96a3835b0d2f"/>
+      href="BusinessObject_id-9e14841bf7a34845a4465fb9aa96cc53.xml#id-9e14841bf7a34845a4465fb9aa96cc53"/>
   <target
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-9e14841bf7a34845a4465fb9aa96cc53.xml#id-9e14841bf7a34845a4465fb9aa96cc53"/>
-</archimate:SpecializationRelationship>
+      href="BusinessObject_id-f51d4497b87b4751842effe518b903d5.xml#id-f51d4497b87b4751842effe518b903d5"/>
+</archimate:AssociationRelationship>
diff --git a/model/relations/AssociationRelationship_id-8cc61827e0494b4c9a5466806bd5fd7d.xml b/model/relations/AssociationRelationship_id-8cc61827e0494b4c9a5466806bd5fd7d.xml
new file mode 100644
index 00000000..d3b00ec1
--- /dev/null
+++ b/model/relations/AssociationRelationship_id-8cc61827e0494b4c9a5466806bd5fd7d.xml
@@ -0,0 +1,12 @@
+<archimate:AssociationRelationship
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="wordt gebruikt voor"
+    id="id-8cc61827e0494b4c9a5466806bd5fd7d">
+  <source
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml#id-1cb3ac18cb83432ebe33dacfbd3d2832"/>
+  <target
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-0e6a68545b2d470d841b82aa5e05d4a5.xml#id-0e6a68545b2d470d841b82aa5e05d4a5"/>
+</archimate:AssociationRelationship>
diff --git a/model/relations/AssociationRelationship_id-a460ce6a84ab4b6dbc5a857e13f4ce26.xml b/model/relations/AssociationRelationship_id-a460ce6a84ab4b6dbc5a857e13f4ce26.xml
new file mode 100644
index 00000000..4a5888a3
--- /dev/null
+++ b/model/relations/AssociationRelationship_id-a460ce6a84ab4b6dbc5a857e13f4ce26.xml
@@ -0,0 +1,12 @@
+<archimate:AssociationRelationship
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="is belanghebbende bij"
+    id="id-a460ce6a84ab4b6dbc5a857e13f4ce26">
+  <source
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-9e14841bf7a34845a4465fb9aa96cc53.xml#id-9e14841bf7a34845a4465fb9aa96cc53"/>
+  <target
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-19881848ccce47c9974cf7bc005393e8.xml#id-19881848ccce47c9974cf7bc005393e8"/>
+</archimate:AssociationRelationship>
diff --git a/model/relations/AssociationRelationship_id-ba3d239e7ae24515a7d453f23f5d41ae.xml b/model/relations/AssociationRelationship_id-cc0457e292b44586aa95b0778542dec0.xml
similarity index 68%
rename from model/relations/AssociationRelationship_id-ba3d239e7ae24515a7d453f23f5d41ae.xml
rename to model/relations/AssociationRelationship_id-cc0457e292b44586aa95b0778542dec0.xml
index 3a133b90..a6886acf 100644
--- a/model/relations/AssociationRelationship_id-ba3d239e7ae24515a7d453f23f5d41ae.xml
+++ b/model/relations/AssociationRelationship_id-cc0457e292b44586aa95b0778542dec0.xml
@@ -1,10 +1,11 @@
 <archimate:AssociationRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-ba3d239e7ae24515a7d453f23f5d41ae">
+    name="kan betrekking hebben op"
+    id="id-cc0457e292b44586aa95b0778542dec0">
   <source
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-906f182647604ffc90107fdb1c8d46de.xml#id-906f182647604ffc90107fdb1c8d46de"/>
+      href="BusinessObject_id-19881848ccce47c9974cf7bc005393e8.xml#id-19881848ccce47c9974cf7bc005393e8"/>
   <target
       xsi:type="archimate:BusinessObject"
       href="BusinessObject_id-276320a6bad14e10a39ac2bcfcd13178.xml#id-276320a6bad14e10a39ac2bcfcd13178"/>
diff --git a/model/relations/AssociationRelationship_id-e8f14d425db449a195762d35136b623e.xml b/model/relations/AssociationRelationship_id-e8f14d425db449a195762d35136b623e.xml
new file mode 100644
index 00000000..e494af4a
--- /dev/null
+++ b/model/relations/AssociationRelationship_id-e8f14d425db449a195762d35136b623e.xml
@@ -0,0 +1,12 @@
+<archimate:AssociationRelationship
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    name="wordt gebruikt voor"
+    id="id-e8f14d425db449a195762d35136b623e">
+  <source
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-f51d4497b87b4751842effe518b903d5.xml#id-f51d4497b87b4751842effe518b903d5"/>
+  <target
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml#id-1cb3ac18cb83432ebe33dacfbd3d2832"/>
+</archimate:AssociationRelationship>
diff --git a/model/relations/AssociationRelationship_id-6c86ec24816e4c29bc460094b32bbb51.xml b/model/relations/AssociationRelationship_id-f920610ad6df4de5b46ef0782f6b9a1c.xml
similarity index 68%
rename from model/relations/AssociationRelationship_id-6c86ec24816e4c29bc460094b32bbb51.xml
rename to model/relations/AssociationRelationship_id-f920610ad6df4de5b46ef0782f6b9a1c.xml
index d89c5ded..66c3183c 100644
--- a/model/relations/AssociationRelationship_id-6c86ec24816e4c29bc460094b32bbb51.xml
+++ b/model/relations/AssociationRelationship_id-f920610ad6df4de5b46ef0782f6b9a1c.xml
@@ -1,11 +1,12 @@
 <archimate:AssociationRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-6c86ec24816e4c29bc460094b32bbb51">
+    name="wordt gebruikt voor"
+    id="id-f920610ad6df4de5b46ef0782f6b9a1c">
   <source
       xsi:type="archimate:BusinessObject"
       href="BusinessObject_id-19881848ccce47c9974cf7bc005393e8.xml#id-19881848ccce47c9974cf7bc005393e8"/>
   <target
       xsi:type="archimate:BusinessObject"
-      href="BusinessObject_id-797830dc4f51491caf773ed85703e466.xml#id-797830dc4f51491caf773ed85703e466"/>
+      href="BusinessObject_id-1cb3ac18cb83432ebe33dacfbd3d2832.xml#id-1cb3ac18cb83432ebe33dacfbd3d2832"/>
 </archimate:AssociationRelationship>
diff --git a/model/relations/CompositionRelationship_id-919fb12f4b64443cbdb4d185a5305d79.xml b/model/relations/CompositionRelationship_id-919fb12f4b64443cbdb4d185a5305d79.xml
deleted file mode 100644
index 64ceea57..00000000
--- a/model/relations/CompositionRelationship_id-919fb12f4b64443cbdb4d185a5305d79.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<archimate:CompositionRelationship
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-919fb12f4b64443cbdb4d185a5305d79">
-  <source
-      xsi:type="archimate:ApplicationFunction"
-      href="ApplicationFunction_id-f2ceecc4528847d599ad006163029943.xml#id-f2ceecc4528847d599ad006163029943"/>
-  <target
-      xsi:type="archimate:ApplicationFunction"
-      href="ApplicationFunction_id-25010f0e0b01416b811bfe0416463f02.xml#id-25010f0e0b01416b811bfe0416463f02"/>
-</archimate:CompositionRelationship>
diff --git a/model/relations/CompositionRelationship_id-9eab8cdead43402c8c0322faaec748e6.xml b/model/relations/CompositionRelationship_id-9eab8cdead43402c8c0322faaec748e6.xml
deleted file mode 100644
index efee6eeb..00000000
--- a/model/relations/CompositionRelationship_id-9eab8cdead43402c8c0322faaec748e6.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<archimate:CompositionRelationship
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:archimate="http://www.archimatetool.com/archimate"
-    id="id-9eab8cdead43402c8c0322faaec748e6">
-  <source
-      xsi:type="archimate:ApplicationFunction"
-      href="ApplicationFunction_id-f2ceecc4528847d599ad006163029943.xml#id-f2ceecc4528847d599ad006163029943"/>
-  <target
-      xsi:type="archimate:ApplicationFunction"
-      href="ApplicationFunction_id-96f541deda2f4ede86942209459d6057.xml#id-96f541deda2f4ede86942209459d6057"/>
-</archimate:CompositionRelationship>
diff --git a/model/relations/FlowRelationship_id-178a7abaf3984e03982f59bd2f499f72.xml b/model/relations/FlowRelationship_id-178a7abaf3984e03982f59bd2f499f72.xml
index cdc29c99..0cf107cf 100644
--- a/model/relations/FlowRelationship_id-178a7abaf3984e03982f59bd2f499f72.xml
+++ b/model/relations/FlowRelationship_id-178a7abaf3984e03982f59bd2f499f72.xml
@@ -1,7 +1,7 @@
 <archimate:FlowRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="bevoegdheid"
+    name="wettelijke vertegenwoordiging"
     id="id-178a7abaf3984e03982f59bd2f499f72">
   <source
       xsi:type="archimate:ApplicationComponent"
diff --git a/model/relations/FlowRelationship_id-1d6a9e7e7c624fd6bdf4cdfd3d335e53.xml b/model/relations/FlowRelationship_id-1d6a9e7e7c624fd6bdf4cdfd3d335e53.xml
index e96a8846..4a362253 100644
--- a/model/relations/FlowRelationship_id-1d6a9e7e7c624fd6bdf4cdfd3d335e53.xml
+++ b/model/relations/FlowRelationship_id-1d6a9e7e7c624fd6bdf4cdfd3d335e53.xml
@@ -1,7 +1,7 @@
 <archimate:FlowRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="bevoegheidsverklaring"
+    name="bevoegdheidsverklaring"
     id="id-1d6a9e7e7c624fd6bdf4cdfd3d335e53">
   <source
       xsi:type="archimate:ApplicationComponent"
diff --git a/model/relations/FlowRelationship_id-a3c36365ad6d4db09db79b4a2c826a0a.xml b/model/relations/FlowRelationship_id-a3c36365ad6d4db09db79b4a2c826a0a.xml
index 898fb64b..e16ec664 100644
--- a/model/relations/FlowRelationship_id-a3c36365ad6d4db09db79b4a2c826a0a.xml
+++ b/model/relations/FlowRelationship_id-a3c36365ad6d4db09db79b4a2c826a0a.xml
@@ -1,7 +1,7 @@
 <archimate:FlowRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="bevoegdheid"
+    name="machting"
     id="id-a3c36365ad6d4db09db79b4a2c826a0a">
   <source
       xsi:type="archimate:ApplicationComponent"
diff --git a/model/relations/FlowRelationship_id-de8f02c80d5744ea84db9883add41991.xml b/model/relations/FlowRelationship_id-de8f02c80d5744ea84db9883add41991.xml
index 2b292603..cb5d48e2 100644
--- a/model/relations/FlowRelationship_id-de8f02c80d5744ea84db9883add41991.xml
+++ b/model/relations/FlowRelationship_id-de8f02c80d5744ea84db9883add41991.xml
@@ -1,7 +1,7 @@
 <archimate:FlowRelationship
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="vrijwillige machtigingen"
+    name="vrijwillige machtiging"
     id="id-de8f02c80d5744ea84db9883add41991">
   <source
       xsi:type="archimate:ApplicationComponent"
diff --git a/model/relations/SpecializationRelationship_id-f97b745c207045be9513f2d5459f65d0.xml b/model/relations/SpecializationRelationship_id-f97b745c207045be9513f2d5459f65d0.xml
new file mode 100644
index 00000000..e3be7727
--- /dev/null
+++ b/model/relations/SpecializationRelationship_id-f97b745c207045be9513f2d5459f65d0.xml
@@ -0,0 +1,11 @@
+<archimate:SpecializationRelationship
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:archimate="http://www.archimatetool.com/archimate"
+    id="id-f97b745c207045be9513f2d5459f65d0">
+  <source
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-89c65a70db1b44d198856566c5d012be.xml#id-89c65a70db1b44d198856566c5d012be"/>
+  <target
+      xsi:type="archimate:BusinessObject"
+      href="BusinessObject_id-276320a6bad14e10a39ac2bcfcd13178.xml#id-276320a6bad14e10a39ac2bcfcd13178"/>
+</archimate:SpecializationRelationship>